Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package modello for openSUSE:Factory checked in at 2023-09-07 21:12:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/modello (Old) and /work/SRC/openSUSE:Factory/.modello.new.1766 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "modello" Thu Sep 7 21:12:42 2023 rev:9 rq:1109297 version:2.1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/modello/modello-maven-plugin.changes 2022-05-25 20:35:21.052293672 +0200 +++ /work/SRC/openSUSE:Factory/.modello.new.1766/modello-maven-plugin.changes 2023-09-07 21:13:18.834534092 +0200 @@ -1,0 +2,31 @@ +Wed Sep 6 14:43:46 UTC 2023 - Fridrich Strba <[email protected]> + +- Upgrade to upstream version 2.1.2 + * Changes of version 2.1.2 + + Switch to codehaus plexus-build-api 1.2.0 (reverted by a + patch in this package) + + Add plexus 13 parent and reformat + + Remove readonly flag from basedir: support .mdo from any + location + + Require Maven 3.5.4+ + + Prepare to run with Java 19+ + * Changes of version 2.1.1 + + replace generatedBy context value by template + + add velocityBasedir to select where to load (shared) .vm from + * Changes of version 2.1.0 + + Make the Xpp3Reader#read(XmlPullParser, boolean strict) public + + Fix json encoding + + Support arbitrary element names via 'xs:any' + + Call setter only after object has been populated + + replace handwritten components.xml with annotations + + Optionally enforce required elements in XSDs + + Add a velocity template based generator + + Use optimised plexus-utils CachingWriter +- Added patch: + * 0001-Revert-Switch-to-codehaus-plexus-build-api-1.2.0-345.patch + + use the version of plexus-build-api that we have packaged +- Modified patch: + * modello-cli-domasxpp3.patch + + rediff to changed context + +------------------------------------------------------------------- modello.changes: same change Old: ---- modello-2.0.0-source-release.zip New: ---- 0001-Revert-Switch-to-codehaus-plexus-build-api-1.2.0-345.patch modello-2.1.2-source-release.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ modello-maven-plugin.spec ++++++ --- /var/tmp/diff_new_pack.BGwtaE/_old 2023-09-07 21:13:20.298586429 +0200 +++ /var/tmp/diff_new_pack.BGwtaE/_new 2023-09-07 21:13:20.298586429 +0200 @@ -19,14 +19,16 @@ %global parent modello %global subname maven-plugin Name: %{parent}-%{subname} -Version: 2.0.0 +Version: 2.1.2 Release: 0 Summary: Modello Maven Plugin License: Apache-2.0 AND MIT Group: Development/Libraries/Java URL: https://codehaus-plexus.github.io/modello/modello-maven-plugin Source0: https://repo1.maven.org/maven2/org/codehaus/%{parent}/%{parent}/%{version}/%{parent}-%{version}-source-release.zip -Source1: http://www.apache.org/licenses/LICENSE-2.0.txt +Source1: https://www.apache.org/licenses/LICENSE-2.0.txt +Patch0: modello-cli-domasxpp3.patch +Patch1: 0001-Revert-Switch-to-codehaus-plexus-build-api-1.2.0-345.patch BuildRequires: fdupes BuildRequires: maven-local BuildRequires: unzip @@ -45,7 +47,9 @@ BuildRequires: mvn(org.codehaus.modello:modello-plugin-xdoc) = %{version} BuildRequires: mvn(org.codehaus.modello:modello-plugin-xpp3) = %{version} BuildRequires: mvn(org.codehaus.modello:modello-plugin-xsd) = %{version} +BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) +BuildRequires: mvn(org.codehaus.plexus:plexus:pom:) BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) #!BuildRequires: maven-compiler-plugin-bootstrap #!BuildRequires: maven-jar-plugin-bootstrap @@ -75,18 +79,31 @@ %prep %setup -q -n %{parent}-%{version} +%patch0 -p1 +%patch1 -p1 cp -p %{SOURCE1} LICENSE %pom_remove_plugin :maven-site-plugin +%pom_remove_plugin :maven-enforcer-plugin + +%pom_remove_dep :plexus-xml modello-core +%pom_remove_dep :sisu-guice modello-core +%pom_add_dep com.google.inject:guice modello-core %pom_remove_dep :jackson-bom %pom_disable_module modello-plugin-jackson modello-plugins %pom_disable_module modello-plugin-jsonschema modello-plugins %pom_disable_module modello-plugin-snakeyaml modello-plugins +%pom_disable_module modello-plugin-velocity modello-plugins %pom_remove_dep :modello-plugin-jackson modello-maven-plugin %pom_remove_dep :modello-plugin-jsonschema modello-maven-plugin %pom_remove_dep :modello-plugin-snakeyaml modello-maven-plugin +%pom_remove_dep :modello-plugin-velocity modello-maven-plugin + +rm -f modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloVelocityMojo.java + +%pom_disable_module modello-test %build pushd %{name} ++++++ modello.spec ++++++ --- /var/tmp/diff_new_pack.BGwtaE/_old 2023-09-07 21:13:20.330587573 +0200 +++ /var/tmp/diff_new_pack.BGwtaE/_new 2023-09-07 21:13:20.334587716 +0200 @@ -17,39 +17,35 @@ Name: modello -Version: 2.0.0 +Version: 2.1.2 Release: 0 Summary: Modello Data Model toolkit License: Apache-2.0 AND MIT Group: Development/Libraries/Java URL: https://codehaus-plexus.github.io/modello Source0: https://repo1.maven.org/maven2/org/codehaus/%{name}/%{name}/%{version}/%{name}-%{version}-source-release.zip -Source1: http://www.apache.org/licenses/LICENSE-2.0.txt +Source1: https://www.apache.org/licenses/LICENSE-2.0.txt Source100: %{name}-build.tar.xz Patch0: modello-cli-domasxpp3.patch +Patch1: 0001-Revert-Switch-to-codehaus-plexus-build-api-1.2.0-345.patch BuildRequires: ant BuildRequires: fdupes BuildRequires: google-guice BuildRequires: guava -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 BuildRequires: jsoup BuildRequires: junit BuildRequires: plexus-build-api BuildRequires: plexus-classworlds BuildRequires: plexus-compiler +BuildRequires: plexus-containers-component-annotations +BuildRequires: plexus-metadata-generator BuildRequires: plexus-utils BuildRequires: sisu-plexus BuildRequires: unzip Requires: guava Requires: javapackages-tools Requires: xbean -Requires: mvn(org.codehaus.plexus:plexus-compiler-api) -Requires: mvn(org.codehaus.plexus:plexus-compiler-javac) -Requires: mvn(org.codehaus.plexus:plexus-utils) -Requires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus) -Requires: mvn(org.jsoup:jsoup) -Requires: mvn(org.sonatype.plexus:plexus-build-api) -Requires: mvn(org.sonatype.sisu:sisu-guice::no_aop:) BuildArch: noarch %description @@ -71,25 +67,55 @@ %prep %setup -q -a100 %patch0 -p1 +%patch1 -p1 cp -p %{SOURCE1} LICENSE %pom_remove_plugin :maven-site-plugin +%pom_remove_plugin :maven-enforcer-plugin + +%pom_remove_dep :plexus-xml modello-core +%pom_remove_dep :sisu-guice modello-core +%pom_add_dep com.google.inject:guice modello-core %pom_remove_dep :jackson-bom %pom_disable_module modello-plugin-jackson modello-plugins %pom_disable_module modello-plugin-jsonschema modello-plugins %pom_disable_module modello-plugin-snakeyaml modello-plugins +%pom_disable_module modello-plugin-velocity modello-plugins %pom_remove_dep :modello-plugin-jackson modello-maven-plugin %pom_remove_dep :modello-plugin-jsonschema modello-maven-plugin %pom_remove_dep :modello-plugin-snakeyaml modello-maven-plugin +%pom_remove_dep :modello-plugin-velocity modello-maven-plugin + +rm -f modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloVelocityMojo.java + +%pom_disable_module modello-test %build mkdir -p lib -build-jar-repository -s lib plexus/classworlds plexus/utils plexus/plexus-build-api \ - plexus-compiler/plexus-compiler-api plexus-compiler/plexus-compiler-javac \ - jsoup guava/guava junit org.eclipse.sisu.plexus -# skip tests because we have too old xmlunit in openSUSE now (1.5) +build-jar-repository -s lib \ + atinject \ + commons-cli \ + guava/guava \ + guice/google-guice \ + jdom2/jdom2 \ + jsoup \ + junit \ + objectweb-asm/asm \ + org.eclipse.sisu.inject \ + org.eclipse.sisu.plexus \ + plexus/classworlds \ + plexus/cli \ + plexus/plexus-build-api \ + plexus/utils \ + plexus-compiler/plexus-compiler-api \ + plexus-compiler/plexus-compiler-javac \ + plexus-containers/plexus-component-annotations \ + plexus-metadata-generator \ + qdox \ + xbean/xbean-reflect + %{ant} \ -Dtest.skip=true \ package javadoc @@ -98,7 +124,7 @@ # jars install -dm 0755 %{buildroot}%{_javadir}/%{name} -for i in core test; do +for i in core; do install -pm 0644 %{name}-${i}/target/%{name}-${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-${i}.jar done @@ -109,26 +135,20 @@ # poms install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} -install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom -%add_maven_depmap %{name}/%{name}.pom - -install -pm 0644 %{name}-plugins/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-plugins.pom -%add_maven_depmap %{name}/%{name}-plugins.pom - -for i in core test; do - install -pm 0644 %{name}-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-${i}.pom +for i in core; do + %mvn_install_pom %{name}-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-${i}.pom %add_maven_depmap %{name}/%{name}-${i}.pom %{name}/%{name}-${i}.jar done for i in converters dom4j java jdom sax stax xdoc xml xpp3 xsd; do - install -pm 0644 %{name}-plugins/%{name}-plugin-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-plugin-${i}.pom + %mvn_install_pom %{name}-plugins/%{name}-plugin-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-plugin-${i}.pom %add_maven_depmap %{name}/%{name}-plugin-${i}.pom %{name}/%{name}-plugin-${i}.jar done # javadoc install -dm 0755 %{buildroot}%{_javadocdir}/%{name} -for i in core test; do +for i in core; do install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/%{name}-${i} cp -pr %{name}-${i}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/%{name}-${i}/ done @@ -141,7 +161,7 @@ %fdupes -s %{buildroot}%{_javadocdir} # script -%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:org.eclipse.sisu.plexus:org.eclipse.sisu.inject:google-guice-no_aop:atinject:plexus-containers/plexus-component-annotations:plexus/classworlds:plexus/utils:plexus/plexus-build-api:guava:plexus-compiler/plexus-compiler-api:plexus-compiler/plexus-compiler-javac %{name} true +%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:org.eclipse.sisu.plexus:org.eclipse.sisu.inject:google-guice:aopalliance:atinject:plexus-containers/plexus-component-annotations:plexus/classworlds:plexus/utils:plexus/plexus-build-api:guava:plexus-compiler/plexus-compiler-api:plexus-compiler/plexus-compiler-javac %{name} true %files -f .mfiles %license LICENSE ++++++ 0001-Revert-Switch-to-codehaus-plexus-build-api-1.2.0-345.patch ++++++ >From f892c4e5906fcacaec99a146a2a36dd4ca5d5166 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski <[email protected]> Date: Sun, 27 Aug 2023 07:49:01 +0200 Subject: [PATCH] Revert "Switch to codehaus plexus-build-api 1.2.0 (#345)" This reverts commit c689155598257f225963b9332f57fe72dfd78753. --- modello-core/pom.xml | 2 +- .../codehaus/modello/plugin/AbstractModelloGenerator.java | 2 +- modello-maven-plugin/pom.xml | 2 +- .../modello/maven/AbstractModelloGeneratorMojo.java | 2 +- .../codehaus/modello/maven/ModelloConvertersMojoTest.java | 8 +------- .../org/codehaus/modello/maven/ModelloJavaMojoTest.java | 8 +------- modello-plugins/modello-plugin-java/pom.xml | 2 +- .../codehaus/modello/AbstractModelloGeneratorTest.java | 6 ------ pom.xml | 4 ++-- 9 files changed, 9 insertions(+), 27 deletions(-) diff --git a/modello-core/pom.xml b/modello-core/pom.xml index 636c03fe..7f9adf39 100644 --- a/modello-core/pom.xml +++ b/modello-core/pom.xml @@ -13,7 +13,7 @@ <dependencies> <dependency> - <groupId>org.codehaus.plexus</groupId> + <groupId>org.sonatype.plexus</groupId> <artifactId>plexus-build-api</artifactId> </dependency> <dependency> diff --git a/modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java b/modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java index bb59b439..334e16e8 100644 --- a/modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java +++ b/modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java @@ -43,7 +43,6 @@ import org.codehaus.modello.model.ModelField; import org.codehaus.modello.model.Version; import org.codehaus.plexus.PlexusConstants; import org.codehaus.plexus.PlexusContainer; -import org.codehaus.plexus.build.BuildContext; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; import org.codehaus.plexus.context.Context; import org.codehaus.plexus.context.ContextException; @@ -51,6 +50,7 @@ import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable; import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.io.CachingWriter; +import org.sonatype.plexus.build.incremental.BuildContext; /** * @author <a href="mailto:[email protected]";>Jason van Zyl</a> diff --git a/modello-maven-plugin/pom.xml b/modello-maven-plugin/pom.xml index 3687fb05..57227449 100644 --- a/modello-maven-plugin/pom.xml +++ b/modello-maven-plugin/pom.xml @@ -121,7 +121,7 @@ <artifactId>modello-plugin-velocity</artifactId> </dependency> <dependency> - <groupId>org.codehaus.plexus</groupId> + <groupId>org.sonatype.plexus</groupId> <artifactId>plexus-build-api</artifactId> </dependency> </dependencies> diff --git a/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/AbstractModelloGeneratorMojo.java b/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/AbstractModelloGeneratorMojo.java index 762b5784..51b75a12 100644 --- a/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/AbstractModelloGeneratorMojo.java +++ b/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/AbstractModelloGeneratorMojo.java @@ -41,8 +41,8 @@ import org.codehaus.modello.ModelloParameterConstants; import org.codehaus.modello.core.ModelloCore; import org.codehaus.modello.model.Model; import org.codehaus.modello.model.ModelValidationException; -import org.codehaus.plexus.build.BuildContext; import org.codehaus.plexus.util.StringUtils; +import org.sonatype.plexus.build.incremental.BuildContext; /** * @author <a href="mailto:[email protected]";>Trygve Laugstøl</a> diff --git a/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloConvertersMojoTest.java b/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloConvertersMojoTest.java index 779f178d..23f466d3 100644 --- a/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloConvertersMojoTest.java +++ b/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloConvertersMojoTest.java @@ -26,10 +26,9 @@ import java.io.File; import java.util.Arrays; import org.codehaus.modello.core.ModelloCore; -import org.codehaus.plexus.ContainerConfiguration; import org.codehaus.plexus.PlexusTestCase; -import org.codehaus.plexus.build.BuildContext; import org.codehaus.plexus.util.FileUtils; +import org.sonatype.plexus.build.incremental.BuildContext; /** * @author <a href="mailto:[email protected]";>Brett Porter</a> @@ -99,9 +98,4 @@ public class ModelloConvertersMojoTest extends PlexusTestCase { assertFalse("The generated java file doesn't exist: '" + javaFile.getAbsolutePath() + "'.", javaFile.exists()); } - - @Override - protected void customizeContainerConfiguration(ContainerConfiguration containerConfiguration) { - containerConfiguration.setClassPathScanning("cache"); - } } diff --git a/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloJavaMojoTest.java b/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloJavaMojoTest.java index f15b4031..bb5bb7cf 100644 --- a/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloJavaMojoTest.java +++ b/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloJavaMojoTest.java @@ -26,10 +26,9 @@ import java.io.File; import java.util.Arrays; import org.codehaus.modello.core.ModelloCore; -import org.codehaus.plexus.ContainerConfiguration; import org.codehaus.plexus.PlexusTestCase; -import org.codehaus.plexus.build.BuildContext; import org.codehaus.plexus.util.FileUtils; +import org.sonatype.plexus.build.incremental.BuildContext; /** * @author <a href="mailto:[email protected]";>Trygve Laugstøl</a> @@ -97,9 +96,4 @@ public class ModelloJavaMojoTest extends PlexusTestCase { assertFalse( "The generated java file shouldn't exist: '" + javaFile.getAbsolutePath() + "'.", javaFile.exists()); } - - @Override - protected void customizeContainerConfiguration(ContainerConfiguration containerConfiguration) { - containerConfiguration.setClassPathScanning("cache"); - } } diff --git a/modello-plugins/modello-plugin-java/pom.xml b/modello-plugins/modello-plugin-java/pom.xml index ea94c3c6..6ba7c01f 100644 --- a/modello-plugins/modello-plugin-java/pom.xml +++ b/modello-plugins/modello-plugin-java/pom.xml @@ -17,7 +17,7 @@ <artifactId>plexus-utils</artifactId> </dependency> <dependency> - <groupId>org.codehaus.plexus</groupId> + <groupId>org.sonatype.plexus</groupId> <artifactId>plexus-build-api</artifactId> </dependency> diff --git a/modello-test/src/main/java/org/codehaus/modello/AbstractModelloGeneratorTest.java b/modello-test/src/main/java/org/codehaus/modello/AbstractModelloGeneratorTest.java index f46cece1..e71231fb 100644 --- a/modello-test/src/main/java/org/codehaus/modello/AbstractModelloGeneratorTest.java +++ b/modello-test/src/main/java/org/codehaus/modello/AbstractModelloGeneratorTest.java @@ -32,7 +32,6 @@ import java.io.Reader; import java.util.Optional; import java.util.Properties; -import org.codehaus.plexus.ContainerConfiguration; import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.ReaderFactory; @@ -108,9 +107,4 @@ public abstract class AbstractModelloGeneratorTest extends PlexusTestCase { new File(getOutputDirectory(), generatedXsdName)); return saxParser; } - - @Override - protected void customizeContainerConfiguration(ContainerConfiguration containerConfiguration) { - containerConfiguration.setClassPathScanning("cache"); - } } diff --git a/pom.xml b/pom.xml index 88f8ed6f..9a4ac6df 100644 --- a/pom.xml +++ b/pom.xml @@ -347,9 +347,9 @@ <version>4.0.0</version> </dependency> <dependency> - <groupId>org.codehaus.plexus</groupId> + <groupId>org.sonatype.plexus</groupId> <artifactId>plexus-build-api</artifactId> - <version>1.2.0</version> + <version>0.0.7</version> </dependency> <dependency> <groupId>junit</groupId> -- 2.41.0 ++++++ modello-build.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build.xml new/build.xml --- old/build.xml 2019-03-12 07:56:31.057201667 +0100 +++ new/build.xml 2023-09-05 01:34:43.766102765 +0200 @@ -8,7 +8,6 @@ <target name="clean" description="Clean the output directory"> <ant antfile="build.xml" dir="modello-core" target="clean"/> - <ant antfile="build.xml" dir="modello-test" target="clean"/> <ant antfile="build.xml" dir="modello-plugins" target="clean"/> </target> @@ -18,7 +17,6 @@ <target name="compile" description="Compile the code"> <ant antfile="build.xml" dir="modello-core" target="compile"/> - <ant antfile="build.xml" dir="modello-test" target="compile"/> <ant antfile="build.xml" dir="modello-plugins" target="compile"/> </target> @@ -28,7 +26,6 @@ <target name="compile-tests" description="Compile the test code"> <ant antfile="build.xml" dir="modello-core" target="compile-tests"/> - <ant antfile="build.xml" dir="modello-test" target="compile-tests"/> <ant antfile="build.xml" dir="modello-plugins" target="compile-tests"/> </target> @@ -38,7 +35,6 @@ <target name="test" description="Run the test cases"> <ant antfile="build.xml" dir="modello-core" target="test"/> - <ant antfile="build.xml" dir="modello-test" target="test"/> <ant antfile="build.xml" dir="modello-plugins" target="test"/> </target> @@ -48,7 +44,6 @@ <target name="javadoc" description="Generates the Javadoc of the application"> <ant antfile="build.xml" dir="modello-core" target="javadoc"/> - <ant antfile="build.xml" dir="modello-test" target="javadoc"/> <ant antfile="build.xml" dir="modello-plugins" target="javadoc"/> </target> @@ -58,7 +53,6 @@ <target name="package" description="Package the application"> <ant antfile="build.xml" dir="modello-core" target="package"/> - <ant antfile="build.xml" dir="modello-test" target="package"/> <ant antfile="build.xml" dir="modello-plugins" target="package"/> </target> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/common.xml new/common.xml --- old/common.xml 2022-05-10 09:13:18.171136556 +0200 +++ new/common.xml 2023-09-04 23:31:10.008391550 +0200 @@ -3,7 +3,7 @@ <project name="common" basedir="."> <property file="build.properties"/> - <property name="project.version" value="2.0.0"/> + <property name="project.version" value="2.1.2"/> <property name="project.groupId" value="org.codehaus.modello"/> <property name="project.organization.name" value="Codehaus Plexus"/> <property name="project.organization.url" value="https://codehaus-plexus.github.io/"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-core/build.xml new/modello-core/build.xml --- old/modello-core/build.xml 2019-03-12 08:42:55.907254445 +0100 +++ new/modello-core/build.xml 2023-09-05 01:09:57.665763404 +0200 @@ -72,9 +72,34 @@ </src> <classpath refid="build.classpath"/> </javac> - <copy todir="${build.outputDir}"> - <fileset dir="${build.resourceDir}"/> - </copy> + </target> + + <!-- ====================================================================== --> + <!-- Target to generate Plexus component.xml --> + <!-- ====================================================================== --> + + <target name="plexus" + 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"> + <!-- <jvmarg value="-verbose"/> --> + <classpath> + <path refid="build.classpath"/> + <pathelement location="${build.outputDir}"/> + </classpath> + <arg value="-X"/> + <arg value="-s"/> + <arg value="${build.srcDir}"/> + <arg value="-c"/> + <arg value="${build.outputDir}"/> + <arg value="-m"/> + <arg value="${build.outputDir}/META-INF/plexus"/> + <arg value="-o"/> + <arg value="${build.outputDir}/META-INF/plexus/components.xml"/> + </java> </target> <!-- ====================================================================== --> @@ -205,7 +230,7 @@ <!-- Package target --> <!-- ====================================================================== --> - <target name="package" depends="compile,test" description="Package the application"> + <target name="package" depends="plexus,test" description="Package the application"> <jar jarfile="${build.dir}/${build.finalName}.jar" compress="true" index="false" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-plugins/modello-plugin-converters/build.xml new/modello-plugins/modello-plugin-converters/build.xml --- old/modello-plugins/modello-plugin-converters/build.xml 2019-03-12 08:42:04.642998322 +0100 +++ new/modello-plugins/modello-plugin-converters/build.xml 2023-09-05 01:10:02.995800498 +0200 @@ -80,9 +80,34 @@ </src> <classpath refid="build.classpath"/> </javac> - <copy todir="${build.outputDir}"> - <fileset dir="${build.resourceDir}"/> - </copy> + </target> + + <!-- ====================================================================== --> + <!-- Target to generate Plexus component.xml --> + <!-- ====================================================================== --> + + <target name="plexus" + 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"> + <!-- <jvmarg value="-verbose"/> --> + <classpath> + <path refid="build.classpath"/> + <pathelement location="${build.outputDir}"/> + </classpath> + <arg value="-X"/> + <arg value="-s"/> + <arg value="${build.srcDir}"/> + <arg value="-c"/> + <arg value="${build.outputDir}"/> + <arg value="-m"/> + <arg value="${build.outputDir}/META-INF/plexus"/> + <arg value="-o"/> + <arg value="${build.outputDir}/META-INF/plexus/components.xml"/> + </java> </target> <!-- ====================================================================== --> @@ -213,7 +238,7 @@ <!-- Package target --> <!-- ====================================================================== --> - <target name="package" depends="compile,test" description="Package the application"> + <target name="package" depends="plexus,test" description="Package the application"> <jar jarfile="${build.dir}/${build.finalName}.jar" compress="true" index="false" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-plugins/modello-plugin-dom4j/build.xml new/modello-plugins/modello-plugin-dom4j/build.xml --- old/modello-plugins/modello-plugin-dom4j/build.xml 2019-03-12 08:41:41.910884747 +0100 +++ new/modello-plugins/modello-plugin-dom4j/build.xml 2023-09-05 01:10:07.715833364 +0200 @@ -80,9 +80,34 @@ </src> <classpath refid="build.classpath"/> </javac> - <copy todir="${build.outputDir}"> - <fileset dir="${build.resourceDir}"/> - </copy> + </target> + + <!-- ====================================================================== --> + <!-- Target to generate Plexus component.xml --> + <!-- ====================================================================== --> + + <target name="plexus" + 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"> + <!-- <jvmarg value="-verbose"/> --> + <classpath> + <path refid="build.classpath"/> + <pathelement location="${build.outputDir}"/> + </classpath> + <arg value="-X"/> + <arg value="-s"/> + <arg value="${build.srcDir}"/> + <arg value="-c"/> + <arg value="${build.outputDir}"/> + <arg value="-m"/> + <arg value="${build.outputDir}/META-INF/plexus"/> + <arg value="-o"/> + <arg value="${build.outputDir}/META-INF/plexus/components.xml"/> + </java> </target> <!-- ====================================================================== --> @@ -213,7 +238,7 @@ <!-- Package target --> <!-- ====================================================================== --> - <target name="package" depends="compile,test" description="Package the application"> + <target name="package" depends="plexus,test" description="Package the application"> <jar jarfile="${build.dir}/${build.finalName}.jar" compress="true" index="false" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-plugins/modello-plugin-java/build.xml new/modello-plugins/modello-plugin-java/build.xml --- old/modello-plugins/modello-plugin-java/build.xml 2019-03-12 08:41:22.534788170 +0100 +++ new/modello-plugins/modello-plugin-java/build.xml 2023-09-05 01:10:12.545866985 +0200 @@ -76,9 +76,34 @@ </src> <classpath refid="build.classpath"/> </javac> - <copy todir="${build.outputDir}"> - <fileset dir="${build.resourceDir}"/> - </copy> + </target> + + <!-- ====================================================================== --> + <!-- Target to generate Plexus component.xml --> + <!-- ====================================================================== --> + + <target name="plexus" + 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"> + <!-- <jvmarg value="-verbose"/> --> + <classpath> + <path refid="build.classpath"/> + <pathelement location="${build.outputDir}"/> + </classpath> + <arg value="-X"/> + <arg value="-s"/> + <arg value="${build.srcDir}"/> + <arg value="-c"/> + <arg value="${build.outputDir}"/> + <arg value="-m"/> + <arg value="${build.outputDir}/META-INF/plexus"/> + <arg value="-o"/> + <arg value="${build.outputDir}/META-INF/plexus/components.xml"/> + </java> </target> <!-- ====================================================================== --> @@ -209,7 +234,7 @@ <!-- Package target --> <!-- ====================================================================== --> - <target name="package" depends="compile,test" description="Package the application"> + <target name="package" depends="plexus,test" description="Package the application"> <jar jarfile="${build.dir}/${build.finalName}.jar" compress="true" index="false" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-plugins/modello-plugin-jdom/build.xml new/modello-plugins/modello-plugin-jdom/build.xml --- old/modello-plugins/modello-plugin-jdom/build.xml 2019-03-12 08:41:01.638684231 +0100 +++ new/modello-plugins/modello-plugin-jdom/build.xml 2023-09-05 01:10:17.075898524 +0200 @@ -81,9 +81,34 @@ </src> <classpath refid="build.classpath"/> </javac> - <copy todir="${build.outputDir}"> - <fileset dir="${build.resourceDir}"/> - </copy> + </target> + + <!-- ====================================================================== --> + <!-- Target to generate Plexus component.xml --> + <!-- ====================================================================== --> + + <target name="plexus" + 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"> + <!-- <jvmarg value="-verbose"/> --> + <classpath> + <path refid="build.classpath"/> + <pathelement location="${build.outputDir}"/> + </classpath> + <arg value="-X"/> + <arg value="-s"/> + <arg value="${build.srcDir}"/> + <arg value="-c"/> + <arg value="${build.outputDir}"/> + <arg value="-m"/> + <arg value="${build.outputDir}/META-INF/plexus"/> + <arg value="-o"/> + <arg value="${build.outputDir}/META-INF/plexus/components.xml"/> + </java> </target> <!-- ====================================================================== --> @@ -211,7 +236,7 @@ <!-- Package target --> <!-- ====================================================================== --> - <target name="package" depends="compile,test" description="Package the application"> + <target name="package" depends="plexus,test" description="Package the application"> <jar jarfile="${build.dir}/${build.finalName}.jar" compress="true" index="false" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-plugins/modello-plugin-sax/build.xml new/modello-plugins/modello-plugin-sax/build.xml --- old/modello-plugins/modello-plugin-sax/build.xml 2019-03-12 08:40:40.718580181 +0100 +++ new/modello-plugins/modello-plugin-sax/build.xml 2023-09-05 01:10:21.905932142 +0200 @@ -81,9 +81,34 @@ </src> <classpath refid="build.classpath"/> </javac> - <copy todir="${build.outputDir}"> - <fileset dir="${build.resourceDir}"/> - </copy> + </target> + + <!-- ====================================================================== --> + <!-- Target to generate Plexus component.xml --> + <!-- ====================================================================== --> + + <target name="plexus" + 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"> + <!-- <jvmarg value="-verbose"/> --> + <classpath> + <path refid="build.classpath"/> + <pathelement location="${build.outputDir}"/> + </classpath> + <arg value="-X"/> + <arg value="-s"/> + <arg value="${build.srcDir}"/> + <arg value="-c"/> + <arg value="${build.outputDir}"/> + <arg value="-m"/> + <arg value="${build.outputDir}/META-INF/plexus"/> + <arg value="-o"/> + <arg value="${build.outputDir}/META-INF/plexus/components.xml"/> + </java> </target> <!-- ====================================================================== --> @@ -214,7 +239,7 @@ <!-- Package target --> <!-- ====================================================================== --> - <target name="package" depends="compile,test" description="Package the application"> + <target name="package" depends="plexus,test" description="Package the application"> <jar jarfile="${build.dir}/${build.finalName}.jar" compress="true" index="false" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-plugins/modello-plugin-stax/build.xml new/modello-plugins/modello-plugin-stax/build.xml --- old/modello-plugins/modello-plugin-stax/build.xml 2019-03-12 08:38:48.982024380 +0100 +++ new/modello-plugins/modello-plugin-stax/build.xml 2023-09-05 01:10:26.752632545 +0200 @@ -80,9 +80,34 @@ </src> <classpath refid="build.classpath"/> </javac> - <copy todir="${build.outputDir}"> - <fileset dir="${build.resourceDir}"/> - </copy> + </target> + + <!-- ====================================================================== --> + <!-- Target to generate Plexus component.xml --> + <!-- ====================================================================== --> + + <target name="plexus" + 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"> + <!-- <jvmarg value="-verbose"/> --> + <classpath> + <path refid="build.classpath"/> + <pathelement location="${build.outputDir}"/> + </classpath> + <arg value="-X"/> + <arg value="-s"/> + <arg value="${build.srcDir}"/> + <arg value="-c"/> + <arg value="${build.outputDir}"/> + <arg value="-m"/> + <arg value="${build.outputDir}/META-INF/plexus"/> + <arg value="-o"/> + <arg value="${build.outputDir}/META-INF/plexus/components.xml"/> + </java> </target> <!-- ====================================================================== --> @@ -213,7 +238,7 @@ <!-- Package target --> <!-- ====================================================================== --> - <target name="package" depends="compile,test" description="Package the application"> + <target name="package" depends="plexus,test" description="Package the application"> <jar jarfile="${build.dir}/${build.finalName}.jar" compress="true" index="false" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-plugins/modello-plugin-xdoc/build.xml new/modello-plugins/modello-plugin-xdoc/build.xml --- old/modello-plugins/modello-plugin-xdoc/build.xml 2019-03-12 08:38:25.101905601 +0100 +++ new/modello-plugins/modello-plugin-xdoc/build.xml 2023-09-05 01:10:30.982661984 +0200 @@ -82,9 +82,34 @@ </src> <classpath refid="build.classpath"/> </javac> - <copy todir="${build.outputDir}"> - <fileset dir="${build.resourceDir}"/> - </copy> + </target> + + <!-- ====================================================================== --> + <!-- Target to generate Plexus component.xml --> + <!-- ====================================================================== --> + + <target name="plexus" + 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"> + <!-- <jvmarg value="-verbose"/> --> + <classpath> + <path refid="build.classpath"/> + <pathelement location="${build.outputDir}"/> + </classpath> + <arg value="-X"/> + <arg value="-s"/> + <arg value="${build.srcDir}"/> + <arg value="-c"/> + <arg value="${build.outputDir}"/> + <arg value="-m"/> + <arg value="${build.outputDir}/META-INF/plexus"/> + <arg value="-o"/> + <arg value="${build.outputDir}/META-INF/plexus/components.xml"/> + </java> </target> <!-- ====================================================================== --> @@ -215,7 +240,7 @@ <!-- Package target --> <!-- ====================================================================== --> - <target name="package" depends="compile,test" description="Package the application"> + <target name="package" depends="plexus,test" description="Package the application"> <jar jarfile="${build.dir}/${build.finalName}.jar" compress="true" index="false" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-plugins/modello-plugin-xml/build.xml new/modello-plugins/modello-plugin-xml/build.xml --- old/modello-plugins/modello-plugin-xml/build.xml 2019-03-12 08:37:59.509778304 +0100 +++ new/modello-plugins/modello-plugin-xml/build.xml 2023-09-05 01:10:35.666027919 +0200 @@ -83,6 +83,34 @@ </target> <!-- ====================================================================== --> + <!-- Target to generate Plexus component.xml --> + <!-- ====================================================================== --> + + <target name="plexus" + 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"> + <!-- <jvmarg value="-verbose"/> --> + <classpath> + <path refid="build.classpath"/> + <pathelement location="${build.outputDir}"/> + </classpath> + <arg value="-X"/> + <arg value="-s"/> + <arg value="${build.srcDir}"/> + <arg value="-c"/> + <arg value="${build.outputDir}"/> + <arg value="-m"/> + <arg value="${build.outputDir}/META-INF/plexus"/> + <arg value="-o"/> + <arg value="${build.outputDir}/META-INF/plexus/components.xml"/> + </java> + </target> + + <!-- ====================================================================== --> <!-- Test-compilation target --> <!-- ====================================================================== --> @@ -210,7 +238,7 @@ <!-- Package target --> <!-- ====================================================================== --> - <target name="package" depends="compile,test" description="Package the application"> + <target name="package" depends="plexus,test" description="Package the application"> <jar jarfile="${build.dir}/${build.finalName}.jar" compress="true" index="false" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-plugins/modello-plugin-xpp3/build.xml new/modello-plugins/modello-plugin-xpp3/build.xml --- old/modello-plugins/modello-plugin-xpp3/build.xml 2019-03-12 08:37:32.701644958 +0100 +++ new/modello-plugins/modello-plugin-xpp3/build.xml 2023-09-05 01:10:41.329400664 +0200 @@ -80,9 +80,34 @@ </src> <classpath refid="build.classpath"/> </javac> - <copy todir="${build.outputDir}"> - <fileset dir="${build.resourceDir}"/> - </copy> + </target> + + <!-- ====================================================================== --> + <!-- Target to generate Plexus component.xml --> + <!-- ====================================================================== --> + + <target name="plexus" + 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"> + <!-- <jvmarg value="-verbose"/> --> + <classpath> + <path refid="build.classpath"/> + <pathelement location="${build.outputDir}"/> + </classpath> + <arg value="-X"/> + <arg value="-s"/> + <arg value="${build.srcDir}"/> + <arg value="-c"/> + <arg value="${build.outputDir}"/> + <arg value="-m"/> + <arg value="${build.outputDir}/META-INF/plexus"/> + <arg value="-o"/> + <arg value="${build.outputDir}/META-INF/plexus/components.xml"/> + </java> </target> <!-- ====================================================================== --> @@ -213,7 +238,7 @@ <!-- Package target --> <!-- ====================================================================== --> - <target name="package" depends="compile,test" description="Package the application"> + <target name="package" depends="plexus,test" description="Package the application"> <jar jarfile="${build.dir}/${build.finalName}.jar" compress="true" index="false" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-plugins/modello-plugin-xsd/build.xml new/modello-plugins/modello-plugin-xsd/build.xml --- old/modello-plugins/modello-plugin-xsd/build.xml 2019-03-12 08:37:01.621490346 +0100 +++ new/modello-plugins/modello-plugin-xsd/build.xml 2023-09-05 01:09:30.225572385 +0200 @@ -77,9 +77,34 @@ </src> <classpath refid="build.classpath"/> </javac> - <copy todir="${build.outputDir}"> - <fileset dir="${build.resourceDir}"/> - </copy> + </target> + + <!-- ====================================================================== --> + <!-- Target to generate Plexus component.xml --> + <!-- ====================================================================== --> + + <target name="plexus" + 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"> + <!-- <jvmarg value="-verbose"/> --> + <classpath> + <path refid="build.classpath"/> + <pathelement location="${build.outputDir}"/> + </classpath> + <arg value="-X"/> + <arg value="-s"/> + <arg value="${build.srcDir}"/> + <arg value="-c"/> + <arg value="${build.outputDir}"/> + <arg value="-m"/> + <arg value="${build.outputDir}/META-INF/plexus"/> + <arg value="-o"/> + <arg value="${build.outputDir}/META-INF/plexus/components.xml"/> + </java> </target> <!-- ====================================================================== --> @@ -210,7 +235,7 @@ <!-- Package target --> <!-- ====================================================================== --> - <target name="package" depends="compile,test" description="Package the application"> + <target name="package" depends="plexus,test" description="Package the application"> <jar jarfile="${build.dir}/${build.finalName}.jar" compress="true" index="false" ++++++ modello-cli-domasxpp3.patch ++++++ --- /var/tmp/diff_new_pack.BGwtaE/_old 2023-09-07 21:13:20.522594437 +0200 +++ /var/tmp/diff_new_pack.BGwtaE/_new 2023-09-07 21:13:20.526594581 +0200 @@ -1,11 +1,10 @@ ---- modello-2.0.0/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java 2022-02-13 14:30:34.000000000 +0100 -+++ modello-2.0.0/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java 2022-05-10 09:08:57.893555360 +0200 -@@ -114,6 +114,15 @@ - - System.exit( 1 ); +--- modello-2.1.2/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java 2023-09-04 23:38:10.194571922 +0200 ++++ modello-2.1.2/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java 2023-09-05 12:10:26.198361088 +0200 +@@ -105,11 +105,24 @@ + System.exit(1); } -+ if ( StringUtils.equalsIgnoreCase( javaSource, "true" ) || StringUtils.equalsIgnoreCase( javaSource, "false" ) ) -+ { + ++ if ( StringUtils.equalsIgnoreCase( javaSource, "true" ) || StringUtils.equalsIgnoreCase( javaSource, "false" ) ) { + // The old useJava5 parameter at this position + System.err.println( "Missing required parameter: Java Source (replacing the old \"Use Java5\" parameter)" ); + @@ -13,27 +12,25 @@ + + System.exit( 1 ); + } ++ + parameters.setProperty(ModelloParameterConstants.OUTPUT_JAVA_SOURCE, javaSource); - parameters.setProperty( ModelloParameterConstants.OUTPUT_JAVA_SOURCE, javaSource ); - -@@ -121,6 +130,11 @@ - { - parameters.setProperty( ModelloParameterConstants.ENCODING, args[6] ); + if (args.length > 6) { + parameters.setProperty(ModelloParameterConstants.ENCODING, args[6]); } + -+ if ( args.length > 7 ) -+ { ++ if ( args.length > 7 ) { + parameters.setProperty( ModelloParameterConstants.DOM_AS_XPP3, args[7] ); + } } // ---------------------------------------------------------------------- -@@ -130,6 +144,6 @@ - private static void usage() - { - System.err.println( "Usage: modello <model> <outputType> <output directory> <modelVersion> <packageWithVersion>" -- + "<javaSource> [<encoding>]" ); -+ + " <javaSource> [<encoding> [<domAsXpp3>]]" ); +@@ -118,6 +131,6 @@ + + private static void usage() { + System.err.println("Usage: modello <model> <outputType> <output directory> <modelVersion> <packageWithVersion>" +- + "<javaSource> [<encoding>]"); ++ + " <javaSource> [<encoding> [<domAsXpp3>]]" ); } }
