Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package maven-doxia-sitetools for
openSUSE:Factory checked in at 2024-06-11 18:27:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/maven-doxia-sitetools (Old)
and /work/SRC/openSUSE:Factory/.maven-doxia-sitetools.new.19518 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven-doxia-sitetools"
Tue Jun 11 18:27:41 2024 rev:9 rq:1179826 version:1.11.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/maven-doxia-sitetools/maven-doxia-sitetools.changes
2024-04-03 17:21:22.083602938 +0200
+++
/work/SRC/openSUSE:Factory/.maven-doxia-sitetools.new.19518/maven-doxia-sitetools.changes
2024-06-11 18:28:20.302777661 +0200
@@ -1,0 +2,6 @@
+Mon Jun 10 16:41:51 UTC 2024 - Fridrich Strba <fst...@suse.com>
+
+- Use plexus-metadata-generator executable directly to simplify
+ build classpath
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ maven-doxia-sitetools.spec ++++++
--- /var/tmp/diff_new_pack.rwUmnX/_old 2024-06-11 18:28:21.970838536 +0200
+++ /var/tmp/diff_new_pack.rwUmnX/_new 2024-06-11 18:28:21.974838681 +0200
@@ -29,17 +29,12 @@
Source1: %{name}-build.tar.xz
Patch1: 0002-Remove-dependency-on-velocity-tools.patch
BuildRequires: ant
-BuildRequires: apache-commons-cli
BuildRequires: apache-commons-collections
BuildRequires: apache-commons-io
BuildRequires: apache-commons-lang3
-BuildRequires: atinject
BuildRequires: fdupes
-BuildRequires: google-guice
-BuildRequires: guava
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local >= 6
-BuildRequires: jdom2
BuildRequires: maven-doxia-core
BuildRequires: maven-doxia-logging-api
BuildRequires: maven-doxia-module-fo
@@ -48,9 +43,6 @@
BuildRequires: maven-lib
BuildRequires: maven-reporting-api
BuildRequires: modello >= 2.0.0
-BuildRequires: objectweb-asm
-BuildRequires: plexus-classworlds
-BuildRequires: plexus-cli
BuildRequires: plexus-containers-component-annotations
BuildRequires: plexus-i18n
BuildRequires: plexus-interpolation
@@ -58,12 +50,9 @@
BuildRequires: plexus-utils
BuildRequires: plexus-velocity
BuildRequires: plexus-xml
-BuildRequires: qdox
-BuildRequires: sisu-inject
BuildRequires: sisu-plexus
BuildRequires: unzip
BuildRequires: velocity
-BuildRequires: xbean
BuildRequires: xmvn-install
BuildRequires: xmvn-resolve
BuildRequires: xz
@@ -118,14 +107,9 @@
%build
mkdir -p lib
build-jar-repository -s lib \
- atinject \
apache-commons-collections \
apache-commons-lang3 \
- commons-cli \
commons-io \
- guava/guava \
- guice/google-guice \
- jdom2/jdom2 \
maven-doxia/doxia-core \
maven-doxia/doxia-logging-api \
maven-doxia/doxia-module-fo \
@@ -137,21 +121,14 @@
maven/maven-plugin-api \
maven/maven-project \
maven-reporting-api/maven-reporting-api \
- objectweb-asm/asm \
- org.eclipse.sisu.inject \
org.eclipse.sisu.plexus \
- plexus-classworlds \
- plexus/cli \
plexus-containers/plexus-component-annotations \
plexus-i18n/plexus-i18n \
plexus/interpolation \
- plexus-metadata-generator \
plexus/utils \
plexus/xml \
plexus-velocity/plexus-velocity \
- qdox \
- velocity \
- xbean/xbean-reflect
+ velocity
# tests can't run because of missing deps
%{ant} -Dtest.skip=true package javadoc
++++++ maven-doxia-sitetools-build.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/doxia-decoration-model/build.xml
new/doxia-decoration-model/build.xml
--- old/doxia-decoration-model/build.xml 2022-05-10 10:59:20.335364865
+0200
+++ new/doxia-decoration-model/build.xml 2024-06-10 20:21:31.622643219
+0200
@@ -115,14 +115,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"/>
@@ -131,7 +128,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-doc-renderer/build.xml
new/doxia-doc-renderer/build.xml
--- old/doxia-doc-renderer/build.xml 2019-03-28 21:22:12.449423382 +0100
+++ new/doxia-doc-renderer/build.xml 2024-06-10 20:21:24.349258936 +0200
@@ -80,14 +80,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"/>
@@ -96,7 +93,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-integration-tools/build.xml
new/doxia-integration-tools/build.xml
--- old/doxia-integration-tools/build.xml 2019-03-28 21:22:02.153372498
+0100
+++ new/doxia-integration-tools/build.xml 2024-06-10 20:20:27.422193637
+0200
@@ -82,14 +82,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"/>
@@ -98,7 +95,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-site-renderer/build.xml
new/doxia-site-renderer/build.xml
--- old/doxia-site-renderer/build.xml 2019-03-28 21:21:38.817257186 +0100
+++ new/doxia-site-renderer/build.xml 2024-06-10 20:20:18.925467474 +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>
<!-- ======================================================================
-->
