maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aherit...@apache.org
Subject svn commit: r320941 [1/2] - in /maven/maven-1/plugins/trunk: ./ abbot/ abbot/xdocs/ announcement/ announcement/xdocs/ ant/ ant/xdocs/ antlr/ artifact/ artifact/xdocs/ changelog/ changelog/xdocs/ changes/ changes/xdocs/ cruisecontrol/ cruisecontrol/src/...
Date Thu, 13 Oct 2005 23:20:03 GMT
Author: aheritier
Date: Thu Oct 13 16:17:23 2005
New Revision: 320941

URL: http://svn.apache.org/viewcvs?rev=320941&view=rev
Log:
MAVEN-1712 : Update dependencies to match ones in maven 1.1 core and to unify them between plugins.

Modified:
    maven/maven-1/plugins/trunk/abbot/project.xml
    maven/maven-1/plugins/trunk/abbot/xdocs/changes.xml
    maven/maven-1/plugins/trunk/announcement/project.xml
    maven/maven-1/plugins/trunk/announcement/xdocs/changes.xml
    maven/maven-1/plugins/trunk/ant/project.xml
    maven/maven-1/plugins/trunk/ant/xdocs/changes.xml
    maven/maven-1/plugins/trunk/antlr/project.xml
    maven/maven-1/plugins/trunk/artifact/project.xml
    maven/maven-1/plugins/trunk/artifact/xdocs/changes.xml
    maven/maven-1/plugins/trunk/changelog/project.xml
    maven/maven-1/plugins/trunk/changelog/xdocs/changes.xml
    maven/maven-1/plugins/trunk/changes/project.xml
    maven/maven-1/plugins/trunk/changes/xdocs/changes.xml
    maven/maven-1/plugins/trunk/cruisecontrol/project.xml
    maven/maven-1/plugins/trunk/cruisecontrol/src/plugin-test/project.xml
    maven/maven-1/plugins/trunk/cruisecontrol/xdocs/changes.xml
    maven/maven-1/plugins/trunk/dashboard/src/plugin-test/common/project.xml
    maven/maven-1/plugins/trunk/dashboard/src/plugin-test/testIndividualReportsNotGeneratedByDashboard/project.xml
    maven/maven-1/plugins/trunk/developer-activity/project.xml
    maven/maven-1/plugins/trunk/developer-activity/xdocs/changes.xml
    maven/maven-1/plugins/trunk/dist/project.xml
    maven/maven-1/plugins/trunk/dist/xdocs/changes.xml
    maven/maven-1/plugins/trunk/ear/project.xml
    maven/maven-1/plugins/trunk/ear/src/plugin-test/bundlePropertiesTest/maven.xml
    maven/maven-1/plugins/trunk/ear/src/plugin-test/bundlePropertiesTest/project.xml
    maven/maven-1/plugins/trunk/ear/src/plugin-test/simpleTest/maven.xml
    maven/maven-1/plugins/trunk/ear/src/plugin-test/simpleTest/project.xml
    maven/maven-1/plugins/trunk/ear/xdocs/changes.xml
    maven/maven-1/plugins/trunk/eclipse/src/plugin-test/justresourcestest/project.xml
    maven/maven-1/plugins/trunk/eclipse/src/plugin-test/maintest/project.xml
    maven/maven-1/plugins/trunk/ejb/project.xml
    maven/maven-1/plugins/trunk/ejb/xdocs/changes.xml
    maven/maven-1/plugins/trunk/faq/project.xml
    maven/maven-1/plugins/trunk/faq/xdocs/changes.xml
    maven/maven-1/plugins/trunk/file-activity/project.xml
    maven/maven-1/plugins/trunk/file-activity/xdocs/changes.xml
    maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts-jstl/template-resources/project.xml
    maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/project.xml
    maven/maven-1/plugins/trunk/genapp/src/plugin-resources/web-velocity/template-resources/project.xml
    maven/maven-1/plugins/trunk/genapp/xdocs/changes.xml
    maven/maven-1/plugins/trunk/hibernate/project.xml
    maven/maven-1/plugins/trunk/hibernate/src/plugin-test/codeGenerationTest/project.xml
    maven/maven-1/plugins/trunk/hibernate/src/plugin-test/simpleTest/project.xml
    maven/maven-1/plugins/trunk/hibernate/xdocs/changes.xml
    maven/maven-1/plugins/trunk/html2xdoc/project.xml
    maven/maven-1/plugins/trunk/html2xdoc/xdocs/changes.xml
    maven/maven-1/plugins/trunk/j2ee/plugin.jelly
    maven/maven-1/plugins/trunk/j2ee/project.xml
    maven/maven-1/plugins/trunk/j2ee/xdocs/changes.xml
    maven/maven-1/plugins/trunk/jalopy/project.xml
    maven/maven-1/plugins/trunk/jalopy/xdocs/changes.xml
    maven/maven-1/plugins/trunk/jar/project.xml
    maven/maven-1/plugins/trunk/jar/xdocs/changes.xml
    maven/maven-1/plugins/trunk/javacc/project.xml
    maven/maven-1/plugins/trunk/javacc/xdocs/changes.xml
    maven/maven-1/plugins/trunk/javadoc/project.xml
    maven/maven-1/plugins/trunk/jbuilder/project.xml
    maven/maven-1/plugins/trunk/jbuilder/xdocs/changes.xml
    maven/maven-1/plugins/trunk/jcoverage/project.xml
    maven/maven-1/plugins/trunk/jcoverage/xdocs/changes.xml
    maven/maven-1/plugins/trunk/jdepend/project.xml
    maven/maven-1/plugins/trunk/jdepend/xdocs/changes.xml
    maven/maven-1/plugins/trunk/jdiff/project.xml
    maven/maven-1/plugins/trunk/jellydoc/plugin.jelly
    maven/maven-1/plugins/trunk/jellydoc/project.xml
    maven/maven-1/plugins/trunk/jellydoc/xdocs/changes.xml
    maven/maven-1/plugins/trunk/jetty/project.xml
    maven/maven-1/plugins/trunk/jetty/xdocs/changes.xml
    maven/maven-1/plugins/trunk/jira/project.xml
    maven/maven-1/plugins/trunk/jira/xdocs/changes.xml
    maven/maven-1/plugins/trunk/junit-report/project.xml
    maven/maven-1/plugins/trunk/junit-report/xdocs/changes.xml
    maven/maven-1/plugins/trunk/jxr/project.xml
    maven/maven-1/plugins/trunk/jxr/xdocs/changes.xml
    maven/maven-1/plugins/trunk/linkcheck/project.xml
    maven/maven-1/plugins/trunk/linkcheck/xdocs/changes.xml
    maven/maven-1/plugins/trunk/multiproject/project.xml
    maven/maven-1/plugins/trunk/multiproject/xdocs/changes.xml
    maven/maven-1/plugins/trunk/pdf/plugin.jelly
    maven/maven-1/plugins/trunk/pdf/project.xml
    maven/maven-1/plugins/trunk/pdf/xdocs/changes.xml
    maven/maven-1/plugins/trunk/plugin-parent/project.properties
    maven/maven-1/plugins/trunk/plugin/project.xml
    maven/maven-1/plugins/trunk/plugin/src/plugin-test/project.xml
    maven/maven-1/plugins/trunk/plugin/xdocs/changes.xml
    maven/maven-1/plugins/trunk/pom/project.xml
    maven/maven-1/plugins/trunk/pom/xdocs/changes.xml
    maven/maven-1/plugins/trunk/project.xml
    maven/maven-1/plugins/trunk/rar/project.xml
    maven/maven-1/plugins/trunk/rar/xdocs/changes.xml
    maven/maven-1/plugins/trunk/release/project.xml
    maven/maven-1/plugins/trunk/release/xdocs/changes.xml
    maven/maven-1/plugins/trunk/repository/project.xml
    maven/maven-1/plugins/trunk/repository/xdocs/changes.xml
    maven/maven-1/plugins/trunk/scm/project.xml
    maven/maven-1/plugins/trunk/simian/project.xml
    maven/maven-1/plugins/trunk/simian/xdocs/changes.xml
    maven/maven-1/plugins/trunk/site/project.xml
    maven/maven-1/plugins/trunk/site/xdocs/changes.xml
    maven/maven-1/plugins/trunk/tasklist/project.xml
    maven/maven-1/plugins/trunk/tasklist/xdocs/changes.xml
    maven/maven-1/plugins/trunk/test/plugin.jelly
    maven/maven-1/plugins/trunk/test/project.xml
    maven/maven-1/plugins/trunk/test/xdocs/changes.xml
    maven/maven-1/plugins/trunk/xdoc/project.xml
    maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml

