Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package maven-doxia for openSUSE:Factory
checked in at 2024-06-11 18:27:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/maven-doxia (Old)
and /work/SRC/openSUSE:Factory/.maven-doxia.new.19518 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven-doxia"
Tue Jun 11 18:27:46 2024 rev:13 rq:1179962 version:1.12.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/maven-doxia/maven-doxia.changes 2024-04-03
17:21:23.323648669 +0200
+++ /work/SRC/openSUSE:Factory/.maven-doxia.new.19518/maven-doxia.changes
2024-06-11 18:28:28.079061448 +0200
@@ -1,0 +2,6 @@
+Mon Jun 10 16:37:25 UTC 2024 - Fridrich Strba <fst...@suse.com>
+
+- Use plexus-metadata-generator executable directly to simplify
+ build classpath
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ maven-doxia.spec ++++++
--- /var/tmp/diff_new_pack.HDBbpY/_old 2024-06-11 18:28:29.119099403 +0200
+++ /var/tmp/diff_new_pack.HDBbpY/_new 2024-06-11 18:28:29.119099403 +0200
@@ -27,34 +27,22 @@
Source1: %{name}-build.tar.xz
Patch0: 0002-Commons-configuration2.patch
BuildRequires: ant
-BuildRequires: apache-commons-cli
-BuildRequires: apache-commons-collections
BuildRequires: apache-commons-configuration2
BuildRequires: apache-commons-lang3
BuildRequires: apache-commons-text
-BuildRequires: atinject
BuildRequires: fdupes
-BuildRequires: google-guice
-BuildRequires: guava
BuildRequires: httpcomponents-client
BuildRequires: httpcomponents-core
BuildRequires: javapackages-local
-BuildRequires: jdom2
BuildRequires: modello >= 2.0.0
-BuildRequires: objectweb-asm
BuildRequires: parboiled
BuildRequires: pegdown
-BuildRequires: plexus-classworlds
-BuildRequires: plexus-cli
BuildRequires: plexus-containers-component-annotations
BuildRequires: plexus-metadata-generator
BuildRequires: plexus-utils
BuildRequires: plexus-xml
-BuildRequires: qdox
-BuildRequires: sisu-inject
BuildRequires: sisu-plexus
BuildRequires: unzip
-BuildRequires: xbean
BuildRequires: xmlgraphics-commons
BuildRequires: xmlgraphics-fop
BuildRequires: xmlunit
@@ -212,29 +200,17 @@
%build
mkdir -p lib
build-jar-repository -s lib \
- atinject \
apache-commons-text \
- commons-cli \
commons-configuration2 \
commons-lang3 \
- guava/guava \
- guice/google-guice \
httpcomponents/httpclient \
httpcomponents/httpcore \
- jdom2/jdom2 \
- objectweb-asm/asm \
- org.eclipse.sisu.inject \
org.eclipse.sisu.plexus \
parboiled/core \
pegdown \
- plexus-classworlds \
- plexus/cli \
plexus-containers/plexus-component-annotations \
- plexus-metadata-generator \
plexus/utils \
plexus/xml \
- qdox \
- xbean/xbean-reflect \
xmlgraphics-commons \
xmlgraphics-fop
++++++ maven-doxia-build.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/doxia-core/build.xml new/doxia-core/build.xml
--- old/doxia-core/build.xml 2022-05-10 10:22:58.801859630 +0200
+++ new/doxia-core/build.xml 2024-06-10 19:55:16.961640930 +0200
@@ -125,14 +125,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">
- <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"/>
@@ -141,7 +138,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/doxia-modules/doxia-module-apt/build.xml
new/doxia-modules/doxia-module-apt/build.xml
--- old/doxia-modules/doxia-module-apt/build.xml 2020-03-10
11:39:14.105809782 +0100
+++ new/doxia-modules/doxia-module-apt/build.xml 2024-06-10
19:52:01.046939128 +0200
@@ -84,14 +84,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">
- <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"/>
@@ -100,7 +97,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/doxia-modules/doxia-module-confluence/build.xml
new/doxia-modules/doxia-module-confluence/build.xml
--- old/doxia-modules/doxia-module-confluence/build.xml 2019-03-28
15:59:58.437873733 +0100
+++ new/doxia-modules/doxia-module-confluence/build.xml 2024-06-10
19:53:22.100838619 +0200
@@ -84,14 +84,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">
- <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"/>
@@ -100,7 +97,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/doxia-modules/doxia-module-docbook-simple/build.xml
new/doxia-modules/doxia-module-docbook-simple/build.xml
--- old/doxia-modules/doxia-module-docbook-simple/build.xml 2019-03-28
15:59:58.437873733 +0100
+++ new/doxia-modules/doxia-module-docbook-simple/build.xml 2024-06-10
19:53:33.534251815 +0200
@@ -87,14 +87,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">
- <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"/>
@@ -103,7 +100,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/doxia-modules/doxia-module-fml/build.xml
new/doxia-modules/doxia-module-fml/build.xml
--- old/doxia-modules/doxia-module-fml/build.xml 2022-05-10
10:25:21.050738255 +0200
+++ new/doxia-modules/doxia-module-fml/build.xml 2024-06-10
19:53:42.694315802 +0200
@@ -124,14 +124,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">
- <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"/>
@@ -140,7 +137,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/doxia-modules/doxia-module-fo/build.xml
new/doxia-modules/doxia-module-fo/build.xml
--- old/doxia-modules/doxia-module-fo/build.xml 2019-03-28 15:59:58.437873733
+0100
+++ new/doxia-modules/doxia-module-fo/build.xml 2024-06-10 19:53:51.901046776
+0200
@@ -87,14 +87,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">
- <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"/>
@@ -103,7 +100,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/doxia-modules/doxia-module-latex/build.xml
new/doxia-modules/doxia-module-latex/build.xml
--- old/doxia-modules/doxia-module-latex/build.xml 2019-03-28
15:59:58.437873733 +0100
+++ new/doxia-modules/doxia-module-latex/build.xml 2024-06-10
19:54:00.381106011 +0200
@@ -87,14 +87,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">
- <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"/>
@@ -103,7 +100,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/doxia-modules/doxia-module-markdown/build.xml
new/doxia-modules/doxia-module-markdown/build.xml
--- old/doxia-modules/doxia-module-markdown/build.xml 2019-03-28
15:59:58.437873733 +0100
+++ new/doxia-modules/doxia-module-markdown/build.xml 2024-06-10
19:54:08.111160006 +0200
@@ -86,14 +86,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">
- <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"/>
@@ -102,7 +99,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/doxia-modules/doxia-module-rtf/build.xml
new/doxia-modules/doxia-module-rtf/build.xml
--- old/doxia-modules/doxia-module-rtf/build.xml 2019-03-28
15:59:58.437873733 +0100
+++ new/doxia-modules/doxia-module-rtf/build.xml 2024-06-10
19:54:19.264571252 +0200
@@ -85,14 +85,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">
- <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"/>
@@ -101,7 +98,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/doxia-modules/doxia-module-twiki/build.xml
new/doxia-modules/doxia-module-twiki/build.xml
--- old/doxia-modules/doxia-module-twiki/build.xml 2019-03-28
15:59:58.437873733 +0100
+++ new/doxia-modules/doxia-module-twiki/build.xml 2024-06-10
19:54:29.361308443 +0200
@@ -84,14 +84,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">
- <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"/>
@@ -100,7 +97,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/doxia-modules/doxia-module-xdoc/build.xml
new/doxia-modules/doxia-module-xdoc/build.xml
--- old/doxia-modules/doxia-module-xdoc/build.xml 2019-03-28
15:59:58.437873733 +0100
+++ new/doxia-modules/doxia-module-xdoc/build.xml 2024-06-10
19:54:35.664685806 +0200
@@ -88,14 +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">
- <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"/>
@@ -104,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/doxia-modules/doxia-module-xhtml/build.xml
new/doxia-modules/doxia-module-xhtml/build.xml
--- old/doxia-modules/doxia-module-xhtml/build.xml 2019-03-28
15:59:58.437873733 +0100
+++ new/doxia-modules/doxia-module-xhtml/build.xml 2024-06-10
19:54:53.774812307 +0200
@@ -84,14 +84,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">
- <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"/>
@@ -100,7 +97,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/doxia-modules/doxia-module-xhtml5/build.xml
new/doxia-modules/doxia-module-xhtml5/build.xml
--- old/doxia-modules/doxia-module-xhtml5/build.xml 2020-03-10
11:25:07.181709972 +0100
+++ new/doxia-modules/doxia-module-xhtml5/build.xml 2024-06-10
19:54:46.294760057 +0200
@@ -84,14 +84,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">
- <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"/>
@@ -100,7 +97,7 @@
<arg value="${build.outputDir}/META-INF/plexus"/>
<arg value="-o"/>
<arg value="${build.outputDir}/META-INF/plexus/components.xml"/>
- </java>
+ </exec>
</target>
<!-- ======================================================================
-->
