Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package modello for openSUSE:Factory checked in at 2026-05-09 12:59:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/modello (Old) and /work/SRC/openSUSE:Factory/.modello.new.1966 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "modello" Sat May 9 12:59:47 2026 rev:27 rq:1352128 version:2.7.0 Changes: -------- --- /work/SRC/openSUSE:Factory/modello/modello-maven-plugin.changes 2026-03-01 22:14:59.030355455 +0100 +++ /work/SRC/openSUSE:Factory/.modello.new.1966/modello-maven-plugin.changes 2026-05-09 12:59:59.961543972 +0200 @@ -1,0 +2,23 @@ +Fri May 8 18:19:49 UTC 2026 - Fridrich Strba <[email protected]> + +- Upgrade to upstream version 2.7.0 + * New features and improvements + + XDOC: document required fields in generated model docs + * Bug Fixes + + Refactor PLURAL_EXCEPTIONS to use ThreadLocal for thread + safety + + Initialize model parameters in VelocityGenerator + + Use correct getter method prefix for type "Boolean" + * Dependency updates + + Bump org.codehaus.plexus:plexus-utils from 3.0.24 to 3.6.1 in + /modello-maven-plugin/src/it/maven-model + + Bump org.codehaus.plexus:plexus-utils from 4.0.2 to 4.0.3 + + Bump org.codehaus.woodstox:stax2-api from 4.2.2 to 4.3.0 + + Bump com.fasterxml.jackson:jackson-bom from 2.21.0 to 2.21.2 + + Bump org.yaml:snakeyaml from 2.5 to 2.6 + + Bump org.apache.maven.plugins:maven-shade-plugin from 3.6.1 to + 3.6.2 + + Bump sisu.version from 0.9.0.M4 to 1.0.0 + + Bump plexus.compiler.version from 2.16.1 to 2.16.2 + +------------------------------------------------------------------- modello.changes: same change Old: ---- modello-2.6.0-source-release.zip New: ---- modello-2.7.0-source-release.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ modello-maven-plugin.spec ++++++ --- /var/tmp/diff_new_pack.Yy94UL/_old 2026-05-09 13:00:00.941584187 +0200 +++ /var/tmp/diff_new_pack.Yy94UL/_new 2026-05-09 13:00:00.945584351 +0200 @@ -19,7 +19,7 @@ %global parent modello %global subname maven-plugin Name: %{parent}-%{subname} -Version: 2.6.0 +Version: 2.7.0 Release: 0 Summary: Modello Maven Plugin License: Apache-2.0 AND MIT ++++++ modello.spec ++++++ --- /var/tmp/diff_new_pack.Yy94UL/_old 2026-05-09 13:00:00.989586156 +0200 +++ /var/tmp/diff_new_pack.Yy94UL/_new 2026-05-09 13:00:00.993586320 +0200 @@ -17,7 +17,7 @@ Name: modello -Version: 2.6.0 +Version: 2.7.0 Release: 0 Summary: Modello Data Model toolkit License: Apache-2.0 AND MIT ++++++ _scmsync.obsinfo ++++++ --- /var/tmp/diff_new_pack.Yy94UL/_old 2026-05-09 13:00:01.089590259 +0200 +++ /var/tmp/diff_new_pack.Yy94UL/_new 2026-05-09 13:00:01.093590424 +0200 @@ -1,6 +1,6 @@ -mtime: 1772203114 -commit: edfe9cd49574b6ecdc9293eb9ee4a7456774f73f2b6c5fa390f76cc5000643e4 -url: https://src.opensuse.org/java-packages/modello.git -revision: edfe9cd49574b6ecdc9293eb9ee4a7456774f73f2b6c5fa390f76cc5000643e4 +mtime: 1778264753 +commit: 5539160912ef584346935de3e5d78bf83d3bc9f91d9dd1dcc85756db5cb8970c +url: https://src.opensuse.org/java-packages/modello +revision: 5539160912ef584346935de3e5d78bf83d3bc9f91d9dd1dcc85756db5cb8970c projectscmsync: https://src.opensuse.org/java-packages/_ObsPrj ++++++ build.specials.obscpio ++++++ ++++++ build.specials.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/.gitignore new/.gitignore --- old/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/.gitignore 2026-05-08 20:25:53.000000000 +0200 @@ -0,0 +1 @@ +.osc ++++++ modello-2.6.0-source-release.zip -> modello-2.7.0-source-release.zip ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-2.6.0/modello-core/pom.xml new/modello-2.7.0/modello-core/pom.xml --- old/modello-2.6.0/modello-core/pom.xml 2026-01-25 23:50:16.000000000 +0100 +++ new/modello-2.7.0/modello-core/pom.xml 2026-04-12 20:39:40.000000000 +0200 @@ -5,7 +5,7 @@ <parent> <groupId>org.codehaus.modello</groupId> <artifactId>modello</artifactId> - <version>2.6.0</version> + <version>2.7.0</version> </parent> <artifactId>modello-core</artifactId> <name>Modello Core</name> @@ -65,7 +65,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>3.6.1</version> + <version>3.6.2</version> <executions> <execution> <id>cli</id> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-2.6.0/modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java new/modello-2.7.0/modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java --- old/modello-2.6.0/modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java 2026-01-25 23:50:16.000000000 +0100 +++ new/modello-2.7.0/modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java 2026-04-12 20:39:40.000000000 +0200 @@ -59,7 +59,7 @@ public abstract class AbstractModelloGenerator implements ModelloGenerator { private final Logger logger = LoggerFactory.getLogger(getClass()); - private static final Map<String, String> PLURAL_EXCEPTIONS = new HashMap<>(); + private static final ThreadLocal<Map<String, String>> PLURAL_EXCEPTIONS = ThreadLocal.withInitial(HashMap::new); private Model model; @@ -97,8 +97,9 @@ licenseText = (List<String>) parameters.get(ModelloParameterConstants.LICENSE_TEXT); + PLURAL_EXCEPTIONS.get().clear(); Optional.ofNullable(parameters.get(ModelloParameterConstants.PLURAL_EXCEPTIONS)) - .ifPresent(o -> PLURAL_EXCEPTIONS.putAll((Map<String, String>) o)); + .ifPresent(o -> PLURAL_EXCEPTIONS.get().putAll((Map<String, String>) o)); } protected Model getModel() { @@ -207,8 +208,8 @@ return name; } - if (PLURAL_EXCEPTIONS.containsKey(name)) { - return PLURAL_EXCEPTIONS.get(name); + if (PLURAL_EXCEPTIONS.get().containsKey(name)) { + return PLURAL_EXCEPTIONS.get().get(name); } if (name.endsWith("ies")) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-2.6.0/modello-maven-plugin/pom.xml new/modello-2.7.0/modello-maven-plugin/pom.xml --- old/modello-2.6.0/modello-maven-plugin/pom.xml 2026-01-25 23:50:16.000000000 +0100 +++ new/modello-2.7.0/modello-maven-plugin/pom.xml 2026-04-12 20:39:40.000000000 +0200 @@ -5,7 +5,7 @@ <parent> <groupId>org.codehaus.modello</groupId> <artifactId>modello</artifactId> - <version>2.6.0</version> + <version>2.7.0</version> </parent> <artifactId>modello-maven-plugin</artifactId> @@ -193,7 +193,7 @@ <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath> <debug>true</debug> <filterProperties> - <plexusUtilsVersion>3.0.22</plexusUtilsVersion> + <plexusUtilsVersion>3.6.1</plexusUtilsVersion> <junit4Version>${junit4Version}</junit4Version> <java.version>${java.version}</java.version> <jdom.version>${jdom.version}</jdom.version> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-2.6.0/modello-maven-plugin/src/it/features/pom.xml new/modello-2.7.0/modello-maven-plugin/src/it/features/pom.xml --- old/modello-2.6.0/modello-maven-plugin/src/it/features/pom.xml 2026-01-25 23:50:16.000000000 +0100 +++ new/modello-2.7.0/modello-maven-plugin/src/it/features/pom.xml 2026-04-12 20:39:40.000000000 +0200 @@ -20,7 +20,7 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> - <version>3.0.24</version> + <version>@plexusUtilsVersion@</version> </dependency> <dependency> <groupId>org.codehaus.woodstox</groupId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-2.6.0/modello-maven-plugin/src/it/maven-model/pom.xml new/modello-2.7.0/modello-maven-plugin/src/it/maven-model/pom.xml --- old/modello-2.6.0/modello-maven-plugin/src/it/maven-model/pom.xml 2026-01-25 23:50:16.000000000 +0100 +++ new/modello-2.7.0/modello-maven-plugin/src/it/maven-model/pom.xml 2026-04-12 20:39:40.000000000 +0200 @@ -46,7 +46,7 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> - <version>3.0.24</version> + <version>@plexusUtilsVersion@</version> </dependency> <dependency> <groupId>junit</groupId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-2.6.0/modello-maven-plugin/src/it/maven-model/src/test/java/org/codehaus/modello/xpp3/Xpp3ParsingTest.java new/modello-2.7.0/modello-maven-plugin/src/it/maven-model/src/test/java/org/codehaus/modello/xpp3/Xpp3ParsingTest.java --- old/modello-2.6.0/modello-maven-plugin/src/it/maven-model/src/test/java/org/codehaus/modello/xpp3/Xpp3ParsingTest.java 2026-01-25 23:50:16.000000000 +0100 +++ new/modello-2.7.0/modello-maven-plugin/src/it/maven-model/src/test/java/org/codehaus/modello/xpp3/Xpp3ParsingTest.java 2026-04-12 20:39:40.000000000 +0200 @@ -22,8 +22,8 @@ public void testXpp3ParsingWithModelWithWrongRootTag() throws Exception { - thrown.expectMessage( startsWith( "Expected root element 'project' but found 'model' (position: START_TAG seen <model>... @1:7)" ) ); - + thrown.expectMessage( startsWith( "Expected root element 'project' but found 'model' (position: START_TAG seen <model>... @1:8" ) ); + File model = new File( System.getProperty( "basedir" ), "src/test/models/model-with-wrong-root-tag.xml" ); MavenXpp3Reader reader = new MavenXpp3Reader(); @@ -36,21 +36,21 @@ throws Exception { thrown.expectMessage( startsWith( "Unrecognised tag: 'groupId' (position: START_TAG seen ...<dependencies>" ) ); - + File model = new File( System.getProperty( "basedir" ), "src/test/models/model-with-missing-elements.xml" ); MavenXpp3Reader reader = new MavenXpp3Reader(); reader.read( new XmlStreamReader( model ), true ); } - + @Test public void testXpp3ParsingWithModelWithPostTags() throws Exception { // internal message from MXParser thrown.expectMessage( startsWith( "start tag not allowed in epilog" ) ); - + File model = new File( System.getProperty( "basedir" ), "src/test/models/model-with-post-tags.xml" ); MavenXpp3Reader reader = new MavenXpp3Reader(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-2.6.0/modello-plugins/modello-plugin-converters/pom.xml new/modello-2.7.0/modello-plugins/modello-plugin-converters/pom.xml --- old/modello-2.6.0/modello-plugins/modello-plugin-converters/pom.xml 2026-01-25 23:50:16.000000000 +0100 +++ new/modello-2.7.0/modello-plugins/modello-plugin-converters/pom.xml 2026-04-12 20:39:40.000000000 +0200 @@ -5,7 +5,7 @@ <parent> <groupId>org.codehaus.modello</groupId> <artifactId>modello-plugins</artifactId> - <version>2.6.0</version> + <version>2.7.0</version> </parent> <artifactId>modello-plugin-converters</artifactId> <name>Modello Model Version Converter Plugin</name> @@ -28,7 +28,7 @@ <dependency> <groupId>org.codehaus.woodstox</groupId> <artifactId>stax2-api</artifactId> - <version>4.2.2</version> + <version>4.3.0</version> <scope>test</scope> </dependency> <dependency> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-2.6.0/modello-plugins/modello-plugin-dom4j/pom.xml new/modello-2.7.0/modello-plugins/modello-plugin-dom4j/pom.xml --- old/modello-2.6.0/modello-plugins/modello-plugin-dom4j/pom.xml 2026-01-25 23:50:16.000000000 +0100 +++ new/modello-2.7.0/modello-plugins/modello-plugin-dom4j/pom.xml 2026-04-12 20:39:40.000000000 +0200 @@ -5,7 +5,7 @@ <parent> <groupId>org.codehaus.modello</groupId> <artifactId>modello-plugins</artifactId> - <version>2.6.0</version> + <version>2.7.0</version> </parent> <artifactId>modello-plugin-dom4j</artifactId> <name>Modello Dom4J Plugin</name> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-2.6.0/modello-plugins/modello-plugin-jackson/pom.xml new/modello-2.7.0/modello-plugins/modello-plugin-jackson/pom.xml --- old/modello-2.6.0/modello-plugins/modello-plugin-jackson/pom.xml 2026-01-25 23:50:16.000000000 +0100 +++ new/modello-2.7.0/modello-plugins/modello-plugin-jackson/pom.xml 2026-04-12 20:39:40.000000000 +0200 @@ -5,7 +5,7 @@ <parent> <groupId>org.codehaus.modello</groupId> <artifactId>modello-plugins</artifactId> - <version>2.6.0</version> + <version>2.7.0</version> </parent> <artifactId>modello-plugin-jackson</artifactId> <name>Modello Jackson Plugin</name> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-2.6.0/modello-plugins/modello-plugin-java/pom.xml new/modello-2.7.0/modello-plugins/modello-plugin-java/pom.xml --- old/modello-2.6.0/modello-plugins/modello-plugin-java/pom.xml 2026-01-25 23:50:16.000000000 +0100 +++ new/modello-2.7.0/modello-plugins/modello-plugin-java/pom.xml 2026-04-12 20:39:40.000000000 +0200 @@ -5,7 +5,7 @@ <parent> <groupId>org.codehaus.modello</groupId> <artifactId>modello-plugins</artifactId> - <version>2.6.0</version> + <version>2.7.0</version> </parent> <artifactId>modello-plugin-java</artifactId> <name>Modello Java Plugin</name> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-2.6.0/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/JavaModelloGenerator.java new/modello-2.7.0/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/JavaModelloGenerator.java --- old/modello-2.6.0/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/JavaModelloGenerator.java 2026-01-25 23:50:16.000000000 +0100 +++ new/modello-2.7.0/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/JavaModelloGenerator.java 2026-04-12 20:39:40.000000000 +0200 @@ -347,6 +347,7 @@ for (ModelField identifier : modelClass.getIdentifierFields(getGeneratedVersion())) { String name = identifier.getName(); + // for primitives reference field directly if ("boolean".equals(identifier.getType()) || "byte".equals(identifier.getType()) || "char".equals(identifier.getType()) @@ -357,7 +358,10 @@ || "long".equals(identifier.getType())) { sc.add("result = result && " + name + " == that." + name + ";"); } else { - name = "get" + capitalise(name) + "()"; + // non-primitives use getters + JavaFieldMetadata javaFieldMetadata = (JavaFieldMetadata) identifier.getMetadata(JavaFieldMetadata.ID); + String prefix = getPrefix(javaFieldMetadata); + name = prefix + capitalise(name) + "()"; sc.add("result = result && ( " + name + " == null ? that." + name + " == null : " + name + ".equals( that." + name + " ) );"); } @@ -396,10 +400,11 @@ for (Iterator<ModelField> j = fields.iterator(); j.hasNext(); ) { ModelField identifier = j.next(); - String getter = "boolean".equals(identifier.getType()) ? "is" : "get"; + JavaFieldMetadata javaFieldMetadata = (JavaFieldMetadata) identifier.getMetadata(JavaFieldMetadata.ID); + String prefix = getPrefix(javaFieldMetadata); sc.add("buf.append( \"" + identifier.getName() + " = '\" );"); - sc.add("buf.append( " + getter + capitalise(identifier.getName()) + "() );"); + sc.add("buf.append( " + prefix + capitalise(identifier.getName()) + "() );"); sc.add("buf.append( \"'\" );"); if (j.hasNext()) { @@ -1173,7 +1178,7 @@ JavaFieldMetadata javaFieldMetadata = (JavaFieldMetadata) modelField.getMetadata(JavaFieldMetadata.ID); - String prefix = javaFieldMetadata.isBooleanGetter() ? "is" : "get"; + String prefix = getPrefix(javaFieldMetadata); JType returnType = field.getType(); String interfaceCast = ""; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-2.6.0/modello-plugins/modello-plugin-java/src/test/resources/models/tostring.mdo new/modello-2.7.0/modello-plugins/modello-plugin-java/src/test/resources/models/tostring.mdo --- old/modello-2.6.0/modello-plugins/modello-plugin-java/src/test/resources/models/tostring.mdo 2026-01-25 23:50:16.000000000 +0100 +++ new/modello-2.7.0/modello-plugins/modello-plugin-java/src/test/resources/models/tostring.mdo 2026-04-12 20:39:40.000000000 +0200 @@ -25,6 +25,12 @@ <type>double</type> <identifier>true</identifier> </field> + <field> + <name>flag</name> + <version>1.0.0</version> + <type>Boolean</type> + <identifier>true</identifier> + </field> </fields> </class> </classes> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-2.6.0/modello-plugins/modello-plugin-jdom/pom.xml new/modello-2.7.0/modello-plugins/modello-plugin-jdom/pom.xml --- old/modello-2.6.0/modello-plugins/modello-plugin-jdom/pom.xml 2026-01-25 23:50:16.000000000 +0100 +++ new/modello-2.7.0/modello-plugins/modello-plugin-jdom/pom.xml 2026-04-12 20:39:40.000000000 +0200 @@ -5,7 +5,7 @@ <parent> <groupId>org.codehaus.modello</groupId> <artifactId>modello-plugins</artifactId> - <version>2.6.0</version> + <version>2.7.0</version> </parent> <artifactId>modello-plugin-jdom</artifactId> <name>Modello JDOM Plugin</name> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-2.6.0/modello-plugins/modello-plugin-jsonschema/pom.xml new/modello-2.7.0/modello-plugins/modello-plugin-jsonschema/pom.xml --- old/modello-2.6.0/modello-plugins/modello-plugin-jsonschema/pom.xml 2026-01-25 23:50:16.000000000 +0100 +++ new/modello-2.7.0/modello-plugins/modello-plugin-jsonschema/pom.xml 2026-04-12 20:39:40.000000000 +0200 @@ -5,7 +5,7 @@ <parent> <groupId>org.codehaus.modello</groupId> <artifactId>modello-plugins</artifactId> - <version>2.6.0</version> + <version>2.7.0</version> </parent> <artifactId>modello-plugin-jsonschema</artifactId> <name>Modello JSON-Schema Plugin</name> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-2.6.0/modello-plugins/modello-plugin-sax/pom.xml new/modello-2.7.0/modello-plugins/modello-plugin-sax/pom.xml --- old/modello-2.6.0/modello-plugins/modello-plugin-sax/pom.xml 2026-01-25 23:50:16.000000000 +0100 +++ new/modello-2.7.0/modello-plugins/modello-plugin-sax/pom.xml 2026-04-12 20:39:40.000000000 +0200 @@ -5,7 +5,7 @@ <parent> <groupId>org.codehaus.modello</groupId> <artifactId>modello-plugins</artifactId> - <version>2.6.0</version> + <version>2.7.0</version> </parent> <artifactId>modello-plugin-sax</artifactId> <name>Modello SAX Plugin</name> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-2.6.0/modello-plugins/modello-plugin-snakeyaml/pom.xml new/modello-2.7.0/modello-plugins/modello-plugin-snakeyaml/pom.xml --- old/modello-2.6.0/modello-plugins/modello-plugin-snakeyaml/pom.xml 2026-01-25 23:50:16.000000000 +0100 +++ new/modello-2.7.0/modello-plugins/modello-plugin-snakeyaml/pom.xml 2026-04-12 20:39:40.000000000 +0200 @@ -5,7 +5,7 @@ <parent> <groupId>org.codehaus.modello</groupId> <artifactId>modello-plugins</artifactId> - <version>2.6.0</version> + <version>2.7.0</version> </parent> <artifactId>modello-plugin-snakeyaml</artifactId> <name>Modello SnakeYaml Plugin</name> @@ -24,7 +24,7 @@ <dependency> <groupId>org.yaml</groupId> <artifactId>snakeyaml</artifactId> - <version>2.5</version> + <version>2.6</version> </dependency> <!-- needed for modello compiler test(inside)--> <dependency> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-2.6.0/modello-plugins/modello-plugin-stax/pom.xml new/modello-2.7.0/modello-plugins/modello-plugin-stax/pom.xml --- old/modello-2.6.0/modello-plugins/modello-plugin-stax/pom.xml 2026-01-25 23:50:16.000000000 +0100 +++ new/modello-2.7.0/modello-plugins/modello-plugin-stax/pom.xml 2026-04-12 20:39:40.000000000 +0200 @@ -5,7 +5,7 @@ <parent> <groupId>org.codehaus.modello</groupId> <artifactId>modello-plugins</artifactId> - <version>2.6.0</version> + <version>2.7.0</version> </parent> <artifactId>modello-plugin-stax</artifactId> <name>Modello StAX Plugin</name> @@ -28,7 +28,7 @@ <dependency> <groupId>org.codehaus.woodstox</groupId> <artifactId>stax2-api</artifactId> - <version>4.2.2</version> + <version>4.3.0</version> <scope>test</scope> </dependency> <dependency> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-2.6.0/modello-plugins/modello-plugin-velocity/pom.xml new/modello-2.7.0/modello-plugins/modello-plugin-velocity/pom.xml --- old/modello-2.6.0/modello-plugins/modello-plugin-velocity/pom.xml 2026-01-25 23:50:16.000000000 +0100 +++ new/modello-2.7.0/modello-plugins/modello-plugin-velocity/pom.xml 2026-04-12 20:39:40.000000000 +0200 @@ -5,7 +5,7 @@ <parent> <groupId>org.codehaus.modello</groupId> <artifactId>modello-plugins</artifactId> - <version>2.6.0</version> + <version>2.7.0</version> </parent> <artifactId>modello-plugin-velocity</artifactId> <name>Modello Velocity Plugin</name> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-2.6.0/modello-plugins/modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/VelocityGenerator.java new/modello-2.7.0/modello-plugins/modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/VelocityGenerator.java --- old/modello-2.6.0/modello-plugins/modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/VelocityGenerator.java 2026-01-25 23:50:16.000000000 +0100 +++ new/modello-2.7.0/modello-plugins/modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/VelocityGenerator.java 2026-04-12 20:39:40.000000000 +0200 @@ -54,6 +54,7 @@ @Override @SuppressWarnings("unchecked") public void generate(Model model, Map<String, Object> parameters) throws ModelloException { + initialize(model, parameters); try { Map<String, String> params = (Map<String, String>) Objects.requireNonNull(parameters.get(VELOCITY_PARAMETERS)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-2.6.0/modello-plugins/modello-plugin-xdoc/pom.xml new/modello-2.7.0/modello-plugins/modello-plugin-xdoc/pom.xml --- old/modello-2.6.0/modello-plugins/modello-plugin-xdoc/pom.xml 2026-01-25 23:50:16.000000000 +0100 +++ new/modello-2.7.0/modello-plugins/modello-plugin-xdoc/pom.xml 2026-04-12 20:39:40.000000000 +0200 @@ -5,7 +5,7 @@ <parent> <groupId>org.codehaus.modello</groupId> <artifactId>modello-plugins</artifactId> - <version>2.6.0</version> + <version>2.7.0</version> </parent> <artifactId>modello-plugin-xdoc</artifactId> <name>Modello XDOC Plugin</name> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-2.6.0/modello-plugins/modello-plugin-xdoc/src/main/java/org/codehaus/modello/plugin/xdoc/XdocGenerator.java new/modello-2.7.0/modello-plugins/modello-plugin-xdoc/src/main/java/org/codehaus/modello/plugin/xdoc/XdocGenerator.java --- old/modello-2.6.0/modello-plugins/modello-plugin-xdoc/src/main/java/org/codehaus/modello/plugin/xdoc/XdocGenerator.java 2026-01-25 23:50:16.000000000 +0100 +++ new/modello-2.7.0/modello-plugins/modello-plugin-xdoc/src/main/java/org/codehaus/modello/plugin/xdoc/XdocGenerator.java 2026-04-12 20:39:40.000000000 +0200 @@ -417,6 +417,10 @@ w.writeMarkup(getDescription(f)); + if (f.isRequired()) { + w.writeMarkup("<p><strong>Required</strong>: Yes.</p>"); + } + // Write the default value, if it exists. // But only for fields that are not a ModelAssociation if (f.getDefaultValue() != null && !(f instanceof ModelAssociation)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-2.6.0/modello-plugins/modello-plugin-xdoc/src/test/java/org/codehaus/modello/plugin/xdoc/XdocGeneratorTest.java new/modello-2.7.0/modello-plugins/modello-plugin-xdoc/src/test/java/org/codehaus/modello/plugin/xdoc/XdocGeneratorTest.java --- old/modello-2.6.0/modello-plugins/modello-plugin-xdoc/src/test/java/org/codehaus/modello/plugin/xdoc/XdocGeneratorTest.java 2026-01-25 23:50:16.000000000 +0100 +++ new/modello-2.7.0/modello-plugins/modello-plugin-xdoc/src/test/java/org/codehaus/modello/plugin/xdoc/XdocGeneratorTest.java 2026-04-12 20:39:40.000000000 +0200 @@ -135,6 +135,16 @@ // verify( "org.codehaus.modello.generator.xml.cdoc.XdocVerifier", "xdoc" ); checkInternalLinks("maven.xml"); + + String content = FileUtils.fileRead(new File(getOutputDirectory(), "maven.xml"), "UTF-8"); + + Pattern requiredModelVersion = + Pattern.compile("<code>modelVersion</code>.*?<strong>Required</strong>: Yes\\.", Pattern.DOTALL); + assertTrue(requiredModelVersion.matcher(content).find(), "Required modelVersion field should be documented"); + + Pattern requiredGroupId = + Pattern.compile("<code>groupId</code>.*?<strong>Required</strong>: Yes\\.", Pattern.DOTALL); + assertTrue(requiredGroupId.matcher(content).find(), "Required groupId field should be documented"); } public void checkFeaturesXdocGenerator() throws Exception { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-2.6.0/modello-plugins/modello-plugin-xml/pom.xml new/modello-2.7.0/modello-plugins/modello-plugin-xml/pom.xml --- old/modello-2.6.0/modello-plugins/modello-plugin-xml/pom.xml 2026-01-25 23:50:16.000000000 +0100 +++ new/modello-2.7.0/modello-plugins/modello-plugin-xml/pom.xml 2026-04-12 20:39:40.000000000 +0200 @@ -5,7 +5,7 @@ <parent> <groupId>org.codehaus.modello</groupId> <artifactId>modello-plugins</artifactId> - <version>2.6.0</version> + <version>2.7.0</version> </parent> <artifactId>modello-plugin-xml</artifactId> <name>Modello XML Plugin</name> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-2.6.0/modello-plugins/modello-plugin-xpp3/pom.xml new/modello-2.7.0/modello-plugins/modello-plugin-xpp3/pom.xml --- old/modello-2.6.0/modello-plugins/modello-plugin-xpp3/pom.xml 2026-01-25 23:50:16.000000000 +0100 +++ new/modello-2.7.0/modello-plugins/modello-plugin-xpp3/pom.xml 2026-04-12 20:39:40.000000000 +0200 @@ -5,7 +5,7 @@ <parent> <groupId>org.codehaus.modello</groupId> <artifactId>modello-plugins</artifactId> - <version>2.6.0</version> + <version>2.7.0</version> </parent> <artifactId>modello-plugin-xpp3</artifactId> <name>Modello XPP3 Plugin</name> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-2.6.0/modello-plugins/modello-plugin-xsd/pom.xml new/modello-2.7.0/modello-plugins/modello-plugin-xsd/pom.xml --- old/modello-2.6.0/modello-plugins/modello-plugin-xsd/pom.xml 2026-01-25 23:50:16.000000000 +0100 +++ new/modello-2.7.0/modello-plugins/modello-plugin-xsd/pom.xml 2026-04-12 20:39:40.000000000 +0200 @@ -5,7 +5,7 @@ <parent> <groupId>org.codehaus.modello</groupId> <artifactId>modello-plugins</artifactId> - <version>2.6.0</version> + <version>2.7.0</version> </parent> <artifactId>modello-plugin-xsd</artifactId> <name>Modello XSD Plugin</name> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-2.6.0/modello-plugins/pom.xml new/modello-2.7.0/modello-plugins/pom.xml --- old/modello-2.6.0/modello-plugins/pom.xml 2026-01-25 23:50:16.000000000 +0100 +++ new/modello-2.7.0/modello-plugins/pom.xml 2026-04-12 20:39:40.000000000 +0200 @@ -5,7 +5,7 @@ <parent> <groupId>org.codehaus.modello</groupId> <artifactId>modello</artifactId> - <version>2.6.0</version> + <version>2.7.0</version> </parent> <artifactId>modello-plugins</artifactId> <packaging>pom</packaging> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-2.6.0/modello-test/pom.xml new/modello-2.7.0/modello-test/pom.xml --- old/modello-2.6.0/modello-test/pom.xml 2026-01-25 23:50:16.000000000 +0100 +++ new/modello-2.7.0/modello-test/pom.xml 2026-04-12 20:39:40.000000000 +0200 @@ -5,7 +5,7 @@ <parent> <groupId>org.codehaus.modello</groupId> <artifactId>modello</artifactId> - <version>2.6.0</version> + <version>2.7.0</version> </parent> <artifactId>modello-test</artifactId> <name>Modello Test Package</name> @@ -13,7 +13,7 @@ and xml files to test every feature for every plugin.</description> <properties> - <plexus.compiler.version>2.16.1</plexus.compiler.version> + <plexus.compiler.version>2.16.2</plexus.compiler.version> </properties> <dependencies> <dependency> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/modello-2.6.0/pom.xml new/modello-2.7.0/pom.xml --- old/modello-2.6.0/pom.xml 2026-01-25 23:50:16.000000000 +0100 +++ new/modello-2.7.0/pom.xml 2026-04-12 20:39:40.000000000 +0200 @@ -10,7 +10,7 @@ <groupId>org.codehaus.modello</groupId> <artifactId>modello</artifactId> - <version>2.6.0</version> + <version>2.7.0</version> <packaging>pom</packaging> <name>Modello</name> @@ -158,7 +158,7 @@ <scm> <connection>${scm.url}</connection> <developerConnection>${scm.url}</developerConnection> - <tag>modello-2.6.0</tag> + <tag>modello-2.7.0</tag> <url>https://github.com/codehaus-plexus/modello/tree/${project.scm.tag}/</url> </scm> @@ -182,10 +182,10 @@ <properties> <scm.url>scm:git:[email protected]:codehaus-plexus/modello.git</scm.url> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <jackson.version>2.21.0</jackson.version> + <jackson.version>2.21.2</jackson.version> <jdom.version>2.0.2</jdom.version> <slf4j.version>1.7.36</slf4j.version> - <sisu.version>0.9.0.M4</sisu.version> + <sisu.version>1.0.0</sisu.version> <mavenVersion>3.6.3</mavenVersion> <junit4Version>4.13.2</junit4Version> <!-- @@ -194,7 +194,7 @@ ! in the integration tests. --> <javaVersion>8</javaVersion> - <project.build.outputTimestamp>2026-01-25T23:50:15Z</project.build.outputTimestamp> + <project.build.outputTimestamp>2026-04-12T20:39:40Z</project.build.outputTimestamp> </properties> <dependencyManagement> @@ -305,7 +305,7 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> - <version>4.0.2</version> + <version>4.0.3</version> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> ++++++ modello-build.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/common.xml new/common.xml --- old/common.xml 2026-02-27 15:07:54.982768115 +0100 +++ new/common.xml 2026-05-08 20:11:27.071536148 +0200 @@ -3,7 +3,7 @@ <project name="common" basedir="."> <property file="build.properties"/> - <property name="project.version" value="2.6.0"/> + <property name="project.version" value="2.7.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/"/>