Modified: maven/maven-1/plugins/trunk/abbot/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/abbot/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/abbot/project.xml (original)
+++ maven/maven-1/plugins/trunk/abbot/project.xml Thu Oct 13 16:17:23 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- 
 /*
  * Copyright 2004 The Apache Software Foundation.
@@ -17,7 +16,6 @@
  * limitations under the License.
  */
  -->
-
 <project>
   <extend>../plugin-parent/project.xml</extend>
   <pomVersion>3</pomVersion>
@@ -83,14 +81,13 @@
     <dependency>
       <groupId>jdom</groupId>
       <artifactId>jdom</artifactId>
-      <version>b10</version>
+      <version>1.0</version>
       <properties>
         <abbot.editor>true</abbot.editor>
         <abbot.webstart>true</abbot.webstart>
       </properties>
     </dependency>
     <!-- Required for the Costello editor -->
-
     <dependency>
       <groupId>mrj</groupId>
       <artifactId>MRJToolkitStubs</artifactId>
@@ -118,8 +115,8 @@
     </dependency>
     <dependency>
       <groupId>xerces</groupId>
-      <artifactId>xerces</artifactId>
-      <version>2.4.0</version>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.6.2</version>
       <properties>
         <abbot.editor>true</abbot.editor>
         <abbot.webstart>true</abbot.webstart>
@@ -128,7 +125,7 @@
     <dependency>
       <groupId>xerces</groupId>
       <artifactId>xmlParserAPIs</artifactId>
-      <version>2.2.1</version>
+      <version>2.6.2</version>
       <properties>
         <abbot.editor>true</abbot.editor>
         <abbot.webstart>true</abbot.webstart>
@@ -137,24 +134,29 @@
     <dependency>
       <groupId>ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.5.3-1</version>
+      <version>1.6.5</version>
       <properties>
         <abbot.webstart>true</abbot.webstart>
+        <comment>Overriden by the release of this library bundled in the core of maven and already loaded in the root classloader.</comment>        
       </properties>
     </dependency>
     <dependency>
       <groupId>ant</groupId>
-      <artifactId>ant-optional</artifactId>
-      <version>1.5.3-1</version>
+      <artifactId>ant-junit</artifactId>
+      <version>1.6.5</version>
       <properties>
         <abbot.webstart>true</abbot.webstart>
+        <comment>Overriden by the release of this library bundled in the core of maven and already loaded in the root classloader.</comment>
       </properties>
     </dependency>
     <dependency>
       <groupId>commons-jelly</groupId>
       <artifactId>commons-jelly-tags-xml</artifactId>
-      <version>1.0</version>
+      <version>1.1</version>
       <url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
+      <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>

Modified: maven/maven-1/plugins/trunk/abbot/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/abbot/xdocs/changes.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/abbot/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/abbot/xdocs/changes.xml Thu Oct 13 16:17:23 2005
@@ -1,12 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <document>
   <properties>
     <title>Changes</title>
     <author email="vmassol@apache.org">Vincent Massol</author>
   </properties>
   <body>
-    <release version="1.2-SNAPSHOT" date="in CVS">
+    <release version="1.2-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>ant v1.5.3-1 -> v1.6.5</li>
+          <li>ant-junit (ant-optional) v1.5.3-1 -> v1.6.5</li>
+          <li>commons-jelly-tags-xml v1.0 -> v1.1</li>
+          <li>jdom v b10 -> v1.0</li>
+          <li>xercesImpl v 2.4.0 -> v2.6.2</li>
+          <li>xmlParserAPIs v 2.2.1 -> v2.6.2</li>
+        </ul>
+      </action>
       <action dev="vmassol" type="update">
         Removed the need to set up a <code>JAVAWS_HOME</code> property. This is 
         now automatically inferred from <code>${java.home}</code> and defaults

Modified: maven/maven-1/plugins/trunk/announcement/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/announcement/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/announcement/project.xml (original)
+++ maven/maven-1/plugins/trunk/announcement/project.xml Thu Oct 13 16:17:23 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -17,7 +16,6 @@
  * limitations under the License.
  */
  -->
-
 <project>
   <extend>../plugin-parent/project.xml</extend>
   <pomVersion>3</pomVersion>
@@ -102,17 +100,23 @@
     <dependency>
       <groupId>commons-jelly</groupId>
       <artifactId>commons-jelly-tags-xml</artifactId>
-      <version>1.0</version>
+      <version>1.1</version>
       <url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
+      <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>
     <dependency>
       <id>commons-lang</id>
       <version>2.0</version>
       <url>http://jakarta.apache.org/commons/lang/</url>
+      <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>
     <dependency>
       <id>commons-net</id>
-      <version>1.2.1</version>
+      <version>1.4.0</version>
       <url>http://jakarta.apache.org/commons/net/</url>
     </dependency>
   </dependencies>

Modified: maven/maven-1/plugins/trunk/announcement/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/announcement/xdocs/changes.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/announcement/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/announcement/xdocs/changes.xml Thu Oct 13 16:17:23 2005
@@ -24,7 +24,13 @@
     <author email="vmassol@apache.org">Vincent Massol</author>
   </properties>
   <body>
-    <release version="1.4-SNAPSHOT" date="in CVS">
+    <release version="1.4-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>commons-net v1.2.1 -> v1.4.0</li>
+          <li>commons-jelly-tags-xml v1.0 -> v1.1</li>
+        </ul>
+      </action>
       <action dev="ltheussl" type="add" issue="MPANNOUNCEMENT-18">Support new format of <code>&lt;action&gt;</code> element in <code>changes.xml</code>.</action>
       <action dev="ltheussl" type="fix" issue="MPANNOUNCEMENT-3">CR-LF generated do not match the platform.</action>
       <action dev="ltheussl" type="fix" issue="MPANNOUNCEMENT-10">Xml entities transformed in wrong direction.</action>

Modified: maven/maven-1/plugins/trunk/ant/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/ant/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/ant/project.xml (original)
+++ maven/maven-1/plugins/trunk/ant/project.xml Thu Oct 13 16:17:23 2005
@@ -92,7 +92,10 @@
     <dependency>
       <groupId>commons-jelly</groupId>
       <artifactId>commons-jelly-tags-xml</artifactId>
-      <version>1.0</version>
+      <version>1.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>

Modified: maven/maven-1/plugins/trunk/ant/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/ant/xdocs/changes.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/ant/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/ant/xdocs/changes.xml Thu Oct 13 16:17:23 2005
@@ -25,6 +25,13 @@
     <author email="aheritier@apache.org">Arnaud Heritier</author>
   </properties>
   <body>
+    <release version="1.10-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>commons-jelly-tags-xml v1.0 -> v1.1</li>
+        </ul>
+      </action>
+    </release>
     <release version="1.9" date="2005-04-09">
       <action dev="aheritier" type="add" issue="MPANT-24">Ant script looks for dependencies in several remote repositories.</action>
       <action dev="aheritier" type="add" issue="MPANT-23" due-to="Phil Steitz">Add License file to jar META-INF.</action>

Modified: maven/maven-1/plugins/trunk/antlr/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/antlr/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/antlr/project.xml (original)
+++ maven/maven-1/plugins/trunk/antlr/project.xml Thu Oct 13 16:17:23 2005
@@ -89,6 +89,9 @@
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
       <version>2.0</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>
     <dependency>
       <groupId>antlr</groupId>

Modified: maven/maven-1/plugins/trunk/artifact/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/artifact/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/artifact/project.xml (original)
+++ maven/maven-1/plugins/trunk/artifact/project.xml Thu Oct 13 16:17:23 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -84,37 +83,52 @@
     <dependency>
       <groupId>plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>1.0-alpha-3</version>
