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

pom.xml

@@ -405,15 +405,12 @@ under the License.
       <plugin>
         <groupId>org.codehaus.modello</groupId>
         <artifactId>modello-maven-plugin</artifactId>
-        <version>1.0.1</version>
         <configuration>
-          <useJava5>true</useJava5>
-          <version>1.0.0</version>
+          <version>2.0.0</version>
           <models>
             <model>src/main/mdo/changes.mdo</model>
           </models>
         </configuration>
-        <!-- cannot upgrade because of MODELLO-254 -->
         <executions>
           <execution>
             <id>site-docs</id>
@@ -427,7 +424,6 @@ under the License.
             <goals>
               <goal>java</goal>
               <goal>xpp3-reader</goal>
-              <goal>xpp3-writer</goal>
             </goals>
           </execution>
           <execution>
@@ -452,24 +448,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>
 

src/it/announce-generate-inconsistent-issue-management/src/changes/changes.xml

@@ -17,9 +17,9 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<document xmlns="http://maven.apache.org/changes/1.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/xsd/changes-1.0.0.xsd">
+<document xmlns="http://maven.apache.org/changes/2.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/changes/2.0.0 http://maven.apache.org/xsd/changes-2.0.0.xsd">
   <properties>
     <title>Changes report Project</title>
     <author email="[email protected]">Mr Zloug</author>
@@ -32,33 +32,29 @@ under the License.
       <action dev="me" type="fix" issue="MCHANGES-88">
         Enable retrieving component-specific issues.
       </action>
-      <action dev="jruiz" type="remove" issue="MCHANGES-899">
+      <action dev="jruiz" type="remove" issue="MCHANGES-899"
+              fixedIssues="MCHANGES-1,JIRA-12"
+              due-to="John Doe,John Doe" due-to-email="[email protected]">
         The element type " link " must be terminated by the matching end-tag.
         Deleted the erroneous code.
-        <fixes issue="MCHANGES-1"/>
-        <fixes issue="JIRA-12"/>
-        <dueto name="John Doe" email="[email protected]"/>
-        <dueto name="Jane Doe"/>
       </action>
-      <action dev="you" type="update" issue="MCHANGES-999" system="bugzilla" due-to="External Submitter">
+      <action dev="you" type="update" issue="MCHANGES-999"
+              fixedIssues="bug-12345"
+              system="bugzilla"
+              due-to="External Submitter,John Doe" due-to-email=",[email protected]">
         Handle different issue systems.
-        <fixes issue="bug-12345"/>
-        <dueto name="John Doe" email="[email protected]"/>
       </action>
-      <action dev="him" type="update">
+      <action dev="him" type="update"
+              due-to="John Doe,John Doe" due-to-email="[email protected]">
         Updated dependencies.
-        <dueto name="John Doe" email="[email protected]"/>
-        <dueto name="Jane Doe"/>
       </action>
     </release>
 
     <release version="1.0" date="2005-01-01" description="First release">
-      <action dev="me" type="update" issue="MCHANGES-47" due-to="others" due-to-email="[email protected]">
+      <action dev="me" type="update" issue="MCHANGES-47"
+              fixedIssues="MCHANGES-88,JIRA-YYY"
+              due-to="others,John Doe,John Doe" due-to-email="[email protected],[email protected]">
         Uploaded documentation on how to use the plugin.
-        <fixes issue="MCHANGES-88"/>
-        <fixes issue="JIRA-YYY"/>
-        <dueto name="John Doe" email="[email protected]"/>
-        <dueto name="Jane Doe"/>
       </action>
     </release>
   </body>

src/it/announce-generate-no-issue-management/src/changes/changes.xml

@@ -17,9 +17,9 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<document xmlns="http://maven.apache.org/changes/1.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/xsd/changes-1.0.0.xsd">
+<document xmlns="http://maven.apache.org/changes/2.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/changes/2.0.0 http://maven.apache.org/xsd/changes-2.0.0.xsd">
   <properties>
     <title>Changes report Project</title>
     <author email="[email protected]">Mr Zloug</author>
