Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package modello for openSUSE:Factory checked in at 2024-05-05 12:10:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/modello (Old) and /work/SRC/openSUSE:Factory/.modello.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "modello" Sun May 5 12:10:36 2024 rev:16 rq:1171906 version:2.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/modello/modello-maven-plugin.changes 2024-05-03 10:34:30.647358117 +0200 +++ /work/SRC/openSUSE:Factory/.modello.new.1880/modello-maven-plugin.changes 2024-05-05 12:10:55.920194548 +0200 @@ -1,0 +2,27 @@ +Sat May 4 12:02:36 UTC 2024 - Fridrich Strba <[email protected]> + +- Upgrade to upstream version 2.4.0 + * New features and improvements + + Keep license structure + + Support addition of license header to generated files + + Make generated code - Java 8 based by default + + threadsafety + * Bug Fixes + + Revert snakeyaml to 1.33 (as 2.x is not fully compatible with + 1.x). This change is reverted and SnakeYaml fixed by the + 0003-Fix-Snakeyaml.patch +- Modified patches: + * 0001-Fix-ModelloCli-after-moving-from-Plexus-to-JSR330.patch + * 0002-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch + * 0003-Fix-Snakeyaml.patch + + rediff to changed context + +------------------------------------------------------------------- +Fri May 3 16:50:54 UTC 2024 - Fridrich Strba <[email protected]> + +- Added patch: + * 0003-Fix-Snakeyaml.patch + + patch to fix the modello-plugin-snakeyaml with SnakeYaml 2.2 + + https://github.com/codehaus-plexus/modello/pull/439 + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/modello/modello.changes 2024-05-03 10:34:30.663358698 +0200 +++ /work/SRC/openSUSE:Factory/.modello.new.1880/modello.changes 2024-05-05 12:10:56.040198893 +0200 @@ -1,0 +2,27 @@ +Sat May 4 12:02:36 UTC 2024 - Fridrich Strba <[email protected]> + +- Upgrade to upstream version 2.4.0 + * New features and improvements + + Keep license structure + + Support addition of license header to generated files + + Make generated code - Java 8 based by default + + threadsafety + * Bug Fixes + + Revert snakeyaml to 1.33 (as 2.x is not fully compatible with + 1.x). This change is reverted and SnakeYaml fixed by the + 0003-Fix-Snakeyaml.patch +- Modified patches: + * 0001-Fix-ModelloCli-after-moving-from-Plexus-to-JSR330.patch + * 0002-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch + * 0003-Fix-Snakeyaml.patch + + rediff to changed context + +------------------------------------------------------------------- +Fri May 3 16:50:54 UTC 2024 - Fridrich Strba <[email protected]> + +- Added patch: + * 0003-Fix-Snakeyaml.patch + + patch to fix the modello-plugin-snakeyaml with SnakeYaml 2.2 + + https://github.com/codehaus-plexus/modello/pull/439 + +------------------------------------------------------------------- @@ -17 +44 @@ -- Upgrade to upstrem version 2.3.0 +- Upgrade to upstream version 2.3.0 Old: ---- modello-2.3.0-source-release.zip New: ---- 0003-Fix-Snakeyaml.patch modello-2.4.0-source-release.zip BETA DEBUG BEGIN: New:/work/SRC/openSUSE:Factory/.modello.new.1880/modello-maven-plugin.changes- 1.x). This change is reverted and SnakeYaml fixed by the /work/SRC/openSUSE:Factory/.modello.new.1880/modello-maven-plugin.changes: 0003-Fix-Snakeyaml.patch /work/SRC/openSUSE:Factory/.modello.new.1880/modello-maven-plugin.changes-- Modified patches: -- /work/SRC/openSUSE:Factory/.modello.new.1880/modello.changes- 1.x). This change is reverted and SnakeYaml fixed by the /work/SRC/openSUSE:Factory/.modello.new.1880/modello.changes: 0003-Fix-Snakeyaml.patch /work/SRC/openSUSE:Factory/.modello.new.1880/modello.changes-- Modified patches: BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ modello-maven-plugin.spec ++++++ --- /var/tmp/diff_new_pack.2LxqSt/_old 2024-05-05 12:10:57.572254338 +0200 +++ /var/tmp/diff_new_pack.2LxqSt/_new 2024-05-05 12:10:57.576254483 +0200 @@ -19,7 +19,7 @@ %global parent modello %global subname maven-plugin Name: %{parent}-%{subname} -Version: 2.3.0 +Version: 2.4.0 Release: 0 Summary: Modello Maven Plugin License: Apache-2.0 AND MIT @@ -29,6 +29,7 @@ Source1: https://www.apache.org/licenses/LICENSE-2.0.txt Patch0: 0001-Fix-ModelloCli-after-moving-from-Plexus-to-JSR330.patch Patch1: 0002-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch +Patch2: 0003-Fix-Snakeyaml.patch BuildRequires: fdupes BuildRequires: maven-local BuildRequires: unzip @@ -84,6 +85,7 @@ %setup -q -n %{parent}-%{version} %patch -P 0 -p1 %patch -P 1 -p1 +%patch -P 2 -p1 cp -p %{SOURCE1} LICENSE %pom_remove_plugin :maven-site-plugin ++++++ modello.spec ++++++ --- /var/tmp/diff_new_pack.2LxqSt/_old 2024-05-05 12:10:57.600255351 +0200 +++ /var/tmp/diff_new_pack.2LxqSt/_new 2024-05-05 12:10:57.604255496 +0200 @@ -17,7 +17,7 @@ Name: modello -Version: 2.3.0 +Version: 2.4.0 Release: 0 Summary: Modello Data Model toolkit License: Apache-2.0 AND MIT @@ -28,6 +28,7 @@ Source100: %{name}-build.tar.xz Patch0: 0001-Fix-ModelloCli-after-moving-from-Plexus-to-JSR330.patch Patch1: 0002-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch +Patch2: 0003-Fix-Snakeyaml.patch BuildRequires: ant BuildRequires: atinject BuildRequires: fdupes @@ -97,6 +98,7 @@ %setup -q -a100 %patch -P 0 -p1 %patch -P 1 -p1 +%patch -P 2 -p1 cp -p %{SOURCE1} LICENSE %pom_remove_plugin :maven-site-plugin ++++++ 0001-Fix-ModelloCli-after-moving-from-Plexus-to-JSR330.patch ++++++ --- /var/tmp/diff_new_pack.2LxqSt/_old 2024-05-05 12:10:57.624256220 +0200 +++ /var/tmp/diff_new_pack.2LxqSt/_new 2024-05-05 12:10:57.628256365 +0200 @@ -1,7 +1,7 @@ -From 90352d3cd8de0382be73d5ce16b5f9d96469e39c Mon Sep 17 00:00:00 2001 +From cc800846da128d795c69142d4ae0c33c0677e943 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <[email protected]> Date: Sat, 13 Apr 2024 15:14:24 +0200 -Subject: [PATCH] Fix ModelloCli after moving from Plexus to JSR330 +Subject: [PATCH 1/3] Fix ModelloCli after moving from Plexus to JSR330 --- .../java/org/codehaus/modello/Modello.java | 26 ++++++++++++++----- @@ -9,7 +9,7 @@ 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/modello-core/src/main/java/org/codehaus/modello/Modello.java b/modello-core/src/main/java/org/codehaus/modello/Modello.java -index 2b73884f..9e3f8072 100644 +index 00fb7114..0572fce6 100644 --- a/modello-core/src/main/java/org/codehaus/modello/Modello.java +++ b/modello-core/src/main/java/org/codehaus/modello/Modello.java @@ -22,8 +22,6 @@ package org.codehaus.modello; @@ -20,8 +20,8 @@ - import java.io.Reader; import java.io.Writer; - import java.util.Properties; -@@ -31,17 +29,33 @@ import java.util.Properties; + import java.util.Map; +@@ -31,17 +29,33 @@ import java.util.Map; import org.codehaus.modello.core.ModelloCore; import org.codehaus.modello.model.Model; import org.codehaus.modello.model.ModelValidationException; @@ -58,21 +58,21 @@ + } } - public void generate(Reader modelReader, String outputType, Properties parameters) + public void generate(Reader modelReader, String outputType, Map<String, Object> parameters) diff --git a/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java b/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java -index ba8f029f..e9c9e079 100644 +index 1b4cd974..a75e4011 100644 --- a/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java +++ b/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java -@@ -25,7 +25,6 @@ package org.codehaus.modello; - import java.io.File; - import java.util.Properties; +@@ -26,7 +26,6 @@ import java.io.File; + import java.util.HashMap; + import java.util.Map; -import org.codehaus.plexus.DefaultPlexusContainer; import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.xml.XmlStreamReader; -@@ -40,7 +39,7 @@ public class ModelloCli { - private static Properties parameters; +@@ -41,7 +40,7 @@ public class ModelloCli { + private static Map<String, Object> parameters; public static void main(String[] args) throws Exception { - Modello modello = new DefaultPlexusContainer().lookup(Modello.class); ++++++ 0002-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch ++++++ --- /var/tmp/diff_new_pack.2LxqSt/_old 2024-05-05 12:10:57.640256799 +0200 +++ /var/tmp/diff_new_pack.2LxqSt/_new 2024-05-05 12:10:57.644256944 +0200 @@ -1,4 +1,4 @@ -From fa4864cc12b705ce55f3a01a71096223e920dc21 Mon Sep 17 00:00:00 2001 +From 8e04db4d5602a985ef4c5fa72cb862e9b4d6daf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <[email protected]> Date: Fri, 12 Apr 2024 09:37:47 +0200 Subject: [PATCH 2/3] Add support for domAsXpp3 and fail if the old Java5 @@ -9,10 +9,10 @@ 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java b/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java -index 19144947..579f56e3 100644 +index a75e4011..db40052c 100644 --- a/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java +++ b/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java -@@ -121,11 +121,24 @@ public class ModelloCli { +@@ -106,11 +106,24 @@ public class ModelloCli { System.exit(1); } @@ -25,19 +25,19 @@ + System.exit(1); + } + - parameters.setProperty(ModelloParameterConstants.OUTPUT_JAVA_SOURCE, javaSource); + parameters.put(ModelloParameterConstants.OUTPUT_JAVA_SOURCE, javaSource); if (args.length > 6) { - parameters.setProperty(ModelloParameterConstants.ENCODING, args[6]); + parameters.put(ModelloParameterConstants.ENCODING, args[6]); } + + if (args.length > 7) { -+ parameters.setProperty(ModelloParameterConstants.DOM_AS_XPP3, args[7]); ++ parameters.put(ModelloParameterConstants.DOM_AS_XPP3, args[7]); + } } // ---------------------------------------------------------------------- -@@ -134,6 +147,6 @@ public class ModelloCli { +@@ -119,6 +132,6 @@ public class ModelloCli { private static void usage() { System.err.println("Usage: modello <model> <outputType> <output directory> <modelVersion> <packageWithVersion>" ++++++ 0003-Fix-Snakeyaml.patch ++++++ ++++ 1850 lines (skipped) ++++++ modello-2.3.0-source-release.zip -> modello-2.4.0-source-release.zip ++++++ ++++ 4333 lines of diff (skipped) ++++++ modello-build.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/common.xml new/common.xml --- old/common.xml 2024-04-16 18:56:26.263884618 +0200 +++ new/common.xml 2024-05-04 13:58:52.329708924 +0200 @@ -3,7 +3,7 @@ <project name="common" basedir="."> <property file="build.properties"/> - <property name="project.version" value="2.3.0"/> + <property name="project.version" value="2.4.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/"/>