+      <version>1.0.3</version>
     </dependency>
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
-      <version>3.1</version>
+      <version>3.0</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>
     <dependency>
       <groupId>commons-beanutils</groupId>
       <artifactId>commons-beanutils</artifactId>
       <version>1.6.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>
     <dependency>
       <groupId>commons-net</groupId>
       <artifactId>commons-net</artifactId>
-      <version>1.1.0</version>
+      <version>1.4.0</version>
     </dependency>
     <dependency>
       <groupId>commons-httpclient</groupId>
       <artifactId>commons-httpclient</artifactId>
-      <version>2.0</version>
+      <version>2.0.2</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>
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
       <version>2.0</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>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
       <version>1.0.3</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>
     <dependency>
       <groupId>jsch</groupId>
@@ -124,7 +138,10 @@
     <dependency>
       <groupId>commons-jelly</groupId>
       <artifactId>commons-jelly</artifactId>
-      <version>1.0-beta-4</version>
+      <version>1.0</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>
     <dependency>
       <groupId>commons-jelly</groupId>
@@ -170,6 +187,9 @@
       <groupId>maven</groupId>
       <artifactId>maven-model</artifactId>
       <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>
     <!-- For MavenUtils  -->
     <dependency>
@@ -180,13 +200,19 @@
     <dependency>
       <groupId>commons-jexl</groupId>
       <artifactId>commons-jexl</artifactId>
-      <version>1.0-beta-1</version>
+      <version>1.0</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>
     <!-- Used in the bootstrap -->
     <dependency>
       <groupId>forehead</groupId>
       <artifactId>forehead</artifactId>
       <version>1.0-beta-5</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>
   <build>

Modified: maven/maven-1/plugins/trunk/artifact/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/artifact/xdocs/changes.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/artifact/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/artifact/xdocs/changes.xml Thu Oct 13 16:17:23 2005
@@ -25,6 +25,16 @@
   </properties>
   <body>
     <release version="1.7-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>commons-collections v3.1 -> v3.0</li>
+          <li>commons-httpclient v2.0 -> v2.0.2</li>
+          <li>commons-jelly v1.0-beta-4 -> v1.0</li>
+          <li>commons-jexl v1.0-beta-1 -> v1.0</li>
+          <li>commons-net v1.1.0 -> v1.4.0</li>
+          <li>plexus-utils v1.0-alpha-3 -> v1.0.3</li>
+        </ul>
+      </action>
       <action dev="brett" type="fix" issue="MPARTIFACT-58">Correct handling of directory without a leading /</action>
       <action dev="aheritier" type="update">When rewriting POM, versions of dependencies overrided are resolved.</action>
       <action dev="aheritier" type="add">New tag artifact:rewritePOM to Rewrite a full model. Inheritence,expression, and versions of dependencies overrided are resolved.</action>

Modified: maven/maven-1/plugins/trunk/changelog/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/changelog/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/changelog/project.xml (original)
+++ maven/maven-1/plugins/trunk/changelog/project.xml Thu Oct 13 16:17:23 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -157,7 +156,10 @@
     <dependency>
       <groupId>ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.5.3-1</version>
+      <version>1.6.5</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>
     <dependency>
       <groupId>commons-jelly</groupId>
@@ -167,13 +169,19 @@
     <dependency>
       <groupId>commons-jelly</groupId>
       <artifactId>commons-jelly-tags-xml</artifactId>
-      <version>1.0</version>
+      <version>1.1</version>
       <url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
+      <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>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
       <version>1.0.3</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>
     <dependency>
       <groupId>junit</groupId>
@@ -194,24 +202,27 @@
     <dependency>
       <groupId>maven</groupId>
       <artifactId>maven</artifactId>
-      <version>1.0</version>
+      <version>1.0.2</version>
     </dependency>
     <!-- Required because of the Developer class -->
     <dependency>
       <groupId>maven</groupId>
       <artifactId>maven-model</artifactId>
-      <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>
     <!-- Required to build under for JDK 1.3 because we fork junit -->
     <dependency>
       <groupId>xerces</groupId>
-      <artifactId>xerces</artifactId>
-      <version>2.4.0</version>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.6.2</version>
     </dependency>
     <dependency>
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis</artifactId>
-      <version>1.0.b2</version>
+      <groupId>xerces</groupId>
+      <artifactId>xmlParserAPIs</artifactId>
+      <version>2.6.2</version>
     </dependency>
   </dependencies>
 </project>

Modified: maven/maven-1/plugins/trunk/changelog/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/changelog/xdocs/changes.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/changelog/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/changelog/xdocs/changes.xml Thu Oct 13 16:17:23 2005
@@ -25,6 +25,16 @@
   </properties>
   <body>
     <release version="1.9-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>ant v1.5.3-1 -> v1.6.5</li>
+          <li>commons-jelly-tags-xml v1.0 -> v1.1</li>
+          <li>maven v1.0 -> v1.0.2</li>
+          <li>maven-model v3.0.0 -> v3.0.1</li>
+          <li>xercesImpl v 2.4.0 -> v2.6.2</li>
+          <li>xml-apis v 1.0.b2 -> xmlParserAPIs v2.6.2</li>
+        </ul>
+      </action>
       <action dev="ltheussl" type="fix" issue="MPCHANGELOG-70" due-to="Arnaud Bailly">Incorrect parsing of SVN log files when username contains spaces.</action>
     </release>
     <release version="1.8.2" date="2005-06-15">

Modified: maven/maven-1/plugins/trunk/changes/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/changes/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/changes/project.xml (original)
+++ maven/maven-1/plugins/trunk/changes/project.xml Thu Oct 13 16:17:23 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -17,7 +16,6 @@
  * limitations under the License.
  */
  -->
-
 <project>
   <extend>../plugin-parent/project.xml</extend>
   <pomVersion>3</pomVersion>
@@ -98,18 +96,24 @@
     <dependency>
       <groupId>dom4j</groupId>
       <artifactId>dom4j</artifactId>
-      <version>1.4-dev-8</version>
+      <version>1.4</version>
       <url>http://www.dom4j.org/</url>
+      <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>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
       <version>1.0</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>
     <dependency>
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis</artifactId>
-      <version>1.0.b2</version>
+      <groupId>xerces</groupId>
+      <artifactId>xmlParserAPIs</artifactId>
+      <version>2.6.2</version>
       <url>http://xml.apache.org/xerces2-j/</url>
     </dependency>
   </dependencies>

Modified: maven/maven-1/plugins/trunk/changes/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/changes/xdocs/changes.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/changes/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/changes/xdocs/changes.xml Thu Oct 13 16:17:23 2005
@@ -25,6 +25,12 @@
   </properties>
   <body>
     <release version="1.6-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>dom4j v1.4-dev-8 -> v1.4</li>
+          <li>xml-apis v 1.0.b2 -> xmlParserAPIs v2.6.2</li>
+        </ul>
+      </action>
       <action dev="ltheussl" type="add" issue="MPCHANGES-25">Validate <code>changes.xml</code>.</action>
       <action dev="ltheussl" type="add" issue="MPCHANGES-15"> Add multiple due-to/due-to-email support.</action>
       <action dev="ltheussl" type="add" issue="MPCHANGES-16"> Add multiple issue support.</action>

Modified: maven/maven-1/plugins/trunk/cruisecontrol/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/cruisecontrol/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/cruisecontrol/project.xml (original)
+++ maven/maven-1/plugins/trunk/cruisecontrol/project.xml Thu Oct 13 16:17:23 2005
@@ -109,8 +109,11 @@
     <dependency>
       <groupId>commons-jelly</groupId>
       <artifactId>commons-jelly-tags-xml</artifactId>
-      <version>1.0</version>
+      <version>1.1</version>
       <url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
+      <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>
     <dependency>
       <groupId>commons-jelly</groupId>

Modified: maven/maven-1/plugins/trunk/cruisecontrol/src/plugin-test/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/cruisecontrol/src/plugin-test/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/cruisecontrol/src/plugin-test/project.xml (original)
+++ maven/maven-1/plugins/trunk/cruisecontrol/src/plugin-test/project.xml Thu Oct 13 16:17:23 2005
@@ -16,8 +16,6 @@
  * limitations under the License.
  */
  -->
-
-
 <project>
   <pomVersion>3</pomVersion>
   <id>test-maven-cruisecontrol-plugin</id>
