From 14383813f4419b76c3321f0925ed41c5bd084646 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:06:44 +0000 Subject: [PATCH 01/13] Switch to SHA512 sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 26e340f..1864d72 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -68ec64cf4d4e7ef1edb336a16fd138c2 plexus-classworlds-2.5.2.tar.gz +SHA512 (plexus-classworlds-2.5.2.tar.gz) = 4217b8c9ff7f599d0ca449cefffad2894d9a14364d17a78d0a57c833ffe86b4fcaaca030ee7db343a83960d86b0987557f55b5fb7e4a69488fe19cb9c0ed8c94 From 7a371b4bcc64305fc36de6d74f932aa8c4efff78 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:55:39 +0000 Subject: [PATCH 02/13] Remove Obsoletes --- plexus-classworlds.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/plexus-classworlds.spec b/plexus-classworlds.spec index fa384b8..f8fc502 100644 --- a/plexus-classworlds.spec +++ b/plexus-classworlds.spec @@ -19,7 +19,6 @@ BuildRequires: mvn(org.apache.ant:ant) BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(xml-apis:xml-apis) -Obsoletes: classworlds < 1.1-13 %description Classworlds is a framework for container developers From d2d99235e617f5e4ca1094d70a65fb28f2a3a4de Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 14 May 2019 10:24:24 +0200 Subject: [PATCH 03/13] Update to upstream version 2.6.0 --- .gitignore | 1 + plexus-classworlds.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 98482d4..3a68598 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ bin /plexus-classworlds-2.5.tar.gz /plexus-classworlds-2.5.1.tar.gz /plexus-classworlds-2.5.2.tar.gz +/plexus-classworlds-2.6.0.tar.gz diff --git a/plexus-classworlds.spec b/plexus-classworlds.spec index f8fc502..5dbadbe 100644 --- a/plexus-classworlds.spec +++ b/plexus-classworlds.spec @@ -1,12 +1,12 @@ Name: plexus-classworlds -Version: 2.5.2 -Release: 9%{?dist} +Version: 2.6.0 +Release: 1%{?dist} Summary: Plexus Classworlds Classloader Framework License: ASL 2.0 and Plexus URL: https://github.com/codehaus-plexus/plexus-classworlds BuildArch: noarch -Source0: https://github.com/sonatype/%{name}/archive/%{name}-%{version}.tar.gz +Source0: https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{version}.tar.gz BuildRequires: maven-local BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) @@ -54,6 +54,9 @@ API documentation for %{name}. %doc LICENSE.txt LICENSE-2.0.txt %changelog +* Tue May 14 2019 Mikolaj Izdebski - 2.6.0-1 +- Update to upstream version 2.6.0 + * Fri Feb 09 2018 Fedora Release Engineering - 2.5.2-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 1864d72..0558d34 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (plexus-classworlds-2.5.2.tar.gz) = 4217b8c9ff7f599d0ca449cefffad2894d9a14364d17a78d0a57c833ffe86b4fcaaca030ee7db343a83960d86b0987557f55b5fb7e4a69488fe19cb9c0ed8c94 +SHA512 (plexus-classworlds-2.6.0.tar.gz) = d6ef17a4651da99975bcfc04f89ba128d891efc9047dc9b8afa52bd092d07268d44a7424a3a3700209bb56452f035ac1071c58ae6dc961b7e991efee1c0e117e From 2a3af29787558a238898a516ece9f049260f8344 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:01:29 +0200 Subject: [PATCH 04/13] Mass rebuild for javapackages-tools 201901 --- plexus-classworlds.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plexus-classworlds.spec b/plexus-classworlds.spec index 5dbadbe..f8c6730 100644 --- a/plexus-classworlds.spec +++ b/plexus-classworlds.spec @@ -1,6 +1,6 @@ Name: plexus-classworlds Version: 2.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Plexus Classworlds Classloader Framework License: ASL 2.0 and Plexus URL: https://github.com/codehaus-plexus/plexus-classworlds @@ -54,6 +54,9 @@ API documentation for %{name}. %doc LICENSE.txt LICENSE-2.0.txt %changelog +* Fri May 24 2019 Mikolaj Izdebski - 2.6.0-2 +- Mass rebuild for javapackages-tools 201901 + * Tue May 14 2019 Mikolaj Izdebski - 2.6.0-1 - Update to upstream version 2.6.0 From 1a3c171dc425c9de26e835261a5f74a0cc1693a2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 11:19:00 +0200 Subject: [PATCH 05/13] Use javadoc_package macro --- plexus-classworlds.spec | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/plexus-classworlds.spec b/plexus-classworlds.spec index f8c6730..037d86c 100644 --- a/plexus-classworlds.spec +++ b/plexus-classworlds.spec @@ -30,11 +30,7 @@ loading of components or otherwise represent a 'container' can benefit from the classloading control provided by classworlds. -%package javadoc -Summary: Javadoc for %{name} - -%description javadoc -API documentation for %{name}. +%{?javadoc_package} %prep %setup -q -n %{name}-%{name}-%{version} @@ -48,10 +44,7 @@ API documentation for %{name}. %mvn_install %files -f .mfiles -%doc LICENSE.txt LICENSE-2.0.txt - -%files javadoc -f .mfiles-javadoc -%doc LICENSE.txt LICENSE-2.0.txt +%license LICENSE.txt LICENSE-2.0.txt %changelog * Fri May 24 2019 Mikolaj Izdebski - 2.6.0-2 From 8c87c1a0e3c52d0abbe00465171dd71949cac3dc Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 11:19:29 +0200 Subject: [PATCH 06/13] Declare module package --- plexus-classworlds.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plexus-classworlds.spec b/plexus-classworlds.spec index 037d86c..64c00e5 100644 --- a/plexus-classworlds.spec +++ b/plexus-classworlds.spec @@ -30,6 +30,7 @@ loading of components or otherwise represent a 'container' can benefit from the classloading control provided by classworlds. +%{?module_package} %{?javadoc_package} %prep @@ -43,7 +44,7 @@ classworlds. %install %mvn_install -%files -f .mfiles +%files -n %{?module_prefix}%{name} -f .mfiles %license LICENSE.txt LICENSE-2.0.txt %changelog From 205ea90f73913ce70baa19284918fc8719d185a4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 29 Oct 2019 08:37:34 +0100 Subject: [PATCH 07/13] Add BR on junit --- plexus-classworlds.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/plexus-classworlds.spec b/plexus-classworlds.spec index 64c00e5..3998a1f 100644 --- a/plexus-classworlds.spec +++ b/plexus-classworlds.spec @@ -15,6 +15,7 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.codehaus.plexus:plexus:pom:) # test deps missed by builddep +BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.ant:ant) BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(xml-apis:xml-apis) From d49b90f1eae0ddb4d6802dcbc7deec8452431945 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 31 Oct 2019 14:43:13 +0100 Subject: [PATCH 08/13] Revert "Add BR on junit" This reverts commit 205ea90f73913ce70baa19284918fc8719d185a4. --- plexus-classworlds.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/plexus-classworlds.spec b/plexus-classworlds.spec index 3998a1f..64c00e5 100644 --- a/plexus-classworlds.spec +++ b/plexus-classworlds.spec @@ -15,7 +15,6 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.codehaus.plexus:plexus:pom:) # test deps missed by builddep -BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.ant:ant) BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(xml-apis:xml-apis) From 3658c5032de6a55171b2140913895d2903c82d9b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:28 +0100 Subject: [PATCH 09/13] Mass rebuild for javapackages-tools 201902 --- plexus-classworlds.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plexus-classworlds.spec b/plexus-classworlds.spec index 64c00e5..312fefc 100644 --- a/plexus-classworlds.spec +++ b/plexus-classworlds.spec @@ -1,6 +1,6 @@ Name: plexus-classworlds Version: 2.6.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Plexus Classworlds Classloader Framework License: ASL 2.0 and Plexus URL: https://github.com/codehaus-plexus/plexus-classworlds @@ -48,6 +48,9 @@ classworlds. %license LICENSE.txt LICENSE-2.0.txt %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 2.6.0-3 +- Mass rebuild for javapackages-tools 201902 + * Fri May 24 2019 Mikolaj Izdebski - 2.6.0-2 - Mass rebuild for javapackages-tools 201901 From 8fbe1db53b1c762b7f6b71c17964c8a6d613832c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 25 Jan 2020 14:40:08 +0100 Subject: [PATCH 10/13] Build with OpenJDK 8 --- plexus-classworlds.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/plexus-classworlds.spec b/plexus-classworlds.spec index 312fefc..ab52e8c 100644 --- a/plexus-classworlds.spec +++ b/plexus-classworlds.spec @@ -1,6 +1,6 @@ Name: plexus-classworlds Version: 2.6.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Plexus Classworlds Classloader Framework License: ASL 2.0 and Plexus URL: https://github.com/codehaus-plexus/plexus-classworlds @@ -8,7 +8,7 @@ BuildArch: noarch Source0: https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{version}.tar.gz -BuildRequires: maven-local +BuildRequires: maven-local-openjdk8 BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) @@ -48,6 +48,9 @@ classworlds. %license LICENSE.txt LICENSE-2.0.txt %changelog +* Sat Jan 25 2020 Mikolaj Izdebski - 2.6.0-4 +- Build with OpenJDK 8 + * Tue Nov 05 2019 Mikolaj Izdebski - 2.6.0-3 - Mass rebuild for javapackages-tools 201902 From d106ba8ee4161d2c30c10b996b50a73381159e97 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 21 Apr 2020 06:54:52 +0200 Subject: [PATCH 11/13] Reduce test dependencies --- plexus-classworlds.spec | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/plexus-classworlds.spec b/plexus-classworlds.spec index ab52e8c..a06cf4f 100644 --- a/plexus-classworlds.spec +++ b/plexus-classworlds.spec @@ -10,16 +10,8 @@ Source0: https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{ver BuildRequires: maven-local-openjdk8 BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.codehaus.plexus:plexus:pom:) -# test deps missed by builddep -BuildRequires: mvn(org.apache.ant:ant) -BuildRequires: mvn(commons-logging:commons-logging) -BuildRequires: mvn(xml-apis:xml-apis) - - %description Classworlds is a framework for container developers who require complex manipulation of Java's ClassLoaders. @@ -38,6 +30,13 @@ classworlds. %mvn_file : %{name} plexus/classworlds %mvn_alias : classworlds:classworlds +%pom_remove_plugin :maven-enforcer-plugin +%pom_remove_plugin :maven-dependency-plugin + +# These tests depend on artifacts that are not packaged +sed -i /testConfigure_Valid/s/./@org.junit.Ignore/ $(find -name ConfiguratorTest.java) +sed -i /testConfigure_Optionally_Existent/s/./@org.junit.Ignore/ $(find -name ConfiguratorTest.java) + %build %mvn_build From 5fd6ef3e158e2944dd2fa3439fa1571891d09b09 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:13 +0200 Subject: [PATCH 12/13] Conditionalize buildrequires in bootstrap mode --- plexus-classworlds.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plexus-classworlds.spec b/plexus-classworlds.spec index a06cf4f..f62d30c 100644 --- a/plexus-classworlds.spec +++ b/plexus-classworlds.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: plexus-classworlds Version: 2.6.0 Release: 4%{?dist} @@ -9,8 +11,12 @@ BuildArch: noarch Source0: https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{version}.tar.gz BuildRequires: maven-local-openjdk8 +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.codehaus.plexus:plexus:pom:) +%endif %description Classworlds is a framework for container developers From 4682f138ac8da70fabd160b7d303ac168444489b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 13/13] Turn off bootstrap mode by default --- plexus-classworlds.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plexus-classworlds.spec b/plexus-classworlds.spec index f62d30c..17f511b 100644 --- a/plexus-classworlds.spec +++ b/plexus-classworlds.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: plexus-classworlds Version: 2.6.0