diff --git a/.gitignore b/.gitignore index c68f7bc..a8e4b46 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /.build-*.log /aether-connector-okhttp-0.14.0-1b66624.tar.gz /aether-connector-okhttp-0.16.0-ded2b31.tar.gz +/aether-connector-okhttp-0.17.3-a1115e4.tar.gz diff --git a/aether-connector-okhttp.spec b/aether-connector-okhttp.spec index 33a2d90..41dba00 100644 --- a/aether-connector-okhttp.spec +++ b/aether-connector-okhttp.spec @@ -1,9 +1,9 @@ -%global commit ded2b3155c61fdc8532323c99d63d002d486e526 +%global commit a1115e45f2a52d3b43d3b4f885eb8eaf041e69df %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: aether-connector-okhttp -Version: 0.16.0 -Release: 2%{?dist} +Version: 0.17.3 +Release: 1%{?dist} Summary: OkHttp Aether Connector # src/main/java/io/tesla/aether/wagon/OkHttpsWagon.java is ASL and EPL @@ -14,11 +14,9 @@ Source0: https://github.com/tesla/%{name}/archive/%{commit}/%{name}-%{ver BuildArch: noarch BuildRequires: maven-local -BuildRequires: mvn(com.google.guava:guava) -BuildRequires: mvn(com.squareup.okhttp:okhttp) -BuildRequires: mvn(com.squareup.okio:okio) -BuildRequires: mvn(io.takari.maven.plugins:takari-lifecycle-plugin) -BuildRequires: mvn(io.takari:takari:pom:) +BuildRequires: mvn(com.google.guava:guava:18.0) +BuildRequires: mvn(com.squareup.okhttp3:okhttp) >= 3.10.0 +BuildRequires: mvn(com.squareup.okio:okio) >= 1.14.0 BuildRequires: mvn(javax.inject:javax.inject) BuildRequires: mvn(org.apache.maven.wagon:wagon-provider-api) BuildRequires: mvn(org.eclipse.aether:aether-api) @@ -28,8 +26,12 @@ 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.10.0 +Requires: mvn(com.squareup.okio:okio) >= 1.14.0 + %description A repository connector implementation based on Square's OkHttp. @@ -46,9 +48,21 @@ API documentation for %{name}. find -name '*.class' -delete find -name '*.jar' -delete +# Avoid reliance on takari-lifecycle +%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) -%mvn_build --skip-tests -- -Dtakari.privatePackageReference=ignore +# We don't have all test deps (e.g. npn-boot, provisio-webserver) +%mvn_build --skip-tests -- -Dtakari.privatePackageReference=ignore -Dmaven.compiler.source=1.7 -Dmaven.compiler.target=1.7 %install %mvn_install @@ -61,6 +75,9 @@ find -name '*.jar' -delete %license eclipse-1.0.txt %changelog +* Tue Mar 20 2018 Mat Booth - 0.17.3-1 +- Update to latest release + * Wed Feb 07 2018 Fedora Release Engineering - 0.16.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 809fa3e..857020c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aether-connector-okhttp-0.16.0-ded2b31.tar.gz) = 01050fccfce8d43b6b0fce9acbddd0b598feddaf9d1fc8e6b07c650ccfe743d87856aa8fb907aeec2a0cffeb9ec03716b4bae96e1376c9d0048e0db11e46ddd0 +SHA512 (aether-connector-okhttp-0.17.3-a1115e4.tar.gz) = 6126faf85b2a3891b3a98cf7fdac7405af58c32dd2ddff4b5406d13473460f402e08c9145c09773f97325e40a0c986b679d8d7788ec07dfc548acc67af1d344e