This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch MCHANGES-425
in repository https://gitbox.apache.org/repos/asf/maven-changes-plugin.git
commit 599e7277fdddc13d2fbe3d0fa8b2587887ff500e
Author: Slawomir Jaranowski <s.jaranow...@gmail.com>
AuthorDate: Mon Nov 18 21:51:59 2024 +0100
[MCHANGES-425] Use the latest version of modello, update changes schema
---
pom.xml | 23 +-----
.../plugins/changes/ChangesReportGenerator.java | 2 +-
.../apache/maven/plugins/changes/IssueAdapter.java | 2 +-
.../apache/maven/plugins/changes/ReleaseUtils.java | 2 +-
src/main/mdo/changes.mdo | 93 +++++++++++-----------
.../maven/plugins/announcement/announcement.vm | 8 +-
.../apache/maven/plugins/changes/ActionTest.java | 4 +-
.../plugins/changes/ChangesValidatorMojoTest.java | 3 +-
.../maven/plugins/changes/ChangesXMLTest.java | 2 +-
src/test/unit/announce-changes.xml | 54 ++++++++-----
src/test/unit/changes.xml | 28 ++++---
11 files changed, 112 insertions(+), 109 deletions(-)
diff --git a/pom.xml b/pom.xml
index 68cb154..a8a41d0 100644
--- 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
index a1ff1df..6851a9b 100644
--- 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 @@ public class ChangesReportGenerator extends
AbstractIssuesReportGenerator {
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
index 34923a9..120b948 100644
--- 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 class IssueAdapter {
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
index 482f8a8..c03f27e 100644
--- 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 @@ public class ReleaseUtils {
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());
}
}
diff --git a/src/main/mdo/changes.mdo b/src/main/mdo/changes.mdo
index 880cb85..d62f89b 100644
--- a/src/main/mdo/changes.mdo
+++ b/src/main/mdo/changes.mdo
@@ -17,11 +17,10 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<model xmlns="https://codehaus-plexus.github.io/MODELLO/1.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="https://codehaus-plexus.github.io/MODELLO/1.0.0
https://codehaus-plexus.github.io/modello/xsd/modello-1.0.0.xsd";
- xsd.namespace="http://maven.apache.org/changes/1.0.0";
- xsd.targetNamespace="http://maven.apache.org/changes/1.0.0";>
+<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";
+ xml.namespace="http://maven.apache.org/changes/${version}";
+ xml.schemaLocation="https://maven.apache.org/xsd/${version}.xsd";>
<id>changes</id>
<name>Changes</name>
<description>
@@ -40,11 +39,11 @@ under the License.
<description>
Record every release with their subsequent changes.
</description>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<fields>
<field>
<name>properties</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<association>
<type>Properties</type>
<multiplicity>1</multiplicity>
@@ -55,7 +54,7 @@ under the License.
</field>
<field>
<name>body</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<required>true</required>
<association>
<type>Body</type>
@@ -69,18 +68,18 @@ under the License.
</class>
<class>
<name>Properties</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<fields>
<field>
<name>title</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<required>true</required>
<type>String</type>
<description>The page title.</description>
</field>
<field>
<name>author</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<description>The page author.</description>
<association>
<type>Author</type>
@@ -91,11 +90,11 @@ under the License.
</class>
<class xsd.compositor="sequence">
<name>Body</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<fields>
<field>
<name>releases</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<association xml.itemsStyle="flat">
<type>Release</type>
<multiplicity>*</multiplicity>
@@ -106,12 +105,12 @@ under the License.
</class>
<class xsd.compositor="sequence">
<name>Release</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<description>A single release of this project.</description>
<fields>
<field xml.attribute="true">
<name>version</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<required>true</required>
<type>String</type>
<description>
@@ -120,7 +119,7 @@ under the License.
</field>
<field xml.attribute="true" xml.tagName="date">
<name>dateRelease</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<required>true</required>
<type>String</type>
<description>
@@ -132,7 +131,7 @@ under the License.
</field>
<field xml.attribute="true">
<name>description</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<type>String</type>
<description>
A short description of this release.
@@ -140,7 +139,7 @@ under the License.
</field>
<field>
<name>actions</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<association xml.itemsStyle="flat">
<type>Action</type>
<multiplicity>*</multiplicity>
@@ -150,7 +149,7 @@ under the License.
</fields>
<codeSegments>
<codeSegment>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<code><![CDATA[
public java.util.List<Action> getActions(String type)
{
@@ -167,7 +166,7 @@ under the License.
]]></code>
</codeSegment>
<codeSegment>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<code><