From c259acbdc26cf99dc8b19cc869a57c8050e0f447 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 17 May 2019 14:19:53 +0200 Subject: [PATCH 01/12] Remove requires on asm-all --- plexus-containers.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/plexus-containers.spec b/plexus-containers.spec index c2c5c6f..0dc7ba5 100644 --- a/plexus-containers.spec +++ b/plexus-containers.spec @@ -37,7 +37,6 @@ BuildRequires: mvn(org.codehaus.plexus:plexus:pom:) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.jdom:jdom2) BuildRequires: mvn(org.ow2.asm:asm) -BuildRequires: mvn(org.ow2.asm:asm-all) BuildRequires: mvn(org.ow2.asm:asm-commons) From 890465b3cdcc5518774609828b7316054d553ec2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:01:32 +0200 Subject: [PATCH 02/12] Mass rebuild for javapackages-tools 201901 --- plexus-containers.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plexus-containers.spec b/plexus-containers.spec index 0dc7ba5..a01d3af 100644 --- a/plexus-containers.spec +++ b/plexus-containers.spec @@ -1,6 +1,6 @@ Name: plexus-containers Version: 1.7.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Containers for Plexus # Most of the files are either under ASL 2.0 or MIT # The following files are under xpp: @@ -154,6 +154,9 @@ sed -i "s|2.3| %{javadoc_plugin_version}|" %license LICENSE-2.0.txt LICENSE.MIT %changelog +* Fri May 24 2019 Mikolaj Izdebski - 1.7.1-9 +- Mass rebuild for javapackages-tools 201901 + * Tue Jul 31 2018 Michael Simacek - 1.7.1-8 - Fix license tag - Include missing license files From d421e5f0cbbe0da0430393d3c401bbb114dfd58b Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 31 Jan 2019 15:41:09 +0100 Subject: [PATCH 03/12] Update to upstream version 2.0.0 --- .gitignore | 1 + 0001-Port-to-current-qdox.patch | 39 ---------------------------- plexus-containers.spec | 45 ++++++--------------------------- sources | 2 +- 4 files changed, 10 insertions(+), 77 deletions(-) delete mode 100644 0001-Port-to-current-qdox.patch diff --git a/.gitignore b/.gitignore index 4d55954..a330e8b 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /noarch /plexus-containers-1.6.tar.gz /plexus-containers-1.7.1.tar.gz +/plexus-containers-2.0.0.tar.gz diff --git a/0001-Port-to-current-qdox.patch b/0001-Port-to-current-qdox.patch deleted file mode 100644 index 1d283b9..0000000 --- a/0001-Port-to-current-qdox.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 81ed06024dd78113d2e6c5090e59cacc43453a54 Mon Sep 17 00:00:00 2001 -From: Michael Simacek -Date: Fri, 20 Jan 2017 17:27:51 +0100 -Subject: [PATCH] Port to current qdox - ---- - .../java/org/codehaus/plexus/metadata/gleaner/QDoxComponentGleaner.java | 2 +- - pom.xml | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/gleaner/QDoxComponentGleaner.java b/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/gleaner/QDoxComponentGleaner.java -index 0a798fe..41efa44 100644 ---- a/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/gleaner/QDoxComponentGleaner.java -+++ b/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/gleaner/QDoxComponentGleaner.java -@@ -244,7 +244,7 @@ public class QDoxComponentGleaner - // Remove any Plexus specific interfaces from the calculation - // ---------------------------------------------------------------------- - -- List interfaces = new ArrayList( javaClass.getImplementedInterfaces() ); -+ List interfaces = new ArrayList( javaClass.getInterfaces() ); - - for ( Iterator it = interfaces.iterator(); it.hasNext(); ) - { -diff --git a/pom.xml b/pom.xml -index eaba94d..f80f0d2 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -85,7 +85,7 @@ - - com.thoughtworks.qdox - qdox -- 2.0-M2 -+ 2.0-M5 - - - org.jdom --- -2.9.3 - diff --git a/plexus-containers.spec b/plexus-containers.spec index a01d3af..aa9e3c2 100644 --- a/plexus-containers.spec +++ b/plexus-containers.spec @@ -1,6 +1,6 @@ Name: plexus-containers -Version: 1.7.1 -Release: 9%{?dist} +Version: 2.0.0 +Release: 1%{?dist} Summary: Containers for Plexus # Most of the files are either under ASL 2.0 or MIT # The following files are under xpp: @@ -14,31 +14,26 @@ Source0: https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{ver Source1: http://www.apache.org/licenses/LICENSE-2.0.txt Source2: LICENSE.MIT -Patch0: 0001-Port-to-current-qdox.patch - BuildRequires: maven-local BuildRequires: mvn(com.google.guava:guava:20.0) -BuildRequires: mvn(commons-cli:commons-cli) -BuildRequires: mvn(com.sun:tools) BuildRequires: mvn(com.thoughtworks.qdox:qdox) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven:maven-core) BuildRequires: mvn(org.apache.maven:maven-model) BuildRequires: mvn(org.apache.maven:maven-plugin-api) -BuildRequires: mvn(org.apache.maven:maven-project) BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) BuildRequires: mvn(org.apache.xbean:xbean-reflect) BuildRequires: mvn(org.codehaus.plexus:plexus-classworlds) -BuildRequires: mvn(org.codehaus.plexus:plexus-cli) -BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations) BuildRequires: mvn(org.codehaus.plexus:plexus:pom:) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.jdom:jdom2) BuildRequires: mvn(org.ow2.asm:asm) -BuildRequires: mvn(org.ow2.asm:asm-commons) +Obsoletes: mvn(org.codehaus.plexus:plexus-component-javadoc) <= 1.7.1 +Obsoletes: mvn(org.codehaus.plexus:plexus-component-javadoc:pom:) <= 1.7.1 +Obsoletes: plexus-containers-component-javadoc <= 1.7.1 %description The Plexus project seeks to create end-to-end developer tools for @@ -54,12 +49,6 @@ Summary: Component metadata from %{name} %description component-metadata %{summary}. -%package component-javadoc -Summary: Javadoc component from %{name} - -%description component-javadoc -%{summary}. - %package component-annotations Summary: Component API from %{name} @@ -81,25 +70,13 @@ Summary: API documentation for all plexus-containers packages %prep %setup -q -n %{name}-%{name}-%{version} -%patch0 -p1 - cp %{SOURCE1} . cp %{SOURCE2} . %pom_remove_plugin -r :maven-site-plugin -# For Maven 3 compat -%pom_add_dep org.apache.maven:maven-core plexus-component-metadata - %pom_change_dep -r :google-collections com.google.guava:guava:20.0 -# ASM dependency was changed to "provided" in XBean 4.x, so we need to provide ASM -%pom_add_dep org.ow2.asm:asm:5.0.3:runtime plexus-container-default -%pom_add_dep org.ow2.asm:asm-commons:5.0.3:runtime plexus-container-default - -%pom_remove_dep com.sun:tools plexus-component-javadoc -%pom_add_dep com.sun:tools plexus-component-javadoc - # Generate OSGI info %pom_xpath_inject "pom:project" " bundle @@ -119,12 +96,6 @@ cp %{SOURCE2} . " plexus-component-annotations -# to prevent ant from failing -mkdir -p plexus-component-annotations/src/test/java - -# integration tests fix -sed -i "s|2.3| %{javadoc_plugin_version}|" plexus-component-javadoc/src/it/basic/pom.xml - # plexus-component-api has been merged into plexus-container-default %mvn_alias ":plexus-container-default" "org.codehaus.plexus:containers-component-api" @@ -137,7 +108,6 @@ sed -i "s|2.3| %{javadoc_plugin_version}|" %install %mvn_install - # plexus-containers pom goes into main package %files -f .mfiles-plexus-containers %license LICENSE-2.0.txt LICENSE.MIT @@ -147,13 +117,14 @@ sed -i "s|2.3| %{javadoc_plugin_version}|" %license LICENSE-2.0.txt LICENSE.MIT %files component-metadata -f .mfiles-plexus-component-metadata %license LICENSE-2.0.txt LICENSE.MIT -%files component-javadoc -f .mfiles-plexus-component-javadoc -%license LICENSE-2.0.txt LICENSE.MIT %files javadoc -f .mfiles-javadoc %license LICENSE-2.0.txt LICENSE.MIT %changelog +* Thu May 30 2019 Marian Koncek - 2.0.0-1 +- Update to upstream version 2.0.0 + * Fri May 24 2019 Mikolaj Izdebski - 1.7.1-9 - Mass rebuild for javapackages-tools 201901 diff --git a/sources b/sources index d743f65..45ccaa5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (plexus-containers-1.7.1.tar.gz) = d799e70cec8b6ba171e4af406e1ebb038cffa33b9b317d36dd55f9c1f57fb241652509add1806aa7afd17d9be032087e3981983c5f277e5e0d3e618420283314 +SHA512 (plexus-containers-2.0.0.tar.gz) = 80f1f70a93b29886a2b9c7564b9ab56de82abac95958b7b293b9fff05a18de585a28d748954286a9c5b42c7221a66b10dbc3defa902d64248e9309255620da44 From 93c565fef82318fae0dffdfe55d0aabac8f4a359 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 30 May 2019 16:41:28 +0200 Subject: [PATCH 04/12] Update guava dependency --- plexus-containers.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plexus-containers.spec b/plexus-containers.spec index aa9e3c2..a6b7a75 100644 --- a/plexus-containers.spec +++ b/plexus-containers.spec @@ -15,7 +15,7 @@ Source1: http://www.apache.org/licenses/LICENSE-2.0.txt Source2: LICENSE.MIT BuildRequires: maven-local -BuildRequires: mvn(com.google.guava:guava:20.0) +BuildRequires: mvn(com.google.guava:guava) BuildRequires: mvn(com.thoughtworks.qdox:qdox) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) @@ -75,7 +75,7 @@ cp %{SOURCE2} . %pom_remove_plugin -r :maven-site-plugin -%pom_change_dep -r :google-collections com.google.guava:guava:20.0 +%pom_change_dep -r :google-collections com.google.guava:guava # Generate OSGI info %pom_xpath_inject "pom:project" " From 30c540a3ba641ec066c33d3d4e7e5dacdda3c014 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 11:20:46 +0200 Subject: [PATCH 05/12] Use javadoc_package macro --- plexus-containers.spec | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/plexus-containers.spec b/plexus-containers.spec index a6b7a75..f45d7a9 100644 --- a/plexus-containers.spec +++ b/plexus-containers.spec @@ -61,11 +61,7 @@ Summary: Default Container from %{name} %description container-default %{summary}. -%package javadoc -Summary: API documentation for all plexus-containers packages - -%description javadoc -%{summary}. +%{?javadoc_package} %prep %setup -q -n %{name}-%{name}-%{version} @@ -118,9 +114,6 @@ cp %{SOURCE2} . %files component-metadata -f .mfiles-plexus-component-metadata %license LICENSE-2.0.txt LICENSE.MIT -%files javadoc -f .mfiles-javadoc -%license LICENSE-2.0.txt LICENSE.MIT - %changelog * Thu May 30 2019 Marian Koncek - 2.0.0-1 - Update to upstream version 2.0.0 From 445c01de26c2ceaef511b1dfb9a2feb6817d2dac Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 11:23:36 +0200 Subject: [PATCH 06/12] Namespace plexus-component-annotations subpackage --- plexus-containers.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plexus-containers.spec b/plexus-containers.spec index f45d7a9..feac9bf 100644 --- a/plexus-containers.spec +++ b/plexus-containers.spec @@ -49,10 +49,10 @@ Summary: Component metadata from %{name} %description component-metadata %{summary}. -%package component-annotations +%package -n %{?module_prefix}%{name}-component-annotations Summary: Component API from %{name} -%description component-annotations +%description -n %{?module_prefix}%{name}-component-annotations %{summary}. %package container-default @@ -107,7 +107,7 @@ cp %{SOURCE2} . # plexus-containers pom goes into main package %files -f .mfiles-plexus-containers %license LICENSE-2.0.txt LICENSE.MIT -%files component-annotations -f .mfiles-plexus-component-annotations +%files -n %{?module_prefix}%{name}-component-annotations -f .mfiles-plexus-component-annotations %license LICENSE-2.0.txt LICENSE.MIT %files container-default -f .mfiles-plexus-container-default %license LICENSE-2.0.txt LICENSE.MIT From 39a7532a168028fc625ac5fef7fa6bfdc1f7ecaa Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 26 Oct 2019 12:11:25 +0200 Subject: [PATCH 07/12] Remove Obsoletes --- plexus-containers.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/plexus-containers.spec b/plexus-containers.spec index feac9bf..71b56eb 100644 --- a/plexus-containers.spec +++ b/plexus-containers.spec @@ -31,10 +31,6 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.jdom:jdom2) BuildRequires: mvn(org.ow2.asm:asm) -Obsoletes: mvn(org.codehaus.plexus:plexus-component-javadoc) <= 1.7.1 -Obsoletes: mvn(org.codehaus.plexus:plexus-component-javadoc:pom:) <= 1.7.1 -Obsoletes: plexus-containers-component-javadoc <= 1.7.1 - %description The Plexus project seeks to create end-to-end developer tools for writing applications. At the core is the container, which can be From e8e97715c292d0364268865b08427935239f6e8c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:28 +0100 Subject: [PATCH 08/12] Mass rebuild for javapackages-tools 201902 --- plexus-containers.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plexus-containers.spec b/plexus-containers.spec index 71b56eb..c8ec729 100644 --- a/plexus-containers.spec +++ b/plexus-containers.spec @@ -1,6 +1,6 @@ Name: plexus-containers Version: 2.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Containers for Plexus # Most of the files are either under ASL 2.0 or MIT # The following files are under xpp: @@ -111,6 +111,9 @@ cp %{SOURCE2} . %license LICENSE-2.0.txt LICENSE.MIT %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 2.0.0-2 +- Mass rebuild for javapackages-tools 201902 + * Thu May 30 2019 Marian Koncek - 2.0.0-1 - Update to upstream version 2.0.0 From 38f9b8e2a4293eef2ee3e6d4dfc1c57e34a1eeed Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 20 Nov 2019 12:03:26 +0100 Subject: [PATCH 09/12] Update to upstream version 2.1.0 --- .gitignore | 1 + plexus-containers.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a330e8b..117e66a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /plexus-containers-1.6.tar.gz /plexus-containers-1.7.1.tar.gz /plexus-containers-2.0.0.tar.gz +/plexus-containers-2.1.0.tar.gz diff --git a/plexus-containers.spec b/plexus-containers.spec index c8ec729..e39ccf5 100644 --- a/plexus-containers.spec +++ b/plexus-containers.spec @@ -1,6 +1,6 @@ Name: plexus-containers -Version: 2.0.0 -Release: 2%{?dist} +Version: 2.1.0 +Release: 1%{?dist} Summary: Containers for Plexus # Most of the files are either under ASL 2.0 or MIT # The following files are under xpp: @@ -111,6 +111,9 @@ cp %{SOURCE2} . %license LICENSE-2.0.txt LICENSE.MIT %changelog +* Wed Nov 20 2019 Marian Koncek - 2.1.0-1 +- Update to upstream version 2.1.0 + * Tue Nov 05 2019 Mikolaj Izdebski - 2.0.0-2 - Mass rebuild for javapackages-tools 201902 diff --git a/sources b/sources index 45ccaa5..49fe24f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (plexus-containers-2.0.0.tar.gz) = 80f1f70a93b29886a2b9c7564b9ab56de82abac95958b7b293b9fff05a18de585a28d748954286a9c5b42c7221a66b10dbc3defa902d64248e9309255620da44 +SHA512 (plexus-containers-2.1.0.tar.gz) = 612165af24049843c3004f59bb6be32467bf8671d3c8cb76989427f4b672ba16c4391894bdee6c85f38a5da1d043ba332884f394de03ebc560d8be4de79760ce From acd7116db56466d1b3977f7ca00eadb1ed8d3396 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 25 Jan 2020 14:40:08 +0100 Subject: [PATCH 10/12] Build with OpenJDK 8 --- plexus-containers.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/plexus-containers.spec b/plexus-containers.spec index e39ccf5..762fa45 100644 --- a/plexus-containers.spec +++ b/plexus-containers.spec @@ -1,6 +1,6 @@ Name: plexus-containers Version: 2.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Containers for Plexus # Most of the files are either under ASL 2.0 or MIT # The following files are under xpp: @@ -14,7 +14,7 @@ Source0: https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{ver Source1: http://www.apache.org/licenses/LICENSE-2.0.txt Source2: LICENSE.MIT -BuildRequires: maven-local +BuildRequires: maven-local-openjdk8 BuildRequires: mvn(com.google.guava:guava) BuildRequires: mvn(com.thoughtworks.qdox:qdox) BuildRequires: mvn(junit:junit) @@ -111,6 +111,9 @@ cp %{SOURCE2} . %license LICENSE-2.0.txt LICENSE.MIT %changelog +* Sat Jan 25 2020 Mikolaj Izdebski - 2.1.0-2 +- Build with OpenJDK 8 + * Wed Nov 20 2019 Marian Koncek - 2.1.0-1 - Update to upstream version 2.1.0 From ef4e4247d7c5cc2d9d64274af06c54aede8f0497 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:13 +0200 Subject: [PATCH 11/12] Conditionalize buildrequires in bootstrap mode --- plexus-containers.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plexus-containers.spec b/plexus-containers.spec index 762fa45..a0290c7 100644 --- a/plexus-containers.spec +++ b/plexus-containers.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: plexus-containers Version: 2.1.0 Release: 2%{?dist} @@ -15,6 +17,9 @@ Source1: http://www.apache.org/licenses/LICENSE-2.0.txt Source2: LICENSE.MIT BuildRequires: maven-local-openjdk8 +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(com.google.guava:guava) BuildRequires: mvn(com.thoughtworks.qdox:qdox) BuildRequires: mvn(junit:junit) @@ -30,6 +35,7 @@ BuildRequires: mvn(org.codehaus.plexus:plexus:pom:) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.jdom:jdom2) BuildRequires: mvn(org.ow2.asm:asm) +%endif %description The Plexus project seeks to create end-to-end developer tools for From b4ebf0f487b4f7bc2078107485ed6a57e4eee6e5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 12/12] Turn off bootstrap mode by default --- plexus-containers.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plexus-containers.spec b/plexus-containers.spec index a0290c7..0565e13 100644 --- a/plexus-containers.spec +++ b/plexus-containers.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: plexus-containers Version: 2.1.0