diff --git a/aether-connector-okhttp.spec b/aether-connector-okhttp.spec index 6faf0a5..e6e6ebb 100644 --- a/aether-connector-okhttp.spec +++ b/aether-connector-okhttp.spec @@ -3,7 +3,7 @@ Name: aether-connector-okhttp Version: 0.17.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: OkHttp Aether Connector # src/main/java/io/tesla/aether/wagon/OkHttpsWagon.java is ASL and EPL @@ -20,8 +20,6 @@ BuildRequires: maven-local BuildRequires: mvn(com.google.guava:guava:18.0) BuildRequires: mvn(com.squareup.okhttp3:okhttp) >= 3.14.2 BuildRequires: mvn(com.squareup.okio:okio) >= 1.17.4 -BuildRequires: mvn(io.takari.maven.plugins:takari-lifecycle-plugin) -BuildRequires: mvn(io.takari:takari:pom:) BuildRequires: mvn(javax.inject:javax.inject) BuildRequires: mvn(org.apache.maven.wagon:wagon-provider-api) BuildRequires: mvn(org.eclipse.aether:aether-api) @@ -31,6 +29,7 @@ BuildRequires: mvn(org.eclipse.aether:aether-util) BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.inject) BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus) BuildRequires: mvn(org.slf4j:slf4j-api) +BuildRequires: mvn(org.sonatype.plugins:sisu-maven-plugin) BuildRequires: mvn(org.sonatype.sisu:sisu-guice::no_aop:) Requires: mvn(com.squareup.okhttp3:okhttp) >= 3.14.2 @@ -51,9 +50,20 @@ API documentation for %{name}. find -name '*.class' -delete find -name '*.jar' -delete +%pom_remove_parent +%pom_xpath_remove "pom:packaging" +%pom_add_plugin "org.sonatype.plugins:sisu-maven-plugin" . " + + + generate-index + process-classes + main-index + +" + %build # We don't have all test deps (e.g. npn-boot, provisio-webserver) -%mvn_build -f -- -Dtakari.privatePackageReference=ignore +%mvn_build -f -- -Dtakari.privatePackageReference=ignore -Dmaven.compiler.source=1.7 -Dmaven.compiler.target=1.7 %install %mvn_install @@ -66,6 +76,9 @@ find -name '*.jar' -delete %license eclipse-1.0.txt %changelog +* Fri Jan 24 2020 Mat Booth - 0.17.6-3 +- Avoid using takari stack for building + * Fri Jun 14 2019 Mat Booth - 0.17.6-2 - Restrict to same architectures as Eclipse itself