@@ -36,7 +34,6 @@
   <shortDescription>Test for Maven CruiseControl plugin</shortDescription>
   <url>http://maven.apache.org/reference/plugins/cruisecontrol/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/cruisecontrol/</siteDirectory>
-
   <developers>
     <developer>
       <name>Eric Pugh</name>
@@ -48,17 +45,15 @@
       </roles>
     </developer>
   </developers>
-
   <dependencies>
     <dependency>
       <groupId>commons-jelly</groupId>
       <artifactId>commons-jelly-tags-xml</artifactId>
-      <version>1.0</version>
-    </dependency> 
+      <version>1.1</version>
+    </dependency>
   </dependencies>
-  
   <build>
     <sourceDirectory>src/main</sourceDirectory>
     <nagEmailAddress>epugh@opensourceconnections.com</nagEmailAddress>
-  </build>  
+  </build>
 </project>

Modified: maven/maven-1/plugins/trunk/cruisecontrol/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/cruisecontrol/xdocs/changes.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/cruisecontrol/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/cruisecontrol/xdocs/changes.xml Thu Oct 13 16:17:23 2005
@@ -25,6 +25,13 @@
     <author email="vmassol@apache.org">Vincent Massol</author>
   </properties>
   <body>
+    <release version="1.9-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>commons-jelly-tags-xml v1.0 -> v1.1</li>
+        </ul>
+      </action>
+    </release>
     <release version="1.8" date="">
       <action dev="epugh" type="fix" issue="MPCRUISECONTROL-25">Properties documentation lists incorrect default for maven.cruisecontrol.buildresults.url</action>
     </release>

Modified: maven/maven-1/plugins/trunk/dashboard/src/plugin-test/common/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/dashboard/src/plugin-test/common/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dashboard/src/plugin-test/common/project.xml (original)
+++ maven/maven-1/plugins/trunk/dashboard/src/plugin-test/common/project.xml Thu Oct 13 16:17:23 2005
@@ -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>
   <pomVersion>3</pomVersion>
   <groupId>maven</groupId>
@@ -39,7 +37,7 @@
     <dependency>
       <groupId>commons-jelly</groupId>
       <artifactId>commons-jelly-tags-xml</artifactId>
-      <version>1.0</version>
+      <version>1.1</version>
       <url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
     </dependency>
     <!-- We need to be sure the findbugs plugin is downloaded for the tests -->

Modified: maven/maven-1/plugins/trunk/dashboard/src/plugin-test/testIndividualReportsNotGeneratedByDashboard/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/dashboard/src/plugin-test/testIndividualReportsNotGeneratedByDashboard/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dashboard/src/plugin-test/testIndividualReportsNotGeneratedByDashboard/project.xml (original)
+++ maven/maven-1/plugins/trunk/dashboard/src/plugin-test/testIndividualReportsNotGeneratedByDashboard/project.xml Thu Oct 13 16:17:23 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-
 <!-- 
 /*
  * Copyright 2001-2005 The Apache Software Foundation.
@@ -17,7 +16,6 @@
  * limitations under the License.
  */
  -->
-
 <project>
   <extend>${basedir}/../common/project.xml</extend>
   <id>testIndividualReportsNotGeneratedByDashboard</id>
@@ -25,13 +23,13 @@
   <dependencies>
     <dependency>
       <groupId>xerces</groupId>
-      <artifactId>xerces</artifactId>
-      <version>2.4.0</version>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.6.2</version>
     </dependency>
     <dependency>
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis</artifactId>
-      <version>1.0.b2</version>
+      <groupId>xerces</groupId>
+      <artifactId>xmlParserAPIs</artifactId>
+      <version>2.6.2</version>
     </dependency>
   </dependencies>
   <reports>
@@ -41,7 +39,7 @@
     <report>maven-findbugs-plugin</report>
     <report>maven-junit-report-plugin</report>
     <report>maven-simian-plugin</report>
-    <report>maven-jcoverage-plugin</report>    
+    <report>maven-jcoverage-plugin</report>
     <report>maven-tasklist-plugin</report>
     <report>maven-javancss-plugin</report>
   </reports>

Modified: maven/maven-1/plugins/trunk/developer-activity/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/developer-activity/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/developer-activity/project.xml (original)
+++ maven/maven-1/plugins/trunk/developer-activity/project.xml Thu Oct 13 16:17:23 2005
@@ -22,7 +22,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-developer-activity-plugin</id>
   <name>Maven Developer Activity Plugin</name>
-  <currentVersion>1.5.2</currentVersion>
+  <currentVersion>1.6-SNAPSHOT</currentVersion>
   <description>This document provides a report of activity in terms of CVS commits and breaks it out by developer.</description>
   <shortDescription>Developer Activity report</shortDescription>
   <url>http://maven.apache.org/reference/plugins/developer-activity/</url>
@@ -95,8 +95,11 @@
     <dependency>
       <groupId>commons-jelly</groupId>
       <artifactId>commons-jelly-tags-xml</artifactId>
-      <version>1.0</version>
+      <version>1.1</version>
       <url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
+      <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>

Modified: maven/maven-1/plugins/trunk/developer-activity/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/developer-activity/xdocs/changes.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/developer-activity/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/developer-activity/xdocs/changes.xml Thu Oct 13 16:17:23 2005
@@ -23,6 +23,13 @@
     <author email="evenisse@ifrance.com">Emmanuel Venisse</author>
   </properties>
   <body>
+    <release version="1.6-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>commons-jelly-tags-xml v1.0 -> v1.1</li>
+        </ul>
+      </action>
+    </release>
     <release version="1.5.2" date="2005-07-30">
       <action dev="brett" type="fix" issue="MPDEVACTIVITY-3">Allow single quotes in a developer's name</action>
       <action dev="brett" type="fix" issue="MPDEVACTIVITY-4">Make template compatible with changelog 1.8 plugin</action>

Modified: maven/maven-1/plugins/trunk/dist/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/dist/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dist/project.xml (original)
+++ maven/maven-1/plugins/trunk/dist/project.xml Thu Oct 13 16:17:23 2005
@@ -81,22 +81,31 @@
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
       <version>1.0.3</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>
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
       <version>2.0</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>
     <dependency>
       <groupId>maven</groupId>
       <artifactId>maven</artifactId>
-      <version>1.0</version>
+      <version>1.0.2</version>
     </dependency>
     <!-- Test dep -->
     <dependency>
       <groupId>maven</groupId>
       <artifactId>maven-model</artifactId>
-      <version>3.0.0-SNAPSHOT</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>

Modified: maven/maven-1/plugins/trunk/dist/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/dist/xdocs/changes.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dist/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/dist/xdocs/changes.xml Thu Oct 13 16:17:23 2005
@@ -25,6 +25,12 @@
   </properties>
   <body>
     <release version="1.7-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>
+        </ul>
+      </action>
       <action dev="aheritier" type="update">It requires at least maven-plugin-plugin v1.7.</action>
       <action dev="aheritier" type="update">It requires at least maven-artifact-plugin v1.3.</action>
       <action dev="akarasulu" date="2005-02-07" type="add">Added multiproject analogs mirroring single project goals.  Also added the abiltiy to generate combined javadocs for multiproject distribution.  However multiproject consolidation might be best put into the site plugin.  These fixes are associated with the following <a href="http://jira.codehaus.org/browse/MPDIST-20">JIRA enhancement issue</a>.</action>

Modified: maven/maven-1/plugins/trunk/ear/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/ear/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/ear/project.xml (original)
+++ maven/maven-1/plugins/trunk/ear/project.xml Thu Oct 13 16:17:23 2005
@@ -23,7 +23,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-ear-plugin</id>
   <name>Maven EAR Plugin</name>
-  <currentVersion>1.7</currentVersion>
+  <currentVersion>1.8-SNAPSHOT</currentVersion>
   <description>Ear Plugin for Maven</description>
   <shortDescription>Ear Plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/ear/</url>
@@ -112,14 +112,20 @@
     <dependency>
       <groupId>commons-jelly</groupId>
       <artifactId>commons-jelly-tags-xml</artifactId>
-      <version>1.0</version>
+      <version>1.1</version>
       <url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
+      <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>
     <dependency>
       <groupId>commons-jelly</groupId>
       <artifactId>commons-jelly-tags-util</artifactId>
-      <version>1.1</version>
+      <version>1.1.1</version>
       <url>http://jakarta.apache.org/commons/jelly/libs/util/index.html</url>