@@ -32,33 +32,29 @@ under the License.
       <action dev="me" type="fix" issue="MCHANGES-88">
         Enable retrieving component-specific issues.
       </action>
-      <action dev="jruiz" type="remove" issue="MCHANGES-899">
+      <action dev="jruiz" type="remove" issue="MCHANGES-899"
+              fixedIssues="MCHANGES-1,JIRA-12"
+              due-to="John Doe,John Doe" due-to-email="[email protected]">
         The element type " link " must be terminated by the matching end-tag.
         Deleted the erroneous code.
-        <fixes issue="MCHANGES-1"/>
-        <fixes issue="JIRA-12"/>
-        <dueto name="John Doe" email="[email protected]"/>
-        <dueto name="Jane Doe"/>
       </action>
-      <action dev="you" type="update" issue="MCHANGES-999" system="bugzilla" due-to="External Submitter">
+      <action dev="you" type="update" issue="MCHANGES-999"
+              fixedIssues="bug-12345"
+              system="bugzilla"
+              due-to="External Submitter,John Doe" due-to-email=",[email protected]">
         Handle different issue systems.
-        <fixes issue="bug-12345"/>
-        <dueto name="John Doe" email="[email protected]"/>
       </action>
-      <action dev="him" type="update">
+      <action dev="him" type="update"
+              due-to="John Doe,John Doe" due-to-email="[email protected]">
         Updated dependencies.
-        <dueto name="John Doe" email="[email protected]"/>
-        <dueto name="Jane Doe"/>
       </action>
     </release>
 
     <release version="1.0" date="2005-01-01" description="First release">
-      <action dev="me" type="update" issue="MCHANGES-47" due-to="others" due-to-email="[email protected]">
+      <action dev="me" type="update" issue="MCHANGES-47"
+              fixedIssues="MCHANGES-88,JIRA-YYY"
+              due-to="others,John Doe,John Doe" due-to-email="[email protected],[email protected]">
         Uploaded documentation on how to use the plugin.
-        <fixes issue="MCHANGES-88"/>
-        <fixes issue="JIRA-YYY"/>
-        <dueto name="John Doe" email="[email protected]"/>
-        <dueto name="Jane Doe"/>
       </action>
     </release>
   </body>

src/it/announce-generate-no-url/src/changes/changes.xml

@@ -17,9 +17,9 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<document xmlns="http://maven.apache.org/changes/1.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/xsd/changes-1.0.0.xsd">
+<document xmlns="http://maven.apache.org/changes/2.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/changes/2.0.0 http://maven.apache.org/xsd/changes-2.0.0.xsd">
   <properties>
     <title>Changes report Project</title>
     <author email="[email protected]">Mr Zloug</author>
@@ -32,33 +32,29 @@ under the License.
       <action dev="me" type="fix" issue="MCHANGES-88">
         Enable retrieving component-specific issues.
       </action>
-      <action dev="jruiz" type="remove" issue="MCHANGES-899">
+      <action dev="jruiz" type="remove" issue="MCHANGES-899"
+              fixedIssues="MCHANGES-1,JIRA-12"
+              due-to="John Doe,John Doe" due-to-email="[email protected]">
         The element type " link " must be terminated by the matching end-tag.
         Deleted the erroneous code.
-        <fixes issue="MCHANGES-1"/>
-        <fixes issue="JIRA-12"/>
-        <dueto name="John Doe" email="[email protected]"/>
-        <dueto name="Jane Doe"/>
       </action>
-      <action dev="you" type="update" issue="MCHANGES-999" system="bugzilla" due-to="External Submitter">
+      <action dev="you" type="update" issue="MCHANGES-999"
+              fixedIssues="bug-12345"
+              system="bugzilla"
+              due-to="External Submitter,John Doe" due-to-email=",[email protected]">
         Handle different issue systems.
