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 2026-11-10 14:41:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/maven-doxia-sitetools (Old)
and /work/SRC/openSUSE:Factory/.maven-doxia-sitetools.new.3759290 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven-doxia-sitetools"
Tue Nov 10 14:41:51 2026 rev:15 rq:1396448 version:2.1.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/maven-doxia-sitetools/maven-doxia-sitetools.changes
2026-08-03 17:19:08.018576614 +0200
+++
/work/SRC/openSUSE:Factory/.maven-doxia-sitetools.new.3759290/maven-doxia-sitetools.changes
2026-11-10 14:42:44.586403952 +0100
@@ -1,0 +2,5 @@
+Mon Nov 9 23:45:33 UTC 2026 - Fridrich Strba <[email protected]>
+
+- Use modello-ant-task instead of ModelloCli
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ maven-doxia-sitetools.spec ++++++
--- /var/tmp/diff_new_pack.zMBTjw/_old 2026-11-10 14:42:45.512442746 +0100
+++ /var/tmp/diff_new_pack.zMBTjw/_new 2026-11-10 14:42:45.514442830 +0100
@@ -39,7 +39,7 @@
BuildRequires: maven-lib
BuildRequires: maven-reporting-api
BuildRequires: maven-resolver-api
-BuildRequires: modello
+BuildRequires: modello-ant-task
BuildRequires: objectweb-asm
BuildRequires: plexus-i18n
BuildRequires: plexus-interpolation
++++++ _scmsync.obsinfo ++++++
--- /var/tmp/diff_new_pack.zMBTjw/_old 2026-11-10 14:42:45.550444338 +0100
+++ /var/tmp/diff_new_pack.zMBTjw/_new 2026-11-10 14:42:45.553444464 +0100
@@ -1,6 +1,6 @@
-mtime: 1785743510
-commit: 671e109a154794446f0b27d035db895263fa52c621b55782529f852cbaa2bcec
+mtime: 1794267960
+commit: 1c1a90e713b188cc6e74b4aab962453550f119990fe1949e0e7907f2c86d5247
url: https://src.opensuse.org/java-packages/maven-doxia-sitetools
-revision: 671e109a154794446f0b27d035db895263fa52c621b55782529f852cbaa2bcec
+revision: 1c1a90e713b188cc6e74b4aab962453550f119990fe1949e0e7907f2c86d5247
projectscmsync: https://src.opensuse.org/java-packages/_ObsPrj
++++++ build.specials.obscpio ++++++
++++++ build.specials.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/.gitignore new/.gitignore
--- old/.gitignore 1970-01-01 01:00:00.000000000 +0100
+++ new/.gitignore 2026-11-10 00:46:00.000000000 +0100
@@ -0,0 +1 @@
+.osc
++++++ maven-doxia-sitetools-build.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/doxia-site-model/build.xml
new/doxia-site-model/build.xml
--- old/doxia-site-model/build.xml 2026-03-31 20:54:34.555320087 +0200
+++ new/doxia-site-model/build.xml 2026-09-28 10:15:49.136310233 +0200
@@ -47,43 +47,20 @@
<target name="mdo" description="Generate sources from mdo files">
<mkdir dir="${build.mdoOutputDir}"/>
- <macrodef name="modello-single-mode">
- <attribute name="file"/>
- <attribute name="mode"/>
- <attribute name="version"/>
- <sequential>
- <exec executable="modello" failonerror="true">
- <arg file="@{file}"/> <!-- model file -->
- <arg value="@{mode}"/> <!-- output type -->
- <arg file="${build.mdoOutputDir}"/> <!-- output directory -->
- <arg value="@{version}"/> <!-- model version -->
- <arg value="false"/> <!-- package with version -->
- <arg value="8"/> <!-- javaSource -->
- </exec>
- </sequential>
- </macrodef>
- <macrodef name="modello">
- <attribute name="file"/>
- <attribute name="version" default="2.1.0"/>
- <sequential>
- <echo taskname="modello" message="Generating sources for @{file}"/>
- <modello-single-mode file="@{file}" version="@{version}"
mode="xpp3-writer"/>
- <modello-single-mode file="@{file}" version="@{version}" mode="java"/>
- <modello-single-mode file="@{file}" version="@{version}"
mode="xpp3-reader"/>
- <modello-single-mode file="@{file}" version="@{version}" mode="xsd"/>
- </sequential>
- </macrodef>
- <macrodef name="modello_old">
- <attribute name="file"/>
- <attribute name="version" default="1.8.1"/>
- <sequential>
- <echo taskname="modello_old" message="Generating sources for @{file}"/>
- <modello-single-mode file="@{file}" version="@{version}" mode="java"/>
- <modello-single-mode file="@{file}" version="@{version}"
mode="xpp3-reader"/>
- </sequential>
- </macrodef>
- <modello file="${build.mdoDir}/site.mdo"/>
- <modello_old file="${build.mdoDir}/decoration.mdo"/>
+ <typedef resource="org/codehaus/modello/ant/antlib.xml" />
+
+ <modello version="2.1.0" outputDirectory="${build.mdoOutputDir}"
javaSource="8">
+ <model file="${build.mdoDir}/site.mdo"/>
+ <goal name="java"/>
+ <goal name="xpp3-reader"/>
+ <goal name="xpp3-writer"/>
+ <goal name="xsd"/>
+ </modello>
+ <modello version="1.8.1" outputDirectory="${build.mdoOutputDir}"
javaSource="8">
+ <model file="${build.mdoDir}/decoration.mdo"/>
+ <goal name="java"/>
+ <goal name="xpp3-reader"/>
+ </modello>
</target>
<!-- ======================================================================
-->
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/doxia-skin-model/build.xml
new/doxia-skin-model/build.xml
--- old/doxia-skin-model/build.xml 2026-03-31 20:55:49.739877787 +0200
+++ new/doxia-skin-model/build.xml 2026-09-28 10:16:00.232643127 +0200
@@ -44,32 +44,14 @@
<target name="mdo" description="Generate sources from mdo files">
<mkdir dir="${build.mdoOutputDir}"/>
- <macrodef name="modello-single-mode">
- <attribute name="file"/>
- <attribute name="mode"/>
- <attribute name="version"/>
- <sequential>
- <exec executable="modello" failonerror="true">
- <arg file="@{file}"/> <!-- model file -->
- <arg value="@{mode}"/> <!-- output type -->
- <arg file="${build.mdoOutputDir}"/> <!-- output directory -->
- <arg value="@{version}"/> <!-- model version -->
- <arg value="false"/> <!-- package with version -->
- <arg value="8"/> <!-- javaSource -->
- </exec>
- </sequential>
- </macrodef>
- <macrodef name="modello">
- <attribute name="file"/>
- <attribute name="version" default="2.1.0"/>
- <sequential>
- <echo taskname="modello" message="Generating sources for @{file}"/>
- <modello-single-mode file="@{file}" version="@{version}" mode="java"/>
- <modello-single-mode file="@{file}" version="@{version}"
mode="xpp3-reader"/>
- <modello-single-mode file="@{file}" version="@{version}" mode="xsd"/>
- </sequential>
- </macrodef>
- <modello file="${build.mdoDir}/skin.mdo"/>
+ <typedef resource="org/codehaus/modello/ant/antlib.xml" />
+
+ <modello version="2.1.0" outputDirectory="${build.mdoOutputDir}"
javaSource="8">
+ <model file="${build.mdoDir}/skin.mdo"/>
+ <goal name="java"/>
+ <goal name="xpp3-reader"/>
+ <goal name="xsd"/>
+ </modello>
</target>
<!-- ======================================================================
-->