+      <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>

Modified: maven/maven-1/plugins/trunk/ear/src/plugin-test/bundlePropertiesTest/maven.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/ear/src/plugin-test/bundlePropertiesTest/maven.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/ear/src/plugin-test/bundlePropertiesTest/maven.xml (original)
+++ maven/maven-1/plugins/trunk/ear/src/plugin-test/bundlePropertiesTest/maven.xml Thu Oct 13 16:17:23 2005
@@ -42,7 +42,7 @@
       msg="commons-logging was not bundled"/>
     
     <!-- check that commons-collections has been packaged in the right place-->
-    <assert:assertFileExists file="${unzipDir}/commons-collections-2.1.jar"
+    <assert:assertFileExists file="${unzipDir}/commons-collections-3.0.jar"
       msg="commons-collections was bundled incorrectly"/>
 
     <!-- check that commons-digester has been packaged in the right place-->

Modified: maven/maven-1/plugins/trunk/ear/src/plugin-test/bundlePropertiesTest/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/ear/src/plugin-test/bundlePropertiesTest/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/ear/src/plugin-test/bundlePropertiesTest/project.xml (original)
+++ maven/maven-1/plugins/trunk/ear/src/plugin-test/bundlePropertiesTest/project.xml Thu Oct 13 16:17:23 2005
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
-      <version>2.1</version>
+      <version>3.0</version>
       <properties>
         <ear.bundle>true</ear.bundle>
       </properties>

Modified: maven/maven-1/plugins/trunk/ear/src/plugin-test/simpleTest/maven.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/ear/src/plugin-test/simpleTest/maven.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/ear/src/plugin-test/simpleTest/maven.xml (original)
+++ maven/maven-1/plugins/trunk/ear/src/plugin-test/simpleTest/maven.xml Thu Oct 13 16:17:23 2005
@@ -41,7 +41,7 @@
     <assert:assertFileExists file="${unzipDir}/commons-logging-1.0.3.jar"
       msg="commons logging was not bundled"/>
     <!-- check for commons-collections -->
-    <assert:assertFileExists file="${unzipDir}/commons-collections-2.1.jar"
+    <assert:assertFileExists file="${unzipDir}/commons-collections-3.0.jar"
       msg="commons collections was not bundled"/>
 
     <!-- check application.xml got a java module in it -->
@@ -53,7 +53,7 @@
     <x:set var="firstJavaModule" select="string($applicationDoc/application/module/java)"/>
 
     <assert:assertEquals 
-      expected="commons-collections-2.1.jar" 
+      expected="commons-collections-3.0.jar" 
       value="${firstJavaModule}"
       msg="commons collections was not the first java module"/>
 

Modified: maven/maven-1/plugins/trunk/ear/src/plugin-test/simpleTest/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/ear/src/plugin-test/simpleTest/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/ear/src/plugin-test/simpleTest/project.xml (original)
+++ maven/maven-1/plugins/trunk/ear/src/plugin-test/simpleTest/project.xml Thu Oct 13 16:17:23 2005
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
-      <version>2.1</version>
+      <version>3.0</version>
       <url>http://jakarta.apache.org/commons/collections/</url>
       <properties>
         <ear.module>true</ear.module>
@@ -63,7 +63,7 @@
     <dependency>
       <groupId>commons-jelly</groupId>
       <artifactId>commons-jelly-tags-xml</artifactId>
-      <version>1.0</version>
+      <version>1.1</version>
     </dependency>
     <!-- Needed for the entity resolver -->
     <dependency>

Modified: maven/maven-1/plugins/trunk/ear/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/ear/xdocs/changes.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/ear/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/ear/xdocs/changes.xml Thu Oct 13 16:17:23 2005
@@ -24,6 +24,14 @@
     <author email="nathan.coast@blueyonder.co.uk">Nathan Coast</author>
   </properties>
   <body>
+    <release version="1.8-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>commons-jelly-tags-util v1.1 -> v1.1.1</li>
+          <li>commons-jelly-tags-xml v1.0 -> v1.1</li>
+        </ul>
+      </action>
+    </release>
     <release version="1.7" date="2005-06-05">
       <action dev="felipeal" type="fix" issue="MPEAR-39">Improved how dependencies are copied into the EAR file.</action>
       <action dev="felipeal" type="add" issue="MPEAR-25">Added property

Modified: maven/maven-1/plugins/trunk/eclipse/src/plugin-test/justresourcestest/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/eclipse/src/plugin-test/justresourcestest/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/eclipse/src/plugin-test/justresourcestest/project.xml (original)
+++ maven/maven-1/plugins/trunk/eclipse/src/plugin-test/justresourcestest/project.xml Thu Oct 13 16:17:23 2005
@@ -16,24 +16,21 @@
  * limitations under the License.
  */
  -->
-
-
 <project>
   <pomVersion>3</pomVersion>
   <extend>${basedir}/../project.xml</extend>
   <id>test-maven-eclipse-nosourcetest-plugin</id>
   <name>Test project for Maven Eclipse Plugin (resources only)</name>
-
   <dependencies>
     <dependency>
       <id>maven</id>
-      <version>beta-8</version>
+      <version>1.0.2</version>
       <jar>maven.jar</jar>
     </dependency>
     <dependency>
       <groupId>commons-jelly</groupId>
       <artifactId>commons-jelly-tags-xml</artifactId>
-      <version>20030211.142705</version>
+      <version>1.1</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -45,22 +42,20 @@
     <sourceDirectory>src/main/java</sourceDirectory>
     <unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
     <resources>
-        <resource>
-            <directory>src/main/resources</directory>
-            <includes>
-                <include>**/*.properties</include>
-            </includes>
-            <filtering>false</filtering>
-        </resource>
-        <resource>
-            <directory>src/main/noresources</directory>
-            <includes>
-                <include>**/*.properties</include>
-            </includes>
-            <filtering>false</filtering>
-        </resource>
+      <resource>
+        <directory>src/main/resources</directory>
+        <includes>
+          <include>**/*.properties</include>
+        </includes>
+        <filtering>false</filtering>
+      </resource>
+      <resource>
+        <directory>src/main/noresources</directory>
+        <includes>
+          <include>**/*.properties</include>
+        </includes>
+        <filtering>false</filtering>
+      </resource>
     </resources>
   </build>
-
-
 </project>

Modified: maven/maven-1/plugins/trunk/eclipse/src/plugin-test/maintest/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/eclipse/src/plugin-test/maintest/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/eclipse/src/plugin-test/maintest/project.xml (original)
+++ maven/maven-1/plugins/trunk/eclipse/src/plugin-test/maintest/project.xml Thu Oct 13 16:17:23 2005
@@ -16,22 +16,19 @@
  * limitations under the License.
  */
  -->
-
-
 <project>
   <pomVersion>3</pomVersion>
   <extend>${basedir}/../project.xml</extend>
   <id>test-maven-eclipse-maintest-plugin (main)</id>
   <name>Test project for Maven Eclipse Plugin</name>
-
   <dependencies>
-	<dependency>
-	  <groupId>facts</groupId>
-  	  <artifactId>commons-dude</artifactId>
-	  <version>1.0.3</version>
-	  <type>jar</type>
-	  <properties/>
-	</dependency>
+    <dependency>
+      <groupId>facts</groupId>
+      <artifactId>commons-dude</artifactId>
+      <version>1.0.3</version>
+      <type>jar</type>
+      <properties/>
+    </dependency>
     <dependency>
       <id>maven</id>
       <version>1.0.2</version>
@@ -40,7 +37,7 @@
     <dependency>
       <groupId>commons-jelly</groupId>
       <artifactId>commons-jelly-tags-xml</artifactId>
-      <version>1.0</version>
+      <version>1.1</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -57,38 +54,38 @@
     <sourceDirectory>src/main</sourceDirectory>
     <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
     <unitTest>
-        <includes>
-            <include>**/TestAll.java</include>
-        </includes>
-        <resources>
-            <resource>
-                <directory>src/test-resources</directory>
-                <filtering>false</filtering>
-            </resource>
-            <resource>
-                <directory>src/main</directory>
-            </resource>
-        </resources>
-    </unitTest>
-    <resources>
+      <includes>
+        <include>**/TestAll.java</include>
+      </includes>
+      <resources>
         <resource>
