Sync from SUSE:SLFO:Main plexus-containers revision b2b23e0a3d46d50a7180224abd67e6e0

plexus-component-metadata.changes

@@ -1,8 +1,48 @@
+-------------------------------------------------------------------
+Thu May 16 12:59:05 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to version 2.2.0
+  * improve documentation to switch to Sisu
+  * pom clean after parent upgrade
+  * Improve plexus-component metadata - remove dependency to
+    plexus-container-default
+  * Add deprecation information to Plexus components
+  * Require Java 8
+  * Drop plexus-container-default artefact
+  * Require Maven 3.6.3+
+  * Switch to JUnit5
+  * Bump org.eclipse.sisu.plexus from 0.3.0.M1 to 0.9.0.M2
+
+-------------------------------------------------------------------
+Wed May 15 13:38:06 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Fix build with maven-plugin-plugin >= 3.11.0: define goalPrefix
+
+-------------------------------------------------------------------
+Tue Apr  2 17:33:04 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Add dependency on plexus-xml where relevant
+  * this will be needed for smooth upgrade to plexus-utils 4.0.0
+
+-------------------------------------------------------------------
+Tue Feb 20 14:46:35 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Use %patch -P N instead of deprecated %patchN.
+
 -------------------------------------------------------------------
 Sun Mar 20 17:45:24 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
 - Build with java source and target levels 8
 
+-------------------------------------------------------------------
+Tue Jan 18 07:57:30 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to version 2.1.1
+  * Last version before deprecation
+  * Requires Java 7 and Maven 3.2.5+
+  * Upgrade ASM to 9.2
+  * Security upgrade org.jdom:jdom2 from 2.0.6 to 2.0.6.1
+
 -------------------------------------------------------------------
 Fri May 14 16:39:03 UTC 2021 - Fridrich Strba <fstrba@suse.com>
 

plexus-component-metadata.spec

@@ -1,7 +1,7 @@
 #
-# spec file
+# spec file for package plexus-component-metadata
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
 %global comp_name plexus-component-metadata
 %bcond_with tests
 Name:           %{comp_name}
-Version:        2.1.1
+Version:        2.2.0
 Release:        0
 Summary:        Component metadata from %{base_name}
 # Most of the files are either under ASL 2.0 or MIT
@@ -42,8 +42,8 @@ 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.codehaus.plexus:plexus-component-annotations)
-BuildRequires:  mvn(org.codehaus.plexus:plexus-container-default)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-xml)
 BuildRequires:  mvn(org.codehaus.plexus:plexus:pom:)
 BuildRequires:  mvn(org.jdom:jdom2)
 BuildRequires:  mvn(org.ow2.asm:asm) >= 7
@@ -76,16 +76,9 @@ Group:          Documentation/HTML
 cp %{SOURCE1} .
 cp %{SOURCE2} .
 
-rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy
-
 %pom_remove_plugin -r :maven-site-plugin
 
-# For Maven 3 compat
+%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 plexus-component-metadata
-%pom_add_dep org.apache.maven:maven-core plexus-component-metadata
-
-# 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
 
 # Generate OSGI info
 %pom_xpath_inject "pom:project" "
@@ -106,6 +99,12 @@ rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy
       </plugins>
     </build>" plexus-component-annotations
 
+# Fix build with maven-plugin-plugin >= 3.11.0
+%pom_add_plugin org.apache.maven.plugins:maven-plugin-plugin plexus-component-metadata "
+    <configuration>
+      <goalPrefix>plexus-component-metadata</goalPrefix>
+    </configuration>"
+
 # to prevent ant from failing
 mkdir -p plexus-component-annotations/src/test/java
 

plexus-containers.changes

@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Thu May 16 12:59:05 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to version 2.2.0
+  * improve documentation to switch to Sisu
+  * pom clean after parent upgrade
+  * Improve plexus-component metadata - remove dependency to
+    plexus-container-default
+  * Add deprecation information to Plexus components
+  * Require Java 8
+  * Drop plexus-container-default artefact
+  * Require Maven 3.6.3+
+  * Switch to JUnit5
+  * Bump org.eclipse.sisu.plexus from 0.3.0.M1 to 0.9.0.M2
+
+-------------------------------------------------------------------
+Tue Apr  2 17:33:09 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Add dependency on plexus-xml where relevant
+  * this will be needed for smooth upgrade to plexus-utils 4.0.0
+
+-------------------------------------------------------------------
+Tue Feb 20 14:46:18 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Use %patch -P N instead of deprecated %patchN.
+
 -------------------------------------------------------------------
 Thu May  4 12:06:52 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
 

