From 0354bc3b7ec8ea0f0cc329f7e8dc0439398d7339610bd98fa8dab9f57cf9e33a Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 3 May 2024 16:54:50 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/modello?expand=0&rev=50 --- 0003-Fix-Snakeyaml.patch | 1845 ++++++++++++++++++++++++++++++++++ modello-maven-plugin.changes | 8 + modello-maven-plugin.spec | 2 + modello.changes | 8 + modello.spec | 2 + 5 files changed, 1865 insertions(+) create mode 100644 0003-Fix-Snakeyaml.patch diff --git a/0003-Fix-Snakeyaml.patch b/0003-Fix-Snakeyaml.patch new file mode 100644 index 0000000..f4f8468 --- /dev/null +++ b/0003-Fix-Snakeyaml.patch @@ -0,0 +1,1845 @@ +From 7c7e9d2512c6c4a37cf3f7c95168b33e07f6655c 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 + +--- + .../modello-plugin-snakeyaml/pom.xml | 8 + + .../snakeyaml/SnakeYamlReaderGenerator.java | 16 +- + .../snakeyaml/SnakeYamlWriterGenerator.java | 4 +- + .../snakeyaml/SnakeYamlGeneratorTest.java | 50 + + .../src/test/resources/models/maven.mdo | 1668 +++++++++++++++++ + 5 files changed, 1743 insertions(+), 3 deletions(-) + create mode 100644 modello-plugins/modello-plugin-snakeyaml/src/test/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlGeneratorTest.java + 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 3d31a88d..80e6ae32 100644 +--- a/modello-plugins/modello-plugin-snakeyaml/pom.xml ++++ b/modello-plugins/modello-plugin-snakeyaml/pom.xml +@@ -27,4 +27,12 @@ + 2.2 + + ++ ++ ++ ++ ++ maven-dependency-plugin ++ ++ ++ + +diff --git a/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlReaderGenerator.java b/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlReaderGenerator.java +index 78f5c348..6bc43443 100644 +--- a/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlReaderGenerator.java ++++ b/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlReaderGenerator.java +@@ -209,7 +209,7 @@ public class SnakeYamlReaderGenerator extends AbstractSnakeYamlGenerator { + + sc = unmarshall.getSourceCode(); + +- sc.add("Parser parser = new ParserImpl( new StreamReader( reader ) );"); ++ sc.add("Parser parser = new ParserImpl( new StreamReader( reader ), new LoaderOptions() );"); + + sc.add("return " + readerMethodName + "( parser, strict );"); + +@@ -287,6 +287,7 @@ public class SnakeYamlReaderGenerator extends AbstractSnakeYamlGenerator { + jClass.addImport("org.yaml.snakeyaml.parser.ParserException"); + jClass.addImport("org.yaml.snakeyaml.parser.ParserImpl"); + jClass.addImport("org.yaml.snakeyaml.reader.StreamReader"); ++ jClass.addImport("org.yaml.snakeyaml.LoaderOptions"); + jClass.addImport("java.io.InputStream"); + jClass.addImport("java.io.InputStreamReader"); + jClass.addImport("java.io.IOException"); +@@ -820,6 +821,8 @@ public class SnakeYamlReaderGenerator extends AbstractSnakeYamlGenerator { + + sc = method.getSourceCode(); + ++ sc.add("if (!(event instanceof ScalarEvent))"); ++ sc.addIndented("return false;"); + sc.add("String currentName = ( (ScalarEvent) event ).getValue();"); + + sc.add(""); +@@ -855,9 +858,17 @@ public class SnakeYamlReaderGenerator extends AbstractSnakeYamlGenerator { + + sc.add("if ( strict )"); + ++ sc.add("{"); ++ sc.indent(); ++ sc.add("if ( event instanceof ScalarEvent )"); + sc.add("{"); + sc.addIndented( + "throw new ParserException( \"Unrecognised tag: '\" + ( (ScalarEvent) event ).getValue() + \"'\", event.getStartMark(), \"\", null );"); ++ sc.add("} else {"); ++ sc.addIndented( ++ "return ; // throw new ParserException( \"Unrecognised : '\" + event.getEventId() + \"'\", event.getStartMark(), \"\", null );"); ++ sc.add("}"); ++ sc.unindent(); + sc.add("}"); + + sc.add(""); +@@ -1041,7 +1052,8 @@ public class SnakeYamlReaderGenerator extends AbstractSnakeYamlGenerator { + return; + } + +- String constr = "new " + locationTracker.getName() + "( parser.getLineNumber(), parser.getColumnNumber()"; ++ String constr = "new " + locationTracker.getName() ++ + "( parser.peekEvent().getStartMark().getLine(), parser.peekEvent().getStartMark().getColumn()"; + constr += (sourceTracker != null) ? ", " + SOURCE_PARAM : ""; + constr += " )"; + +diff --git a/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlWriterGenerator.java b/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlWriterGenerator.java +index 33e2112c..538fa6ec 100644 +--- a/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlWriterGenerator.java ++++ b/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlWriterGenerator.java +@@ -73,6 +73,7 @@ public class SnakeYamlWriterGenerator extends AbstractSnakeYamlGenerator { + + JClass jClass = new JClass(packageName + '.' + marshallerName); + initHeader(jClass); ++ suppressAllWarnings(objectModel, jClass); + + jClass.addImport("org.yaml.snakeyaml.DumperOptions"); + jClass.addImport("org.yaml.snakeyaml.DumperOptions.Version"); +@@ -291,7 +292,8 @@ public class SnakeYamlWriterGenerator extends AbstractSnakeYamlGenerator { + sc.indent(); + + writeScalarKey(sc, fieldTagName); +- sc.add("generator.emit( new SequenceStartEvent( null, null, true, null, null, false ) );"); ++ sc.add( ++ "generator.emit( new SequenceStartEvent( null, null, true, null, null, FlowStyle.AUTO ) );"); + + if (useJava5) { + sc.add("for ( " + toType + " o : " + value + " )"); +diff --git a/modello-plugins/modello-plugin-snakeyaml/src/test/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlGeneratorTest.java b/modello-plugins/modello-plugin-snakeyaml/src/test/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlGeneratorTest.java +new file mode 100644 +index 00000000..4b479020 +--- /dev/null ++++ b/modello-plugins/modello-plugin-snakeyaml/src/test/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlGeneratorTest.java +@@ -0,0 +1,50 @@ ++package org.codehaus.modello.plugin.snakeyaml; ++ ++/* ++ * Copyright (c) 2004, Codehaus.org ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy of ++ * this software and associated documentation files (the "Software"), to deal in ++ * the Software without restriction, including without limitation the rights to ++ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies ++ * of the Software, and to permit persons to whom the Software is furnished to do ++ * so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in all ++ * copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE ++ * SOFTWARE. ++ */ ++ ++import java.util.Properties; ++ ++import org.codehaus.modello.AbstractModelloJavaGeneratorTest; ++import org.codehaus.modello.core.ModelloCore; ++import org.codehaus.modello.model.Model; ++ ++public class SnakeYamlGeneratorTest extends AbstractModelloJavaGeneratorTest { ++ public SnakeYamlGeneratorTest() { ++ super("snakeyaml"); ++ } ++ ++ public void testYamlGenerator() throws Throwable { ++ ModelloCore modello = (ModelloCore) lookup(ModelloCore.ROLE); ++ ++ Model model = modello.loadModel(getXmlResourceReader("/models/maven.mdo")); ++ ++ Properties parameters = getModelloParameters("4.0.0"); ++ ++ modello.generate(model, "java", parameters); ++ modello.generate(model, "snakeyaml-writer", parameters); ++ modello.generate(model, "snakeyaml-reader", parameters); ++ ++ addDependency("org.yaml", "snakeyaml"); ++ compileGeneratedSources(); ++ } ++} +diff --git a/modello-plugins/modello-plugin-snakeyaml/src/test/resources/models/maven.mdo b/modello-plugins/modello-plugin-snakeyaml/src/test/resources/models/maven.mdo +new file mode 100644 +index 00000000..4ebfc768 +--- /dev/null ++++ b/modello-plugins/modello-plugin-snakeyaml/src/test/resources/models/maven.mdo +@@ -0,0 +1,1668 @@ ++ ++ ++ maven ++ Maven ++ ++ ++ ++ package ++ org.codehaus.modello.test.model ++ ++ ++ ++ ++ Model ++ 3.0.0+ ++ ++ ++ extend ++ 3.0.0+ ++ ++ String ++ ++ ++ parent ++ 4.0.0 ++ ++ ++ Parent ++ ++ ++ ++ ++ modelVersion ++ 4.0.0 ++ true ++ ++ String ++ ++ ++ pomVersion ++ 3.0.0 ++ true ++ String ++ ++ ++ id ++ 3.0.0 ++ true ++ ++ String ++ ++ ++ groupId ++ 3.0.0+ ++ true ++ ++ String ++ ++ ++ artifactId ++ 3.0.0+ ++ true ++ ++ String ++ ++ ++ type ++ 4.0.0 ++ ++ String ++ jar ++ ++ ++ name ++ 3.0.0+ ++ true ++ ++ String ++ ++ ++ currentVersion ++ 3.0.0 ++ true ++ String ++ ++ ++ version ++ 4.0.0 ++ true ++ ++ String ++ ++ ++ shortDescription ++ 3.0.0+ ++ ++ String ++ ++ ++ description ++ 3.0.0+ ++ front page ++ of the project's web site. ++ ]]> ++ String ++ ++ ++ url ++ 3.0.0+ ++ ++ String ++ ++ ++ logo ++ 3.0.0+ ++ ++ String ++ ++ ++ issueTrackingUrl ++ 3.0.0 ++ ++ ++ String ++ ++ ++ issueManagement ++ 4.0.0 ++ ++ ++ IssueManagement ++ ++ ++ ++ ciManagement ++ 4.0.0 ++ ++ ++ CiManagement ++ ++ ++ ++ inceptionYear ++ 3.0.0+ ++ true ++ ++ String ++ ++ ++ gumpRepositoryId ++ 3.0.0 ++ ++ String ++ ++ ++ siteAddress ++ 3.0.0 ++ ++ String ++ ++ ++ siteDirectory ++ 3.0.0 ++ ++ ++ String ++ ++ ++ distributionSite ++ 3.0.0 ++ ++ String ++ This naming is inconsistent and distribution should occur from a repository structure. ++ ++ ++ distributionDirectory ++ 3.0.0 ++ ++ ++ String ++ This naming is inconsistent and distribution should occur from a repository structure. ++ ++ ++ ++ repositories ++ 4.0.0 ++ ++ ++ Repository ++ * ++ ++ ++ ++ pluginRepositories ++ 4.0.0 ++ ++ ++ Repository ++ * ++ ++ This may be removed or relocated in the near future. It is undecided whether plugins really need a ++ remote repository set of their own. ++ ++ ++ mailingLists ++ 3.0.0+ ++ ++ ++ MailingList ++ * ++ ++ ++ ++ developers ++ 3.0.0+ ++ developer element, which is then described by ++ additional elements (described below). The auto-generated site ++ documentation references this information. ++ ]]> ++ ++ Developer ++ * ++ ++ ++ ++ contributors ++ 3.0.0+ ++ contributor element, which is then describe by additional ++ elements (described below). The auto-generated site documentation ++ references this information. ++ ]]> ++ ++ Contributor ++ * ++ ++ ++ ++ dependencies ++ 3.0.0+ ++ dependency element, which is then described by ++ additional elements (described below). ++ ]]> ++ ++ Dependency ++ * ++ ++ These should ultimately only be compile time dependencies when transitive dependencies come into ++ play. ++ ++ ++ overrides ++ 4.0.0 ++ override element, which is then described by ++ additional elements (described below). ++ ]]> ++ ++ Override ++ * ++ ++ ++ ++ licenses ++ 3.0.0+ ++ license element, which is then describe by additional ++ elements (described below). The auto-generated site documentation ++ references this information. Projects should only list the license(s) that ++ applies to the project and not the licenses that apply to dependencies. ++ ]]> ++ ++ License ++ * ++ ++ ++ ++ versions ++ 3.0.0 ++ ++ ++ Version ++ * ++ ++ ++ ++ branches ++ 3.0.0 ++ ++ ++ Branch ++ * ++ ++ ++ ++ packageGroups ++ 3.0.0+ ++ ++ ++ PackageGroup ++ * ++ ++ ++ ++ reports ++ 3.0.0+ ++ maven site. All of the ++ reports will be included in the navigation bar for browsing in ++ the order they are specified. ++ ]]> ++ ++ String ++ * ++ ++ ++ ++ scm ++ 4.0.0 ++ ++ ++ Scm ++ ++ ++ ++ repository ++ 3.0.0 ++ ++ ++ Repository ++ ++ This element needs to be renamed as it conflicts with the existing notion of repositories in ++ Maven. ++ ++ ++ build ++ 3.0.0+ ++ true ++ ++ ++ Build ++ ++ ++ ++ organization ++ 3.0.0+ ++ ++ ++ Organization ++ ++ ++ ++ distributionManagement ++ 4.0.0 ++ ++ ++ DistributionManagement ++ ++ ++ ++ local ++ 4.0.0 ++ false ++ ++ ++ Local ++ ++ ++ ++ ++ properties ++ 3.0.0+ ++ ++ Properties ++ ++ String ++ * ++ ++ ++ ++ preGoals ++ 4.0.0 ++ ++ ++ PreGoal ++ * ++ ++ ++ ++ postGoals ++ 4.0.0 ++ ++ ++ PostGoal ++ * ++ ++ ++ ++ ++ ++ ++ ++ 3.0.0 ++ ++ public void setVersion(String version) ++ { ++ this.currentVersion = version; ++ } ++ ++ public String getVersion() ++ { ++ return currentVersion; ++ } ++ ++ ++ ++ 3.0.0+ ++ ++ private String packageName; ++ ++ public void setPackage(String packageName) ++ { ++ this.packageName = packageName; ++ } ++ ++ public String getPackage() ++ { ++ return packageName; ++ } ++ ++ ++ ++ 4.0.0 ++ ++ public String getId() ++ { ++ StringBuilder id = new StringBuilder(); ++ ++ id.append( getGroupId() ); ++ id.append( ":" ); ++ id.append( getArtifactId() ); ++ id.append( ":" ); ++ id.append( getType() ); ++ id.append( ":" ); ++ id.append( getVersion() ); ++ ++ return id.toString(); ++ } ++ ++ ++ ++ ++ ++ ++ Branch ++ 3.0.0+ ++ tag ++ element ++ ]]> ++ ++ ++ tag ++ 3.0.0+ ++ true ++ ++ String ++ ++ ++ description ++ 4.0.0 ++ ++ String ++ ++ ++ lastMergeTag ++ 4.0.0 ++ ++ String ++ ++ ++ ++ ++ Build ++ 3.0.0+ ++ ++ ++ nagEmailAddress ++ 3.0.0 ++ maven:gump-descriptor ++ target. ++ ]]> ++ String ++ This should be moved out of the build section. Vestigal for use with Gump. ++ ++ ++ sourceDirectory ++ 3.0.0+ ++ true ++ ++ String ++ ++ ++ unitTestSourceDirectory ++ 3.0.0+ ++ true ++ ++ String ++ ++ ++ aspectSourceDirectory ++ 3.0.0+ ++ Aspectj goals document). ++ The path given is relative to the project descriptor. ++ ]]> ++ String ++ ++ ++ integrationUnitTestSourceDirectory ++ 3.0.0+ ++ ++ String ++ ++ ++ sourceModifications ++ 3.0.0+ ++ true ++ sourceModification element, which is then described by ++ additional elements (described below). These modifications are used ++ to exclude or include various source depending on the environment ++ the build is running in. ++ ]]> ++ ++ SourceModification ++ * ++ ++ ++ ++ unitTest ++ 3.0.0+ ++ true ++ ++ new UnitTest() ++ ++ UnitTest ++ ++ ++ ++ resources ++ 3.0.0+ ++ below). These resources are used to ++ complete the jar file or to run unit test. ++ ]]> ++ ++ Resource ++ * ++ ++ ++ ++ directory ++ 4.0.0 ++ ++ String ++ ++ ++ output ++ 4.0.0 ++ ++ String ++ ++ ++ finalName ++ 4.0.0 ++ ++ String ++ ++ ++ testOutput ++ 4.0.0 ++ ++ String ++ ++ ++ ++ ++ CiManagement ++ 4.0.0 ++ ++ ++ system ++ 4.0.0 ++ ++ String ++ ++ ++ url ++ 4.0.0 ++ ++ String ++ ++ ++ nagEmailAddress ++ 4.0.0 ++ ++ String ++ ++ ++ ++ ++ Contributor ++ 3.0.0+ ++ ++ ++ name ++ 3.0.0+ ++ ++ String ++ ++ ++ email ++ 3.0.0+ ++ ++ String ++ ++ ++ url ++ 3.0.0+ ++ ++ String ++ ++ ++ organization ++ 3.0.0+ ++ ++ String ++ ++ ++ roles ++ 3.0.0+ ++ role element, the body of which is a ++ role name. ++ ]]> ++ ++ String ++ * ++ ++ ++ ++ timezone ++ 3.0.0+ ++ ++ String ++ ++ ++ ++ ++ Dependency ++ 3.0.0+ ++ ++ ++ id ++ 3.0.0 ++ true ++ ++ String ++ ++ ++ groupId ++ 3.0.0+ ++ true ++ geronimo. ++ ]]> ++ String ++ ++ ++ artifactId ++ 3.0.0+ ++ true ++ germonimo-jms ++ ]]> ++ String ++ ++ ++ version ++ 3.0.0+ ++ true ++ 3.2.1 ++ ]]> ++ String ++ ++ ++ url ++ 3.0.0+ ++ ++ String ++ The URL should really be gleaned from a shared database of dependency information. ++ ++ ++ jar ++ 3.0.0 ++ ++ String ++ ++ ++ artifact ++ 4.0.0+ ++ ++ String ++ ++ ++ type ++ 3.0.0+ ++ ejb and ++ plugin. ++ ]]> ++ String ++ jar ++ ++ ++ properties ++ 3.0.0+ ++ mark dependencies with properties. For example the ++ war plugin looks for a ++ war.bundle property, and if found will include the dependency ++ in ++ WEB-INF/lib. For example syntax, check the war plugin docs. ++ ]]> ++ Properties ++ ++ String ++ * ++ ++ ++ ++ ++ ++ 3.0.0+ ++ ++ public String toString() ++ { ++ return groupId + "/" + type + "s:" + artifactId + "-" + version; ++ } ++ ++ ++ ++ 4.0.0 ++ ++ public String getId() ++ { ++ return groupId + ":" + artifactId + ":" + type + ":" + version; ++ } ++ ++ ++ ++ 3.0.0 ++ element is explicity used in the POM. ++ if ( getJar() != null) ++ { ++ return getJar(); ++ } ++ ++ return getArtifactId() + "-" + getVersion() + "." + getExtension(); ++ } ++ ++ public String getExtension() ++ { ++ if ("ejb".equals(getType()) || "plugin".equals(getType()) || "aspect".equals(getType())) return "jar"; ++ return getType(); ++ } ++ ++ public boolean isAddedToClasspath() ++ { ++ return ("jar".equals(getType()) || "ejb".equals(getType())); ++ } ++ ++ public boolean isPlugin() ++ { ++ return ("plugin".equals(getType())); ++ } ++ ++ public String getProperty( String property ) ++ { ++ return getProperties().getProperty( property ); ++ } ++ ++ public boolean equals( Object o ) ++ { ++ if ( this == o ) ++ { ++ return true; ++ } ++ ++ if ( !( o instanceof Dependency ) ) ++ { ++ return false; ++ } ++ ++ Dependency d = (Dependency) o; ++ return getId().equals( d.getId() ); ++ } ++ ++ public int hashCode() ++ { ++ return getId().hashCode(); ++ } ++ ]]> ++ ++ ++ ++ ++ Override ++ 4.0.0 ++ ++ ++ groupId ++ 4.0.0 ++ true ++ geronimo. ++ ]]> ++ String ++ ++ ++ artifactId ++ 4.0.0 ++ true ++ germonimo-jms ++ ]]> ++ String ++ ++ ++ type ++ 4.0.0 ++ ejb and ++ plugin. ++ ]]> ++ String ++ jar ++ ++ ++ ++ version ++ 4.0.0 ++ true ++ 3.2.1 ++ ]]> ++ String ++ ++ ++ file ++ 4.0.0 ++ true ++ lib/non-distributable-code-1.3.jar ++ ]]> ++ String ++ ++ ++ ++ ++ Contributor ++ Developer ++ 3.0.0+ ++ ++ ++ id ++ 3.0.0+ ++ ++ String ++ ++ ++ ++ ++ IssueManagement ++ 4.0.0 ++ ++ ++ system ++ 4.0.0 ++ ++ String ++ ++ ++ url ++ 4.0.0 ++ ++ String ++ ++ ++ ++ ++ DistributionManagement ++ 4.0.0 ++ ++ ++ ++ repository ++ 4.0.0 ++ ++ ++ ++ Repository ++ ++ ++ ++ site ++ ++ 4.0.0 ++ ++ Site ++ ++ ++ ++ ++ ++ License ++ 3.0.0+ ++ ++ ++ name ++ 3.0.0+ ++ ++ String ++ ++ ++ url ++ 3.0.0+ ++ ++ String ++ ++ ++ distribution ++ 3.0.0 ++ ++
repo
++
may be downloaded from the Maven repository
++
manual
++
user must manually download and install the dependency.
++ ++ ]]> ++ String ++ ++ ++ comments ++ 3.0.0+ ++ ++ String ++ ++ ++ ++ ++ MailingList ++ 3.0.0+ ++ mailingList element, which is then described by ++ additional elements (described below). The auto-generated site ++ documentation references this information. ++ ]]> ++ ++ ++ name ++ 3.0.0+ ++ ++ String ++ ++ ++ subscribe ++ 3.0.0+ ++ mailto: link will automatically be created when ++ the documentation is created. ++ ]]> ++ String ++ ++ ++ unsubscribe ++ 3.0.0+ ++ mailto: link will automatically be created ++ when the documentation is created. ++ ]]> ++ String ++ ++ ++ post ++ 4.0.0 ++ mailto: link will automatically be created ++ when the documentation is created. ++ ]]> ++ String ++ ++ ++ archive ++ 3.0.0+ ++ ++ String ++ This should probably be removed from 4.0.0 before alpha-1 ++ ++ ++ archives ++ 4.0.0 ++ ++ ++ String ++ * ++ ++ ++ ++ ++ We could probably have a specific element for a dev mailing list for ++ things like CI, and maybe even a specific element for the user and scm ++ mailing lists. Then leave the more lose structure for any other type ++ of mailing list. ++ ++ ++ ++ Organization ++ 3.0.0+ ++ ++ ++ name ++ 3.0.0+ ++ ++ String ++ ++ ++ url ++ 3.0.0+ ++ ++ String ++ ++ ++ logo ++ 3.0.0+ ++ /images/org-logo.png) or an absolute URL ++ (e.g., ++ http://my.corp/logo.png). This value is used ++ when generating the project documentation. ++ ]]> ++ String ++ ++ ++ ++ ++ PackageGroup ++ 3.0.0+ ++ ++ ++ title ++ 3.0.0+ ++ ++ String ++ ++ ++ packages ++ 3.0.0+ ++ ++ String ++ ++ ++ ++ ++ PatternSet ++ 3.0.0+ ++ ++ ++ includes ++ 3.0.0+ ++ ++ ++ String ++ * ++ ++ ++ ++ excludes ++ 3.0.0+ ++ ++ ++ String ++ * ++ ++ ++ ++ ++ ++ 3.0.0+ ++ ++ ++ public java.util.List getDefaultExcludes() ++ { ++ java.util.List defaultExcludes = new java.util.ArrayList(); ++ defaultExcludes.add( "**/*~" ); ++ defaultExcludes.add( "**/#*#" ); ++ defaultExcludes.add( "**/.#*" ); ++ defaultExcludes.add( "**/%*%" ); ++ defaultExcludes.add( "**/._*" ); ++ ++ // CVS ++ defaultExcludes.add( "**/CVS" ); ++ defaultExcludes.add( "**/CVS/**" ); ++ defaultExcludes.add( "**/.cvsignore" ); ++ ++ // SCCS ++ defaultExcludes.add( "**/SCCS" ); ++ defaultExcludes.add( "**/SCCS/**" ); ++ ++ // Visual SourceSafe ++ defaultExcludes.add( "**/vssver.scc" ); ++ ++ // Subversion ++ defaultExcludes.add( "**/.svn" ); ++ defaultExcludes.add( "**/.svn/**" ); ++ ++ // Mac ++ defaultExcludes.add( "**/.DS_Store" ); ++ return defaultExcludes; ++ } ++ ++ ++ ++ ++ ++ Parent ++ 4.0.0 ++ ++ ++ artifactId ++ 4.0.0 ++ ++ String ++ ++ ++ groupId ++ 4.0.0 ++ ++ String ++ ++ ++ version ++ 4.0.0 ++ on of the project to extend.]]> ++ String ++ ++ ++ ++ ++ Repository ++ 3.0.0 ++ ++ ++ connection ++ 3.0.0 ++ building versions ++ from specific ID. ++ ]]> ++ String ++ ++ ++ developerConnection ++ 3.0.0 ++ ++ String ++ ++ ++ url ++ 3.0.0 ++ ++ String ++ ++ ++ ++ ++ Scm ++ 4.0.0 ++ ++ ++ connection ++ 4.0.0 ++ building versions ++ from specific ID. ++ ]]> ++ String ++ ++ ++ developerConnection ++ 4.0.0 ++ ++ String ++ ++ ++ url ++ 4.0.0 ++ ++ String ++ ++ ++ branches ++ 4.0.0 ++ ++ ++ ++ String ++ * ++ ++ ++ ++ ++ ++ Resource ++ 3.0.0+ ++ PatternSet ++ ++ ++ directory ++ 3.0.0+ ++ ++ String ++ ++ ++ targetPath ++ 3.0.0+ ++ org.apache.maven.messages), you must specify this ++ element with this value : ++ org/apache/maven/messages ++ ]]> ++ String ++ ++ ++ filtering ++ 3.0.0+ ++ ++ boolean ++ false ++ ++ ++ ++ ++ SourceModification ++ 3.0.0+ ++ Resource ++ ++ ++ className ++ 3.0.0+ ++ not be ++ loaded, then the includes and excludes specified below ++ will be applied to the contents of the ++ sourceDirectory ++ ]]> ++ String ++ ++ ++ property ++ 3.0.0+ ++ ++ String ++ ++ ++ ++ ++ UnitTest ++ 3.0.0+ ++ PatternSet ++ ++ ++ resources ++ 3.0.0+ ++ ++ ++ Resource ++ * ++ ++ ++ ++ ++ ++ Version ++ 3.0.0 ++ version ++ element ++ ]]> ++ ++ ++ name ++ 3.0.0 ++ 1.0, ++ 1.1-alpha1, ++ 1.2-beta, ++ 1.3.2 etc. ++ ]]> ++ String ++ ++ ++ tag ++ 3.0.0 ++ ++ String ++ ++ ++ id ++ 3.0.0 ++ ++ maven:dist ++ builds. ++ ]]> ++ String ++ ++ ++ ++ ++ ++ Repository ++ 4.0.0 ++ ++ ++ ++ id ++ 4.0.0 ++ ++ String ++ ++ ++ name ++ 4.0.0 ++ ++ String ++ ++ ++ url ++ 4.0.0 ++ ++ String ++ ++ ++ ++ ++ 4.0.0 ++ ++ public boolean equals( Object obj ) ++ { ++ Repository other = ( Repository ) obj; ++ ++ boolean retValue = false; ++ ++ if ( id != null ) ++ { ++ retValue = id.equals( other.id ); ++ } ++ ++ return retValue; ++ } ++ ++ ++ ++ ++ ++ ++ Site ++ 4.0.0 ++ ++ ++ ++ id ++ 4.0.0 ++ ++ String ++ ++ ++ name ++ 4.0.0 ++ ++ String ++ ++ ++ url ++ 4.0.0 ++ ++ String ++ ++ ++ ++ ++ GoalDecorator ++ 4.0.0 ++ ++ ++ name ++ 4.0.0 ++ ++ String ++ ++ ++ attain ++ 4.0.0 ++ ++ String ++ ++ ++ ++ ++ GoalDecorator ++ PreGoal ++ 4.0.0 ++ ++ ++ ++ GoalDecorator ++ PostGoal ++ 4.0.0 ++ ++ ++ ++ ++ ++ Local ++ 4.0.0 ++ ++ ++ ++ ++ repository ++ 4.0.0 ++ ++ String ++ ++ ++ ++ online ++ 4.0.0 ++ ++ boolean ++ true ++ ++ ++ ++ ++ ++ +-- +2.44.0 + diff --git a/modello-maven-plugin.changes b/modello-maven-plugin.changes index 19d6eaf..f46a168 100644 --- a/modello-maven-plugin.changes +++ b/modello-maven-plugin.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri May 3 16:50:54 UTC 2024 - Fridrich Strba + +- 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 + ------------------------------------------------------------------- Wed May 1 12:22:05 UTC 2024 - Fridrich Strba diff --git a/modello-maven-plugin.spec b/modello-maven-plugin.spec index 5616b68..008d495 100644 --- a/modello-maven-plugin.spec +++ b/modello-maven-plugin.spec @@ -29,6 +29,7 @@ Source0: https://repo1.maven.org/maven2/org/codehaus/%{parent}/%{parent}/ 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 @@ API documentation for %{name}. %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 diff --git a/modello.changes b/modello.changes index e048270..112a03f 100644 --- a/modello.changes +++ b/modello.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri May 3 16:50:54 UTC 2024 - Fridrich Strba + +- 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 + ------------------------------------------------------------------- Wed May 1 12:22:05 UTC 2024 - Fridrich Strba diff --git a/modello.spec b/modello.spec index 5a5066b..a64a6eb 100644 --- a/modello.spec +++ b/modello.spec @@ -28,6 +28,7 @@ Source1: https://www.apache.org/licenses/LICENSE-2.0.txt 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 @@ API documentation for %{name}. %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 From e7eacc8ca8ef3e32c03d8fb56e3d2f1a6f7babcb47bc0bbfb4f0abb769bd6740 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sat, 4 May 2024 12:12:46 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/modello?expand=0&rev=51 --- ...i-after-moving-from-Plexus-to-JSR330.patch | 24 ++++++------ ...domAsXpp3-and-fail-if-the-old-Java5-.patch | 14 +++---- 0003-Fix-Snakeyaml.patch | 38 ++++++++++--------- modello-2.3.0-source-release.zip | 3 -- modello-2.4.0-source-release.zip | 3 ++ modello-build.tar.xz | 4 +- modello-maven-plugin.changes | 19 ++++++++++ modello-maven-plugin.spec | 2 +- modello.changes | 21 +++++++++- modello.spec | 2 +- 10 files changed, 86 insertions(+), 44 deletions(-) delete mode 100644 modello-2.3.0-source-release.zip create mode 100644 modello-2.4.0-source-release.zip diff --git a/0001-Fix-ModelloCli-after-moving-from-Plexus-to-JSR330.patch b/0001-Fix-ModelloCli-after-moving-from-Plexus-to-JSR330.patch index fc38dd1..153fb00 100644 --- a/0001-Fix-ModelloCli-after-moving-from-Plexus-to-JSR330.patch +++ b/0001-Fix-ModelloCli-after-moving-from-Plexus-to-JSR330.patch @@ -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?= 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 @@ Subject: [PATCH] Fix ModelloCli after moving from Plexus to JSR330 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 @@ index 2b73884f..9e3f8072 100644 - 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 @@ index 2b73884f..9e3f8072 100644 + } } - public void generate(Reader modelReader, String outputType, Properties parameters) + 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 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 parameters; public static void main(String[] args) throws Exception { - Modello modello = new DefaultPlexusContainer().lookup(Modello.class); diff --git a/0002-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch b/0002-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch index 8155ee2..f7efd14 100644 --- a/0002-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch +++ b/0002-Add-support-for-domAsXpp3-and-fail-if-the-old-Java5-.patch @@ -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?= 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 @@ Subject: [PATCH 2/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 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 @@ index 19144947..579f56e3 100644 + 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 " diff --git a/0003-Fix-Snakeyaml.patch b/0003-Fix-Snakeyaml.patch index f4f8468..1326a04 100644 --- a/0003-Fix-Snakeyaml.patch +++ b/0003-Fix-Snakeyaml.patch @@ -1,24 +1,28 @@ -From 7c7e9d2512c6c4a37cf3f7c95168b33e07f6655c Mon Sep 17 00:00:00 2001 +From 0321e3dfb5010eb4ea4dc59629e0b67cb673b16d 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 --- - .../modello-plugin-snakeyaml/pom.xml | 8 + + .../modello-plugin-snakeyaml/pom.xml | 10 +- .../snakeyaml/SnakeYamlReaderGenerator.java | 16 +- .../snakeyaml/SnakeYamlWriterGenerator.java | 4 +- .../snakeyaml/SnakeYamlGeneratorTest.java | 50 + .../src/test/resources/models/maven.mdo | 1668 +++++++++++++++++ - 5 files changed, 1743 insertions(+), 3 deletions(-) + 5 files changed, 1744 insertions(+), 4 deletions(-) create mode 100644 modello-plugins/modello-plugin-snakeyaml/src/test/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlGeneratorTest.java 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 3d31a88d..80e6ae32 100644 +index 43d9a72c..c377175b 100644 --- a/modello-plugins/modello-plugin-snakeyaml/pom.xml +++ b/modello-plugins/modello-plugin-snakeyaml/pom.xml -@@ -27,4 +27,12 @@ - 2.2 +@@ -24,7 +24,15 @@ + + org.yaml + snakeyaml +- 1.33 ++ 2.2 + @@ -31,10 +35,10 @@ index 3d31a88d..80e6ae32 100644 + diff --git a/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlReaderGenerator.java b/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlReaderGenerator.java -index 78f5c348..6bc43443 100644 +index d53a40a5..532afe6e 100644 --- a/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlReaderGenerator.java +++ b/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlReaderGenerator.java -@@ -209,7 +209,7 @@ public class SnakeYamlReaderGenerator extends AbstractSnakeYamlGenerator { +@@ -210,7 +210,7 @@ public class SnakeYamlReaderGenerator extends AbstractSnakeYamlGenerator { sc = unmarshall.getSourceCode(); @@ -43,7 +47,7 @@ index 78f5c348..6bc43443 100644 sc.add("return " + readerMethodName + "( parser, strict );"); -@@ -287,6 +287,7 @@ public class SnakeYamlReaderGenerator extends AbstractSnakeYamlGenerator { +@@ -288,6 +288,7 @@ public class SnakeYamlReaderGenerator extends AbstractSnakeYamlGenerator { jClass.addImport("org.yaml.snakeyaml.parser.ParserException"); jClass.addImport("org.yaml.snakeyaml.parser.ParserImpl"); jClass.addImport("org.yaml.snakeyaml.reader.StreamReader"); @@ -89,10 +93,10 @@ index 78f5c348..6bc43443 100644 constr += " )"; diff --git a/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlWriterGenerator.java b/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlWriterGenerator.java -index 33e2112c..538fa6ec 100644 +index cd1a5f9d..00da62ff 100644 --- a/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlWriterGenerator.java +++ b/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlWriterGenerator.java -@@ -73,6 +73,7 @@ public class SnakeYamlWriterGenerator extends AbstractSnakeYamlGenerator { +@@ -74,6 +74,7 @@ public class SnakeYamlWriterGenerator extends AbstractSnakeYamlGenerator { JClass jClass = new JClass(packageName + '.' + marshallerName); initHeader(jClass); @@ -100,7 +104,7 @@ index 33e2112c..538fa6ec 100644 jClass.addImport("org.yaml.snakeyaml.DumperOptions"); jClass.addImport("org.yaml.snakeyaml.DumperOptions.Version"); -@@ -291,7 +292,8 @@ public class SnakeYamlWriterGenerator extends AbstractSnakeYamlGenerator { +@@ -290,7 +291,8 @@ public class SnakeYamlWriterGenerator extends AbstractSnakeYamlGenerator { sc.indent(); writeScalarKey(sc, fieldTagName); @@ -108,11 +112,11 @@ index 33e2112c..538fa6ec 100644 + sc.add( + "generator.emit( new SequenceStartEvent( null, null, true, null, null, FlowStyle.AUTO ) );"); - if (useJava5) { - sc.add("for ( " + toType + " o : " + value + " )"); + sc.add("for ( " + toType + " o : " + value + " )"); + diff --git a/modello-plugins/modello-plugin-snakeyaml/src/test/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlGeneratorTest.java b/modello-plugins/modello-plugin-snakeyaml/src/test/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlGeneratorTest.java new file mode 100644 -index 00000000..4b479020 +index 00000000..a9bb50fb --- /dev/null +++ b/modello-plugins/modello-plugin-snakeyaml/src/test/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlGeneratorTest.java @@ -0,0 +1,50 @@ @@ -140,7 +144,7 @@ index 00000000..4b479020 + * SOFTWARE. + */ + -+import java.util.Properties; ++import java.util.Map; + +import org.codehaus.modello.AbstractModelloJavaGeneratorTest; +import org.codehaus.modello.core.ModelloCore; @@ -156,7 +160,7 @@ index 00000000..4b479020 + + Model model = modello.loadModel(getXmlResourceReader("/models/maven.mdo")); + -+ Properties parameters = getModelloParameters("4.0.0"); ++ Map parameters = getModelloParameters("4.0.0"); + + modello.generate(model, "java", parameters); + modello.generate(model, "snakeyaml-writer", parameters); diff --git a/modello-2.3.0-source-release.zip b/modello-2.3.0-source-release.zip deleted file mode 100644 index 11ed317..0000000 --- a/modello-2.3.0-source-release.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:79de0d691f8115ad5e2de36389ca8d739c8c25c08279e98f76b0642439acfbfa -size 1082568 diff --git a/modello-2.4.0-source-release.zip b/modello-2.4.0-source-release.zip new file mode 100644 index 0000000..0e16244 --- /dev/null +++ b/modello-2.4.0-source-release.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:817ba1ccf42ecb6b700155f380b4334e218b2eeb74fdb02e82ac679561b89acf +size 1081488 diff --git a/modello-build.tar.xz b/modello-build.tar.xz index d4794ce..0d8ff5e 100644 --- a/modello-build.tar.xz +++ b/modello-build.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2464c5ae4ed8d9e6cf481175c8f16d957e750721a4ccc51652ff890d24962ed -size 5032 +oid sha256:ab95de21b7821e3c6c198659ef6128ee0545358d854a5abb99f4f98ab310a08e +size 4780 diff --git a/modello-maven-plugin.changes b/modello-maven-plugin.changes index f46a168..1907a5a 100644 --- a/modello-maven-plugin.changes +++ b/modello-maven-plugin.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Sat May 4 12:02:36 UTC 2024 - Fridrich Strba + +- 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 diff --git a/modello-maven-plugin.spec b/modello-maven-plugin.spec index 008d495..93187b9 100644 --- a/modello-maven-plugin.spec +++ b/modello-maven-plugin.spec @@ -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 diff --git a/modello.changes b/modello.changes index 112a03f..da9a159 100644 --- a/modello.changes +++ b/modello.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Sat May 4 12:02:36 UTC 2024 - Fridrich Strba + +- 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 @@ -22,7 +41,7 @@ Tue Apr 16 13:04:04 UTC 2024 - Fridrich Strba ------------------------------------------------------------------- Sun Apr 14 06:13:08 UTC 2024 - Fridrich Strba -- 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 diff --git a/modello.spec b/modello.spec index a64a6eb..da3141b 100644 --- a/modello.spec +++ b/modello.spec @@ -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