-            <directory>src/main</directory>
+          <directory>src/test-resources</directory>
+          <filtering>false</filtering>
         </resource>
         <resource>
-            <directory>src/resources</directory>
-            <includes>
-                <include>**/*.properties</include>
-                <include>**/*.xml</include>
-            </includes>
-            <excludes>
-                <exclude>**/*.log</exclude>
-                <exclude>**/*.txt</exclude>
-            </excludes>
-            <filtering>false</filtering>
-        </resource>
-        <resource>
-            <directory>src/test</directory>
+          <directory>src/main</directory>
         </resource>
+      </resources>
+    </unitTest>
+    <resources>
+      <resource>
+        <directory>src/main</directory>
+      </resource>
+      <resource>
+        <directory>src/resources</directory>
+        <includes>
+          <include>**/*.properties</include>
+          <include>**/*.xml</include>
+        </includes>
+        <excludes>
+          <exclude>**/*.log</exclude>
+          <exclude>**/*.txt</exclude>
+        </excludes>
+        <filtering>false</filtering>
+      </resource>
+      <resource>
+        <directory>src/test</directory>
+      </resource>
     </resources>
-</build>
+  </build>
 </project>

Modified: maven/maven-1/plugins/trunk/ejb/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/ejb/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/ejb/project.xml (original)
+++ maven/maven-1/plugins/trunk/ejb/project.xml Thu Oct 13 16:17:23 2005
@@ -102,22 +102,31 @@
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
       <version>1.0.3</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>
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
       <version>2.0</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>
     <dependency>
       <groupId>maven</groupId>
       <artifactId>maven</artifactId>
-      <version>1.0</version>
+      <version>1.0.2</version>
     </dependency>
     <!-- Test dep -->
     <dependency>
       <groupId>maven</groupId>
       <artifactId>maven-model</artifactId>
-      <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>

Modified: maven/maven-1/plugins/trunk/ejb/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/ejb/xdocs/changes.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/ejb/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/ejb/xdocs/changes.xml Thu Oct 13 16:17:23 2005
@@ -25,6 +25,12 @@
   </properties>
   <body>
     <release version="1.8-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>
+        </ul>
+      </action>
     </release>
     <release version="1.7.1" date="2005-08-28">
       <action dev="brett" type="fix">Update dependency to Maven Model v3.0.0 final (it was previously depending on 3.0.0 SNAPSHOT).</action>

Modified: maven/maven-1/plugins/trunk/faq/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/faq/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/faq/project.xml (original)
+++ maven/maven-1/plugins/trunk/faq/project.xml Thu Oct 13 16:17:23 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -107,26 +106,32 @@
     <dependency>
       <groupId>commons-jelly</groupId>
       <artifactId>commons-jelly-tags-xml</artifactId>
-      <version>1.0</version>
+      <version>1.1</version>
       <url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
+      <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>
     <!-- core dependencies which i'd have thought Maven introduced -->
     <dependency>
       <groupId>dom4j</groupId>
       <artifactId>dom4j</artifactId>
-      <version>1.4-dev-8</version>
+      <version>1.4</version>
       <url>http://www.dom4j.org/</url>
+      <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>
     <dependency>
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis</artifactId>
-      <version>1.0.b2</version>
+      <groupId>xerces</groupId>
+      <artifactId>xmlParserAPIs</artifactId>
+      <version>2.6.2</version>
       <url>http://xml.apache.org/xerces2-j/</url>
     </dependency>
     <dependency>
       <groupId>xerces</groupId>
-      <artifactId>xerces</artifactId>
-      <version>2.4.0</version>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.6.2</version>
       <url>http://xml.apache.org/xerces2-j/</url>
     </dependency>
   </dependencies>

Modified: maven/maven-1/plugins/trunk/faq/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/faq/xdocs/changes.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/faq/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/faq/xdocs/changes.xml Thu Oct 13 16:17:23 2005
@@ -23,6 +23,14 @@
   </properties>
   <body>
     <release version="1.6-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>commons-jelly-tags-xml v1.0 -> v1.1</li>
+          <li>dom4j v1.4-dev-8 -> v1.4</li>
+          <li>xercesImpl v 2.4.0 -> v2.6.2</li>
+          <li>xml-apis v 1.0.b2 -> xmlParserAPIs v2.6.2</li>
+        </ul>
+      </action>
       <action dev="ltheussl" type="add">New goal <code>faq:validate</code>.</action>
       <action dev="aheritier" type="update">It requires at least maven-plugin-plugin v1.7.</action>
     </release>

Modified: maven/maven-1/plugins/trunk/file-activity/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/file-activity/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/file-activity/project.xml (original)
+++ maven/maven-1/plugins/trunk/file-activity/project.xml Thu Oct 13 16:17:23 2005
@@ -22,7 +22,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-file-activity-plugin</id>
   <name>Maven File Activity Plug-in</name>
-  <currentVersion>1.5.2</currentVersion>
+  <currentVersion>1.6-SNAPSHOT</currentVersion>
   <gumpRepositoryId>jakarta</gumpRepositoryId>
   <description>This document provides a report of activity in terms of CVS commits and breaks it out by file.</description>
   <shortDescription>File activity Report</shortDescription>
@@ -116,8 +116,11 @@
     <dependency>
       <groupId>commons-jelly</groupId>
       <artifactId>commons-jelly-tags-xml</artifactId>
-      <version>1.0</version>
+      <version>1.1</version>
       <url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
+      <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>

Modified: maven/maven-1/plugins/trunk/file-activity/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/file-activity/xdocs/changes.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/file-activity/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/file-activity/xdocs/changes.xml Thu Oct 13 16:17:23 2005
@@ -23,6 +23,13 @@
     <author email="evenisse@ifrance.com">Emmanuel Venisse</author>
   </properties>
   <body>
+    <release version="1.6-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>commons-jelly-tags-xml v1.0 -> v1.1</li>
+        </ul>
+      </action>
+    </release>
     <release version="1.5.2" date="2005-07-30">
       <action dev="brett" type="fix" issue="MPDEVACTIVITY-4">Make template compatible with changelog 1.8 plugin</action>
     </release>

Modified: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts-jstl/template-resources/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts-jstl/template-resources/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts-jstl/template-resources/project.xml (original)
+++ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts-jstl/template-resources/project.xml Thu Oct 13 16:17:23 2005
@@ -168,7 +168,7 @@
     <dependency>
       <groupId>commons-beanutils</groupId>
       <artifactId>commons-beanutils</artifactId>
-      <version>1.6</version>
+      <version>1.6.1</version>
       <properties>
         <war.bundle>true</war.bundle>
       </properties>

Modified: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/project.xml (original)
+++ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/project.xml Thu Oct 13 16:17:23 2005
@@ -151,7 +151,7 @@
     <dependency>
       <groupId>commons-beanutils</groupId>
       <artifactId>commons-beanutils</artifactId>
-      <version>1.6</version>
+      <version>1.6.1</version>
       <properties>
         <war.bundle>true</war.bundle>
       </properties>

Modified: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/web-velocity/template-resources/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/src/plugin-resources/web-velocity/template-resources/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/genapp/src/plugin-resources/web-velocity/template-resources/project.xml (original)
+++ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/web-velocity/template-resources/project.xml Thu Oct 13 16:17:23 2005
@@ -93,7 +93,7 @@
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
-      <version>3.1</version>
+      <version>3.0</version>
       <properties>
         <war.bundle>true</war.bundle>
       </properties>
@@ -102,7 +102,7 @@
     <dependency>
       <groupId>commons-beanutils</groupId>
       <artifactId>commons-beanutils</artifactId>
-      <version>1.7.0</version>
+      <version>1.6.1</version>
       <properties>
         <war.bundle>true</war.bundle>
       </properties>

Modified: maven/maven-1/plugins/trunk/genapp/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/xdocs/changes.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/genapp/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/genapp/xdocs/changes.xml Thu Oct 13 16:17:23 2005
@@ -21,7 +21,7 @@
     <title>Changes</title>
   </properties>
   <body>