-        <fixes issue="bug-12345"/>
-        <dueto name="John Doe" email="[email protected]"/>
       </action>
-      <action dev="him" type="update">
+      <action dev="him" type="update"
+              due-to="John Doe,John Doe" due-to-email="[email protected]">
         Updated dependencies.
-        <dueto name="John Doe" email="[email protected]"/>
-        <dueto name="Jane Doe"/>
       </action>
     </release>
 
     <release version="1.0" date="2005-01-01" description="First release">
-      <action dev="me" type="update" issue="MCHANGES-47" due-to="others" due-to-email="[email protected]">
+      <action dev="me" type="update" issue="MCHANGES-47"
+              fixedIssues="MCHANGES-88,JIRA-YYY"
+              due-to="others,John Doe,John Doe" due-to-email="[email protected],[email protected]">
         Uploaded documentation on how to use the plugin.
-        <fixes issue="MCHANGES-88"/>
-        <fixes issue="JIRA-YYY"/>
-        <dueto name="John Doe" email="[email protected]"/>
-        <dueto name="Jane Doe"/>
       </action>
     </release>
   </body>

src/it/announce-generate/src/changes/changes.xml

@@ -17,9 +17,9 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<document xmlns="http://maven.apache.org/changes/1.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/xsd/changes-1.0.0.xsd">
+<document xmlns="http://maven.apache.org/changes/2.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/changes/2.0.0 http://maven.apache.org/xsd/changes-2.0.0.xsd">
   <properties>
     <title>Changes report Project</title>
     <author email="[email protected]">Mr Zloug</author>
@@ -32,33 +32,29 @@ under the License.
       <action dev="me" type="fix" issue="MCHANGES-88">
         Enable retrieving component-specific issues.
       </action>
-      <action dev="jruiz" type="remove" issue="MCHANGES-899">
+      <action dev="jruiz" type="remove" issue="MCHANGES-899"
+              fixedIssues="MCHANGES-1,JIRA-12"
+              due-to="John Doe,John Doe" due-to-email="[email protected]">
         The element type " link " must be terminated by the matching end-tag.
         Deleted the erroneous code.
-        <fixes issue="MCHANGES-1"/>
-        <fixes issue="JIRA-12"/>
-        <dueto name="John Doe" email="[email protected]"/>
-        <dueto name="Jane Doe"/>
       </action>
-      <action dev="you" type="update" issue="MCHANGES-999" system="bugzilla" due-to="External Submitter">
+      <action dev="you" type="update" issue="MCHANGES-999"
+              fixedIssues="bug-12345"
+              system="bugzilla"
+              due-to="External Submitter,John Doe" due-to-email=",[email protected]">
         Handle different issue systems.
-        <fixes issue="bug-12345"/>
-        <dueto name="John Doe" email="[email protected]"/>
       </action>
-      <action dev="him" type="update">
+      <action dev="him" type="update"
+              due-to="John Doe,John Doe" due-to-email="[email protected]">
         Updated dependencies.
-        <dueto name="John Doe" email="[email protected]"/>
-        <dueto name="Jane Doe"/>
       </action>
     </release>
 
     <release version="1.0" date="2005-01-01" description="First release">
-      <action dev="me" type="update" issue="MCHANGES-47" due-to="others" due-to-email="[email protected]">
+      <action dev="me" type="update" issue="MCHANGES-47"
+              fixedIssues="MCHANGES-88,JIRA-YYY"
+              due-to="others,John Doe,John Doe" due-to-email="[email protected],[email protected]">
         Uploaded documentation on how to use the plugin.
-        <fixes issue="MCHANGES-88"/>
-        <fixes issue="JIRA-YYY"/>
-        <dueto name="John Doe" email="[email protected]"/>
-        <dueto name="Jane Doe"/>
       </action>
     </release>
   </body>

