Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package maven for openSUSE:Factory checked
in at 2024-06-11 18:27:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/maven (Old)
and /work/SRC/openSUSE:Factory/.maven.new.19518 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven"
Tue Jun 11 18:27:44 2024 rev:24 rq:1179835 version:3.9.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/maven/maven.changes 2024-04-03
17:21:27.115788520 +0200
+++ /work/SRC/openSUSE:Factory/.maven.new.19518/maven.changes 2024-06-11
18:28:24.074915322 +0200
@@ -1,0 +2,5 @@
+Mon Jun 10 13:58:23 UTC 2024 - Fridrich Strba <fst...@suse.com>
+
+- Add dependency on jakarta-inject, needed by google-guice 6.0.0
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ maven.spec ++++++
--- /var/tmp/diff_new_pack.BJuSek/_old 2024-06-11 18:28:25.378962911 +0200
+++ /var/tmp/diff_new_pack.BJuSek/_new 2024-06-11 18:28:25.378962911 +0200
@@ -52,6 +52,7 @@
BuildRequires: guava
BuildRequires: httpcomponents-client
BuildRequires: httpcomponents-core
+BuildRequires: jakarta-inject
BuildRequires: jansi
BuildRequires: javapackages-local
BuildRequires: jcl-over-slf4j
@@ -125,6 +126,7 @@
Requires: guava
Requires: httpcomponents-client
Requires: httpcomponents-core
+Requires: jakarta-inject
Requires: jansi
Requires: javapackages-tools
Requires: jcl-over-slf4j
@@ -232,9 +234,8 @@
atinject \
commons-cli \
glassfish-annotation-api \
- guava/guava \
guice/google-guice \
- jdom2/jdom2 \
+ jakarta-inject \
maven-resolver/maven-resolver-api \
maven-resolver/maven-resolver-impl \
maven-resolver/maven-resolver-named-locks \
@@ -247,18 +248,14 @@
org.eclipse.sisu.inject \
org.eclipse.sisu.plexus \
plexus-classworlds \
- plexus/cli \
plexus-containers/plexus-component-annotations \
plexus/interpolation \
- plexus-metadata-generator \
plexus/plexus-cipher \
plexus/plexus-sec-dispatcher \
plexus/utils \
plexus/xml \
- qdox \
slf4j/api \
- slf4j/simple \
- xbean/xbean-reflect
+ slf4j/simple
ln -s $(build-classpath slf4j/slf4j-simple-sources) lib/
%{ant} \
-Dtest.skip=true \
@@ -309,6 +306,7 @@
guice/google-guice \
httpcomponents/httpclient \
httpcomponents/httpcore \
+ jakarta-inject \
jansi/jansi \
maven-resolver/maven-resolver-api \
maven-resolver/maven-resolver-connector-basic \
++++++ apache-maven-3.9.6-build.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-compat/build.xml new/maven-compat/build.xml
--- old/maven-compat/build.xml 2022-05-10 10:40:24.912323088 +0200
+++ new/maven-compat/build.xml 2024-06-10 21:08:24.222329017 +0200
@@ -147,15 +147,11 @@
depends="compile"
description="Generate Plexus component.xml">
<mkdir dir="${build.outputDir}/META-INF/plexus"/>
- <property name="exec_classpath" refid="build.classpath"/>
- <java classname="org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli"
- failonerror="true"
- fork="true">
- <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"/>
@@ -164,7 +160,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-core/build.xml new/maven-core/build.xml
--- old/maven-core/build.xml 2022-05-10 10:40:33.224374639 +0200
+++ new/maven-core/build.xml 2024-06-10 21:08:37.119085896 +0200
@@ -165,15 +165,11 @@
depends="compile"
description="Generate Plexus component.xml">
<mkdir dir="${build.outputDir}/META-INF/plexus"/>
- <property name="exec_classpath" refid="build.classpath"/>
- <java classname="org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli"
- failonerror="true"
- fork="true">
- <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"/>
@@ -182,7 +178,7 @@
<arg value="${build.outputDir}/META-INF/plexus"/>
<arg value="-o"/>
<arg value="${build.outputDir}/META-INF/plexus/components.xml"/>
- </java>
+ </exec>
</target>
<!-- ======================================================================
-->
