From 48b47f88eb30427a50bfad5537c038c4c187bc803c5b3f018ce18f81d2b52ef9 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 5 Jun 2024 15:49:22 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/modello?expand=0&rev=56 --- ...i-after-moving-from-Plexus-to-JSR330.patch | 85 ----- ...=> 0001-Upgrade-to-SnakeYaml-2.2-439.patch | 11 +- ...-build-get-rid-of-legacy-fix-CLI-452.patch | 351 ++++++++++++++++++ ...domAsXpp3-and-fail-if-the-old-Java5-.patch | 6 +- modello-maven-plugin.changes | 16 + modello-maven-plugin.spec | 9 +- modello.changes | 16 + modello.spec | 10 +- 8 files changed, 401 insertions(+), 103 deletions(-) delete mode 100644 0001-Fix-ModelloCli-after-moving-from-Plexus-to-JSR330.patch rename 0003-Fix-Snakeyaml.patch => 0001-Upgrade-to-SnakeYaml-2.2-439.patch (99%) create mode 100644 0002-Update-build-get-rid-of-legacy-fix-CLI-452.patch rename 0002-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch => 0003-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch (92%) diff --git a/0001-Fix-ModelloCli-after-moving-from-Plexus-to-JSR330.patch b/0001-Fix-ModelloCli-after-moving-from-Plexus-to-JSR330.patch deleted file mode 100644 index 153fb00..0000000 --- a/0001-Fix-ModelloCli-after-moving-from-Plexus-to-JSR330.patch +++ /dev/null @@ -1,85 +0,0 @@ -From cc800846da128d795c69142d4ae0c33c0677e943 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fridrich=20=C5=A0trba?= -Date: Sat, 13 Apr 2024 15:14:24 +0200 -Subject: [PATCH 1/3] Fix ModelloCli after moving from Plexus to JSR330 - ---- - .../java/org/codehaus/modello/Modello.java | 26 ++++++++++++++----- - .../java/org/codehaus/modello/ModelloCli.java | 3 +-- - 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 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; - * SOFTWARE. - */ - --import javax.inject.Inject; -- - import java.io.Reader; - import java.io.Writer; - 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; -+import org.codehaus.plexus.ContainerConfiguration; -+import org.codehaus.plexus.DefaultContainerConfiguration; -+import org.codehaus.plexus.DefaultPlexusContainer; -+import org.codehaus.plexus.PlexusConstants; -+import org.codehaus.plexus.PlexusContainer; - - /** - * @author Jason van Zyl - * @author Trygve Laugstøl - */ - public class Modello { -- private final ModelloCore core; -+ private PlexusContainer container; -+ -+ private ModelloCore core; -+ -+ public Modello() throws ModelloException { -+ try { -+ ContainerConfiguration configuration = new DefaultContainerConfiguration(); -+ configuration.setAutoWiring(true); -+ configuration.setClassPathScanning(PlexusConstants.SCANNING_INDEX); -+ -+ container = new DefaultPlexusContainer(configuration); - -- @Inject -- public Modello(ModelloCore core) { -- this.core = core; -+ core = (ModelloCore) container.lookup(ModelloCore.ROLE); -+ } catch (Exception ex) { -+ throw new ModelloException("Error while starting plexus.", ex); -+ } - } - - public void generate(Reader modelReader, String outputType, Map 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 parameters; - - public static void main(String[] args) throws Exception { -- Modello modello = new DefaultPlexusContainer().lookup(Modello.class); -+ Modello modello = new Modello(); - - parseArgumentsFromCommandLine(args); - --- -2.44.0 - diff --git a/0003-Fix-Snakeyaml.patch b/0001-Upgrade-to-SnakeYaml-2.2-439.patch similarity index 99% rename from 0003-Fix-Snakeyaml.patch rename to 0001-Upgrade-to-SnakeYaml-2.2-439.patch index 1326a04..d915066 100644 --- a/0003-Fix-Snakeyaml.patch +++ b/0001-Upgrade-to-SnakeYaml-2.2-439.patch @@ -1,8 +1,9 @@ -From 0321e3dfb5010eb4ea4dc59629e0b67cb673b16d Mon Sep 17 00:00:00 2001 +From c6747419bf16f55b92a2d0eec2e87da09d9a1507 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak -Date: Tue, 30 Apr 2024 15:15:00 +0200 -Subject: [PATCH 3/3] Fix Snakeyaml +Date: Wed, 29 May 2024 18:51:31 +0200 +Subject: [PATCH 1/3] Upgrade to SnakeYaml 2.2 (#439) +Upgrade to SnakeYaml 2.2 --- .../modello-plugin-snakeyaml/pom.xml | 10 +- .../snakeyaml/SnakeYamlReaderGenerator.java | 16 +- @@ -14,7 +15,7 @@ Subject: [PATCH 3/3] Fix Snakeyaml create mode 100644 modello-plugins/modello-plugin-snakeyaml/src/test/resources/models/maven.mdo diff --git a/modello-plugins/modello-plugin-snakeyaml/pom.xml b/modello-plugins/modello-plugin-snakeyaml/pom.xml -index 43d9a72c..c377175b 100644 +index 656a26fa..418654cc 100644 --- a/modello-plugins/modello-plugin-snakeyaml/pom.xml +++ b/modello-plugins/modello-plugin-snakeyaml/pom.xml @@ -24,7 +24,15 @@ @@ -1845,5 +1846,5 @@ index 00000000..4ebfc768 + + -- -2.44.0 +2.45.1 diff --git a/0002-Update-build-get-rid-of-legacy-fix-CLI-452.patch b/0002-Update-build-get-rid-of-legacy-fix-CLI-452.patch new file mode 100644 index 0000000..a4e9b78 --- /dev/null +++ b/0002-Update-build-get-rid-of-legacy-fix-CLI-452.patch @@ -0,0 +1,351 @@ +From ba2e53e7b28fa126e030056921930e83a44e2494 Mon Sep 17 00:00:00 2001 +From: Tamas Cservenak +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 @@ + + org.eclipse.sisu + org.eclipse.sisu.plexus +- provided ++ ++ ++ javax.annotation ++ javax.annotation-api ++ ++ ++ javax.enterprise ++ cdi-api ++ ++ + + +- org.sonatype.sisu +- sisu-guice +- no_aop ++ com.google.inject ++ guice + runtime + + + org.codehaus.plexus + plexus-utils + +- +- org.codehaus.plexus +- plexus-xml +- + + org.slf4j + slf4j-api + + + org.slf4j +- slf4j-simple +- test ++ slf4j-nop ++ runtime ++ true + + + + + + +- maven-assembly-plugin +- +- +- jar-with-dependencies +- +- +- +- org.codehaus.modello.ModelloCli +- +- +- ++ org.apache.maven.plugins ++ maven-shade-plugin ++ 3.5.3 ++ ++ ++ cli ++ ++ shade ++ ++ package ++ ++ cli ++ false ++ true ++ ++ ++ ++ ++ ++ ++ org.codehaus.modello.ModelloCli ++ ${project.artifactId} ++ ${project.version} ++ ${project.artifactId} ++ ${project.version} ++ ${project.groupId} ++ ++ ++ ++ ++ ++ *:* ++ ++ META-INF/MANIFEST.MF ++ META-INF/LICENSE ++ META-INF/LICENSE.txt ++ META-INF/DEPENDENCIES ++ META-INF/NOTICE ++ META-INF/NOTICE.txt ++ **/module-info.class ++ about.html ++ overview.html ++ ++ ++ ++ ++ ++ + + + +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 Jason van Zyl +@@ -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 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 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 @@ + + + ++ ++ org.codehaus.modello ++ modello-core ++ ++ ++ org.eclipse.sisu ++ org.eclipse.sisu.plexus ++ ++ ++ com.google.inject ++ guice ++ ++ ++ ++ ++ org.codehaus.plexus ++ plexus-utils ++ ++ ++ org.codehaus.plexus ++ plexus-build-api ++ ++ + + org.apache.maven + maven-plugin-api + ${mavenVersion} + provided + +- +- org.codehaus.modello +- modello-core +- + + org.apache.maven + maven-model +@@ -41,10 +60,6 @@ + ${mavenVersion} + provided + +- +- org.codehaus.plexus +- plexus-utils +- + + org.apache.maven.plugin-tools + maven-plugin-annotations +@@ -70,6 +85,7 @@ + + org.codehaus.modello + modello-plugin-java ++ runtime + + + org.codehaus.modello +@@ -114,11 +130,9 @@ + + org.codehaus.modello + modello-plugin-velocity ++ + +- +- org.codehaus.plexus +- plexus-build-api +- ++ + + org.slf4j + slf4j-simple +diff --git a/pom.xml b/pom.xml +index 02bcc5de..fb63107f 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -194,7 +194,8 @@ + UTF-8 + 2.17.0 + 2.0.2 +- 3.5.4 ++ 1.7.36 ++ 3.6.3 +