Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package maven-surefire for openSUSE:Factory
checked in at 2024-06-11 18:27:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/maven-surefire (Old)
and /work/SRC/openSUSE:Factory/.maven-surefire.new.19518 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven-surefire"
Tue Jun 11 18:27:43 2024 rev:11 rq:1179830 version:3.2.5
Changes:
--------
maven-surefire-provider-junit5.changes: same change
--- /work/SRC/openSUSE:Factory/maven-surefire/maven-surefire.changes
2024-04-10 17:51:05.378017587 +0200
+++ /work/SRC/openSUSE:Factory/.maven-surefire.new.19518/maven-surefire.changes
2024-06-11 18:28:22.878871674 +0200
@@ -1,0 +2,6 @@
+Mon Jun 10 19:00:07 UTC 2024 - Fridrich Strba <fst...@suse.com>
+
+- Use plexus-metadata-generator executable directly to simplify
+ build classpath
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
maven-surefire-provider-junit5.spec: same change
++++++ maven-surefire.spec ++++++
--- /var/tmp/diff_new_pack.OoC0Kq/_old 2024-06-11 18:28:23.630899118 +0200
+++ /var/tmp/diff_new_pack.OoC0Kq/_new 2024-06-11 18:28:23.630899118 +0200
@@ -30,14 +30,11 @@
Patch0: 0001-Port-to-TestNG-7.4.0.patch
Patch10: %{name}-bootstrap-resources.patch
BuildRequires: ant
-BuildRequires: apache-commons-cli
BuildRequires: apache-commons-compress
BuildRequires: apache-commons-io
BuildRequires: apache-commons-lang3
BuildRequires: atinject
BuildRequires: fdupes
-BuildRequires: google-guice
-BuildRequires: guava
BuildRequires: java-devel >= 1.8
BuildRequires: javacc
BuildRequires: javapackages-local
@@ -55,16 +52,12 @@
BuildRequires: maven-reporting-impl
BuildRequires: maven-resolver
BuildRequires: maven-shared-utils
-BuildRequires: objectweb-asm
-BuildRequires: plexus-classworlds
-BuildRequires: plexus-cli
BuildRequires: plexus-i18n
BuildRequires: plexus-interpolation
BuildRequires: plexus-languages
BuildRequires: plexus-metadata-generator
BuildRequires: plexus-utils
BuildRequires: plexus-xml
-BuildRequires: qdox
BuildRequires: sisu-inject
BuildRequires: sisu-plexus
BuildRequires: testng
@@ -187,13 +180,9 @@
build-jar-repository -s -p lib \
atinject \
apache-commons-lang3 \
- commons-cli \
commons-compress \
commons-io \
- guava/guava \
- guice/google-guice \
javacc \
- jdom2/jdom2 \
jsr-305 \
junit \
maven-common-artifact-filters/maven-common-artifact-filters \
@@ -213,19 +202,14 @@
maven-resolver/maven-resolver-api \
maven-resolver/maven-resolver-util \
maven-shared-utils/maven-shared-utils \
- objectweb-asm/asm \
org.eclipse.sisu.plexus \
org.eclipse.sisu.inject \
- plexus-classworlds \
- plexus/cli \
plexus-containers/plexus-component-annotations \
plexus-i18n/plexus-i18n \
plexus/interpolation \
plexus-languages/plexus-java \
- plexus-metadata-generator \
plexus/utils \
plexus/xml \
- qdox \
testng
%{ant} \
++++++ maven-surefire-build.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-failsafe-plugin/build.xml
new/maven-failsafe-plugin/build.xml
--- old/maven-failsafe-plugin/build.xml 2024-04-08 15:58:41.948262634 +0200
+++ new/maven-failsafe-plugin/build.xml 2024-06-10 20:55:30.956920016 +0200
@@ -107,34 +107,6 @@
</target>
<!-- ======================================================================
-->
- <!-- Target to generate Plexus component.xml
-->
- <!-- ======================================================================
-->
-
- <target name="plexus"
- depends="compile"
- description="Generate Plexus component.xml">
- <mkdir dir="${build.outputDir}/META-INF/plexus"/>
- <java classname="org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli"
- failonerror="true"
- fork="true">
- <!-- <jvmarg value="-verbose"/> -->
- <classpath>
- <path refid="build.classpath"/>
- <pathelement location="${build.outputDir}"/>
- </classpath>
- <arg value="-X"/>
- <arg value="-s"/>
- <arg value="${build.srcDir}"/>
- <arg value="-c"/>
- <arg value="${build.outputDir}"/>
- <arg value="-m"/>
- <arg value="${build.outputDir}/META-INF/plexus"/>
- <arg value="-o"/>
- <arg value="${build.outputDir}/META-INF/plexus/components.xml"/>
- </java>
- </target>
-
- <!-- ======================================================================
-->
<!-- Test-compilation target
-->
<!-- ======================================================================
-->
@@ -261,7 +233,7 @@
<!-- Package target
-->
<!-- ======================================================================
-->
- <target name="package" depends="plexus,test" description="Package the
application">
+ <target name="package" depends="compile,test" description="Package the
application">
<jar jarfile="${build.dir}/${build.finalName}.jar"
compress="true"
index="false"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-surefire-common/build.xml
new/maven-surefire-common/build.xml
--- old/maven-surefire-common/build.xml 2024-04-08 15:58:26.754817410 +0200
+++ new/maven-surefire-common/build.xml 2024-06-10 20:46:41.946551158 +0200
@@ -88,15 +88,11 @@
depends="compile"
description="Generate Plexus component.xml">
<mkdir dir="${build.outputDir}/META-INF/plexus"/>
- <java classname="org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli"
- failonerror="true"
- fork="true">
- <!-- <jvmarg value="-verbose"/> -->
- <classpath>
- <path refid="build.classpath"/>
- <pathelement location="${build.outputDir}"/>
- </classpath>
- <arg value="-X"/>
+ <pathconvert property="classpath.string" pathsep=":">
+ <path refid="build.classpath"/>
+ </pathconvert>
+ <exec executable="plexus-metadata-generator" failonerror="true">
+ <env key="CLASSPATH" value="${build.outputDir}:${classpath.string}"/>
<arg value="-s"/>
<arg value="${build.srcDir}"/>
<arg value="-c"/>
@@ -105,7 +101,7 @@
<arg value="${build.outputDir}/META-INF/plexus"/>
<arg value="-o"/>
<arg value="${build.outputDir}/META-INF/plexus/components.xml"/>
- </java>
+ </exec>
</target>
<!-- ======================================================================
-->
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-surefire-report-plugin/build.xml
new/maven-surefire-report-plugin/build.xml
--- old/maven-surefire-report-plugin/build.xml 2024-04-08 15:57:59.531283591
+0200
+++ new/maven-surefire-report-plugin/build.xml 2024-06-10 20:55:11.070114239
+0200
@@ -105,34 +105,6 @@
</target>
<!-- ======================================================================
-->
- <!-- Target to generate Plexus component.xml
-->
- <!-- ======================================================================
-->
-
- <target name="plexus"
- depends="compile"
- description="Generate Plexus component.xml">
- <mkdir dir="${build.outputDir}/META-INF/plexus"/>
- <java classname="org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli"
- failonerror="true"
- fork="true">
- <!-- <jvmarg value="-verbose"/> -->
- <classpath>
- <path refid="build.classpath"/>
- <pathelement location="${build.outputDir}"/>
- </classpath>
- <arg value="-X"/>
- <arg value="-s"/>
- <arg value="${build.srcDir}"/>
- <arg value="-c"/>
- <arg value="${build.outputDir}"/>
- <arg value="-m"/>
- <arg value="${build.outputDir}/META-INF/plexus"/>
- <arg value="-o"/>
- <arg value="${build.outputDir}/META-INF/plexus/components.xml"/>
- </java>
- </target>
-
- <!-- ======================================================================
-->
<!-- Test-compilation target
-->
<!-- ======================================================================
-->
@@ -261,7 +233,7 @@
<!-- Package target
-->
<!-- ======================================================================
-->
- <target name="package" depends="plexus,test" description="Package the
application">
+ <target name="package" depends="compile,test" description="Package the
application">
<jar jarfile="${build.dir}/${build.finalName}.jar"
compress="true"
index="false"
