Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package maven4 for openSUSE:Factory checked in at 2026-11-10 14:41:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/maven4 (Old) and /work/SRC/openSUSE:Factory/.maven4.new.3759290 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven4" Tue Nov 10 14:41:50 2026 rev:17 rq:1396447 version:4.0.0~rc7 Changes: -------- --- /work/SRC/openSUSE:Factory/maven4/maven4-bootstrap.changes 2026-09-28 10:39:37.044768381 +0200 +++ /work/SRC/openSUSE:Factory/.maven4.new.3759290/maven4-bootstrap.changes 2026-11-10 14:42:41.091257534 +0100 @@ -1,0 +2,5 @@ +Mon Nov 9 23:36:59 UTC 2026 - Fridrich Strba <[email protected]> + +- Use modello-ant-task instead of ModelloCli + +------------------------------------------------------------------- maven4-testing.changes: same change maven4.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ maven4-testing.spec: same change ++++++ maven4.spec ++++++ --- /var/tmp/diff_new_pack.cKiU40/_old 2026-11-10 14:42:43.113342243 +0100 +++ /var/tmp/diff_new_pack.cKiU40/_new 2026-11-10 14:42:43.116342369 +0100 @@ -83,7 +83,7 @@ BuildRequires: maven-wagon-http-shared BuildRequires: maven-wagon-provider-api BuildRequires: methanol -BuildRequires: modello +BuildRequires: modello-ant-task BuildRequires: objectweb-asm BuildRequires: plexus-classworlds BuildRequires: plexus-containers-component-annotations ++++++ _scmsync.obsinfo ++++++ --- /var/tmp/diff_new_pack.cKiU40/_old 2026-11-10 14:42:43.281349281 +0100 +++ /var/tmp/diff_new_pack.cKiU40/_new 2026-11-10 14:42:43.295349868 +0100 @@ -1,6 +1,6 @@ -mtime: 1790292987 -commit: ae2830080c5af15419299f861760ee77250a7f51f2a6cb34424f91b8c63e0f91 +mtime: 1794267444 +commit: a3178c580e50bdfbd4af89f9acfd9ac3088b5dd57893b037cce12be29b3d8e25 url: https://src.opensuse.org/java-packages/maven4 -revision: ae2830080c5af15419299f861760ee77250a7f51f2a6cb34424f91b8c63e0f91 +revision: a3178c580e50bdfbd4af89f9acfd9ac3088b5dd57893b037cce12be29b3d8e25 projectscmsync: https://src.opensuse.org/java-packages/_ObsPrj ++++++ apache-maven-build.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/api/maven-api-cli/build.xml new/api/maven-api-cli/build.xml --- old/api/maven-api-cli/build.xml 2025-11-03 10:17:01.567377443 +0100 +++ new/api/maven-api-cli/build.xml 2026-09-28 10:23:49.450007795 +0200 @@ -49,48 +49,20 @@ <!-- ====================================================================== --> <!-- Code generation target --> <!-- ====================================================================== --> - <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"/> - <attribute name="velocityBaseDir" default=""/> - <attribute name="velocityTemplates" default=""/> - <attribute name="velocityParameters" default=""/> - <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"/> <!-- java source --> - <arg value="utf-8"/> <!-- encoding --> - <arg value="true"/> <!-- domAsXpp3 --> - <arg file="@{velocityBaseDir}"/> <!-- velocityBaseDir --> - <arg value="@{velocityTemplates}"/> <!-- velocityTemplates --> - <arg value="@{velocityParameters}"/> <!-- velocityParameters --> - </exec> - </sequential> - </macrodef> - <macrodef name="modello"> - <attribute name="file"/> - <attribute name="version" default="1.2.0"/> - <attribute name="velocityBaseDir" default="../../src/mdo"/> - <attribute name="velocityTemplates" default="model.vm"/> - <attribute name="velocityParameters" default="locationTracking=true,generateLocationClasses=true,packageModelV4=org.apache.maven.api.cli.extensions,packageToolV4=org.apache.maven.cli.internal.extension.io"/> - <sequential> - <echo taskname="modello" message="Generating sources for @{file}"/> - <modello-single-mode file="@{file}" version="@{version}" mode="velocity" - velocityBaseDir="@{velocityBaseDir}" velocityTemplates="@{velocityTemplates}" - velocityParameters="@{velocityParameters}"/> - <modello-single-mode file="@{file}" version="@{version}" mode="xdoc"/> - <modello-single-mode file="@{file}" version="@{version}" mode="xsd"/> - </sequential> - </macrodef> - <modello file="${build.mdoDir}/core-extensions.mdo"/> + <typedef resource="org/codehaus/modello/ant/antlib.xml" /> + <modello version="1.2.0" outputDirectory="${build.mdoOutputDir}" velocityBasedir="../../src/mdo" javaSource="8" encoding="utf-8"> + <model file="${build.mdoDir}/core-extensions.mdo"/> + <goal name="velocity"/> + <goal name="xdoc"/> + <goal name="xsd"/> + <template name="model.vm"/> + <param name="locationTracking" value="true"/> + <param name="generateLocationClasses" value="true"/> + <param name="packageModelV4" value="org.apache.maven.api.cli.extensions"/> + <param name="packageToolV4" value="org.apache.maven.cli.internal.extension.io"/> + </modello> </target> <!-- ====================================================================== --> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/api/maven-api-metadata/build.xml new/api/maven-api-metadata/build.xml --- old/api/maven-api-metadata/build.xml 2025-11-03 10:17:01.567949741 +0100 +++ new/api/maven-api-metadata/build.xml 2026-09-28 10:23:49.450319743 +0200 @@ -42,48 +42,17 @@ <!-- ====================================================================== --> <!-- Code generation target --> <!-- ====================================================================== --> - <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"/> - <attribute name="velocityBaseDir" default=""/> - <attribute name="velocityTemplates" default=""/> - <attribute name="velocityParameters" default=""/> - <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"/> <!-- java source --> - <arg value="utf-8"/> <!-- encoding --> - <arg value="true"/> <!-- domAsXpp3 --> - <arg file="@{velocityBaseDir}"/> <!-- velocityBaseDir --> - <arg value="@{velocityTemplates}"/> <!-- velocityTemplates --> - <arg value="@{velocityParameters}"/> <!-- velocityParameters --> - </exec> - </sequential> - </macrodef> - <macrodef name="modello"> - <attribute name="file"/> - <attribute name="version" default="1.2.0"/> - <attribute name="velocityBaseDir" default="../../src/mdo"/> - <attribute name="velocityTemplates" default="model.vm"/> - <attribute name="velocityParameters" default="packageModelV4=org.apache.maven.api.metadata"/> - <sequential> - <echo taskname="modello" message="Generating sources for @{file}"/> - <modello-single-mode file="@{file}" version="@{version}" mode="velocity" - velocityBaseDir="@{velocityBaseDir}" velocityTemplates="@{velocityTemplates}" - velocityParameters="@{velocityParameters}"/> - <modello-single-mode file="@{file}" version="@{version}" mode="xdoc"/> - <modello-single-mode file="@{file}" version="@{version}" mode="xsd"/> - </sequential> - </macrodef> - <modello file="${build.mdoDir}/metadata.mdo"/> + <typedef resource="org/codehaus/modello/ant/antlib.xml" /> + <modello version="1.2.0" outputDirectory="${build.mdoOutputDir}" velocityBasedir="../../src/mdo" javaSource="8" encoding="utf-8"> + <model file="${build.mdoDir}/metadata.mdo"/> + <goal name="velocity"/> + <goal name="xdoc"/> + <goal name="xsd"/> + <template name="model.vm"/> + <param name="packageModelV4" value="org.apache.maven.api.metadata"/> + </modello> </target> <!-- ====================================================================== --> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/api/maven-api-model/build.xml new/api/maven-api-model/build.xml --- old/api/maven-api-model/build.xml 2025-11-03 10:17:01.568148236 +0100 +++ new/api/maven-api-model/build.xml 2026-09-28 10:23:49.450525820 +0200 @@ -46,48 +46,18 @@ <!-- ====================================================================== --> <!-- Code generation target --> <!-- ====================================================================== --> - <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"/> - <attribute name="velocityBaseDir" default=""/> - <attribute name="velocityTemplates" default=""/> - <attribute name="velocityParameters" default=""/> - <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"/> <!-- java source --> - <arg value="utf-8"/> <!-- encoding --> - <arg value="true"/> <!-- domAsXpp3 --> - <arg file="@{velocityBaseDir}"/> <!-- velocityBaseDir --> - <arg value="@{velocityTemplates}"/> <!-- velocityTemplates --> - <arg value="@{velocityParameters}"/> <!-- velocityParameters --> - </exec> - </sequential> - </macrodef> - <macrodef name="modello"> - <attribute name="file"/> - <attribute name="version" default="4.1.0"/> - <attribute name="velocityBaseDir" default="../../src/mdo"/> - <attribute name="velocityTemplates" default="model.vm"/> - <attribute name="velocityParameters" default="packageModelV4=org.apache.maven.api.model,isMavenModel=true"/> - <sequential> - <echo taskname="modello" message="Generating sources for @{file}"/> - <modello-single-mode file="@{file}" version="@{version}" mode="velocity" - velocityBaseDir="@{velocityBaseDir}" velocityTemplates="@{velocityTemplates}" - velocityParameters="@{velocityParameters}"/> - <modello-single-mode file="@{file}" version="@{version}" mode="xdoc"/> - <modello-single-mode file="@{file}" version="@{version}" mode="xsd"/> - </sequential> - </macrodef> - <modello file="${build.mdoDir}/maven.mdo"/> + <typedef resource="org/codehaus/modello/ant/antlib.xml" /> + <modello version="4.1.0" outputDirectory="${build.mdoOutputDir}" velocityBasedir="../../src/mdo" javaSource="8" encoding="utf-8"> + <model file="${build.mdoDir}/maven.mdo"/> + <goal name="velocity"/> + <goal name="xdoc"/> + <goal name="xsd"/> + <template name="model.vm"/> + <param name="packageModelV4" value="org.apache.maven.api.model"/> + <param name="isMavenModel" value="true"/> + </modello> </target> <!-- ====================================================================== --> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/api/maven-api-plugin/build.xml new/api/maven-api-plugin/build.xml --- old/api/maven-api-plugin/build.xml 2025-11-03 10:17:01.568365789 +0100 +++ new/api/maven-api-plugin/build.xml 2026-09-28 10:23:49.450719815 +0200 @@ -43,51 +43,25 @@ <!-- ====================================================================== --> <!-- Code generation target --> <!-- ====================================================================== --> - <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"/> - <attribute name="velocityBaseDir" default=""/> - <attribute name="velocityTemplates" default=""/> - <attribute name="velocityParameters" default=""/> - <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"/> <!-- java source --> - <arg value="utf-8"/> <!-- encoding --> - <arg value="true"/> <!-- domAsXpp3 --> - <arg file="@{velocityBaseDir}"/> <!-- velocityBaseDir --> - <arg value="@{velocityTemplates}"/> <!-- velocityTemplates --> - <arg value="@{velocityParameters}"/> <!-- velocityParameters --> - </exec> - </sequential> - </macrodef> - <macrodef name="modello"> - <attribute name="file"/> - <attribute name="version" default="2.0.0"/> - <attribute name="velocityBaseDir" default="../../src/mdo"/> - <attribute name="velocityTemplates" default="model.vm"/> - <attribute name="velocityParameters" default=""/> - <sequential> - <echo taskname="modello" message="Generating sources for @{file}"/> - <modello-single-mode file="@{file}" version="@{version}" mode="velocity" - velocityBaseDir="@{velocityBaseDir}" velocityTemplates="@{velocityTemplates}" - velocityParameters="@{velocityParameters}"/> - <modello-single-mode file="@{file}" version="@{version}" mode="xdoc"/> - <modello-single-mode file="@{file}" version="@{version}" mode="xsd"/> - </sequential> - </macrodef> - <modello file="${build.mdoDir}/plugin.mdo" - velocityParameters="packageModelV4=org.apache.maven.api.plugin.descriptor"/> - <modello file="${build.mdoDir}/lifecycle.mdo" - velocityParameters="packageModelV4=org.apache.maven.api.plugin.descriptor.lifecycle"/> + <typedef resource="org/codehaus/modello/ant/antlib.xml" /> + <modello version="2.0.0" outputDirectory="${build.mdoOutputDir}" velocityBasedir="../../src/mdo" javaSource="8" encoding="utf-8"> + <model file="${build.mdoDir}/plugin.mdo"/> + <goal name="velocity"/> + <goal name="xdoc"/> + <goal name="xsd"/> + <template name="model.vm"/> + <param name="packageModelV4" value="org.apache.maven.api.plugin.descriptor"/> + </modello> + <modello version="2.0.0" outputDirectory="${build.mdoOutputDir}" velocityBasedir="../../src/mdo" javaSource="8" encoding="utf-8"> + <model file="${build.mdoDir}/lifecycle.mdo"/> + <goal name="velocity"/> + <goal name="xdoc"/> + <goal name="xsd"/> + <template name="model.vm"/> + <param name="packageModelV4" value="org.apache.maven.api.plugin.descriptor.lifecycle"/> + </modello> </target> <!-- ====================================================================== --> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/api/maven-api-settings/build.xml new/api/maven-api-settings/build.xml --- old/api/maven-api-settings/build.xml 2025-11-03 10:17:01.568571307 +0100 +++ new/api/maven-api-settings/build.xml 2026-09-28 10:23:49.450925857 +0200 @@ -43,48 +43,19 @@ <!-- ====================================================================== --> <!-- Code generation target --> <!-- ====================================================================== --> - <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"/> - <attribute name="velocityBaseDir" default=""/> - <attribute name="velocityTemplates" default=""/> - <attribute name="velocityParameters" default=""/> - <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"/> <!-- java source --> - <arg value="utf-8"/> <!-- encoding --> - <arg value="true"/> <!-- domAsXpp3 --> - <arg file="@{velocityBaseDir}"/> <!-- velocityBaseDir --> - <arg value="@{velocityTemplates}"/> <!-- velocityTemplates --> - <arg value="@{velocityParameters}"/> <!-- velocityParameters --> - </exec> - </sequential> - </macrodef> - <macrodef name="modello"> - <attribute name="file"/> - <attribute name="version" default="2.0.0"/> - <attribute name="velocityBaseDir" default="../../src/mdo"/> - <attribute name="velocityTemplates" default="model.vm"/> - <attribute name="velocityParameters" default="packageModelV4=org.apache.maven.api.settings,locationTracking=true,generateLocationClasses=true"/> - <sequential> - <echo taskname="modello" message="Generating sources for @{file}"/> - <modello-single-mode file="@{file}" version="@{version}" mode="velocity" - velocityBaseDir="@{velocityBaseDir}" velocityTemplates="@{velocityTemplates}" - velocityParameters="@{velocityParameters}"/> - <modello-single-mode file="@{file}" version="@{version}" mode="xdoc"/> - <modello-single-mode file="@{file}" version="@{version}" mode="xsd"/> - </sequential> - </macrodef> - <modello file="${build.mdoDir}/settings.mdo"/> + <typedef resource="org/codehaus/modello/ant/antlib.xml" /> + <modello version="2.0.0" outputDirectory="${build.mdoOutputDir}" velocityBasedir="../../src/mdo" javaSource="8" encoding="utf-8"> + <model file="${build.mdoDir}/settings.mdo"/> + <goal name="velocity"/> + <goal name="xdoc"/> + <goal name="xsd"/> + <template name="model.vm"/> + <param name="packageModelV4" value="org.apache.maven.api.settings"/> + <param name="locationTracking" value="true"/> + <param name="generateLocationClasses" value="true"/> + </modello> </target> <!-- ====================================================================== --> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/api/maven-api-toolchain/build.xml new/api/maven-api-toolchain/build.xml --- old/api/maven-api-toolchain/build.xml 2025-11-03 10:17:01.568953966 +0100 +++ new/api/maven-api-toolchain/build.xml 2026-09-28 10:23:49.451110583 +0200 @@ -43,48 +43,19 @@ <!-- ====================================================================== --> <!-- Code generation target --> <!-- ====================================================================== --> - <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"/> - <attribute name="velocityBaseDir" default=""/> - <attribute name="velocityTemplates" default=""/> - <attribute name="velocityParameters" default=""/> - <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"/> <!-- java source --> - <arg value="utf-8"/> <!-- encoding --> - <arg value="true"/> <!-- domAsXpp3 --> - <arg file="@{velocityBaseDir}"/> <!-- velocityBaseDir --> - <arg value="@{velocityTemplates}"/> <!-- velocityTemplates --> - <arg value="@{velocityParameters}"/> <!-- velocityParameters --> - </exec> - </sequential> - </macrodef> - <macrodef name="modello"> - <attribute name="file"/> - <attribute name="version" default="1.2.0"/> - <attribute name="velocityBaseDir" default="../../src/mdo"/> - <attribute name="velocityTemplates" default="model.vm"/> - <attribute name="velocityParameters" default="packageModelV4=org.apache.maven.api.toolchain,locationTracking=true,generateLocationClasses=true"/> - <sequential> - <echo taskname="modello" message="Generating sources for @{file}"/> - <modello-single-mode file="@{file}" version="@{version}" mode="velocity" - velocityBaseDir="@{velocityBaseDir}" velocityTemplates="@{velocityTemplates}" - velocityParameters="@{velocityParameters}"/> - <modello-single-mode file="@{file}" version="@{version}" mode="xdoc"/> - <modello-single-mode file="@{file}" version="@{version}" mode="xsd"/> - </sequential> - </macrodef> - <modello file="${build.mdoDir}/toolchains.mdo"/> + <typedef resource="org/codehaus/modello/ant/antlib.xml" /> + <modello version="1.2.0" outputDirectory="${build.mdoOutputDir}" velocityBasedir="../../src/mdo" javaSource="8" encoding="utf-8"> + <model file="${build.mdoDir}/toolchains.mdo"/> + <goal name="velocity"/> + <goal name="xdoc"/> + <goal name="xsd"/> + <template name="model.vm"/> + <param name="packageModelV4" value="org.apache.maven.api.toolchain"/> + <param name="locationTracking" value="true"/> + <param name="generateLocationClasses" value="true"/> + </modello> </target> <!-- ====================================================================== --> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compat/maven-compat/build.xml new/compat/maven-compat/build.xml --- old/compat/maven-compat/build.xml 2025-11-03 10:17:01.570392324 +0100 +++ new/compat/maven-compat/build.xml 2026-09-28 10:23:49.451666319 +0200 @@ -72,38 +72,16 @@ <!-- ====================================================================== --> <!-- Code generation target --> <!-- ====================================================================== --> - <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"/> <!-- java source --> - <arg value="utf-8"/> <!-- encoding --> - <arg value="true"/> <!-- domAsXpp3 --> - </exec> - </sequential> - </macrodef> - <macrodef name="modello"> - <attribute name="file"/> - <attribute name="version" default="1.0.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="xpp3-writer"/> - </sequential> - </macrodef> - <modello file="${build.mdoDir}/profiles.mdo"/> - <modello file="${build.mdoDir}/paramdoc.mdo"/> + <typedef resource="org/codehaus/modello/ant/antlib.xml" /> + <modello version="1.0.0" outputDirectory="${build.mdoOutputDir}" javaSource="8" encoding="utf-8"> + <model file="${build.mdoDir}/profiles.mdo"/> + <model file="${build.mdoDir}/paramdoc.mdo"/> + <goal name="java"/> + <goal name="xpp3-reader"/> + <goal name="xpp3-writer"/> + </modello> </target> <!-- ====================================================================== --> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compat/maven-model/build.xml new/compat/maven-model/build.xml --- old/compat/maven-model/build.xml 2025-11-03 10:17:01.571003796 +0100 +++ new/compat/maven-model/build.xml 2026-09-28 10:23:49.452090722 +0200 @@ -52,46 +52,20 @@ <!-- ====================================================================== --> <!-- Code generation target --> <!-- ====================================================================== --> - <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"/> - <attribute name="velocityBaseDir" default=""/> - <attribute name="velocityTemplates" default=""/> - <attribute name="velocityParameters" default=""/> - <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"/> <!-- java source --> - <arg value="utf-8"/> <!-- encoding --> - <arg value="true"/> <!-- domAsXpp3 --> - <arg file="@{velocityBaseDir}"/> <!-- velocityBaseDir --> - <arg value="@{velocityTemplates}"/> <!-- velocityTemplates --> - <arg value="@{velocityParameters}"/> <!-- velocityParameters --> - </exec> - </sequential> - </macrodef> - <macrodef name="modello"> - <attribute name="file"/> - <attribute name="version" default="4.1.0"/> - <attribute name="velocityBaseDir" default="../../src/mdo"/> - <attribute name="velocityTemplates" default=""/> - <attribute name="velocityParameters" default="forcedIOModelVersion=${spec.version}.0,packageModelV3=org.apache.maven.model,packageModelV4=org.apache.maven.api.model,packageToolV4=org.apache.maven.model.v4,isMavenModel=true,minimalVersion=${spec.version}.0"/> - <sequential> - <echo taskname="modello" message="Generating sources for @{file}"/> - <modello-single-mode file="@{file}" version="@{version}" mode="velocity" - velocityBaseDir="@{velocityBaseDir}" velocityTemplates="@{velocityTemplates}" - velocityParameters="@{velocityParameters}"/> - </sequential> - </macrodef> - <modello file="${build.mdoDir}/maven.mdo" version="${spec.version}.99" velocityTemplates="model-v3.vm"/> + <typedef resource="org/codehaus/modello/ant/antlib.xml" /> + <modello version="${spec.version}.99" outputDirectory="${build.mdoOutputDir}" velocityBasedir="../../src/mdo" javaSource="8" encoding="utf-8"> + <model file="${build.mdoDir}/maven.mdo"/> + <goal name="velocity"/> + <template name="model-v3.vm"/> + <param name="forcedIOModelVersion" value="${spec.version}.0"/> + <param name="packageModelV3" value="org.apache.maven.model"/> + <param name="packageModelV4" value="org.apache.maven.api.model"/> + <param name="packageToolV4" value="org.apache.maven.model.v4"/> + <param name="isMavenModel" value="true"/> + <param name="minimalVersion" value="${spec.version}.0"/> + </modello> </target> <!-- ====================================================================== --> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compat/maven-repository-metadata/build.xml new/compat/maven-repository-metadata/build.xml --- old/compat/maven-repository-metadata/build.xml 2025-11-03 10:17:01.571451592 +0100 +++ new/compat/maven-repository-metadata/build.xml 2026-09-28 10:23:49.451900768 +0200 @@ -52,46 +52,18 @@ <!-- ====================================================================== --> <!-- Code generation target --> <!-- ====================================================================== --> - <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"/> - <attribute name="velocityBaseDir" default=""/> - <attribute name="velocityTemplates" default=""/> - <attribute name="velocityParameters" default=""/> - <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"/> <!-- java source --> - <arg value="utf-8"/> <!-- encoding --> - <arg value="true"/> <!-- domAsXpp3 --> - <arg file="@{velocityBaseDir}"/> <!-- velocityBaseDir --> - <arg value="@{velocityTemplates}"/> <!-- velocityTemplates --> - <arg value="@{velocityParameters}"/> <!-- velocityParameters --> - </exec> - </sequential> - </macrodef> - <macrodef name="modello"> - <attribute name="file"/> - <attribute name="version" default="1.2.0"/> - <attribute name="velocityBaseDir" default="../../src/mdo"/> - <attribute name="velocityTemplates" default=""/> - <attribute name="velocityParameters" default="forcedIOModelVersion=1.1.0,packageModelV3=org.apache.maven.artifact.repository.metadata,packageModelV4=org.apache.maven.api.metadata,packageToolV4=org.apache.maven.artifact.repository.metadata.io"/> - <sequential> - <echo taskname="modello" message="Generating sources for @{file}"/> - <modello-single-mode file="@{file}" version="@{version}" mode="velocity" - velocityBaseDir="@{velocityBaseDir}" velocityTemplates="@{velocityTemplates}" - velocityParameters="@{velocityParameters}"/> - </sequential> - </macrodef> - <modello file="${build.mdoDir}/metadata.mdo" velocityTemplates="model-v3.vm" version="1.1.0"/> + <typedef resource="org/codehaus/modello/ant/antlib.xml" /> + <modello version="1.1.0" outputDirectory="${build.mdoOutputDir}" velocityBasedir="../../src/mdo" javaSource="8" encoding="utf-8"> + <model file="${build.mdoDir}/metadata.mdo"/> + <goal name="velocity"/> + <template name="model-v3.vm"/> + <param name="forcedIOModelVersion" value="1.1.0"/> + <param name="packageModelV3" value="org.apache.maven.artifact.repository.metadata"/> + <param name="packageModelV4" value="org.apache.maven.api.metadata"/> + <param name="packageToolV4" value="org.apache.maven.artifact.repository.metadata.io"/> + </modello> </target> <!-- ====================================================================== --> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compat/maven-settings/build.xml new/compat/maven-settings/build.xml --- old/compat/maven-settings/build.xml 2025-11-03 10:17:01.572101908 +0100 +++ new/compat/maven-settings/build.xml 2026-09-28 10:23:49.451479085 +0200 @@ -48,51 +48,32 @@ <!-- ====================================================================== --> <!-- Code generation target --> <!-- ====================================================================== --> - <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"/> - <attribute name="velocityBaseDir" default=""/> - <attribute name="velocityTemplates" default=""/> - <attribute name="velocityParameters" default=""/> - <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"/> <!-- java source --> - <arg value="utf-8"/> <!-- encoding --> - <arg value="true"/> <!-- domAsXpp3 --> - <arg file="@{velocityBaseDir}"/> <!-- velocityBaseDir --> - <arg value="@{velocityTemplates}"/> <!-- velocityTemplates --> - <arg value="@{velocityParameters}"/> <!-- velocityParameters --> - </exec> - </sequential> - </macrodef> - <macrodef name="modello"> - <attribute name="file"/> - <attribute name="version" default="2.0.0"/> - <attribute name="velocityBaseDir" default="../../src/mdo"/> - <attribute name="velocityTemplates" default=""/> - <attribute name="velocityParameters" default=""/> - <sequential> - <echo taskname="modello" message="Generating sources for @{file}"/> - <modello-single-mode file="@{file}" version="@{version}" mode="velocity" - velocityBaseDir="@{velocityBaseDir}" velocityTemplates="@{velocityTemplates}" - velocityParameters="@{velocityParameters}"/> - </sequential> - </macrodef> - <modello file="${build.mdoDir}/settings.mdo" - velocityTemplates="merger.vm,transformer.vm,reader-stax.vm,writer-stax.vm" - velocityParameters="forcedIOModelVersion=1.2.0,packageModelV3=org.apache.maven.settings,packageModelV4=org.apache.maven.api.settings,packageToolV4=org.apache.maven.settings.v4,locationTracking=true,generateLocationClasses=true"/> - <modello file="${build.mdoDir}/settings.mdo" version="1.3.0" - velocityTemplates="model-v3.vm" - velocityParameters="forcedIOModelVersion=1.2.0,packageModelV3=org.apache.maven.settings,packageModelV4=org.apache.maven.api.settings,packageToolV4=org.apache.maven.settings.v4"/> + <typedef resource="org/codehaus/modello/ant/antlib.xml" /> + <modello version="2.0.0" outputDirectory="${build.mdoOutputDir}" velocityBasedir="../../src/mdo" javaSource="8" encoding="utf-8"> + <model file="${build.mdoDir}/settings.mdo"/> + <goal name="velocity"/> + <template name="merger.vm"/> + <template name="transformer.vm"/> + <template name="reader-stax.vm"/> + <template name="writer-stax.vm"/> + <param name="forcedIOModelVersion" value="1.2.0"/> + <param name="packageModelV3" value="org.apache.maven.settings"/> + <param name="packageModelV4" value="org.apache.maven.api.settings"/> + <param name="packageToolV4" value="org.apache.maven.settings.v4"/> + <param name="locationTracking" value="true"/> + <param name="generateLocationClasses" value="true"/> + </modello> + <modello version="1.3.0" outputDirectory="${build.mdoOutputDir}" velocityBasedir="../../src/mdo" javaSource="8" encoding="utf-8"> + <model file="${build.mdoDir}/settings.mdo"/> + <goal name="velocity"/> + <template name="model-v3.vm"/> + <param name="forcedIOModelVersion" value="1.2.0"/> + <param name="packageModelV3" value="org.apache.maven.settings"/> + <param name="packageModelV4" value="org.apache.maven.api.settings"/> + <param name="packageToolV4" value="org.apache.maven.settings.v4"/> + </modello> </target> <!-- ====================================================================== --> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compat/maven-toolchain-model/build.xml new/compat/maven-toolchain-model/build.xml --- old/compat/maven-toolchain-model/build.xml 2025-11-03 10:17:01.572528328 +0100 +++ new/compat/maven-toolchain-model/build.xml 2026-09-28 10:23:49.451295429 +0200 @@ -48,46 +48,17 @@ <!-- ====================================================================== --> <!-- Code generation target --> <!-- ====================================================================== --> - <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"/> - <attribute name="velocityBaseDir" default=""/> - <attribute name="velocityTemplates" default=""/> - <attribute name="velocityParameters" default=""/> - <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"/> <!-- java source --> - <arg value="utf-8"/> <!-- encoding --> - <arg value="true"/> <!-- domAsXpp3 --> - <arg file="@{velocityBaseDir}"/> <!-- velocityBaseDir --> - <arg value="@{velocityTemplates}"/> <!-- velocityTemplates --> - <arg value="@{velocityParameters}"/> <!-- velocityParameters --> - </exec> - </sequential> - </macrodef> - <macrodef name="modello"> - <attribute name="file"/> - <attribute name="version" default="1.1.0"/> - <attribute name="velocityBaseDir" default="../../src/mdo"/> - <attribute name="velocityTemplates" default="model-v3.vm"/> - <attribute name="velocityParameters" default="packageModelV3=org.apache.maven.toolchain.model,packageModelV4=org.apache.maven.api.toolchain,packageToolV4=org.apache.maven.toolchain.v4"/> - <sequential> - <echo taskname="modello" message="Generating sources for @{file}"/> - <modello-single-mode file="@{file}" version="@{version}" mode="velocity" - velocityBaseDir="@{velocityBaseDir}" velocityTemplates="@{velocityTemplates}" - velocityParameters="@{velocityParameters}"/> - </sequential> - </macrodef> - <modello file="${build.mdoDir}/toolchains.mdo"/> + <typedef resource="org/codehaus/modello/ant/antlib.xml" /> + <modello version="1.1.0" outputDirectory="${build.mdoOutputDir}" velocityBasedir="../../src/mdo" javaSource="8" encoding="utf-8"> + <model file="${build.mdoDir}/toolchains.mdo"/> + <goal name="velocity"/> + <template name="model-v3.vm"/> + <param name="packageModelV3" value="org.apache.maven.toolchain.model"/> + <param name="packageModelV4" value="org.apache.maven.api.toolchain"/> + <param name="packageToolV4" value="org.apache.maven.toolchain.v4"/> + </modello> </target> <!-- ====================================================================== --> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/impl/maven-cli/build.xml new/impl/maven-cli/build.xml --- old/impl/maven-cli/build.xml 2025-11-03 10:17:01.573163536 +0100 +++ new/impl/maven-cli/build.xml 2026-09-28 10:23:49.452505436 +0200 @@ -70,46 +70,18 @@ <!-- ====================================================================== --> <!-- Code generation target --> <!-- ====================================================================== --> - <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"/> - <attribute name="velocityBaseDir" default=""/> - <attribute name="velocityTemplates" default=""/> - <attribute name="velocityParameters" default=""/> - <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"/> <!-- java source --> - <arg value="utf-8"/> <!-- encoding --> - <arg value="true"/> <!-- domAsXpp3 --> - <arg file="@{velocityBaseDir}"/> <!-- velocityBaseDir --> - <arg value="@{velocityTemplates}"/> <!-- velocityTemplates --> - <arg value="@{velocityParameters}"/> <!-- velocityParameters --> - </exec> - </sequential> - </macrodef> - <macrodef name="modello"> - <attribute name="file"/> - <attribute name="version" default="1.2.0"/> - <attribute name="velocityBaseDir" default="../../src/mdo"/> - <attribute name="velocityTemplates" default="reader-stax.vm,writer-stax.vm"/> - <attribute name="velocityParameters" default="packageModelV4=org.apache.maven.api.cli.extensions,packageToolV4=org.apache.maven.cling.internal.extension.io,locationTracking=true"/> - <sequential> - <echo taskname="modello" message="Generating sources for @{file}"/> - <modello-single-mode file="@{file}" version="@{version}" mode="velocity" - velocityBaseDir="@{velocityBaseDir}" velocityTemplates="@{velocityTemplates}" - velocityParameters="@{velocityParameters}"/> - </sequential> - </macrodef> - <modello file="${build.mdoDir}/core-extensions.mdo"/> + <typedef resource="org/codehaus/modello/ant/antlib.xml" /> + <modello version="1.2.0" outputDirectory="${build.mdoOutputDir}" velocityBasedir="../../src/mdo" javaSource="8" encoding="utf-8"> + <model file="${build.mdoDir}/core-extensions.mdo"/> + <goal name="velocity"/> + <template name="reader-stax.vm"/> + <template name="writer-stax.vm"/> + <param name="packageModelV4" value="org.apache.maven.api.cli.extensions"/> + <param name="packageToolV4" value="org.apache.maven.cling.internal.extension.io"/> + <param name="locationTracking" value="true"/> + </modello> </target> <!-- ====================================================================== --> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/impl/maven-support/build.xml new/impl/maven-support/build.xml --- old/impl/maven-support/build.xml 2025-11-03 10:17:01.574505917 +0100 +++ new/impl/maven-support/build.xml 2026-09-28 10:23:49.452275102 +0200 @@ -50,64 +50,76 @@ <!-- ====================================================================== --> <!-- Code generation target --> <!-- ====================================================================== --> - <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"/> - <attribute name="velocityBaseDir" default=""/> - <attribute name="velocityTemplates" default=""/> - <attribute name="velocityParameters" default=""/> - <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"/> <!-- java source --> - <arg value="utf-8"/> <!-- encoding --> - <arg value="true"/> <!-- domAsXpp3 --> - <arg file="@{velocityBaseDir}"/> <!-- velocityBaseDir --> - <arg value="@{velocityTemplates}"/> <!-- velocityTemplates --> - <arg value="@{velocityParameters}"/> <!-- velocityParameters --> - </exec> - </sequential> - </macrodef> - <macrodef name="modello"> - <attribute name="file"/> - <attribute name="version" default=""/> - <attribute name="velocityBaseDir" default="../../src/mdo"/> - <attribute name="velocityTemplates" default=""/> - <attribute name="velocityParameters" default=""/> - <sequential> - <echo taskname="modello" message="Generating sources for @{file}"/> - <modello-single-mode file="@{file}" version="@{version}" mode="velocity" - velocityBaseDir="@{velocityBaseDir}" velocityTemplates="@{velocityTemplates}" - velocityParameters="@{velocityParameters}"/> - </sequential> - </macrodef> - <!-- velocity-settings --> - <modello file="../../api/maven-api-plugin/${build.mdoDir}/lifecycle.mdo" version="2.0.0" - velocityTemplates="reader-stax.vm,writer-stax.vm" - velocityParameters="packageModelV4=org.apache.maven.api.plugin.descriptor.lifecycle,packageToolV4=org.apache.maven.plugin.lifecycle.io"/> - <modello file="../../api/maven-api-plugin/${build.mdoDir}/plugin.mdo" version="2.0.0" - velocityTemplates="reader-stax.vm,writer-stax.vm" - velocityParameters="packageModelV3=org.apache.maven.plugin.descriptor,packageModelV4=org.apache.maven.api.plugin.descriptor,packageToolV4=org.apache.maven.plugin.descriptor.io"/> - <modello file="../../api/maven-api-settings/${build.mdoDir}/settings.mdo" version="2.0.0" - velocityTemplates="merger.vm,transformer.vm,reader-stax.vm,writer-stax.vm" - velocityParameters="forcedIOModelVersion=1.2.0,packageModelV3=org.apache.maven.settings,packageModelV4=org.apache.maven.api.settings,packageToolV4=org.apache.maven.settings.v4,locationTracking=true,generateLocationClasses=true"/> - <modello file="../../api/maven-api-toolchain/${build.mdoDir}/toolchains.mdo" version="1.2.0" - velocityTemplates="merger.vm,transformer.vm,reader-stax.vm,writer-stax.vm" - velocityParameters="packageModelV3=org.apache.maven.toolchain.model,packageModelV4=org.apache.maven.api.toolchain,packageToolV4=org.apache.maven.toolchain.v4,locationTracking=true,generateLocationClasses=true"/> - <modello file="../../api/maven-api-metadata/${build.mdoDir}/metadata.mdo" version="1.1.0" - velocityTemplates="reader-stax.vm,writer-stax.vm" - velocityParameters="packageModelV4=org.apache.maven.api.metadata,packageToolV4=org.apache.maven.metadata.v4"/> - <modello file="../../api/maven-api-model/${build.mdoDir}/maven.mdo" version="4.1.0" - velocityTemplates="merger.vm,transformer.vm,reader-stax.vm,writer-stax.vm,model-version.vm" - velocityParameters="forcedIOModelVersion=${spec.version}.0,packageModelV3=org.apache.maven.model,packageModelV4=org.apache.maven.api.model,packageToolV4=org.apache.maven.model.v4,isMavenModel=true,minimalVersion=${spec.version}.0"/> + <typedef resource="org/codehaus/modello/ant/antlib.xml" /> + <modello version="2.0.0" outputDirectory="${build.mdoOutputDir}" velocityBasedir="../../src/mdo" javaSource="8" encoding="utf-8"> + <model file="../../api/maven-api-plugin/${build.mdoDir}/lifecycle.mdo"/> + <goal name="velocity"/> + <template name="reader-stax.vm"/> + <template name="writer-stax.vm"/> + <param name="packageModelV4" value="org.apache.maven.api.plugin.descriptor.lifecycle"/> + <param name="packageToolV4" value="org.apache.maven.plugin.lifecycle.io"/> + </modello> + <modello version="2.0.0" outputDirectory="${build.mdoOutputDir}" velocityBasedir="../../src/mdo" javaSource="8" encoding="utf-8"> + <model file="../../api/maven-api-plugin/${build.mdoDir}/plugin.mdo"/> + <goal name="velocity"/> + <template name="reader-stax.vm"/> + <template name="writer-stax.vm"/> + <param name="packageModelV3" value="org.apache.maven.plugin.descriptor"/> + <param name="packageModelV4" value="org.apache.maven.api.plugin.descriptor"/> + <param name="packageToolV4" value="org.apache.maven.plugin.descriptor.io"/> + </modello> + <modello version="2.0.0" outputDirectory="${build.mdoOutputDir}" velocityBasedir="../../src/mdo" javaSource="8" encoding="utf-8"> + <model file="../../api/maven-api-settings/${build.mdoDir}/settings.mdo"/> + <goal name="velocity"/> + <template name="merger.vm"/> + <template name="transformer.vm"/> + <template name="reader-stax.vm"/> + <template name="writer-stax.vm"/> + <param name="forcedIOModelVersion" value="1.2.0"/> + <param name="packageModelV3" value="org.apache.maven.settings"/> + <param name="packageModelV4" value="org.apache.maven.api.settings"/> + <param name="packageToolV4" value="org.apache.maven.settings.v4"/> + <param name="locationTracking" value="true"/> + <param name="generateLocationClasses" value="true"/> + </modello> + <modello version="1.2.0" outputDirectory="${build.mdoOutputDir}" velocityBasedir="../../src/mdo" javaSource="8" encoding="utf-8"> + <model file="../../api/maven-api-toolchain/${build.mdoDir}/toolchains.mdo"/> + <goal name="velocity"/> + <template name="merger.vm"/> + <template name="transformer.vm"/> + <template name="reader-stax.vm"/> + <template name="writer-stax.vm"/> + <param name="packageModelV3" value="org.apache.maven.toolchain.model"/> + <param name="packageModelV4" value="org.apache.maven.api.toolchain"/> + <param name="packageToolV4" value="org.apache.maven.toolchain.v4"/> + <param name="locationTracking" value="true"/> + <param name="generateLocationClasses" value="true"/> + </modello> + <modello version="1.1.0" outputDirectory="${build.mdoOutputDir}" velocityBasedir="../../src/mdo" javaSource="8" encoding="utf-8"> + <model file="../../api/maven-api-metadata/${build.mdoDir}/metadata.mdo"/> + <goal name="velocity"/> + <template name="reader-stax.vm"/> + <template name="writer-stax.vm"/> + <param name="packageModelV4" value="org.apache.maven.api.metadata"/> + <param name="packageToolV4" value="org.apache.maven.metadata.v4"/> + </modello> + <modello version="4.1.0" outputDirectory="${build.mdoOutputDir}" velocityBasedir="../../src/mdo" javaSource="8" encoding="utf-8"> + <model file="../../api/maven-api-model/${build.mdoDir}/maven.mdo"/> + <goal name="velocity"/> + <template name="merger.vm"/> + <template name="transformer.vm"/> + <template name="reader-stax.vm"/> + <template name="writer-stax.vm"/> + <template name="model-version.vm"/> + <param name="forcedIOModelVersion" value="${spec.version}.0"/> + <param name="packageModelV3" value="org.apache.maven.model"/> + <param name="packageModelV4" value="org.apache.maven.api.model"/> + <param name="packageToolV4" value="org.apache.maven.model.v4"/> + <param name="isMavenModel" value="true"/> + <param name="minimalVersion" value="${spec.version}.0"/> + </modello> </target> <!-- ====================================================================== --> ++++++ 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:37:24.000000000 +0100 @@ -0,0 +1 @@ +.osc
