MAVEN-1712 : Update dependencies to match ones in maven 1.1 core and to unify them between plugins.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@320941 13f79535-47bb-0310-9956-ffa450edef68

multiproject/project.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- 
 /*
  * Copyright 2001-2005 The Apache Software Foundation.
@@ -17,7 +16,6 @@
  * limitations under the License.
  */
  -->
-
 <project>
   <extend>../plugin-parent/project.xml</extend>
   <id>maven-multiproject-plugin</id>
@@ -100,7 +98,7 @@
       </roles>
       <timezone>+10</timezone>
     </developer>
-        <developer>
+    <developer>
       <name>Lukas Theussl</name>
       <id>ltheussl</id>
       <email>ltheussl@apache.org</email>
@@ -121,19 +119,22 @@
       <groupId>velocity</groupId>
       <artifactId>velocity</artifactId>
       <type>jar</type>
-      <version>1.4-dev</version>
+      <version>1.4</version>
     </dependency>
     <dependency>
       <groupId>maven</groupId>
       <artifactId>maven</artifactId>
       <type>jar</type>
-      <version>1.0</version>
+      <version>1.0.2</version>
     </dependency>
     <dependency>
       <groupId>maven</groupId>
       <artifactId>maven-model</artifactId>
       <type>jar</type>
-      <version>3.0.0</version>
+      <version>3.0.1</version>
+      <properties>
+        <comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
+      </properties>
     </dependency>
   </dependencies>
 </project>

multiproject/xdocs/changes.xml

@@ -26,6 +26,13 @@
   </properties>
   <body>
     <release version="1.5-SNAPSHOT" date="in SVN">
+      <action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : 
+        <ul>
+          <li>maven v1.0 -> v1.0.2</li>
+          <li>maven-model v3.0.0 -> v3.0.1</li>
+          <li>velocity v1.4-dev -> v1.4</li>
+        </ul>
+      </action>
       <action dev="ltheussl" type="fix" issue="MPMULTIPROJECT-44">multiproject:site fails if sub-projects has a &amp;amp; on POM.</action>
       <action dev="ltheussl" type="fix" issue="MPMULTIPROJECT-49">Can not mix multiproject goals with other/custom goals.</action>
     </release>