Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package modello for openSUSE:Factory checked in at 2021-04-27 21:34:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/modello (Old) and /work/SRC/openSUSE:Factory/.modello.new.12324 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "modello" Tue Apr 27 21:34:20 2021 rev:4 rq:888507 version:1.11 Changes: -------- --- /work/SRC/openSUSE:Factory/modello/modello-maven-plugin.changes 2019-11-26 16:55:29.604184466 +0100 +++ /work/SRC/openSUSE:Factory/.modello.new.12324/modello-maven-plugin.changes 2021-04-27 21:34:28.323965013 +0200 @@ -1,0 +2,6 @@ +Mon Apr 26 10:52:49 UTC 2021 - Fridrich Strba <[email protected]> + +- Upgrade to upstream version 1.11 +- Depend on the jackson and jsonschema plugins too + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/modello/modello.changes 2019-11-26 16:55:29.680184441 +0100 +++ /work/SRC/openSUSE:Factory/.modello.new.12324/modello.changes 2021-04-27 21:34:28.339965040 +0200 @@ -1,0 +2,6 @@ +Mon Apr 26 10:52:49 UTC 2021 - Fridrich Strba <[email protected]> + +- Upgrade to upstream version 1.11 +- Build the jackson and jsonschema plugins too + +------------------------------------------------------------------- Old: ---- modello-1.10.0-source-release.zip New: ---- modello-1.11-source-release.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ modello-maven-plugin.spec ++++++ --- /var/tmp/diff_new_pack.vFWvI0/_old 2021-04-27 21:34:28.911965981 +0200 +++ /var/tmp/diff_new_pack.vFWvI0/_new 2021-04-27 21:34:28.911965981 +0200 @@ -1,7 +1,7 @@ # # spec file for package modello-maven-plugin # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,13 +19,13 @@ %global parent modello %global subname maven-plugin Name: %{parent}-%{subname} -Version: 1.10.0 +Version: 1.11 Release: 0 Summary: Modello Maven Plugin -License: MIT AND Apache-2.0 +License: Apache-2.0 AND MIT Group: Development/Libraries/Java -URL: http://codehaus-plexus.github.io/modello/modello-maven-plugin -Source0: http://repo2.maven.org/maven2/org/codehaus/%{parent}/%{parent}/%{version}/%{parent}-%{version}-source-release.zip +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 BuildRequires: fdupes BuildRequires: maven-local @@ -38,8 +38,10 @@ 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} ++++++ modello.spec ++++++ --- /var/tmp/diff_new_pack.vFWvI0/_old 2021-04-27 21:34:28.931966014 +0200 +++ /var/tmp/diff_new_pack.vFWvI0/_new 2021-04-27 21:34:28.935966021 +0200 @@ -1,7 +1,7 @@ # # spec file for package modello # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,19 +17,22 @@ Name: modello -Version: 1.10.0 +Version: 1.11 Release: 0 Summary: Modello Data Model toolkit -License: MIT AND Apache-2.0 +License: Apache-2.0 AND MIT Group: Development/Libraries/Java -URL: http://codehaus-plexus.github.io/modello -Source0: http://repo2.maven.org/maven2/org/codehaus/%{name}/%{name}/%{version}/%{name}-%{version}-source-release.zip +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 Source100: %{name}-build.tar.xz Patch0: modello-cli-domasxpp3.patch BuildRequires: ant BuildRequires: fdupes BuildRequires: guava +BuildRequires: jackson-annotations +BuildRequires: jackson-core +BuildRequires: jackson-databind BuildRequires: javapackages-local BuildRequires: jsoup BuildRequires: junit @@ -43,9 +46,11 @@ Requires: guava # Explicit javapackages-tools requires since modello script uses # /usr/share/java-utils/java-functions -Requires: guava 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) @@ -81,16 +86,12 @@ # Avoid using Maven 2.x APIs sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml -%pom_disable_module modello-plugin-jackson modello-plugins -%pom_disable_module modello-plugin-jsonschema modello-plugins -%pom_remove_dep :modello-plugin-jackson modello-maven-plugin -%pom_remove_dep :modello-plugin-jsonschema 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 + plexus-compiler/plexus-compiler-javac jsoup snakeyaml guava/guava xbean/xbean-reflect \ + jackson-core jackson-annotations jackson-databind # skip tests because we have too old xmlunit in openSUSE now (1.5) %{ant} \ -Dtest.skip=true \ @@ -104,7 +105,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; do +for i in converters dom4j java jdom sax snakeyaml stax xdoc xml xpp3 xsd jackson jsonschema; do install -pm 0644 %{name}-plugins/%{name}-plugin-${i}/target/%{name}-plugin-${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-plugin-${i}.jar done @@ -122,7 +123,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; do +for i in converters dom4j java jdom sax snakeyaml stax xdoc xml xpp3 xsd jackson jsonschema; 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 @@ -135,7 +136,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; do +for i in converters dom4j java jdom sax snakeyaml stax xdoc xml xpp3 xsd jackson jsonschema; 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 ++++++ modello-build.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/common.xml new/common.xml --- old/common.xml 2019-11-21 15:55:04.632110872 +0100 +++ new/common.xml 2021-04-23 08:46:52.194105294 +0200 @@ -3,13 +3,13 @@ <project name="common" basedir="."> <property file="build.properties"/> - <property name="project.version" value="1.10.0"/> + <property name="project.version" value="1.11"/> <property name="project.groupId" value="org.codehaus.modello"/> <property name="project.organization.name" value="Codehaus Plexus"/> - <property name="project.organization.url" value="http://codehaus-plexus.github.io/"/> + <property name="project.organization.url" value="https://codehaus-plexus.github.io/"/> <property name="project.url" value="${project.organization.url}modello/"/> - <property name="spec.version" value="1.10"/> + <property name="spec.version" value="${project.version}"/> <property name="compiler.source" value="1.7"/> <property name="compiler.target" value="${compiler.source}"/> 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 2019-03-12 07:56:31.057201667 +0100 +++ new/modello-plugins/build.xml 2021-04-26 12:14:51.976443859 +0200 @@ -16,6 +16,8 @@ <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> @@ -34,6 +36,8 @@ <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> @@ -52,6 +56,8 @@ <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> @@ -70,6 +76,8 @@ <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> @@ -88,6 +96,8 @@ <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> @@ -106,6 +116,8 @@ <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 1970-01-01 01:00:00.000000000 +0100 +++ new/modello-plugins/modello-plugin-jackson/build.xml 2021-04-26 12:17:47.297492534 +0200 @@ -0,0 +1,243 @@ +<?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 1970-01-01 01:00:00.000000000 +0100 +++ new/modello-plugins/modello-plugin-jsonschema/build.xml 2021-04-26 12:19:36.362145015 +0200 @@ -0,0 +1,243 @@ +<?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>