-    <release version="2.3" date="in cvs">
+    <release version="2.3" date="in SVN">
       <action dev="felipeal" type="add" issue="MPGENAPP-20" due-to="Miguel Griffa">Added customization guide.</action>
       <action dev="felipeal" type="add" issue="MPGENAPP-19" due-to="Miguel Griffa">Added Velocity-based webapp template (named <code>web-velocity</code>).</action>
       <action dev="aheritier" type="add" issue="MPGENAPP-18" due-to="Archimedes Trajano">Use the project's name as display-name in web.xml.</action>

Modified: maven/maven-1/plugins/trunk/hibernate/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/hibernate/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/hibernate/project.xml (original)
+++ maven/maven-1/plugins/trunk/hibernate/project.xml Thu Oct 13 16:17:23 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -17,13 +16,12 @@
  * limitations under the License.
  */
  -->
-
 <project>
   <extend>../plugin-parent/project.xml</extend>
   <pomVersion>3</pomVersion>
   <id>maven-hibernate-plugin</id>
   <name>Maven Hibernate Plug-in</name>
-  <currentVersion>1.3.1-SNAPSHOT</currentVersion>
+  <currentVersion>1.4-SNAPSHOT</currentVersion>
   <description/>
   <shortDescription>Work with Hibernate classes</shortDescription>
   <url>http://maven.apache.org/reference/plugins/hibernate/</url>
@@ -108,26 +106,38 @@
     <dependency>
       <groupId>ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.5.3-1</version>
+      <version>1.6.5</version>
       <type>jar</type>
+      <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>
     <dependency>
       <groupId>commons-jelly</groupId>
       <artifactId>commons-jelly</artifactId>
-      <version>1.0-beta-4</version>
+      <version>1.0</version>
       <url>http://jakarta.apache.org/commons/jelly/</url>
+      <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>
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
       <version>2.0</version>
       <type>jar</type>
+      <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>
     <dependency>
       <groupId>commons-beanutils</groupId>
       <artifactId>commons-beanutils</artifactId>
       <version>1.6.1</version>
       <type>jar</type>
+      <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>
     <dependency>
       <groupId>commons-dbcp</groupId>
@@ -138,14 +148,20 @@
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
-      <version>2.1</version>
+      <version>3.0</version>
       <type>jar</type>
+      <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>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
       <version>1.0.3</version>
       <type>jar</type>
+      <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>
     <dependency>
       <groupId>commons-pool</groupId>
@@ -158,17 +174,20 @@
       <artifactId>log4j</artifactId>
       <version>1.2.8</version>
       <type>jar</type>
+      <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>
     <dependency>
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis</artifactId>
-      <version>1.0.b2</version>
+      <groupId>xerces</groupId>
+      <artifactId>xmlParserAPIs</artifactId>
+      <version>2.6.2</version>
       <url>http://xml.apache.org/xerces2-j/</url>
     </dependency>
     <dependency>
       <groupId>xerces</groupId>
-      <artifactId>xerces</artifactId>
-      <version>2.4.0</version>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.6.2</version>
       <url>http://xml.apache.org/xerces2-j/</url>
     </dependency>
     <dependency>
@@ -188,6 +207,9 @@
       <artifactId>dom4j</artifactId>
       <version>1.4</version>
       <type>jar</type>
+      <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>
     <dependency>
       <groupId>jdom</groupId>

Modified: maven/maven-1/plugins/trunk/hibernate/src/plugin-test/codeGenerationTest/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/hibernate/src/plugin-test/codeGenerationTest/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/hibernate/src/plugin-test/codeGenerationTest/project.xml (original)
+++ maven/maven-1/plugins/trunk/hibernate/src/plugin-test/codeGenerationTest/project.xml Thu Oct 13 16:17:23 2005
@@ -16,8 +16,6 @@
  * limitations under the License.
  */
  -->
-
-
 <project>
   <pomVersion>3</pomVersion>
   <id>test-maven-hibernate-plugin-codeGenerationTest</id>
@@ -50,32 +48,27 @@
         <role>Java Developer</role>
       </roles>
       <timezone>-3</timezone>
-    </developer>     
+    </developer>
   </developers>
-
   <dependencies>
-  
     <dependency>
       <groupId>commons-jelly</groupId>
       <artifactId>commons-jelly-tags-xml</artifactId>
-      <version>1.0</version>
+      <version>1.1</version>
       <url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
     </dependency>
-  
-      
     <dependency>
       <groupId>hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
       <version>1.7.1</version>
       <type>jar</type>
     </dependency>
-  
     <dependency>
       <groupId>hibernate</groupId>
       <artifactId>hibernate</artifactId>
       <version>2.1.3</version>
       <type>jar</type>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>cglib</groupId>
       <artifactId>cglib</artifactId>
@@ -87,7 +80,7 @@
       <artifactId>dom4j</artifactId>
       <version>1.4</version>
       <type>jar</type>
-    </dependency>  
+    </dependency>
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
@@ -95,7 +88,6 @@
       <type>jar</type>
     </dependency>
   </dependencies>
-  
   <build>
     <sourceDirectory>src/main</sourceDirectory>
     <resources>
@@ -105,6 +97,6 @@
           <include>**/*.xml</include>
         </includes>
       </resource>
-    </resources> 
+    </resources>
   </build>
 </project>

Modified: maven/maven-1/plugins/trunk/hibernate/src/plugin-test/simpleTest/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/hibernate/src/plugin-test/simpleTest/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/hibernate/src/plugin-test/simpleTest/project.xml (original)
+++ maven/maven-1/plugins/trunk/hibernate/src/plugin-test/simpleTest/project.xml Thu Oct 13 16:17:23 2005
@@ -16,8 +16,6 @@
  * limitations under the License.
  */
  -->
-
-
 <project>
   <pomVersion>3</pomVersion>
   <id>test-maven-hibernate-plugin-simpleTest</id>
@@ -59,32 +57,27 @@
         <role>Java Developer</role>
       </roles>
       <timezone>-3</timezone>
-    </developer>     
+    </developer>
   </developers>
-
   <dependencies>
-  
     <dependency>
       <groupId>commons-jelly</groupId>
       <artifactId>commons-jelly-tags-xml</artifactId>
-      <version>1.0</version>
+      <version>1.1</version>
       <url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
     </dependency>
-  
-      
     <dependency>
       <groupId>hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
       <version>1.7.1</version>
       <type>jar</type>
     </dependency>
-  
     <dependency>
       <groupId>hibernate</groupId>
       <artifactId>hibernate</artifactId>
       <version>2.1.3</version>
       <type>jar</type>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>cglib</groupId>
       <artifactId>cglib</artifactId>
@@ -96,9 +89,8 @@
       <artifactId>dom4j</artifactId>
       <version>1.4</version>
       <type>jar</type>
-    </dependency>  
+    </dependency>
   </dependencies>
-  
   <build>
     <sourceDirectory>src/main</sourceDirectory>
     <resources>
@@ -108,6 +100,6 @@
           <include>**/*.xml</include>
         </includes>
       </resource>
-    </resources> 
+    </resources>
   </build>
 </project>

Modified: maven/maven-1/plugins/trunk/hibernate/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/hibernate/xdocs/changes.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/hibernate/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/hibernate/xdocs/changes.xml Thu Oct 13 16:17:23 2005
@@ -24,6 +24,17 @@
     <author email="michal.maczka@dimatics.com">Michal Maczka</author>
   </properties>
   <body>
+    <release version="1.4-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>ant v1.5.3-1 -> v1.6.5</li>
+          <li>commons-collections v2.1 -> v3.0</li>
+          <li>commons-jelly v1.0-beta-4 -> v1.0</li>
+          <li>xercesImpl v 2.4.0 -> v2.6.2</li>
+          <li>xml-apis v 1.0.b2 -> xmlParserAPIs v2.6.2</li>
+        </ul>
+      </action>
+    </release>
     <release version="1.3" date="2005-02-10">
       <action dev="felipeal" type="add" issue="MPHIBERNATE-12" due-to="Paul Kearney">Added new goal
         <code>hibernate:code-generation</code>.

Modified: maven/maven-1/plugins/trunk/html2xdoc/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/html2xdoc/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/html2xdoc/project.xml (original)
+++ maven/maven-1/plugins/trunk/html2xdoc/project.xml Thu Oct 13 16:17:23 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -17,13 +16,12 @@
  * limitations under the License.
  */
  -->