plexus-containers.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package plexus-containers
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 
 %bcond_with tests
 Name:           plexus-containers
-Version:        2.1.1
+Version:        2.2.0
 Release:        0
 Summary:        Containers for Plexus
 # Most of the files are either under ASL 2.0 or MIT
@@ -35,10 +35,11 @@ Source100:      %{name}-build.tar.xz
 BuildRequires:  ant
 BuildRequires:  fdupes
 BuildRequires:  guava
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
 BuildRequires:  junit
 BuildRequires:  plexus-classworlds
 BuildRequires:  plexus-utils
+BuildRequires:  plexus-xml
 BuildRequires:  xbean
 BuildArch:      noarch
 %if %{with tests}
@@ -60,19 +61,6 @@ Group:          Development/Libraries/Java
 %description component-annotations
 %{summary}.
 
-%package container-default
-Summary:        Default Container from %{name}
-Group:          Development/Libraries/Java
-Requires:       mvn(com.google.guava:guava)
-Requires:       mvn(org.apache.xbean:xbean-reflect)
-Requires:       mvn(org.codehaus.plexus:plexus-classworlds)
-Requires:       mvn(org.codehaus.plexus:plexus-utils)
-Requires:       mvn(org.ow2.asm:asm)
-Requires:       mvn(org.ow2.asm:asm-commons)
-
-%description container-default
-%{summary}.
-
 %package javadoc
 Summary:        API documentation for all plexus-containers packages
 Group:          Documentation/HTML
@@ -84,7 +72,7 @@ Group:          Documentation/HTML
 %setup -q -n %{name}-%{name}-%{version} -a100
 
 mkdir -p lib
-build-jar-repository -s lib plexus/classworlds plexus/utils guava/guava junit xbean/xbean-reflect
+build-jar-repository -s lib plexus/classworlds plexus/utils plexus/xml guava/guava junit xbean/xbean-reflect
 %if %{with tests}
 build-jar-repository -s lib objectweb-asm/asm objectweb-asm/asm-commons hamcrest/core
 %endif
@@ -92,16 +80,9 @@ build-jar-repository -s lib objectweb-asm/asm objectweb-asm/asm-commons hamcrest
 cp %{SOURCE1} .
 cp %{SOURCE2} .
 
-rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy
-
 %pom_remove_plugin -r :maven-site-plugin
 
-# For Maven 3 compat
+%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 plexus-component-metadata
-%pom_add_dep org.apache.maven:maven-core plexus-component-metadata
-
-# 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
 
 # Generate OSGI info
 %pom_xpath_inject "pom:project" "
@@ -126,48 +107,32 @@ rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy
 mkdir -p plexus-component-annotations/src/test/java
 
 %build
-for i in plexus-component-annotations plexus-container-default; do
+pushd plexus-component-annotations
-  pushd ${i}
+  %{ant} \
-  	%pom_remove_parent .
-	%pom_xpath_inject "pom:project" "<groupId>org.codehaus.plexus</groupId><version>%{version}</version>" .
-    ant \
 %if %{without tests}
     -Dtest.skip=true \
 %endif
     jar javadoc
-  popd
+popd
-done
 
 %install
 # jars
 install -dm 0755 %{buildroot}%{_javadir}/%{name}
