Update to Modello 2.4.0

Author: akurtakov

org.eclipse.m2e.core/mdo/lifecycle-mapping-metadata-model.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
-<model xmlns="http://modello.codehaus.org/MODELLO/1.4.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://modello.codehaus.org/MODELLO/1.4.1 http://modello.codehaus.org/xsd/modello-1.4.1.xsd">
+<model xmlns="http://codehaus-plexus.github.io/MODELLO/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://codehaus-plexus.github.io/MODELLO/2.0.0 https://codehaus-plexus.github.io/modello/xsd/modello-2.0.0.xsd">
 
   <id>lifecycle-mapping-metadata-model</id>
   <name>LifecycleMappingMetadataSource</name>
@@ -70,13 +70,15 @@
     <class xml.tagName="lifecycleMapping" xml.standaloneRead="true">
       <name>LifecycleMappingMetadata</name>
       <fields>
-        <field required="true">
+        <field>
           <name>packagingType</name>
           <type>String</type>
+          <required>true</required>
         </field>
-        <field required="true">
+        <field>
           <name>lifecycleMappingId</name>
           <type>String</type>
+          <required>true</required>
         </field>
         <field>
           <name>lifecycleMappingVersionRange</name>
@@ -109,25 +111,29 @@
     <class xml.tagName="pluginExecutionFilter" xml.standaloneRead="true" java.clone="deep">
       <name>PluginExecutionFilter</name>
       <fields>
-        <field required="true">
+        <field>
           <name>groupId</name>
           <identifier>true</identifier>
           <type>String</type>
+          <required>true</required>
         </field>
-        <field required="true">
+        <field>
           <name>artifactId</name>
           <identifier>true</identifier>
           <type>String</type>
+          <required>true</required>
         </field>
-        <field required="true" java.setter="false">
+        <field java.setter="false">
           <name>versionRange</name>
           <identifier>true</identifier>
           <type>String</type>
+          <required>true</required>
         </field>
-        <field required="true">
+        <field>
           <name>goals</name>
           <identifier>true</identifier>
           <type>Set</type>
+          <required>true</required>
           <association>
             <type>String</type>
             <multiplicity>*</multiplicity>
@@ -213,28 +219,32 @@
     <class xml.tagName="lifecycleMappingFilter" xml.standaloneRead="true" java.clone="deep">
       <name>LifecycleMappingFilter</name>
       <fields>
-        <field required="true">
+        <field>
           <name>symbolicName</name>
           <identifier>true</identifier>
           <type>String</type>
+          <required>true</required>
         </field>
-        <field required="true" java.setter="false">
+        <field java.setter="false">
           <name>versionRange</name>
           <identifier>true</identifier>
           <type>String</type>
+          <required>true</required>
         </field>
-        <field required="true">
+        <field>
           <name>pluginExecutions</name>
           <identifier>true</identifier>
+          <required>true</required>
           <type>Set</type>
           <association>
             <type>PluginExecutionFilter</type>
             <multiplicity>*</multiplicity>
           </association>
         </field>
-        <field required="true">
+        <field>
           <name>packagingTypes</name>
           <identifier>true</identifier>
+          <required>true</required>
           <type>Set</type>
           <association>
             <type>String</type>
@@ -281,20 +291,23 @@
         <interface>org.eclipse.m2e.core.lifecyclemapping.model.IPluginExecutionMetadata</interface>
       </interfaces>
       <fields>
-        <field required="true" xml.tagName="pluginExecutionFilter">
+        <field xml.tagName="pluginExecutionFilter">
           <name>filter</name>
+          <required>true</required>
           <association>
             <type>PluginExecutionFilter</type>
             <multiplicity>1</multiplicity>
           </association>
         </field>
-        <field required="true" xml.tagName="action">
+        <field xml.tagName="action">
           <name>actionDom</name>
           <type>DOM</type>
+          <required>true</required>
         </field>
-        <field required="false" xml.tagName="comment">
+        <field xml.tagName="comment">
           <name>comment</name>
           <type>String</type>
+          <required>true</required>
           <description>
              Arbitrary comment that describes the mapping. The comment is not interpreted by m2e in any way.
              @since 1.2

org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingFactory.java

@@ -707,10 +707,11 @@ private static List<PluginExecutionMetadata> applyParametersFilter(List<PluginEx
 
   private static boolean hasMatchingParameterValue(MavenProject mavenProject, MojoExecution execution,
       PluginExecutionMetadata metadata, IMaven maven, IProgressMonitor monitor) throws CoreException {
-    Map<String, Object> parameters = metadata.getFilter().getParameters();
-    for(Entry<String, Object> entry : parameters.entrySet()) {
+    Map<Object, String> parameters = metadata.getFilter().getParameters();
+    for(Entry<Object, String> entry : parameters.entrySet()) {
       MojoExecution setupExecution = maven.setupMojoExecution(mavenProject, execution, monitor);
-      String value = maven.getMojoParameterValue(mavenProject, setupExecution, entry.getKey(), String.class, monitor);
+      String value = maven.getMojoParameterValue(mavenProject, setupExecution, (String) entry.getKey(), String.class,
+          monitor);
       if(!Objects.equals(entry.getValue(), value)) {
         return false;
       }

pom.xml

@@ -272,7 +272,7 @@
 					<plugin>
 						<groupId>org.codehaus.modello</groupId>
 						<artifactId>modello-maven-plugin</artifactId>
-						<version>1.5</version>
+						<version>2.4.0</version>
 						<executions>
 							<execution>
 								<?m2e execute?>
@@ -285,7 +285,7 @@
 								<configuration>
 									<outputDirectory>${project.basedir}/src-gen</outputDirectory>
 									<version>1.0.0</version>
-									<useJava5>true</useJava5>
+									<javaSource>21</javaSource>
 									<models>
 										<model>
 											mdo/lifecycle-mapping-metadata-model.xml</model>