-
 <project>
   <extend>../plugin-parent/project.xml</extend>
   <pomVersion>3</pomVersion>
   <id>maven-html2xdoc-plugin</id>
   <name>Maven Html2XDoc Plug-in</name>
-  <currentVersion>1.3.2-SNAPSHOT</currentVersion>
+  <currentVersion>1.4-SNAPSHOT</currentVersion>
   <gumpRepositoryId>jakarta</gumpRepositoryId>
   <description>Creates XDoc documentation from normal HTML documentation.</description>
   <shortDescription>HTML to xdoc transformer</shortDescription>
@@ -67,7 +65,7 @@
     <dependency>
       <groupId>commons-jelly</groupId>
       <artifactId>commons-jelly-tags-xml</artifactId>
-      <version>1.0</version>
+      <version>1.1</version>
       <url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
     </dependency>
     <dependency>
@@ -82,7 +80,6 @@
       <version>0.7.7</version>
     </dependency>
     <!-- core dependencies which i'd have thought Maven introduced -->
-
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
@@ -91,19 +88,19 @@
     <dependency>
       <groupId>dom4j</groupId>
       <artifactId>dom4j</artifactId>
-      <version>1.4-dev-8</version>
+      <version>1.4</version>
       <url>http://www.dom4j.org/</url>
     </dependency>
     <dependency>
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis</artifactId>
-      <version>1.0.b2</version>
+      <groupId>xerces</groupId>
+      <artifactId>xmlParserAPIs</artifactId>
+      <version>2.6.2</version>
       <url>http://xml.apache.org/xerces2-j/</url>
     </dependency>
     <dependency>
       <groupId>xerces</groupId>
-      <artifactId>xerces</artifactId>
-      <version>2.4.0</version>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.6.2</version>
       <url>http://xml.apache.org/xerces2-j/</url>
     </dependency>
   </dependencies>

Modified: maven/maven-1/plugins/trunk/html2xdoc/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/html2xdoc/xdocs/changes.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/html2xdoc/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/html2xdoc/xdocs/changes.xml Thu Oct 13 16:17:23 2005
@@ -24,6 +24,16 @@
     <author email="dion@multitask.com.au">dIon Gillard</author>
   </properties>
   <body>
+    <release version="1.4-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>commons-jelly-tags-xml v1.0 -> v1.1</li>
+          <li>dom4j v1.4-dev-8 -> v1.4</li>
+          <li>xercesImpl v 2.4.0 -> v2.6.2</li>
+          <li>xml-apis v 1.0.b2 -> xmlParserAPIs v2.6.2</li>
+        </ul>
+      </action>
+    </release>
     <release version="1.3.1" date="2004-10-23">
       <action dev="carlos" type="update">Run before xdoc:init so generated xdocs can also be used by pdf plugin.</action>
       <action dev="dion" type="fix">Fix crash with an empty html body element.</action>

Modified: maven/maven-1/plugins/trunk/j2ee/plugin.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/j2ee/plugin.jelly?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/j2ee/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/j2ee/plugin.jelly Thu Oct 13 16:17:23 2005
@@ -45,7 +45,7 @@
         <ant:pathelement path="${plugin.dir}" />
         <ant:pathelement path="${plugin.getDependencyPath('ant')}"/>
         <ant:pathelement path="${plugin.getDependencyPath('dom4j')}"/>
-        <ant:pathelement path="${plugin.getDependencyPath('xml-apis')}"/>
+        <ant:pathelement path="${plugin.getDependencyPath('xerces:xmlParserAPIs')}"/>
         <ant:pathelement path="${plugin.getDependencyPath('commons-logging')}"/>
       </ant:classpath>
     </ant:taskdef>

Modified: maven/maven-1/plugins/trunk/j2ee/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/j2ee/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/j2ee/project.xml (original)
+++ maven/maven-1/plugins/trunk/j2ee/project.xml Thu Oct 13 16:17:23 2005
@@ -21,7 +21,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-j2ee-plugin</id>
   <name>Maven J2EE Plugin</name>
-  <currentVersion>1.5.2-SNAPSHOT</currentVersion>
+  <currentVersion>1.6-SNAPSHOT</currentVersion>
   <description/>
   <shortDescription>J2EE tools</shortDescription>
   <url>http://maven.apache.org/reference/plugins/j2ee/</url>
@@ -98,11 +98,17 @@
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
       <version>1.0.3</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>
     <dependency>
       <groupId>dom4j</groupId>
       <artifactId>dom4j</artifactId>
-      <version>1.4-dev-8</version>
+      <version>1.4</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>
     <dependency>
       <groupId>xml-apis</groupId>

Modified: maven/maven-1/plugins/trunk/j2ee/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/j2ee/xdocs/changes.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/j2ee/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/j2ee/xdocs/changes.xml Thu Oct 13 16:17:23 2005
@@ -25,6 +25,13 @@
     <author email="plynch@apache.org">Peter Lynch</author>
   </properties>
   <body>
+    <release version="1.6-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>dom4j v1.4-dev-8 -> v1.4</li>
+        </ul>
+      </action>
+    </release>
     <release version="1.5.1" date="2004-10-23">
       <action dev="vmassol" type="fix">Removed dependency on non-public goal
         <code>war:init</code>and computed the name of the WAR file by using the

Modified: maven/maven-1/plugins/trunk/jalopy/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jalopy/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/jalopy/project.xml (original)
+++ maven/maven-1/plugins/trunk/jalopy/project.xml Thu Oct 13 16:17:23 2005
@@ -21,7 +21,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-jalopy-plugin</id>
   <name>Maven Jalopy Plugin</name>
-  <currentVersion>1.3.1</currentVersion>
+  <currentVersion>1.4-SNAPSHOT</currentVersion>
   <description/>
   <shortDescription>Reformat java source</shortDescription>
   <url>http://maven.apache.org/reference/plugins/jalopy/</url>
@@ -108,17 +108,20 @@
     <dependency>
       <groupId>jdom</groupId>
       <artifactId>jdom</artifactId>
-      <version>1.0b8</version>
+      <version>1.0</version>
     </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
       <version>1.2.8</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>
     <dependency>
       <groupId>oro</groupId>
       <artifactId>oro</artifactId>
-      <version>2.0.7</version>
+      <version>2.0.8</version>
     </dependency>
     <dependency>
       <groupId>textarea</groupId>

Modified: maven/maven-1/plugins/trunk/jalopy/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jalopy/xdocs/changes.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/jalopy/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/jalopy/xdocs/changes.xml Thu Oct 13 16:17:23 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -17,13 +16,20 @@
  * limitations under the License.
  */
  -->
-
 <document>
   <properties>
     <title>Changes</title>
     <author email="evenisse@ifrance.com">Emmanuel Venisse</author>
   </properties>
   <body>
+    <release version="1.4-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>jdom v1.0b8 -> v1.0</li>
+          <li>oro v2.0.7 -> v2.0.8</li>
+        </ul>
+      </action>
+    </release>
     <release version="1.3.1" date="2004-10-23">
       <action dev="evenisse" type="update" issue="MPJALOPY-3">Matchs Jalopy and checkstyle.</action>
       <action dev="evenisse" type="update" issue="MPJALOPY-6">Allows multiple includes/excludes patterns.</action>

Modified: maven/maven-1/plugins/trunk/jar/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jar/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/jar/project.xml (original)
+++ maven/maven-1/plugins/trunk/jar/project.xml Thu Oct 13 16:17:23 2005
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- 
 /*
  * Copyright 2001-2005 The Apache Software Foundation.
@@ -70,7 +69,7 @@
     <dependency>
       <groupId>velocity</groupId>
       <artifactId>velocity</artifactId>
-      <version>1.4-dev</version>
+      <version>1.4</version>
     </dependency>
   </dependencies>
 </project>

Modified: maven/maven-1/plugins/trunk/jar/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jar/xdocs/changes.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/jar/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/jar/xdocs/changes.xml Thu Oct 13 16:17:23 2005
@@ -25,6 +25,11 @@
   </properties>
   <body>
     <release version="1.8-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>velocity v 1.4-dev -> v1.4</li>
+        </ul>
+      </action>
       <action dev="aheritier" type="update">It requires at least maven-plugin-plugin v1.7.</action>
     </release>
     <release version="1.7" date="2005-06-05">



Mime
View raw message