From ed4594a70dab1fb09b6c8ff39688228ac197bd29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 1 Apr 2019 23:11:20 +0200 Subject: [PATCH 1/4] Orphaned for 6+ weeks --- .gitignore | 9 --- aether-connector-okhttp.spec | 122 ----------------------------------- dead.package | 1 + sources | 1 - 4 files changed, 1 insertion(+), 132 deletions(-) delete mode 100644 .gitignore delete mode 100644 aether-connector-okhttp.spec create mode 100644 dead.package delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index a8e4b46..0000000 --- a/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -/aether-connector-okhttp-0.0.11-95e7d98.tar.gz -/aether-connector-okhttp-0.12.0-889599c.tar.gz -/noarch -/.project -/*.src.rpm -/.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 deleted file mode 100644 index af05cb9..0000000 --- a/aether-connector-okhttp.spec +++ /dev/null @@ -1,122 +0,0 @@ -%global commit a1115e45f2a52d3b43d3b4f885eb8eaf041e69df -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - -Name: aether-connector-okhttp -Version: 0.17.3 -Release: 3%{?dist} -Summary: OkHttp Aether Connector - -# src/main/java/io/tesla/aether/wagon/OkHttpsWagon.java is ASL and EPL -License: EPL and (ASL 2.0 and EPL) -URL: https://github.com/tesla/%{name} -Source0: https://github.com/tesla/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz - -BuildArch: noarch - -BuildRequires: maven-local -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) -BuildRequires: mvn(org.eclipse.aether:aether-impl) -BuildRequires: mvn(org.eclipse.aether:aether-spi) -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. - -%package javadoc -Summary: Javadoc for %{name} - -%description javadoc -API documentation for %{name}. - - -%prep -%setup -q -n %{name}-%{commit} - -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, provisio-webserver) -%mvn_build --skip-tests -- -Dtakari.privatePackageReference=ignore -Dmaven.compiler.source=1.7 -Dmaven.compiler.target=1.7 - -%install -%mvn_install - -%files -f .mfiles -%license eclipse-1.0.txt -%license license-header.txt - -%files javadoc -f .mfiles-javadoc -%license eclipse-1.0.txt - -%changelog -* Thu Jan 31 2019 Fedora Release Engineering - 0.17.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 0.17.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* 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 - -* Mon Sep 11 2017 Mat Booth - 0.16.0-1 -- Update to upstream version 0.16.0 - -* Wed Jul 26 2017 Fedora Release Engineering - 0.14.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 0.14.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Feb 03 2016 Fedora Release Engineering - 0.14.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Jun 16 2015 Fedora Release Engineering - 0.14.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed Mar 11 2015 Mikolaj Izdebski - 0.14.0-1 -- Update to upstream version 0.14.0 - -* Fri Jul 25 2014 Mat Booth - 0.12.0-4 -- Fix failure to build with the latest version of guava - -* Sat Jun 07 2014 Fedora Release Engineering - 0.12.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat May 24 2014 Gerard Ryan - 0.12.0-2 -- Update to latest upstream version 0.12.0 -- RHBZ#1100949: Patch for latest aether api - -* Tue Mar 04 2014 Stanislav Ochotnicky - 0.0.11-3 -- Use Requires: java-headless rebuild (#1067528) - -* Wed Feb 5 2014 Gerard Ryan - 0.0.11-2 -- Initial rpm diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/sources b/sources deleted file mode 100644 index 857020c..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (aether-connector-okhttp-0.17.3-a1115e4.tar.gz) = 6126faf85b2a3891b3a98cf7fdac7405af58c32dd2ddff4b5406d13473460f402e08c9145c09773f97325e40a0c986b679d8d7788ec07dfc548acc67af1d344e From c397a9d28b121f9b3d6bd4d3e9809de67995e131 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 11 Jun 2019 00:19:52 +0100 Subject: [PATCH 2/4] Update to latest upstream version Fix license tag, simplify build --- .gitignore | 1 + aether-connector-okhttp.spec | 42 +++++++++++++++--------------------- sources | 2 +- 3 files changed, 19 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index a8e4b46..e73a866 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /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 +/aether-connector-okhttp-0.17.6-fefafe6.tar.gz diff --git a/aether-connector-okhttp.spec b/aether-connector-okhttp.spec index af05cb9..9fac0f8 100644 --- a/aether-connector-okhttp.spec +++ b/aether-connector-okhttp.spec @@ -1,22 +1,24 @@ -%global commit a1115e45f2a52d3b43d3b4f885eb8eaf041e69df +%global commit fefafe6b6e4ceb46e90623bcbde895a6514de65d %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: aether-connector-okhttp -Version: 0.17.3 -Release: 3%{?dist} +Version: 0.17.6 +Release: 1%{?dist} Summary: OkHttp Aether Connector # src/main/java/io/tesla/aether/wagon/OkHttpsWagon.java is ASL and EPL -License: EPL and (ASL 2.0 and EPL) -URL: https://github.com/tesla/%{name} -Source0: https://github.com/tesla/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz +License: EPL-1.0 and (ASL 2.0 and EPL-1.0) +URL: https://github.com/takari/%{name} +Source0: https://github.com/takari/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz BuildArch: noarch BuildRequires: maven-local 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(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) @@ -26,11 +28,10 @@ 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 +Requires: mvn(com.squareup.okhttp3:okhttp) >= 3.14.2 +Requires: mvn(com.squareup.okio:okio) >= 1.17.4 %description A repository connector implementation based on Square's OkHttp. @@ -41,28 +42,15 @@ Summary: Javadoc for %{name} %description javadoc API documentation for %{name}. - %prep %setup -q -n %{name}-%{commit} 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, provisio-webserver) -%mvn_build --skip-tests -- -Dtakari.privatePackageReference=ignore -Dmaven.compiler.source=1.7 -Dmaven.compiler.target=1.7 +%mvn_build -f -- -Dtakari.privatePackageReference=ignore %install %mvn_install @@ -75,6 +63,10 @@ find -name '*.jar' -delete %license eclipse-1.0.txt %changelog +* Mon Jun 10 2019 Mat Booth - 0.17.6-1 +- Update to latest upstream version +- Fix license tag, simplify build + * Thu Jan 31 2019 Fedora Release Engineering - 0.17.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 857020c..886db5e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aether-connector-okhttp-0.17.3-a1115e4.tar.gz) = 6126faf85b2a3891b3a98cf7fdac7405af58c32dd2ddff4b5406d13473460f402e08c9145c09773f97325e40a0c986b679d8d7788ec07dfc548acc67af1d344e +SHA512 (aether-connector-okhttp-0.17.6-fefafe6.tar.gz) = fbfacebcf9446791ac985fa8b3f836c4400f81b11b5fc64f3157b6bcec3d0d2b4eca068026d6001cfaafe27dad932860d25053891b4f8d6aaabef9f4156fe4f8 From c9dfb5455d006ecb5a2a0dda000d89819eae041c Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 14 Jun 2019 10:47:33 +0100 Subject: [PATCH 3/4] Restrict to same architectures as Eclipse itself --- aether-connector-okhttp.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/aether-connector-okhttp.spec b/aether-connector-okhttp.spec index 9fac0f8..6faf0a5 100644 --- a/aether-connector-okhttp.spec +++ b/aether-connector-okhttp.spec @@ -3,7 +3,7 @@ Name: aether-connector-okhttp Version: 0.17.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: OkHttp Aether Connector # src/main/java/io/tesla/aether/wagon/OkHttpsWagon.java is ASL and EPL @@ -13,6 +13,9 @@ Source0: https://github.com/takari/%{name}/archive/%{commit}/%{name}-%{ve BuildArch: noarch +# Upstream Eclipse no longer supports non-64bit arches +ExcludeArch: s390 %{arm} %{ix86} + BuildRequires: maven-local BuildRequires: mvn(com.google.guava:guava:18.0) BuildRequires: mvn(com.squareup.okhttp3:okhttp) >= 3.14.2 @@ -63,6 +66,9 @@ find -name '*.jar' -delete %license eclipse-1.0.txt %changelog +* Fri Jun 14 2019 Mat Booth - 0.17.6-2 +- Restrict to same architectures as Eclipse itself + * Mon Jun 10 2019 Mat Booth - 0.17.6-1 - Update to latest upstream version - Fix license tag, simplify build From 51c0c369de373cada757da323645ae1f3fc56d3a Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 24 Jan 2020 14:43:09 +0000 Subject: [PATCH 4/4] Avoid using takari stack for building --- aether-connector-okhttp.spec | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) 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