[MCHANGES-425] Use the latest version of modello, update changes schema

apache · Nov 18, 2024 · 599e727 · 599e727
1 parent 6f4584b
commit 599e727
Show file tree

Hide file tree

Showing 11 changed files with 112 additions and 109 deletions.
diff --git a/pom.xml b/pom.xml
@@ -433,10 +433,9 @@ under the License.
       <plugin>
         <groupId>org.codehaus.modello</groupId>
         <artifactId>modello-maven-plugin</artifactId>
-        <version>1.0.1</version>
+        <version>2.4.0</version>
         <configuration>
-          <useJava5>true</useJava5>
-          <version>1.0.0</version>
+          <version>2.0.0</version>
           <models>
             <model>src/main/mdo/changes.mdo</model>
           </models>
@@ -492,24 +491,6 @@ under the License.
           </execution>
         </executions>
       </plugin>
-      <!-- workaround to remove timestamp inserted by Modello 1.0.1 into generated .java and .xsd -->
-      <plugin>
-        <groupId>org.codehaus.gmaven</groupId>
-        <artifactId>groovy-maven-plugin</artifactId>
-        <version>2.1.1</version>
-        <executions>
-          <execution>
-            <id>patch-changes-xsd</id>
-            <goals>
-              <goal>execute</goal>
-            </goals>
-            <phase>process-resources</phase>
-            <configuration>
-              <source>${project.basedir}/src/main/script/patch-modello.groovy</source>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 

diff --git a/src/main/java/org/apache/maven/plugins/changes/ChangesReportGenerator.java b/src/main/java/org/apache/maven/plugins/changes/ChangesReportGenerator.java
@@ -209,7 +209,7 @@ private void constructAction(Sink sink, ResourceBundle bundle, Action action) {
 
         sink.tableCell();
 
-        String actionDescription = action.getAction();
+        String actionDescription = action.getDescription();
 
         if (escapeHTML) {
             sink.text(actionDescription);

diff --git a/src/main/java/org/apache/maven/plugins/changes/IssueAdapter.java b/src/main/java/org/apache/maven/plugins/changes/IssueAdapter.java
@@ -123,7 +123,7 @@ public Action createAction(Issue issue) {
 
         action.setDueTo(issue.getReporter() == null ? "" : issue.getReporter());
 
-        action.setAction(issue.getSummary());
+        action.setDescription(issue.getSummary());
         return action;
     }
 }
diff --git a/src/main/java/org/apache/maven/plugins/changes/ReleaseUtils.java b/src/main/java/org/apache/maven/plugins/changes/ReleaseUtils.java
@@ -103,7 +103,7 @@ protected void logRelease(Release release) {
             action = action1;
             getLog().debug("o " + action.getType());
             getLog().debug("issue : " + action.getIssue());
-            getLog().debug("action : " + action.getAction());
+            getLog().debug("action : " + action.getDescription());
             getLog().debug("dueTo : " + action.getDueTo());
         }
     }