Accepting request 1283740 from Java:packages

Do not bomb on empty velocity parameters

OBS-URL: https://build.opensuse.org/request/show/1283740
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/modello?expand=0&rev=24

0001-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch

@@ -1,7 +1,7 @@
-From c692c46aa1898e80c225aaf99724207bd98d5bf7 Mon Sep 17 00:00:00 2001
+From 4f427be2900c95997f8e86fe0e8ec01ba3fcf9f4 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
 Date: Fri, 12 Apr 2024 09:37:47 +0200
-Subject: [PATCH 3/3] Add support for domAsXpp3 and fail if the old Java5
+Subject: [PATCH 1/2] Add support for domAsXpp3 and fail if the old Java5
  parameter is used
 
 ---
@@ -9,7 +9,7 @@ Subject: [PATCH 3/3] Add support for domAsXpp3 and fail if the old Java5
  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 a75e4011..db40052c 100644
+index a75e4011e..db40052ce 100644
 --- a/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java
 +++ b/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java
 @@ -106,11 +106,24 @@ public class ModelloCli {
@@ -46,5 +46,5 @@ index a75e4011..db40052c 100644
      }
  }
 -- 
-2.45.1
+2.49.0
 

0002-Handle-also-the-velocity-stuff-in-ModelloCli.patch

@@ -0,0 +1,60 @@
+From bd8485edf7adec243890deaaeb20f45bd539e8b9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
+Date: Sat, 15 Mar 2025 08:04:34 +0100
+Subject: [PATCH 2/2] Handle also the velocity stuff in ModelloCli
+
+---
+ .../java/org/codehaus/modello/ModelloCli.java | 22 +++++++++++++++++--
+ 1 file changed, 20 insertions(+), 2 deletions(-)
+
+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 db40052ce..7bed3863a 100644
+--- a/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java
++++ b/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java
+@@ -23,8 +23,10 @@ package org.codehaus.modello;
+  */
+ 
+ import java.io.File;
++import java.util.Arrays;
+ import java.util.HashMap;
+ import java.util.Map;
++import java.util.stream.Collectors;
+ 
+ import org.codehaus.plexus.util.StringUtils;
+ import org.codehaus.plexus.util.xml.XmlStreamReader;
+@@ -124,6 +126,21 @@ public class ModelloCli {
+         if (args.length > 7) {
+             parameters.put(ModelloParameterConstants.DOM_AS_XPP3, args[7]);
+         }
++
++        if (args.length > 8 && StringUtils.equalsIgnoreCase(outputType, "velocity")) {
++            parameters.put("modello.velocity.basedir", args[8]);
++        }
++
++        if (args.length > 9 && StringUtils.equalsIgnoreCase(outputType, "velocity")) {
++            parameters.put("modello.velocity.templates", args[9]);
++        }
++
++        if (args.length > 10 && StringUtils.equalsIgnoreCase(outputType, "velocity")) {
++            parameters.put(
++                    "modello.velocity.parameters", (HashMap<String, String>) Arrays.asList(args[10].split(",")).stream()
++                            .map(s -> s.split("="))
++                            .collect(Collectors.toMap(e -> e[0], e -> e[1])));
++        }
+     }
+ 
+     // ----------------------------------------------------------------------
+@@ -131,7 +148,8 @@ public class ModelloCli {
+     // ----------------------------------------------------------------------
+ 
+     private static void usage() {
+-        System.err.println("Usage: modello <model> <outputType> <output directory> <modelVersion> <packageWithVersion>"
+-                + " <javaSource> [<encoding> [<domAsXpp3>]]");
++        System.err.println(
++                "Usage: modello <model> <outputType> <output directory> <modelVersion> <packageWithVersion>"
++                        + " <javaSource> [<encoding> [<domAsXpp3> [<velocityBaseDir> <velocityTemplates> <velocityParameters>]]] ");
+     }
+ }
+-- 
+2.49.0
+

