Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package modello for openSUSE:Factory checked in at 2022-05-13 23:03:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/modello (Old) and /work/SRC/openSUSE:Factory/.modello.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "modello" Fri May 13 23:03:18 2022 rev:6 rq:977013 version:2.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/modello/modello-maven-plugin.changes 2022-03-22 19:40:58.639138822 +0100 +++ /work/SRC/openSUSE:Factory/.modello.new.1538/modello-maven-plugin.changes 2022-05-13 23:03:27.555138983 +0200 @@ -1,0 +2,5 @@ +Fri May 13 08:54:49 UTC 2022 - Fridrich Strba <[email protected]> + +- Upgrade to upstream version 2.0.0 + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/modello/modello.changes 2022-03-22 19:40:58.687138872 +0100 +++ /work/SRC/openSUSE:Factory/.modello.new.1538/modello.changes 2022-05-13 23:03:27.575139001 +0200 @@ -1,0 +2,7 @@ +Fri May 13 08:52:25 UTC 2022 - Fridrich Strba <[email protected]> + +- Upgrade to upstream version 2.0.0 +- Modified patch: + * Adapt to the change of parameter from useJava5 to javaSource + +------------------------------------------------------------------- Old: ---- modello-1.11-source-release.zip New: ---- modello-2.0.0-source-release.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ modello-maven-plugin.spec ++++++ --- /var/tmp/diff_new_pack.CeQgRf/_old 2022-05-13 23:03:28.131139512 +0200 +++ /var/tmp/diff_new_pack.CeQgRf/_new 2022-05-13 23:03:28.135139516 +0200 @@ -19,7 +19,7 @@ %global parent modello %global subname maven-plugin Name: %{parent}-%{subname} -Version: 1.11 +Version: 2.0.0 Release: 0 Summary: Modello Maven Plugin License: Apache-2.0 AND MIT @@ -38,17 +38,13 @@ BuildRequires: mvn(org.codehaus.modello:modello-core) = %{version} BuildRequires: mvn(org.codehaus.modello:modello-plugin-converters) = %{version} BuildRequires: mvn(org.codehaus.modello:modello-plugin-dom4j) = %{version} -BuildRequires: mvn(org.codehaus.modello:modello-plugin-jackson) = %{version} BuildRequires: mvn(org.codehaus.modello:modello-plugin-java) = %{version} BuildRequires: mvn(org.codehaus.modello:modello-plugin-jdom) = %{version} -BuildRequires: mvn(org.codehaus.modello:modello-plugin-jsonschema) = %{version} BuildRequires: mvn(org.codehaus.modello:modello-plugin-sax) = %{version} -BuildRequires: mvn(org.codehaus.modello:modello-plugin-snakeyaml) = %{version} BuildRequires: mvn(org.codehaus.modello:modello-plugin-stax) = %{version} 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-container-default) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) #!BuildRequires: maven-compiler-plugin-bootstrap @@ -80,23 +76,21 @@ %prep %setup -q -n %{parent}-%{version} cp -p %{SOURCE1} LICENSE -# We don't generate site; don't pull extra dependencies. + %pom_remove_plugin :maven-site-plugin -# Avoid using Maven 2.x APIs -sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml + +%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_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 %build pushd %{name} -%{mvn_build} -f -- \ -%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} - -Dmaven.compiler.release=8 \ -%endif - -Dmaven.version=3.1.1 -Dsource=8 +%{mvn_build} -f -- -Dsource=8 popd %install ++++++ modello.spec ++++++ --- /var/tmp/diff_new_pack.CeQgRf/_old 2022-05-13 23:03:28.191139568 +0200 +++ /var/tmp/diff_new_pack.CeQgRf/_new 2022-05-13 23:03:28.195139571 +0200 @@ -17,7 +17,7 @@ Name: modello -Version: 1.11 +Version: 2.0.0 Release: 0 Summary: Modello Data Model toolkit License: Apache-2.0 AND MIT @@ -29,36 +29,27 @@ Patch0: modello-cli-domasxpp3.patch BuildRequires: ant BuildRequires: fdupes +BuildRequires: google-guice BuildRequires: guava -BuildRequires: jackson-annotations -BuildRequires: jackson-core -BuildRequires: jackson-databind BuildRequires: javapackages-local BuildRequires: jsoup BuildRequires: junit BuildRequires: plexus-build-api BuildRequires: plexus-classworlds BuildRequires: plexus-compiler -BuildRequires: plexus-containers-container-default BuildRequires: plexus-utils -BuildRequires: snakeyaml +BuildRequires: sisu-plexus BuildRequires: unzip Requires: guava -# Explicit javapackages-tools requires since modello script uses -# /usr/share/java-utils/java-functions Requires: javapackages-tools Requires: xbean -Requires: mvn(com.fasterxml.jackson.core:jackson-annotations) -Requires: mvn(com.fasterxml.jackson.core:jackson-core) -Requires: mvn(com.fasterxml.jackson.core:jackson-databind) -Requires: mvn(junit:junit) Requires: mvn(org.codehaus.plexus:plexus-compiler-api) Requires: mvn(org.codehaus.plexus:plexus-compiler-javac) -Requires: mvn(org.codehaus.plexus:plexus-container-default) 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.yaml:snakeyaml) +Requires: mvn(org.sonatype.sisu:sisu-guice::no_aop:) BuildArch: noarch %description @@ -81,17 +72,23 @@ %setup -q -a100 %patch0 -p1 cp -p %{SOURCE1} LICENSE -# We don't generate site; don't pull extra dependencies. + %pom_remove_plugin :maven-site-plugin -# Avoid using Maven 2.x APIs -sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml + +%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_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 %build mkdir -p lib build-jar-repository -s lib plexus/classworlds plexus/utils plexus/plexus-build-api \ - plexus-containers/plexus-container-default plexus-compiler/plexus-compiler-api junit \ - plexus-compiler/plexus-compiler-javac jsoup snakeyaml guava/guava xbean/xbean-reflect \ - jackson-core jackson-annotations jackson-databind + 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) %{ant} \ -Dtest.skip=true \ @@ -105,7 +102,7 @@ install -pm 0644 %{name}-${i}/target/%{name}-${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-${i}.jar done -for i in converters dom4j java jdom sax snakeyaml stax xdoc xml xpp3 xsd jackson jsonschema; do +for i in converters dom4j java jdom sax stax xdoc xml xpp3 xsd; do install -pm 0644 %{name}-plugins/%{name}-plugin-${i}/target/%{name}-plugin-${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-plugin-${i}.jar done @@ -123,7 +120,7 @@ %add_maven_depmap %{name}/%{name}-${i}.pom %{name}/%{name}-${i}.jar done -for i in converters dom4j java jdom sax snakeyaml stax xdoc xml xpp3 xsd jackson jsonschema; do +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 %add_maven_depmap %{name}/%{name}-plugin-${i}.pom %{name}/%{name}-plugin-${i}.jar done @@ -136,7 +133,7 @@ cp -pr %{name}-${i}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/%{name}-${i}/ done -for i in converters dom4j java jdom sax snakeyaml stax xdoc xml xpp3 xsd jackson jsonschema; do +for i in converters dom4j java jdom sax stax xdoc xml xpp3 xsd; do install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/%{name}-plugin-${i} cp -pr %{name}-plugins/%{name}-plugin-${i}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/%{name}-plugin-${i}/ done @@ -144,7 +141,7 @@ %fdupes -s %{buildroot}%{_javadocdir} # script -%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:plexus-containers/plexus-container-default:plexus/classworlds:plexus/utils:plexus/plexus-build-api:xbean/xbean-reflect:guava %{name} true +%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 %files -f .mfiles %license LICENSE ++++++ modello-build.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/common.xml new/common.xml --- old/common.xml 2022-03-22 15:05:02.142555310 +0100 +++ new/common.xml 2022-05-10 09:13:18.171136556 +0200 @@ -3,7 +3,7 @@ <project name="common" basedir="."> <property file="build.properties"/> - <property name="project.version" value="1.11"/> + <property name="project.version" value="2.0.0"/> <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-plugins/build.xml new/modello-plugins/build.xml --- old/modello-plugins/build.xml 2021-04-26 12:14:51.976443859 +0200 +++ new/modello-plugins/build.xml 2022-05-10 09:59:57.876671826 +0200 @@ -16,9 +16,6 @@ <ant antfile="build.xml" dir="modello-plugin-stax" target="clean"/> <ant antfile="build.xml" dir="modello-plugin-jdom" target="clean"/> <ant antfile="build.xml" dir="modello-plugin-dom4j" target="clean"/> - <ant antfile="build.xml" dir="modello-plugin-jackson" target="clean"/> - <ant antfile="build.xml" dir="modello-plugin-jsonschema" target="clean"/> - <ant antfile="build.xml" dir="modello-plugin-snakeyaml" target="clean"/> <ant antfile="build.xml" dir="modello-plugin-sax" target="clean"/> </target> @@ -36,9 +33,6 @@ <ant antfile="build.xml" dir="modello-plugin-stax" target="compile"/> <ant antfile="build.xml" dir="modello-plugin-jdom" target="compile"/> <ant antfile="build.xml" dir="modello-plugin-dom4j" target="compile"/> - <ant antfile="build.xml" dir="modello-plugin-jackson" target="compile"/> - <ant antfile="build.xml" dir="modello-plugin-jsonschema" target="compile"/> - <ant antfile="build.xml" dir="modello-plugin-snakeyaml" target="compile"/> <ant antfile="build.xml" dir="modello-plugin-sax" target="compile"/> </target> @@ -56,9 +50,6 @@ <ant antfile="build.xml" dir="modello-plugin-stax" target="compile-tests"/> <ant antfile="build.xml" dir="modello-plugin-jdom" target="compile-tests"/> <ant antfile="build.xml" dir="modello-plugin-dom4j" target="compile-tests"/> - <ant antfile="build.xml" dir="modello-plugin-jackson" target="compile-tests"/> - <ant antfile="build.xml" dir="modello-plugin-jsonschema" target="compile-tests"/> - <ant antfile="build.xml" dir="modello-plugin-snakeyaml" target="compile-tests"/> <ant antfile="build.xml" dir="modello-plugin-sax" target="compile-tests"/> </target> @@ -76,9 +67,6 @@ <ant antfile="build.xml" dir="modello-plugin-stax" target="test"/> <ant antfile="build.xml" dir="modello-plugin-jdom" target="test"/> <ant antfile="build.xml" dir="modello-plugin-dom4j" target="test"/> - <ant antfile="build.xml" dir="modello-plugin-jackson" target="test"/> - <ant antfile="build.xml" dir="modello-plugin-jsonschema" target="test"/> - <ant antfile="build.xml" dir="modello-plugin-snakeyaml" target="test"/> <ant antfile="build.xml" dir="modello-plugin-sax" target="test"/> </target> @@ -96,9 +84,6 @@ <ant antfile="build.xml" dir="modello-plugin-stax" target="javadoc"/> <ant antfile="build.xml" dir="modello-plugin-jdom" target="javadoc"/> <ant antfile="build.xml" dir="modello-plugin-dom4j" target="javadoc"/> - <ant antfile="build.xml" dir="modello-plugin-jackson" target="javadoc"/> - <ant antfile="build.xml" dir="modello-plugin-jsonschema" target="javadoc"/> - <ant antfile="build.xml" dir="modello-plugin-snakeyaml" target="javadoc"/> <ant antfile="build.xml" dir="modello-plugin-sax" target="javadoc"/> </target> @@ -116,9 +101,6 @@ <ant antfile="build.xml" dir="modello-plugin-stax" target="package"/> <ant antfile="build.xml" dir="modello-plugin-jdom" target="package"/> <ant antfile="build.xml" dir="modello-plugin-dom4j" target="package"/> - <ant antfile="build.xml" dir="modello-plugin-jackson" target="package"/> - <ant antfile="build.xml" dir="modello-plugin-jsonschema" target="package"/> - <ant antfile="build.xml" dir="modello-plugin-snakeyaml" target="package"/> <ant antfile="build.xml" dir="modello-plugin-sax" target="package"/> </target> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-plugins/modello-plugin-jackson/build.xml new/modello-plugins/modello-plugin-jackson/build.xml --- old/modello-plugins/modello-plugin-jackson/build.xml 2021-04-26 12:17:47.297492534 +0200 +++ new/modello-plugins/modello-plugin-jackson/build.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,243 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project name="modello-plugin-jackson" default="package" basedir="."> - - <!-- ====================================================================== --> - <!-- Build environment properties --> - <!-- ====================================================================== --> - - <include file="../../common.xml"/> - <property file="build.properties"/> - - <property name="project.artifactId" value="modello-plugin-jackson"/> - <property name="project.name" value="Modello Jackson Plugin"/> - - <property name="build.finalName" value="${project.artifactId}-${project.version}"/> - <property name="build.dir" value="target"/> - <property name="build.outputDir" value="${build.dir}/classes"/> - <property name="build.srcDir" value="src/main/java"/> - <property name="build.resourceDir" value="src/main/resources"/> - <property name="build.testOutputDir" value="${build.dir}/test-classes"/> - <property name="build.testDir" value="src/test/java"/> - <property name="build.testResourceDir" value="src/test/resources"/> - <property name="test.reports" value="${build.dir}/test-reports"/> - <property name="reporting.outputDirectory" value="${build.dir}/site"/> - - <!-- ====================================================================== --> - <!-- Defining classpaths --> - <!-- ====================================================================== --> - - <path id="build.classpath"> - <pathelement location="../../modello-core/target/classes"/> - <pathelement location="../modello-plugin-java/target/classes"/> - <pathelement location="../modello-plugin-xml/target/classes"/> - <fileset dir="../../lib"> - <!-- plexus-build-api-0.0.7 plexus-utils-3.0.24 plexus-container-default-1.7 - plexus-classworlds-2.5.1 xbean-reflect-3.7 google-collections-1.0 --> - <include name="**/*.jar"/> - </fileset> - </path> - <path id="build.test.classpath"> - <pathelement location="../../modello-core/target/classes"/> - <pathelement location="../../modello-test/target/classes"/> - <pathelement location="../modello-plugin-java/target/classes"/> - <pathelement location="../modello-plugin-xml/target/classes"/> - <fileset dir="../../lib"> - <!-- plexus-build-api-0.0.7 plexus-utils-3.0.24 plexus-container-default-1.7 - plexus-classworlds-2.5.1 xbean-reflect-3.7 google-collections-1.0 - plexus-compiler-javac-2.8.2 plexus-compiler-api-2.8.2 junit-3.8.2 --> - <include name="**/*.jar"/> - </fileset> - </path> - - <!-- ====================================================================== --> - <!-- Cleaning up target --> - <!-- ====================================================================== --> - - <target name="clean" description="Clean the output directory"> - <delete dir="${build.dir}"/> - </target> - - <!-- ====================================================================== --> - <!-- Compilation target --> - <!-- ====================================================================== --> - - <target name="compile" description="Compile the code"> - <mkdir dir="${build.outputDir}"/> - <javac destdir="${build.outputDir}" - nowarn="false" - debug="true" - optimize="false" - deprecation="true" - target="${compiler.target}" - encoding="UTF-8" - verbose="false" - fork="false" - source="${compiler.source}"> - <src> - <pathelement location="${build.srcDir}"/> - </src> - <classpath refid="build.classpath"/> - </javac> - <copy todir="${build.outputDir}"> - <fileset dir="${build.resourceDir}"/> - </copy> - </target> - - <!-- ====================================================================== --> - <!-- Test-compilation target --> - <!-- ====================================================================== --> - - <target name="compile-tests" - depends="compile" - description="Compile the test code" - unless="test.skip"> - <mkdir dir="${build.testOutputDir}"/> - <javac destdir="${build.testOutputDir}" - nowarn="false" - debug="true" - optimize="false" - deprecation="true" - target="${compiler.target}" - encoding="UTF-8" - verbose="false" - fork="false" - source="${compiler.source}"> - <src> - <pathelement location="${build.testDir}"/> - </src> - <classpath> - <path refid="build.test.classpath"/> - <pathelement location="${build.outputDir}"/> - </classpath> - </javac> - <copy todir="${build.testOutputDir}"> - <fileset dir="${build.testResourceDir}"/> - </copy> - </target> - - <!-- ====================================================================== --> - <!-- Run all tests --> - <!-- ====================================================================== --> - - <target name="test" - depends="compile-tests, junit-missing" - unless="junit.skipped" - description="Run the test cases"> - <mkdir dir="${test.reports}"/> - <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir="."> - <sysproperty key="basedir" value="."/> - <formatter type="xml"/> - <formatter type="plain" usefile="false"/> - <classpath> - <path refid="build.test.classpath"/> - <pathelement location="${build.outputDir}"/> - <pathelement location="${build.testOutputDir}"/> - </classpath> - <batchtest todir="${test.reports}" unless="test"> - <fileset dir="${build.testDir}"> - <include name="**/Test*.java"/> - <include name="**/*Test.java"/> - <include name="**/*TestCase.java"/> - <exclude name="**/*Abstract*Test.java"/> - </fileset> - </batchtest> - <batchtest todir="${test.reports}" if="test"> - <fileset dir="${build.testDir}"> - <include name="**/${test}.java"/> - <exclude name="**/*Abstract*Test.java"/> - </fileset> - </batchtest> - </junit> - </target> - - <target name="test-junit-present"> - <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/> - </target> - - <target name="test-junit-status" - depends="test-junit-present"> - <condition property="junit.missing"> - <and> - <isfalse value="${junit.present}"/> - <isfalse value="${test.skip}"/> - </and> - </condition> - <condition property="junit.skipped"> - <or> - <isfalse value="${junit.present}"/> - <istrue value="${test.skip}"/> - </or> - </condition> - </target> - - <target name="junit-missing" - depends="test-junit-status" - if="junit.missing"> - <echo>=================================== WARNING ===================================</echo> - <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo> - <echo>===============================================================================</echo> - </target> - - <!-- ====================================================================== --> - <!-- Javadoc target --> - <!-- ====================================================================== --> - - <target name="javadoc" description="Generates the Javadoc of the application"> - <javadoc sourcepath="${build.srcDir}" - packagenames="*" - destdir="${reporting.outputDirectory}/apidocs" - access="protected" - source="${compiler.source}" - verbose="false" - version="true" - use="true" - author="true" - splitindex="false" - nodeprecated="false" - nodeprecatedlist="false" - notree="false" - noindex="false" - nohelp="false" - nonavbar="false" - serialwarn="false" - encoding="UTF-8" - linksource="false" - breakiterator="false"> - <classpath refid="build.classpath"/> - </javadoc> - </target> - - <!-- ====================================================================== --> - <!-- Package target --> - <!-- ====================================================================== --> - - <target name="package" depends="compile,test" description="Package the application"> - <jar jarfile="${build.dir}/${build.finalName}.jar" - compress="true" - index="false" - basedir="${build.outputDir}" - excludes="**/package.html"> - <manifest> - <attribute name="Implementation-Title" value="${project.name}"/> - <attribute name="Implementation-URL" value="${project.url}${project.artifactId}/"/> - <attribute name="Implementation-Vendor" value="${project.organization.name}"/> - <attribute name="Implementation-Vendor-Id" value="${project.groupId}"/> - <attribute name="Implementation-Version" value="${project.version}"/> - <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> - <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> - <attribute name="JavaPackages-Version" value="${project.version}"/> - <attribute name="Specification-Title" value="${project.name}"/> - <attribute name="Specification-Vendor" value="${project.organization.name}"/> - <attribute name="Specification-Version" value="${spec.version}"/> - </manifest> - </jar> - </target> - - <!-- ====================================================================== --> - <!-- A dummy target for the package named after the type it creates --> - <!-- ====================================================================== --> - - <target name="jar" depends="package" description="Builds the jar for the application"/> - -</project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-plugins/modello-plugin-jsonschema/build.xml new/modello-plugins/modello-plugin-jsonschema/build.xml --- old/modello-plugins/modello-plugin-jsonschema/build.xml 2021-04-26 12:19:36.362145015 +0200 +++ new/modello-plugins/modello-plugin-jsonschema/build.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,243 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project name="modello-plugin-jsonschema" default="package" basedir="."> - - <!-- ====================================================================== --> - <!-- Build environment properties --> - <!-- ====================================================================== --> - - <include file="../../common.xml"/> - <property file="build.properties"/> - - <property name="project.artifactId" value="modello-plugin-jsonschema"/> - <property name="project.name" value="Modello JSON-Schema Plugin"/> - - <property name="build.finalName" value="${project.artifactId}-${project.version}"/> - <property name="build.dir" value="target"/> - <property name="build.outputDir" value="${build.dir}/classes"/> - <property name="build.srcDir" value="src/main/java"/> - <property name="build.resourceDir" value="src/main/resources"/> - <property name="build.testOutputDir" value="${build.dir}/test-classes"/> - <property name="build.testDir" value="src/test/java"/> - <property name="build.testResourceDir" value="src/test/resources"/> - <property name="test.reports" value="${build.dir}/test-reports"/> - <property name="reporting.outputDirectory" value="${build.dir}/site"/> - - <!-- ====================================================================== --> - <!-- Defining classpaths --> - <!-- ====================================================================== --> - - <path id="build.classpath"> - <pathelement location="../../modello-core/target/classes"/> - <pathelement location="../modello-plugin-java/target/classes"/> - <pathelement location="../modello-plugin-xml/target/classes"/> - <fileset dir="../../lib"> - <!-- plexus-build-api-0.0.7 plexus-utils-3.0.24 plexus-container-default-1.7 - plexus-classworlds-2.5.1 xbean-reflect-3.7 google-collections-1.0 --> - <include name="**/*.jar"/> - </fileset> - </path> - <path id="build.test.classpath"> - <pathelement location="../../modello-core/target/classes"/> - <pathelement location="../../modello-test/target/classes"/> - <pathelement location="../modello-plugin-java/target/classes"/> - <pathelement location="../modello-plugin-xml/target/classes"/> - <fileset dir="../../lib"> - <!-- plexus-build-api-0.0.7 plexus-utils-3.0.24 plexus-container-default-1.7 - plexus-classworlds-2.5.1 xbean-reflect-3.7 google-collections-1.0 - plexus-compiler-javac-2.8.2 plexus-compiler-api-2.8.2 junit-3.8.2 --> - <include name="**/*.jar"/> - </fileset> - </path> - - <!-- ====================================================================== --> - <!-- Cleaning up target --> - <!-- ====================================================================== --> - - <target name="clean" description="Clean the output directory"> - <delete dir="${build.dir}"/> - </target> - - <!-- ====================================================================== --> - <!-- Compilation target --> - <!-- ====================================================================== --> - - <target name="compile" description="Compile the code"> - <mkdir dir="${build.outputDir}"/> - <javac destdir="${build.outputDir}" - nowarn="false" - debug="true" - optimize="false" - deprecation="true" - target="${compiler.target}" - encoding="UTF-8" - verbose="false" - fork="false" - source="${compiler.source}"> - <src> - <pathelement location="${build.srcDir}"/> - </src> - <classpath refid="build.classpath"/> - </javac> - <copy todir="${build.outputDir}"> - <fileset dir="${build.resourceDir}"/> - </copy> - </target> - - <!-- ====================================================================== --> - <!-- Test-compilation target --> - <!-- ====================================================================== --> - - <target name="compile-tests" - depends="compile" - description="Compile the test code" - unless="test.skip"> - <mkdir dir="${build.testOutputDir}"/> - <javac destdir="${build.testOutputDir}" - nowarn="false" - debug="true" - optimize="false" - deprecation="true" - target="${compiler.target}" - encoding="UTF-8" - verbose="false" - fork="false" - source="${compiler.source}"> - <src> - <pathelement location="${build.testDir}"/> - </src> - <classpath> - <path refid="build.test.classpath"/> - <pathelement location="${build.outputDir}"/> - </classpath> - </javac> - <copy todir="${build.testOutputDir}"> - <fileset dir="${build.testResourceDir}"/> - </copy> - </target> - - <!-- ====================================================================== --> - <!-- Run all tests --> - <!-- ====================================================================== --> - - <target name="test" - depends="compile-tests, junit-missing" - unless="junit.skipped" - description="Run the test cases"> - <mkdir dir="${test.reports}"/> - <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir="."> - <sysproperty key="basedir" value="."/> - <formatter type="xml"/> - <formatter type="plain" usefile="false"/> - <classpath> - <path refid="build.test.classpath"/> - <pathelement location="${build.outputDir}"/> - <pathelement location="${build.testOutputDir}"/> - </classpath> - <batchtest todir="${test.reports}" unless="test"> - <fileset dir="${build.testDir}"> - <include name="**/Test*.java"/> - <include name="**/*Test.java"/> - <include name="**/*TestCase.java"/> - <exclude name="**/*Abstract*Test.java"/> - </fileset> - </batchtest> - <batchtest todir="${test.reports}" if="test"> - <fileset dir="${build.testDir}"> - <include name="**/${test}.java"/> - <exclude name="**/*Abstract*Test.java"/> - </fileset> - </batchtest> - </junit> - </target> - - <target name="test-junit-present"> - <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/> - </target> - - <target name="test-junit-status" - depends="test-junit-present"> - <condition property="junit.missing"> - <and> - <isfalse value="${junit.present}"/> - <isfalse value="${test.skip}"/> - </and> - </condition> - <condition property="junit.skipped"> - <or> - <isfalse value="${junit.present}"/> - <istrue value="${test.skip}"/> - </or> - </condition> - </target> - - <target name="junit-missing" - depends="test-junit-status" - if="junit.missing"> - <echo>=================================== WARNING ===================================</echo> - <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo> - <echo>===============================================================================</echo> - </target> - - <!-- ====================================================================== --> - <!-- Javadoc target --> - <!-- ====================================================================== --> - - <target name="javadoc" description="Generates the Javadoc of the application"> - <javadoc sourcepath="${build.srcDir}" - packagenames="*" - destdir="${reporting.outputDirectory}/apidocs" - access="protected" - source="${compiler.source}" - verbose="false" - version="true" - use="true" - author="true" - splitindex="false" - nodeprecated="false" - nodeprecatedlist="false" - notree="false" - noindex="false" - nohelp="false" - nonavbar="false" - serialwarn="false" - encoding="UTF-8" - linksource="false" - breakiterator="false"> - <classpath refid="build.classpath"/> - </javadoc> - </target> - - <!-- ====================================================================== --> - <!-- Package target --> - <!-- ====================================================================== --> - - <target name="package" depends="compile,test" description="Package the application"> - <jar jarfile="${build.dir}/${build.finalName}.jar" - compress="true" - index="false" - basedir="${build.outputDir}" - excludes="**/package.html"> - <manifest> - <attribute name="Implementation-Title" value="${project.name}"/> - <attribute name="Implementation-URL" value="${project.url}${project.artifactId}/"/> - <attribute name="Implementation-Vendor" value="${project.organization.name}"/> - <attribute name="Implementation-Vendor-Id" value="${project.groupId}"/> - <attribute name="Implementation-Version" value="${project.version}"/> - <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> - <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> - <attribute name="JavaPackages-Version" value="${project.version}"/> - <attribute name="Specification-Title" value="${project.name}"/> - <attribute name="Specification-Vendor" value="${project.organization.name}"/> - <attribute name="Specification-Version" value="${spec.version}"/> - </manifest> - </jar> - </target> - - <!-- ====================================================================== --> - <!-- A dummy target for the package named after the type it creates --> - <!-- ====================================================================== --> - - <target name="jar" depends="package" description="Builds the jar for the application"/> - -</project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-plugins/modello-plugin-snakeyaml/build.xml new/modello-plugins/modello-plugin-snakeyaml/build.xml --- old/modello-plugins/modello-plugin-snakeyaml/build.xml 2019-03-12 08:39:45.326304654 +0100 +++ new/modello-plugins/modello-plugin-snakeyaml/build.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,199 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project name="modello-plugin-snakeyaml" default="package" basedir="."> - - <!-- ====================================================================== --> - <!-- Build environment properties --> - <!-- ====================================================================== --> - - <include file="../../common.xml"/> - <property file="build.properties"/> - - <property name="project.artifactId" value="modello-plugin-snakeyaml"/> - <property name="project.name" value="Modello SnakeYaml Plugin"/> - - <property name="build.finalName" value="${project.artifactId}-${project.version}"/> - <property name="build.dir" value="target"/> - <property name="build.outputDir" value="${build.dir}/classes"/> - <property name="build.srcDir" value="src/main/java"/> - <property name="build.resourceDir" value="src/main/resources"/> - <property name="build.testOutputDir" value="${build.dir}/test-classes"/> - <property name="build.testDir" value="src/test/java"/> - <property name="build.testResourceDir" value="src/test/resources"/> - <property name="test.reports" value="${build.dir}/test-reports"/> - <property name="reporting.outputDirectory" value="${build.dir}/site"/> - - <!-- ====================================================================== --> - <!-- Defining classpaths --> - <!-- ====================================================================== --> - - <path id="build.classpath"> - <pathelement location="../../modello-core/target/classes"/> - <pathelement location="../modello-plugin-java/target/classes"/> - <pathelement location="../modello-plugin-xml/target/classes"/> - <fileset dir="../../lib"> - <!-- plexus-build-api-0.0.7 plexus-utils-3.0.24 plexus-container-default-1.7 - plexus-classworlds-2.5.1 xbean-reflect-3.7 google-collections-1.0 - snakeyaml-1.12 --> - <include name="**/*.jar"/> - </fileset> - <pathelement location="${repo.local}/org/yaml/snakeyaml/1.12/snakeyaml-1.12.jar"/> - </path> - <path id="build.test.classpath"> - <pathelement location="../../modello-core/target/classes"/> - <pathelement location="../../modello-test/target/classes"/> - <pathelement location="../modello-plugin-java/target/classes"/> - <pathelement location="../modello-plugin-xml/target/classes"/> - <fileset dir="../../lib"> - <!-- plexus-build-api-0.0.7 plexus-utils-3.0.24 plexus-container-default-1.7 - plexus-classworlds-2.5.1 xbean-reflect-3.7 google-collections-1.0 - plexus-compiler-javac-2.8.2 plexus-compiler-api-2.8.2 junit-3.8.2 - xmlunit-1.2 snakeyaml-1.12 --> - <include name="**/*.jar"/> - </fileset> - </path> - - <!-- ====================================================================== --> - <!-- Cleaning up target --> - <!-- ====================================================================== --> - - <target name="clean" description="Clean the output directory"> - <delete dir="${build.dir}"/> - </target> - - <!-- ====================================================================== --> - <!-- Compilation target --> - <!-- ====================================================================== --> - - <target name="compile" description="Compile the code"> - <mkdir dir="${build.outputDir}"/> - <javac destdir="${build.outputDir}" - nowarn="false" - debug="true" - optimize="false" - deprecation="true" - target="${compiler.target}" - encoding="UTF-8" - verbose="false" - fork="false" - source="${compiler.source}"> - <src> - <pathelement location="${build.srcDir}"/> - </src> - <classpath refid="build.classpath"/> - </javac> - <copy todir="${build.outputDir}"> - <fileset dir="${build.resourceDir}"/> - </copy> - </target> - - <!-- ====================================================================== --> - <!-- Test-compilation target --> - <!-- ====================================================================== --> - - <target name="compile-tests" - depends="compile" - description="Compile the test code" - unless="test.skip"> - <mkdir dir="${build.testOutputDir}"/> - </target> - - <!-- ====================================================================== --> - <!-- Run all tests --> - <!-- ====================================================================== --> - - <target name="test" - depends="compile-tests, junit-missing" - unless="junit.skipped" - description="Run the test cases"/> - - <target name="test-junit-present"> - <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/> - </target> - - <target name="test-junit-status" - depends="test-junit-present"> - <condition property="junit.missing"> - <and> - <isfalse value="${junit.present}"/> - <isfalse value="${test.skip}"/> - </and> - </condition> - <condition property="junit.skipped"> - <or> - <isfalse value="${junit.present}"/> - <istrue value="${test.skip}"/> - </or> - </condition> - </target> - - <target name="junit-missing" - depends="test-junit-status" - if="junit.missing"> - <echo>=================================== WARNING ===================================</echo> - <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo> - <echo>===============================================================================</echo> - </target> - - <!-- ====================================================================== --> - <!-- Javadoc target --> - <!-- ====================================================================== --> - - <target name="javadoc" description="Generates the Javadoc of the application"> - <javadoc sourcepath="${build.srcDir}" - packagenames="*" - destdir="${reporting.outputDirectory}/apidocs" - access="protected" - source="${compiler.source}" - verbose="false" - version="true" - use="true" - author="true" - splitindex="false" - nodeprecated="false" - nodeprecatedlist="false" - notree="false" - noindex="false" - nohelp="false" - nonavbar="false" - serialwarn="false" - encoding="UTF-8" - linksource="false" - breakiterator="false"> - <classpath refid="build.classpath"/> - </javadoc> - </target> - - <!-- ====================================================================== --> - <!-- Package target --> - <!-- ====================================================================== --> - - <target name="package" depends="compile,test" description="Package the application"> - <jar jarfile="${build.dir}/${build.finalName}.jar" - compress="true" - index="false" - basedir="${build.outputDir}" - excludes="**/package.html"> - <manifest> - <attribute name="Implementation-Title" value="${project.name}"/> - <attribute name="Implementation-URL" value="${project.url}${project.artifactId}/"/> - <attribute name="Implementation-Vendor" value="${project.organization.name}"/> - <attribute name="Implementation-Vendor-Id" value="${project.groupId}"/> - <attribute name="Implementation-Version" value="${project.version}"/> - <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> - <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> - <attribute name="JavaPackages-Version" value="${project.version}"/> - <attribute name="Specification-Title" value="${project.name}"/> - <attribute name="Specification-Vendor" value="${project.organization.name}"/> - <attribute name="Specification-Version" value="${spec.version}"/> - </manifest> - </jar> - </target> - - <!-- ====================================================================== --> - <!-- A dummy target for the package named after the type it creates --> - <!-- ====================================================================== --> - - <target name="jar" depends="package" description="Builds the jar for the application"/> - -</project> ++++++ modello-cli-domasxpp3.patch ++++++ --- /var/tmp/diff_new_pack.CeQgRf/_old 2022-05-13 23:03:28.299139667 +0200 +++ /var/tmp/diff_new_pack.CeQgRf/_new 2022-05-13 23:03:28.303139671 +0200 @@ -1,6 +1,22 @@ ---- modello-1.9.1/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java 2019-03-15 15:06:08.911975772 +0100 -+++ modello-1.9.1/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java 2019-03-15 15:07:02.920265437 +0100 -@@ -121,6 +121,11 @@ +--- 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 ); + } ++ 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)" ); ++ ++ usage(); ++ ++ System.exit( 1 ); ++ } + + parameters.setProperty( ModelloParameterConstants.OUTPUT_JAVA_SOURCE, javaSource ); + +@@ -121,6 +130,11 @@ { parameters.setProperty( ModelloParameterConstants.ENCODING, args[6] ); } @@ -12,12 +28,12 @@ } // ---------------------------------------------------------------------- -@@ -130,6 +135,6 @@ +@@ -130,6 +144,6 @@ private static void usage() { System.err.println( "Usage: modello <model> <outputType> <output directory> <modelVersion> <packageWithVersion>" -- + "<useJava5> [<encoding>]" ); -+ + " <useJava5> [<encoding> [<domAsXpp3>]]" ); +- + "<javaSource> [<encoding>]" ); ++ + " <javaSource> [<encoding> [<domAsXpp3>]]" ); } }
