Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package modello for openSUSE:Factory checked in at 2026-09-29 17:49:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/modello (Old) and /work/SRC/openSUSE:Factory/.modello.new.383539 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "modello" Tue Sep 29 17:49:40 2026 rev:30 rq:1381223 version:2.8.1 Changes: -------- +++ only whitespace diff in changes, re-diffing --- /work/SRC/openSUSE:Factory/modello/modello.changes 2026-09-11 18:07:13.122615261 +0200 +++ /work/SRC/openSUSE:Factory/.modello.new.383539/modello.changes 2026-09-29 17:51:10.986723064 +0200 @@ -1,0 +2,9 @@ +Mon Sep 28 07:00:20 UTC 2026 - Fridrich Strba <[email protected]> + +- Create modello-ant-task and distribute it as a separate package +- Added patch: + * 0003-Integrate-modello-ant-task-to-modello-source-tree.patch + + backporting our pull request creating modello ant task to + run modello generators from ant build. + +------------------------------------------------------------------- New: ---- 0003-Integrate-modello-ant-task-to-modello-source-tree.patch ----------(New B)---------- New:/work/SRC/openSUSE:Factory/.modello.new.383539/modello.changes-- Added patch: /work/SRC/openSUSE:Factory/.modello.new.383539/modello.changes: * 0003-Integrate-modello-ant-task-to-modello-source-tree.patch /work/SRC/openSUSE:Factory/.modello.new.383539/modello.changes- + backporting our pull request creating modello ant task to ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ modello.spec ++++++ --- /var/tmp/diff_new_pack.h2nMu8/_old 2026-09-29 17:51:11.825758099 +0200 +++ /var/tmp/diff_new_pack.h2nMu8/_new 2026-09-29 17:51:11.827758183 +0200 @@ -28,6 +28,7 @@ Source100: %{name}-build.tar.xz Patch0: 0001-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch Patch1: 0002-Handle-also-the-velocity-stuff-in-ModelloCli.patch +Patch2: 0003-Integrate-modello-ant-task-to-modello-source-tree.patch BuildRequires: ant BuildRequires: atinject BuildRequires: fdupes @@ -93,6 +94,14 @@ unit-tests, including sample models and xml files to test every feature for every plugin. +%package ant-task +Summary: Modello Ant Task +Group: Development/Libraries/Java +Requires: %{name} = %{version} + +%description ant-task +Modello Ant Task enables the use of Modello in Apache Ant builds. + %package javadoc Summary: Javadoc for %{name} Group: Development/Libraries/Java @@ -117,6 +126,7 @@ %build mkdir -p lib build-jar-repository -s lib \ + ant/ant \ atinject \ guava/guava \ jackson-core \ @@ -148,7 +158,7 @@ # javadoc install -dm 0755 %{buildroot}%{_javadocdir}/%{name} -for i in core test; do +for i in core test ant-task; do install -pm 0644 %{name}-${i}/target/%{name}-${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-${i}.jar %{mvn_install_pom} %{name}-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-${i}.pom %add_maven_depmap %{name}/%{name}-${i}.pom %{name}/%{name}-${i}.jar -f ${i} @@ -169,10 +179,43 @@ # script %jpackage_script org.codehaus.modello.ModelloCli "" "-Dguice_custom_class_loading=CHILD" modello:aopalliance:atinject:commons-lang3:google-guice:guava:jackson-core:jakarta-inject:javadoc-parser:jsoup/jsoup:objectweb-asm/asm:plexus/plexus-build-api:plexus/plexus-build-api0:plexus/classworlds:plexus-containers/plexus-component-annotations:plexus/utils:plexus/xml:org.eclipse.sisu.inject:org.eclipse.sisu.plexus:slf4j/api:slf4j/simple:snakeyaml:velocity-engine/velocity-engine-core %{name} true +# Ant config +install -dm 0755 %{buildroot}%{_sysconfdir}/ant.d +echo "modello-ant-task" \ + "modello" \ + "aopalliance" \ + "atinject" \ + "commons-lang3" \ + "google-guice" \ + "guava" \ + "jackson-core" \ + "jakarta-inject" \ + "javadoc-parser" \ + "jsoup/jsoup" \ + "objectweb-asm" \ + "plexus/plexus-build-api" \ + "plexus/plexus-build-api0" \ + "plexus/classworlds" \ + "plexus-containers/plexus-component-annotations" \ + "plexus/utils" \ + "plexus/xml" \ + "org.eclipse.sisu.inject" \ + "org.eclipse.sisu.plexus" \ + "slf4j/api" \ + "slf4j/simple" \ + "snakeyaml" \ + "velocity-engine/velocity-engine-core" \ + >%{buildroot}%{_sysconfdir}/ant.d/%{name} + %files -f .mfiles -f .mfiles-core %license LICENSE.txt LICENSE-2.0.txt %{_bindir}/* +%files ant-task -f .mfiles-ant-task +%config(noreplace) %{_sysconfdir}/ant.d/%{name} +%doc modello-ant-task/README.md +%license LICENSE.txt LICENSE-2.0.txt + %files test -f .mfiles-test %license LICENSE.txt LICENSE-2.0.txt ++++++ 0003-Integrate-modello-ant-task-to-modello-source-tree.patch ++++++ ++++ 1627 lines (skipped) ++++++ _scmsync.obsinfo ++++++ --- /var/tmp/diff_new_pack.h2nMu8/_old 2026-09-29 17:51:11.926762317 +0200 +++ /var/tmp/diff_new_pack.h2nMu8/_new 2026-09-29 17:51:11.930762484 +0200 @@ -1,6 +1,6 @@ -mtime: 1788992573 -commit: f0de8270a7e053eddfe81f9213bcc945ac10c386d61e9f4d594bdf4d3a3bfc41 +mtime: 1790578969 +commit: 67129049f2f61a63e0651442703ea3e800081bae38bd7f0fdea42e2eb0d1c0c0 url: https://src.opensuse.org/java-packages/modello -revision: f0de8270a7e053eddfe81f9213bcc945ac10c386d61e9f4d594bdf4d3a3bfc41 +revision: 67129049f2f61a63e0651442703ea3e800081bae38bd7f0fdea42e2eb0d1c0c0 projectscmsync: https://src.opensuse.org/java-packages/_ObsPrj ++++++ build.specials.obscpio ++++++ ++++++ build.specials.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/.gitignore new/.gitignore --- old/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/.gitignore 2026-09-28 09:02:49.000000000 +0200 @@ -0,0 +1 @@ +.osc ++++++ modello-build.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build.xml new/build.xml --- old/build.xml 2024-04-16 18:54:43.959846919 +0200 +++ new/build.xml 2026-09-28 08:35:04.565846525 +0200 @@ -10,6 +10,7 @@ <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"/> + <ant antfile="build.xml" dir="modello-ant-task" target="clean"/> </target> <!-- ====================================================================== --> @@ -20,6 +21,7 @@ <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"/> + <ant antfile="build.xml" dir="modello-ant-task" target="compile"/> </target> <!-- ====================================================================== --> @@ -30,6 +32,7 @@ <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"/> + <ant antfile="build.xml" dir="modello-ant-task" target="compile-tests"/> </target> <!-- ====================================================================== --> @@ -40,6 +43,7 @@ <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"/> + <ant antfile="build.xml" dir="modello-ant-task" target="test"/> </target> <!-- ====================================================================== --> @@ -50,6 +54,7 @@ <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"/> + <ant antfile="build.xml" dir="modello-ant-task" target="javadoc"/> </target> <!-- ====================================================================== --> @@ -60,6 +65,7 @@ <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"/> + <ant antfile="build.xml" dir="modello-ant-task" target="package"/> </target> </project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-ant-task/build.xml new/modello-ant-task/build.xml --- old/modello-ant-task/build.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/modello-ant-task/build.xml 2026-09-28 08:37:49.623770198 +0200 @@ -0,0 +1,238 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="modello-ant-task" default="package" basedir="."> + + <!-- ====================================================================== --> + <!-- Build environment properties --> + <!-- ====================================================================== --> + + <include file="../common.xml"/> + <property file="build.properties"/> + + <property name="project.artifactId" value="modello-ant-task"/> + <property name="project.name" value="Modello Ant Task"/> + + <property name="compiler.release" value="8"/> + <property name="compiler.source" value="1.${compiler.release}"/> + <property name="compiler.target" value="${compiler.source}"/> + + <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="reporting.outputDirectory" value="${build.dir}/site"/> + + <!-- ====================================================================== --> + <!-- Defining classpaths --> + <!-- ====================================================================== --> + + <path id="build.classpath"> + <pathelement location="../modello-core/target/classes"/> + <fileset dir="../lib"> + <include name="**/*.jar"/> + </fileset> + </path> + <path id="build.test.classpath"> + <pathelement location="../modello-core/target/classes"/> + <pathelement location="../modello-test/target/classes"/> + <fileset dir="../lib"> + <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" + release="${compiler.release}" + target="${compiler.target}" + 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" + release="${compiler.release}" + 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" + locale="en" + version="true" + use="true" + author="true" + splitindex="false" + nodeprecated="false" + nodeprecatedlist="false" + notree="false" + noindex="false" + nohelp="false" + nonavbar="false" + serialwarn="false" + charset="ISO-8859-1" + 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="Automatic-Module-Name" value="org.codehaus.modello.ant.task"/> + <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>