-for i in plexus-component-annotations plexus-container-default; do
+install -pm 0644 plexus-component-annotations/target/plexus-component-annotations-%{version}.jar \
-  install -pm 0644 ${i}/target/${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/${i}.jar
+    %{buildroot}%{_javadir}/%{name}/plexus-component-annotations.jar
-done
-install -dm 0755 %{buildroot}%{_javadir}/plexus
-# keep compat symlink for maven's sake
-ln -sf ../%{name}/plexus-component-annotations.jar %{buildroot}%{_javadir}/plexus/containers-component-annotations.jar
 
 # poms
 install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
-for i in plexus-component-annotations plexus-container-default; do
+%{mvn_install_pom} plexus-component-annotations/pom.xml \
-  install -pm 0644 ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
+    %{buildroot}%{_mavenpomdir}/%{name}/plexus-component-annotations.pom
-done
+%add_maven_depmap %{name}/plexus-component-annotations.pom %{name}/plexus-component-annotations.jar
-%add_maven_depmap %{name}/plexus-component-annotations.pom %{name}/plexus-component-annotations.jar -f component-annotations
-%add_maven_depmap %{name}/plexus-container-default.pom %{name}/plexus-container-default.jar -f container-default -a org.codehaus.plexus:containers-component-api
 
 # javadoc
 install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
-for i in plexus-component-annotations plexus-container-default; do
+cp -pr plexus-component-annotations/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/plexus-component-annotations
-  cp -pr ${i}/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/${i}
-done
 %fdupes -s %{buildroot}%{_javadocdir}
 
-%files component-annotations -f .mfiles-component-annotations
+%files component-annotations -f .mfiles
-%license LICENSE-2.0.txt LICENSE.MIT
-%{_javadir}/plexus
-
-%files container-default -f .mfiles-container-default
 %license LICENSE-2.0.txt LICENSE.MIT
 
 %files javadoc

plexus-metadata-generator-nomojo.patch

@@ -1,5 +1,5 @@
---- plexus-containers-plexus-containers-1.7.1/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ClassComponentDescriptorExtractor.java	2016-08-31 21:01:49.000000000 +0200
+--- plexus-containers-2.2.0/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ClassComponentDescriptorExtractor.java	2024-05-15 18:50:14.906335826 +0200
-+++ plexus-containers-plexus-containers-1.7.1/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ClassComponentDescriptorExtractor.java	2019-03-07 07:59:40.878835988 +0100
++++ plexus-containers-2.2.0/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ClassComponentDescriptorExtractor.java	2024-05-15 18:52:35.743977916 +0200
 @@ -23,7 +23,6 @@
  import java.util.List;
  import java.util.Map;
@@ -8,19 +8,15 @@
  import org.codehaus.plexus.component.annotations.Component;
  import org.codehaus.plexus.component.repository.ComponentDescriptor;
  import org.codehaus.plexus.metadata.gleaner.AnnotationComponentGleaner;
-@@ -95,15 +94,8 @@
+@@ -81,11 +80,7 @@
+ 
          // Add the projects dependencies
-         for ( String filename : elements )
+         for (String filename : elements) {
-         {
+-            try {
--            try
+                 list.add(new File(filename).toURI().toURL());
--            {
+-            } catch (MalformedURLException e) {
-                 list.add( new File( filename ).toURI().toURL() );
+-                throw new MojoExecutionException("Invalid classpath entry: " + filename, e);
+-            }
          }
--            catch ( MalformedURLException e )
--            {
--                throw new MojoExecutionException( "Invalid classpath entry: " + filename, e );
--            }
--        }
- 
-         URL[] urls = list.toArray( new URL[list.size()] );
  
+         URL[] urls = list.toArray(new URL[list.size()]);

plexus-metadata-generator.changes

@@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+Thu May 16 12:59:05 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to version 2.2.0
+  * improve documentation to switch to Sisu
+  * pom clean after parent upgrade
+  * Improve plexus-component metadata - remove dependency to
+    plexus-container-default
+  * Add deprecation information to Plexus components
+  * Require Java 8
+  * Drop plexus-container-default artefact
+  * Require Maven 3.6.3+
+  * Switch to JUnit5
+  * Bump org.eclipse.sisu.plexus from 0.3.0.M1 to 0.9.0.M2
+- Modified patch:
+  * plexus-metadata-generator-nomojo.patch
+    + rediff to changed context
+
+-------------------------------------------------------------------
+Tue Apr  2 17:33:15 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Add dependency on plexus-xml where relevant
+  * this will be needed for smooth upgrade to plexus-utils 4.0.0
+
+-------------------------------------------------------------------
+Tue Feb 20 14:45:18 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Use %patch -P N instead of deprecated %patchN.
+
 -------------------------------------------------------------------
 Fri May 20 12:13:42 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
@@ -11,6 +40,15 @@ Sun Mar 20 17:43:54 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
 - Build with source and target levels 8
 
+-------------------------------------------------------------------
+Tue Jan 18 07:57:30 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to version 2.1.1
+  * Last version before deprecation
+  * Requires Java 7 and Maven 3.2.5+
+  * Upgrade ASM to 9.2
+  * Security upgrade org.jdom:jdom2 from 2.0.6 to 2.0.6.1
+
 -------------------------------------------------------------------
 Fri May 14 16:39:03 UTC 2021 - Fridrich Strba <fstrba@suse.com>
 

plexus-metadata-generator.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package plexus-metadata-generator
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
 %global comp_name component-metadata
 %bcond_with tests
 Name:           plexus-metadata-generator
-Version:        2.1.1
+Version:        2.2.0
 Release:        0
 Summary:        Component metadata from %{base_name}
 # Most of the files are either under ASL 2.0 or MIT
@@ -39,26 +39,31 @@ Patch1000:      %{name}-nomojo.patch
 BuildRequires:  ant
 BuildRequires:  apache-commons-cli
 BuildRequires:  fdupes
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
 BuildRequires:  jdom2
 BuildRequires:  junit
 BuildRequires:  objectweb-asm >= 7
 BuildRequires:  plexus-classworlds
 BuildRequires:  plexus-cli
 BuildRequires:  plexus-containers-component-annotations
-BuildRequires:  plexus-containers-container-default
 BuildRequires:  plexus-utils
+BuildRequires:  plexus-xml
 BuildRequires:  qdox >= 2
+BuildRequires:  sisu-plexus
 BuildRequires:  xbean
 Requires:       apache-commons-cli
+Requires:       atinject
+Requires:       google-guice
 Requires:       guava
 Requires:       jdom2
 Requires:       objectweb-asm >= 7
 Requires:       plexus-cli
 Requires:       plexus-containers-component-annotations = %{version}
-Requires:       plexus-containers-container-default = %{version}
 Requires:       plexus-utils
+Requires:       plexus-xml
 Requires:       qdox >= 2
+Requires:       sisu-inject
+Requires:       sisu-plexus
 Requires:       xbean
 BuildArch:      noarch
 %if %{with tests}
@@ -83,28 +88,21 @@ Group:          Documentation/HTML
 %setup -q -n %{base_name}-%{base_name}-%{version} -a100
 
 mkdir -p lib
-build-jar-repository -s lib %{base_name} objectweb-asm/asm objectweb-asm/asm-commons plexus/classworlds plexus/utils jdom2/jdom2 commons-cli qdox plexus/cli
+build-jar-repository -s lib %{base_name} objectweb-asm/asm objectweb-asm/asm-commons org.eclipse.sisu.plexus plexus/classworlds plexus/utils plexus/xml jdom2/jdom2 commons-cli qdox plexus/cli
 %if %{with tests}
 build-jar-repository -s lib hamcrest/core xbean/xbean-reflect
 %endif
 
-%patch1 -p1
+%patch -P 1 -p1
 
-%patch1000 -p1
+%patch -P 1000 -p1
 
 cp %{SOURCE1} .
 cp %{SOURCE2} .
 
-rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy
-
 %pom_remove_plugin -r :maven-site-plugin
 
-# For Maven 3 compat
+%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 plexus-component-metadata
-%pom_add_dep org.apache.maven:maven-core plexus-component-metadata
-
-# 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
 
 # Generate OSGI info
 %pom_xpath_inject "pom:project" "
@@ -135,11 +133,6 @@ rm -rf plexus-%{comp_name}/src/main/resources/META-INF/maven
 %pom_remove_dep :maven-model plexus-%{comp_name}
 %pom_remove_dep :maven-plugin-api plexus-%{comp_name}
 
-%pom_remove_parent plexus-%{comp_name}
-%pom_xpath_inject "pom:project" "
-  <groupId>org.codehaus.plexus</groupId>
-  <version>%{version}</version>
-" plexus-%{comp_name}
 %pom_xpath_set "pom:project/pom:artifactId" %{name} plexus-%{comp_name}
 
 %build
@@ -158,14 +151,14 @@ install -dm 0755 %{buildroot}%{_javadir}
 install -pm 0644 plexus-%{comp_name}/target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
 # pom
 install -dm 0755 %{buildroot}%{_mavenpomdir}
-install -pm 0644 plexus-%{comp_name}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
+%{mvn_install_pom} plexus-%{comp_name}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
 %add_maven_depmap %{name}.pom %{name}.jar
 # javadoc
 install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr plexus-%{comp_name}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
 %fdupes -s %{buildroot}%{_javadocdir}
 # script
-%jpackage_script org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli "" "" %{name}:%{base_name}/plexus-container-default:%{base_name}/plexus-component-annotations:objectweb-asm/asm:plexus-classworlds:plexus/utils:jdom2/jdom2:commons-cli:qdox:plexus/cli:guava/guava:xbean/xbean-reflect %{name}
+%jpackage_script org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli "" "" %{name}:atinject:org.eclipse.sisu.plexus:org.eclipse.sisu.inject:guice/google-guice:%{base_name}/plexus-component-annotations:objectweb-asm/asm:plexus-classworlds:plexus/utils:plexus/xml:jdom2/jdom2:commons-cli:qdox:plexus/cli:guava/guava:xbean/xbean-reflect %{name}
 
 %files -f .mfiles
 %license LICENSE-2.0.txt LICENSE.MIT