src/it/announcement-generate-custom-template/src/changes/changes.xml

@@ -17,9 +17,9 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<document xmlns="http://maven.apache.org/changes/1.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/xsd/changes-1.0.0.xsd">
+<document xmlns="http://maven.apache.org/changes/2.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/changes/2.0.0 http://maven.apache.org/xsd/changes-2.0.0.xsd">
   <properties>
     <title>Changes report Project</title>
     <author email="[email protected]">Mr Zloug</author>
@@ -39,12 +39,10 @@ under the License.
     </release>
 
     <release version="1.0" date="2005-01-01" description="First release">
-      <action dev="me" type="update" issue="MCHANGES-47" due-to="others" due-to-email="[email protected]">
+      <action dev="me" type="update" issue="MCHANGES-47"
+              due-to="others,John Doe,John Doe" due-to-email="[email protected],[email protected]"
+              fixedIssues="MCHANGES-88,JIRA-YYY">
         Uploaded documentation on how to use the plugin.
-        <fixes issue="MCHANGES-88"/>
-        <fixes issue="JIRA-YYY"/>
-        <dueto name="John Doe" email="[email protected]"/>
-        <dueto name="Jane Doe"/>
       </action>
     </release>
   </body>

src/it/email-sender/src/changes/changes.xml

@@ -17,9 +17,9 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<document xmlns="http://maven.apache.org/changes/1.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/xsd/changes-1.0.0.xsd">
+<document xmlns="http://maven.apache.org/changes/2.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/changes/2.0.0 http://maven.apache.org/xsd/changes-2.0.0.xsd">
   <properties>
     <title>Changes report Project</title>
     <author email="[email protected]">Mr Zloug</author>
@@ -32,33 +32,29 @@ under the License.
       <action dev="me" type="fix" issue="MCHANGES-88">
         Enable retrieving component-specific issues.
       </action>
-      <action dev="jruiz" type="remove" issue="MCHANGES-899">
+      <action dev="jruiz" type="remove" issue="MCHANGES-899"
+              fixedIssues="MCHANGES-1,JIRA-12"
+              due-to="John Doe,John Doe" due-to-email="[email protected]">
         The element type " link " must be terminated by the matching end-tag.
         Deleted the erroneous code.
-        <fixes issue="MCHANGES-1"/>
-        <fixes issue="JIRA-12"/>
-        <dueto name="John Doe" email="[email protected]"/>
-        <dueto name="Jane Doe"/>
       </action>
-      <action dev="you" type="update" issue="MCHANGES-999" system="bugzilla">
+      <action dev="you" type="update" issue="MCHANGES-999"
+              fixedIssues="bug-12345"
+              system="bugzilla"
+              due-to="External Submitter,John Doe" due-to-email=",[email protected]">
         Handle different issue systems.
-        <fixes issue="bug-12345"/>
-        <dueto name="John Doe" email="[email protected]"/>
       </action>
-      <action dev="him" type="update">
+      <action dev="him" type="update"
+              due-to="John Doe,John Doe" due-to-email="[email protected]">
         Updated dependencies.
-        <dueto name="John Doe" email="[email protected]"/>
-        <dueto name="Jane Doe"/>
       </action>
     </release>
 
     <release version="1.0" date="2005-01-01" description="First release">
-      <action dev="me" type="update" issue="MCHANGES-47" due-to="others" due-to-email="[email protected]">
+      <action dev="me" type="update" issue="MCHANGES-47"
+              fixedIssues="MCHANGES-88,JIRA-YYY"
+              due-to="others,John Doe,John Doe" due-to-email="[email protected],[email protected]">
         Uploaded documentation on how to use the plugin.
-        <fixes issue="MCHANGES-88"/>
-        <fixes issue="JIRA-YYY"/>
-        <dueto name="John Doe" email="[email protected]"/>
-        <dueto name="Jane Doe"/>
       </action>
     </release>
   </body>