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

test/plugin.jelly

@@ -59,8 +59,8 @@
           <path refid="maven.dependency.classpath"/>
           <pathelement path="${plugin.getDependencyPath('junit')}"/>
           <j:if test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no') and !context.getVariable('maven.test.excludeXmlApis').toString().trim().equalsIgnoreCase('yes') }">
-            <pathelement path="${plugin.getDependencyPath('xml-apis')}"/>
-            <pathelement path="${plugin.getDependencyPath('xerces')}"/>
+            <pathelement path="${plugin.getDependencyPath('xerces:xmlParserAPIs')}"/>
+            <pathelement path="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
           </j:if>
         </classpath>
         <src>
@@ -160,8 +160,8 @@
           <path refid="maven.dependency.classpath"/>
           <pathelement path="${plugin.getDependencyPath('junit')}"/>
           <j:if test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no') and !context.getVariable('maven.test.excludeXmlApis').toString().trim().equalsIgnoreCase('yes') }">
-            <pathelement path="${plugin.getDependencyPath('xml-apis')}"/>
-            <pathelement path="${plugin.getDependencyPath('xerces')}"/>
+            <pathelement path="${plugin.getDependencyPath('xerces:xmlParserAPIs')}"/>
+            <pathelement path="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
           </j:if>
         </classpath>
         <batchtest todir="${maven.test.reportsDirectory}">
@@ -216,8 +216,8 @@
         <path refid="maven.dependency.classpath"/>
         <pathelement path="${plugin.getDependencyPath('junit')}"/>
         <j:if test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no') and !context.getVariable('maven.test.excludeXmlApis').toString().trim().equalsIgnoreCase('yes') }">
-          <pathelement path="${plugin.getDependencyPath('xml-apis')}"/>
-          <pathelement path="${plugin.getDependencyPath('xerces')}"/>
+          <pathelement path="${plugin.getDependencyPath('xerces:xmlParserAPIs')}"/>
+          <pathelement path="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
         </j:if>
       </classpath>
       <arg value="-noloading"/>
@@ -278,8 +278,8 @@
               <path refid="maven.dependency.classpath"/>
               <pathelement path="${plugin.getDependencyPath('junit')}"/>
               <j:if test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no') and !context.getVariable('maven.test.excludeXmlApis').toString().trim().equalsIgnoreCase('yes') }">
-                <pathelement path="${plugin.getDependencyPath('xml-apis')}"/>
-                <pathelement path="${plugin.getDependencyPath('xerces')}"/>
+                <pathelement path="${plugin.getDependencyPath('xerces:xmlParserAPIs')}"/>
+                <pathelement path="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
               </j:if>
             </classpath>
 
@@ -363,8 +363,8 @@
               <path refid="maven.dependency.classpath"/>
               <pathelement path="${plugin.getDependencyPath('junit')}"/>
               <j:if test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no') and !context.getVariable('maven.test.excludeXmlApis').toString().trim().equalsIgnoreCase('yes') }">
-                <pathelement path="${plugin.getDependencyPath('xml-apis')}"/>
-                <pathelement path="${plugin.getDependencyPath('xerces')}"/>
+                <pathelement path="${plugin.getDependencyPath('xerces:xmlParserAPIs')}"/>
+                <pathelement path="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
               </j:if>
             </classpath>
 

test/project.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -22,7 +21,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-test-plugin</id>
   <name>Maven Test Plug-in</name>
-  <currentVersion>1.7.1-SNAPSHOT</currentVersion>
+  <currentVersion>1.8-SNAPSHOT</currentVersion>
   <description>Run JUnit tests.</description>
   <shortDescription>Run JUnit tests</shortDescription>
   <url>http://maven.apache.org/reference/plugins/test/</url>
@@ -89,22 +88,16 @@
       </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>
-      <properties>
-        <classloader>root</classloader>
-      </properties>
     </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>
-      <properties>
-        <classloader>root</classloader>
-      </properties>
     </dependency>
   </dependencies>
 </project>

test/xdocs/changes.xml

@@ -23,7 +23,13 @@
     <author email="dion@multitask.com.au">dIon Gillard</author>
   </properties>
   <body>
-    <release version="1.7.1-SNAPSHOT" date="in SVN">
+    <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>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="brett" type="add" due-to="Eric Hartmann" issue="MPTEST-55">Add maven.test.excludeXmlApis property to avoid duplicated Xerces</action>
     </release>
     <release version="1.7" date="2005-08-09">