0002-Update-build-get-rid-of-legacy-fix-CLI-452.patch

@@ -1,351 +0,0 @@
-From ba2e53e7b28fa126e030056921930e83a44e2494 Mon Sep 17 00:00:00 2001
-From: Tamas Cservenak <tamas@cservenak.net>
-Date: Wed, 5 Jun 2024 10:16:52 +0200
-Subject: [PATCH 2/3] Update build, get rid of legacy, fix CLI (#452)
-
-Port 90352d3cd8de0382be73d5ce16b5f9d96469e39c to this PR, CLI use nop logging, rest unchanged.
-
-Fixes #434
----
- modello-core/pom.xml                          | 84 ++++++++++++++-----
- .../java/org/codehaus/modello/Modello.java    | 17 ++--
- .../java/org/codehaus/modello/ModelloCli.java |  3 +-
- modello-maven-plugin/pom.xml                  | 38 ++++++---
- pom.xml                                       | 28 ++++---
- 5 files changed, 120 insertions(+), 50 deletions(-)
-
-diff --git a/modello-core/pom.xml b/modello-core/pom.xml
-index 4fffa729..2af513a2 100644
---- a/modello-core/pom.xml
-+++ b/modello-core/pom.xml
-@@ -19,47 +19,89 @@
-     <dependency>
-       <groupId>org.eclipse.sisu</groupId>
-       <artifactId>org.eclipse.sisu.plexus</artifactId>
--      <scope>provided</scope>
-+      <exclusions>
-+        <exclusion>
-+          <groupId>javax.annotation</groupId>
-+          <artifactId>javax.annotation-api</artifactId>
-+        </exclusion>
-+        <exclusion>
-+          <groupId>javax.enterprise</groupId>
-+          <artifactId>cdi-api</artifactId>
-+        </exclusion>
-+      </exclusions>
-     </dependency>
-     <dependency>
--      <groupId>org.sonatype.sisu</groupId>
--      <artifactId>sisu-guice</artifactId>
--      <classifier>no_aop</classifier>
-+      <groupId>com.google.inject</groupId>
-+      <artifactId>guice</artifactId>
-       <scope>runtime</scope>
-     </dependency>
-     <dependency>
-       <groupId>org.codehaus.plexus</groupId>
-       <artifactId>plexus-utils</artifactId>
-     </dependency>
--    <dependency>
--      <groupId>org.codehaus.plexus</groupId>
--      <artifactId>plexus-xml</artifactId>
--    </dependency>
-     <dependency>
-       <groupId>org.slf4j</groupId>
-       <artifactId>slf4j-api</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.slf4j</groupId>
--      <artifactId>slf4j-simple</artifactId>
--      <scope>test</scope>
-+      <artifactId>slf4j-nop</artifactId>
-+      <scope>runtime</scope>
-+      <optional>true</optional>
-     </dependency>
-   </dependencies>
- 
-   <build>
-     <plugins>
-       <plugin>
--        <artifactId>maven-assembly-plugin</artifactId>
--        <configuration>
--          <descriptorRefs>
--            <descriptorRef>jar-with-dependencies</descriptorRef>
--          </descriptorRefs>
--          <archive>
--            <manifest>
--              <mainClass>org.codehaus.modello.ModelloCli</mainClass>
--            </manifest>
--          </archive>
--        </configuration>
-+        <groupId>org.apache.maven.plugins</groupId>
-+        <artifactId>maven-shade-plugin</artifactId>
-+        <version>3.5.3</version>
-+        <executions>
-+          <execution>
-+            <id>cli</id>
-+            <goals>
-+              <goal>shade</goal>
-+            </goals>
-+            <phase>package</phase>
-+            <configuration>
-+              <shadedClassifierName>cli</shadedClassifierName>
-+              <createDependencyReducedPom>false</createDependencyReducedPom>
-+              <shadedArtifactAttached>true</shadedArtifactAttached>
-+              <transformers>
-+                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
-+                <transformer implementation="org.apache.maven.plugins.shade.resource.SisuIndexResourceTransformer" />
-+                <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer" />
-+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-+                  <manifestEntries>
-+                    <Main-Class>org.codehaus.modello.ModelloCli</Main-Class>
-+                    <Specification-Title>${project.artifactId}</Specification-Title>
-+                    <Specification-Version>${project.version}</Specification-Version>
-+                    <Implementation-Title>${project.artifactId}</Implementation-Title>
-+                    <Implementation-Version>${project.version}</Implementation-Version>
-+                    <Implementation-Vendor-Id>${project.groupId}</Implementation-Vendor-Id>
-+                  </manifestEntries>
-+                </transformer>
-+              </transformers>
-+              <filters>
-+                <filter>
-+                  <artifact>*:*</artifact>
-+                  <excludes>
-+                    <exclude>META-INF/MANIFEST.MF</exclude>
-+                    <exclude>META-INF/LICENSE</exclude>
-+                    <exclude>META-INF/LICENSE.txt</exclude>
-+                    <exclude>META-INF/DEPENDENCIES</exclude>
-+                    <exclude>META-INF/NOTICE</exclude>
-+                    <exclude>META-INF/NOTICE.txt</exclude>
-+                    <exclude>**/module-info.class</exclude>
-+                    <exclude>about.html</exclude>
-+                    <exclude>overview.html</exclude>
-+                  </excludes>
-+                </filter>
-+              </filters>
-+            </configuration>
-+          </execution>
-+        </executions>
-       </plugin>
-     </plugins>
-   </build>
-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 00fb7114..62cb7eb4 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;
-  * SOFTWARE.
-  */
- 
--import javax.inject.Inject;
--
- import java.io.Reader;
- import java.io.Writer;
- import java.util.Map;
-@@ -31,6 +29,9 @@ import java.util.Map;
- import org.codehaus.modello.core.ModelloCore;
- import org.codehaus.modello.model.Model;
- import org.codehaus.modello.model.ModelValidationException;
-+import org.codehaus.plexus.DefaultContainerConfiguration;
-+import org.codehaus.plexus.DefaultPlexusContainer;
-+import org.codehaus.plexus.PlexusConstants;
- 
- /**
-  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
-@@ -39,9 +40,15 @@ import org.codehaus.modello.model.ModelValidationException;
- public class Modello {
-     private final ModelloCore core;
- 
--    @Inject
--    public Modello(ModelloCore core) {
--        this.core = core;
-+    public Modello() throws ModelloException {
-+        try {
-+            this.core = new DefaultPlexusContainer(new DefaultContainerConfiguration()
-+                            .setClassPathScanning(PlexusConstants.SCANNING_INDEX)
-+                            .setAutoWiring(true))
-+                    .lookup(ModelloCore.class);
-+        } catch (Exception e) {
-+            throw new ModelloException("Error while starting plexus.", e);
-+        }
-     }
- 
-     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 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
-@@ -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;
- 
-@@ -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);
-+        Modello modello = new Modello();
- 
-         parseArgumentsFromCommandLine(args);
- 
-diff --git a/modello-maven-plugin/pom.xml b/modello-maven-plugin/pom.xml
-index cd8d38bd..0765c379 100644
---- a/modello-maven-plugin/pom.xml
-+++ b/modello-maven-plugin/pom.xml
-@@ -19,16 +19,35 @@
-   </prerequisites>
- 
-   <dependencies>
-+    <dependency>
-+      <groupId>org.codehaus.modello</groupId>
-+      <artifactId>modello-core</artifactId>
-+      <exclusions>
-+        <exclusion>
-+          <groupId>org.eclipse.sisu</groupId>
-+          <artifactId>org.eclipse.sisu.plexus</artifactId>
-+        </exclusion>
-+        <exclusion>
-+          <groupId>com.google.inject</groupId>
-+          <artifactId>guice</artifactId>
-+        </exclusion>
-+      </exclusions>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.codehaus.plexus</groupId>
-+      <artifactId>plexus-utils</artifactId>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.codehaus.plexus</groupId>
-+      <artifactId>plexus-build-api</artifactId>
-+    </dependency>
-+
-     <dependency>
-       <groupId>org.apache.maven</groupId>
-       <artifactId>maven-plugin-api</artifactId>
-       <version>${mavenVersion}</version>
-       <scope>provided</scope>
-     </dependency>
--    <dependency>
--      <groupId>org.codehaus.modello</groupId>
--      <artifactId>modello-core</artifactId>
--    </dependency>
-     <dependency>
-       <groupId>org.apache.maven</groupId>
-       <artifactId>maven-model</artifactId>
-@@ -41,10 +60,6 @@
-       <version>${mavenVersion}</version>
-       <scope>provided</scope>
-     </dependency>
--    <dependency>
--      <groupId>org.codehaus.plexus</groupId>
--      <artifactId>plexus-utils</artifactId>
--    </dependency>
-     <dependency>
-       <groupId>org.apache.maven.plugin-tools</groupId>
-       <artifactId>maven-plugin-annotations</artifactId>
-@@ -70,6 +85,7 @@
-     <dependency>
-       <groupId>org.codehaus.modello</groupId>
-       <artifactId>modello-plugin-java</artifactId>
-+      <scope>runtime</scope>
-     </dependency>
-     <dependency>
-       <groupId>org.codehaus.modello</groupId>
-@@ -114,11 +130,9 @@
-     <dependency>
-       <groupId>org.codehaus.modello</groupId>
-       <artifactId>modello-plugin-velocity</artifactId>
-+      <!-- Directly used -->
-     </dependency>
--    <dependency>
--      <groupId>org.codehaus.plexus</groupId>
--      <artifactId>plexus-build-api</artifactId>
--    </dependency>
-+
-     <dependency>
-       <groupId>org.slf4j</groupId>
-       <artifactId>slf4j-simple</artifactId>
-diff --git a/pom.xml b/pom.xml
-index 02bcc5de..fb63107f 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -194,7 +194,8 @@
-     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-     <jackson.version>2.17.0</jackson.version>
-     <jdom.version>2.0.2</jdom.version>
--    <mavenVersion>3.5.4</mavenVersion>
-+    <slf4j.version>1.7.36</slf4j.version>
-+    <mavenVersion>3.6.3</mavenVersion>
-     <!--
-       ! This controls the minimum java version
-       ! and also the version which is used
-@@ -297,18 +298,17 @@
-       <dependency>
-         <groupId>org.eclipse.sisu</groupId>
-         <artifactId>org.eclipse.sisu.plexus</artifactId>
--        <version>0.3.5</version>
-+        <version>0.9.0.M2</version>
-       </dependency>
-       <dependency>
--        <groupId>org.sonatype.sisu</groupId>
--        <artifactId>sisu-guice</artifactId>
--        <version>4.2.0</version>
--        <classifier>no_aop</classifier>
-+        <groupId>com.google.inject</groupId>
-+        <artifactId>guice</artifactId>
-+        <version>5.1.0</version>
-       </dependency>
-       <dependency>
-         <groupId>org.codehaus.plexus</groupId>
-         <artifactId>plexus-utils</artifactId>
--        <version>4.0.1</version>
-+        <version>3.5.1</version>
-       </dependency>
-       <dependency>
-         <groupId>org.codehaus.plexus</groupId>
-@@ -323,12 +323,17 @@
-       <dependency>
-         <groupId>org.slf4j</groupId>
-         <artifactId>slf4j-api</artifactId>
--        <version>1.7.36</version>
-+        <version>${slf4j.version}</version>
-+      </dependency>
-+      <dependency>
-+        <groupId>org.slf4j</groupId>
-+        <artifactId>slf4j-nop</artifactId>
-+        <version>${slf4j.version}</version>
-       </dependency>
-       <dependency>
-         <groupId>org.slf4j</groupId>
-         <artifactId>slf4j-simple</artifactId>
--        <version>1.7.36</version>
-+        <version>${slf4j.version}</version>
-       </dependency>
-       <dependency>
-         <groupId>junit</groupId>
-@@ -369,6 +374,9 @@
-               </goals>
-               <configuration>
-                 <rules>
-+                  <requireMavenVersion>
-+                    <version>${mavenVersion}</version>
-+                  </requireMavenVersion>
-                   <requireJavaVersion>
-                     <version>${javaVersion}</version>
-                   </requireJavaVersion>
-@@ -438,7 +446,7 @@
-           <plugin>
-             <groupId>org.codehaus.modello</groupId>
-             <artifactId>modello-maven-plugin</artifactId>
--            <version>2.0.0</version>
-+            <version>2.4.0</version>
-             <configuration>
-               <models>
-                 <model>src/main/mdo/modello.mdo</model>
--- 
-2.45.1
-

modello-2.5.1-source-release.zip

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1b47410cee967de9580d9dcee7ea7eaad957a75b0d946d6fe96294619c21af15
+size 1094995

modello-maven-plugin.changes

@@ -1,3 +1,57 @@
+-------------------------------------------------------------------
+Fri Jun  6 19:32:50 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Modified patch:
+  * 0002-Handle-also-the-velocity-stuff-in-ModelloCli.patch
+    + Do not bother with velocity parameters if the output type is
+      not "velocity"
+
+-------------------------------------------------------------------
+Wed Jun  4 15:13:12 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to upstream version 2.5.1
+  * New features and improvements
+    + Improve and add exceptions for singular method
+    + Fix Snakeyaml
+    + Restore singular method behavior like was in version 2.4.0
+  * Maintenance
+    + Partially migrate to JUnit 5
+    + Apply spotless re-formatting
+    + Update build, get rid of legacy, fix CLI
+    + Use distributionManagement from parent pom
+- Removed patches:
+  * 0001-Upgrade-to-SnakeYaml-2.2-439.patch
+  * 0002-Update-build-get-rid-of-legacy-fix-CLI-452.patch
+    + integrated in this version
+- Modified patches:
+  * 0003-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch
+    -> 0001-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch
+  * 0004-Handle-also-the-velocity-stuff-in-ModelloCli.patch
+    -> 0002-Handle-also-the-velocity-stuff-in-ModelloCli.patch
+    + rediff
+
+-------------------------------------------------------------------
+Sun Mar 16 20:11:46 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Added patch:
+  * 0004-Handle-also-the-velocity-stuff-in-ModelloCli.patch
+    + maven 4 is using velocity generater. Patch the ModelloCli.java
+      so that one can pass to it the velocity specific configuration
+      options
+- Fix the modello script classpath to be able to run the velocity
+  generator.
+
+-------------------------------------------------------------------
+Wed Oct  2 20:26:43 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Build against velocity-engine-core, since we can do it now without
+  introducing build cycles
+
+-------------------------------------------------------------------
+Mon Jun 10 14:01:25 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Add dependency on jakarta-inject, needed by google-guice 6.0.0
+
 -------------------------------------------------------------------
 Wed Jun  5 11:27:39 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 
@@ -62,7 +116,7 @@ Tue Apr 16 13:04:04 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 -------------------------------------------------------------------
 Sun Apr 14 06:13:08 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 
-- Upgrade to upstrem version 2.3.0
+- Upgrade to upstream version 2.3.0
   * Changes of version 2.3.0
     + Kill off dead Plexus
     + Fix for #366

modello-maven-plugin.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package modello-maven-plugin
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
 %global parent modello
 %global subname maven-plugin
 Name:           %{parent}-%{subname}
-Version:        2.4.0
+Version:        2.5.1
 Release:        0
 Summary:        Modello Maven Plugin
 License:        Apache-2.0 AND MIT
@@ -27,9 +27,8 @@ Group:          Development/Libraries/Java
 URL:            https://codehaus-plexus.github.io/modello/modello-maven-plugin
 Source0:        https://repo1.maven.org/maven2/org/codehaus/%{parent}/%{parent}/%{version}/%{parent}-%{version}-source-release.zip
 Source1:        https://www.apache.org/licenses/LICENSE-2.0.txt
-Patch0:         0001-Upgrade-to-SnakeYaml-2.2-439.patch
+Patch0:         0001-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch
-Patch1:         0002-Update-build-get-rid-of-legacy-fix-CLI-452.patch
+Patch1:         0002-Handle-also-the-velocity-stuff-in-ModelloCli.patch
-Patch2:         0003-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch
 BuildRequires:  fdupes
 BuildRequires:  maven-local
 BuildRequires:  unzip
@@ -83,9 +82,8 @@ API documentation for %{name}.
 
 %prep
 %setup -q -n %{parent}-%{version}
-%patch -P 0 -p1
+%autopatch -p1
-%patch -P 1 -p1
+
-%patch -P 2 -p1
 cp -p %{SOURCE1} .
 
 %pom_remove_plugin :maven-site-plugin
@@ -94,8 +92,6 @@ cp -p %{SOURCE1} .
 
 %pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 modello-core
 
-%pom_change_dep -r :velocity-engine-core :velocity
-
 %pom_remove_dep :jackson-bom
 
 %build

modello.changes

@@ -1,3 +1,57 @@
+-------------------------------------------------------------------
+Fri Jun  6 19:32:50 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Modified patch:
+  * 0002-Handle-also-the-velocity-stuff-in-ModelloCli.patch
+    + Do not bother with velocity parameters if the output type is
+      not "velocity"
+
+-------------------------------------------------------------------
+Wed Jun  4 15:13:12 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to upstream version 2.5.1
+  * New features and improvements
+    + Improve and add exceptions for singular method
+    + Fix Snakeyaml
+    + Restore singular method behavior like was in version 2.4.0
+  * Maintenance
+    + Partially migrate to JUnit 5
+    + Apply spotless re-formatting
+    + Update build, get rid of legacy, fix CLI
+    + Use distributionManagement from parent pom
+- Removed patches:
+  * 0001-Upgrade-to-SnakeYaml-2.2-439.patch
+  * 0002-Update-build-get-rid-of-legacy-fix-CLI-452.patch
+    + integrated in this version
+- Modified patches:
+  * 0003-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch
+    -> 0001-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch
+  * 0004-Handle-also-the-velocity-stuff-in-ModelloCli.patch
+    -> 0002-Handle-also-the-velocity-stuff-in-ModelloCli.patch
+    + rediff
+
+-------------------------------------------------------------------
+Tue Jun  3 08:29:16 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Add dependency on objectweb-asm to build with sisu 0.9.0.M4
+
+-------------------------------------------------------------------
+Sun Mar 16 20:11:46 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Added patch:
+  * 0004-Handle-also-the-velocity-stuff-in-ModelloCli.patch
+    + maven 4 is using velocity generater. Patch the ModelloCli.java
+      so that one can pass to it the velocity specific configuration
+      options
+- Fix the modello script classpath to be able to run the velocity
+  generator.
+
+-------------------------------------------------------------------
+Wed Oct  2 20:26:43 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Build against velocity-engine-core, since we can do it now without
+  introducing build cycles
+
 -------------------------------------------------------------------
 Mon Jun 10 14:01:25 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 

modello.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package modello
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           modello
-Version:        2.4.0
+Version:        2.5.1
 Release:        0
 Summary:        Modello Data Model toolkit
 License:        Apache-2.0 AND MIT
@@ -26,9 +26,8 @@ URL:            https://codehaus-plexus.github.io/modello
 Source0:        https://repo1.maven.org/maven2/org/codehaus/%{name}/%{name}/%{version}/%{name}-%{version}-source-release.zip
 Source1:        https://www.apache.org/licenses/LICENSE-2.0.txt
 Source100:      %{name}-build.tar.xz
-Patch0:         0001-Upgrade-to-SnakeYaml-2.2-439.patch
+Patch0:         0001-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch
-Patch1:         0002-Update-build-get-rid-of-legacy-fix-CLI-452.patch
+Patch1:         0002-Handle-also-the-velocity-stuff-in-ModelloCli.patch
-Patch2:         0003-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch
 BuildRequires:  ant
 BuildRequires:  atinject
 BuildRequires:  fdupes
@@ -39,6 +38,7 @@ BuildRequires:  javadoc-parser
 BuildRequires:  javapackages-local >= 6
 BuildRequires:  jsoup
 BuildRequires:  junit
+BuildRequires:  objectweb-asm
 BuildRequires:  plexus-build-api >= 1.0
 BuildRequires:  plexus-compiler
 BuildRequires:  plexus-utils
@@ -48,8 +48,9 @@ BuildRequires:  sisu-plexus
 BuildRequires:  slf4j
 BuildRequires:  snakeyaml
 BuildRequires:  unzip
-BuildRequires:  velocity
+BuildRequires:  velocity-engine-core
 Requires:       aopalliance
+Requires:       apache-commons-lang3
 Requires:       atinject
 Requires:       google-guice
 Requires:       guava
@@ -57,6 +58,8 @@ Requires:       jackson-core
 Requires:       jakarta-inject
 Requires:       javadoc-parser
 Requires:       javapackages-tools
+Requires:       jsoup
+Requires:       objectweb-asm
 Requires:       plexus-build-api
 Requires:       plexus-build-api0
 Requires:       plexus-classworlds
@@ -67,7 +70,7 @@ Requires:       sisu-inject
 Requires:       sisu-plexus
 Requires:       slf4j
 Requires:       snakeyaml
-Requires:       velocity
+Requires:       velocity-engine-core
 BuildArch:      noarch
 
 %description
@@ -98,9 +101,8 @@ API documentation for %{name}.
 
 %prep
 %setup -q -a100
-%patch -P 0 -p1
+%autopatch -p1
-%patch -P 1 -p1
+
-%patch -P 2 -p1
 cp -p %{SOURCE1} .
 
 %pom_remove_plugin :maven-site-plugin
@@ -109,9 +111,6 @@ cp -p %{SOURCE1} .
 
 %pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 modello-core
 
-# This builds correctly with the older velocity 1.x and avoids build cycles
-%pom_change_dep -r :velocity-engine-core :velocity
-
 %pom_remove_dep :jackson-bom
 
 %build
@@ -124,6 +123,7 @@ build-jar-repository -s lib \
     javadoc-parser \
     jsoup \
     junit \
+    objectweb-asm/asm \
     org.eclipse.sisu.inject \
     org.eclipse.sisu.plexus \
     plexus/cli \
@@ -133,7 +133,7 @@ build-jar-repository -s lib \
     plexus/xml \
     slf4j/api \
     snakeyaml \
-    velocity
+    velocity-engine/velocity-engine-core
 
 %{ant} \
   -Dtest.skip=true \
@@ -166,7 +166,7 @@ done
 %fdupes -s %{buildroot}%{_javadocdir}
 
 # script
-%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:aopalliance:atinject:google-guice:guava:jackson-core:jakarta-inject:javadoc-parser: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 %{name} true
+%jpackage_script org.codehaus.modello.ModelloCli "" "" 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
 
 %files -f .mfiles -f .mfiles-core
 %license LICENSE.txt LICENSE-2.0.txt