You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ah...@apache.org on 2005/10/14 01:20:03 UTC
svn commit: r320941 [2/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/...
Modified: maven/maven-1/plugins/trunk/javacc/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/javacc/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/javacc/project.xml (original)
+++ maven/maven-1/plugins/trunk/javacc/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-javacc-plugin</id>
<name>Maven Javacc Plugin</name>
- <currentVersion>1.1</currentVersion>
+ <currentVersion>1.2-SNAPSHOT</currentVersion>
<description/>
<shortDescription>Process javacc/jtree grammars</shortDescription>
<url>http://maven.apache.org/reference/plugins/javacc/</url>
@@ -68,7 +66,10 @@
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.0-beta-1</version>
+ <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>
</dependencies>
</project>
Modified: maven/maven-1/plugins/trunk/javacc/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/javacc/xdocs/changes.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/javacc/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/javacc/xdocs/changes.xml Thu Oct 13 16:17:23 2005
@@ -24,6 +24,13 @@
<author email="michal.maczka@dinatics.com">Michal Maczka</author>
</properties>
<body>
+ <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>plexus-utils v1.0-beta-1 -> v1.0.3</li>
+ </ul>
+ </action>
+ </release>
<release version="1.1" date="2004-05-15">
<action dev="dion" type="fix">Fix issues with DOM classes and jdk1.3</action>
</release>
Modified: maven/maven-1/plugins/trunk/javadoc/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/javadoc/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/javadoc/project.xml (original)
+++ maven/maven-1/plugins/trunk/javadoc/project.xml Thu Oct 13 16:17:23 2005
@@ -135,14 +135,18 @@
<artifactId>commons-lang</artifactId>
<version>2.0</version>
<type>jar</type>
- <properties/>
+ <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-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.0</version>
<type>jar</type>
- <properties/>
+ <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/jbuilder/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jbuilder/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/jbuilder/project.xml (original)
+++ maven/maven-1/plugins/trunk/jbuilder/project.xml Thu Oct 13 16:17:23 2005
@@ -67,8 +67,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/jbuilder/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jbuilder/xdocs/changes.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/jbuilder/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/jbuilder/xdocs/changes.xml Thu Oct 13 16:17:23 2005
@@ -24,8 +24,13 @@
<author email="evenisse@ifrance.com">Emmanuel Venisse</author>
</properties>
<body>
- <release version="1.6" date="In CVS">
- <action dev="evenisse" type="add">Aadd support for jbuilder 2005.</action>
+ <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>
+ <action dev="evenisse" type="add">Add support for jbuilder 2005.</action>
<action dev="evenisse" type="fix" issue="MPJBUILDER-13">Remove use of pom.getPluginContext and replace with maven:set/get.</action>
</release>
<release version="1.5" date="2004-05-15">
Modified: maven/maven-1/plugins/trunk/jcoverage/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jcoverage/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/jcoverage/project.xml (original)
+++ maven/maven-1/plugins/trunk/jcoverage/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-jcoverage-plugin</id>
<name>Maven JCoverage plugin</name>
- <currentVersion>1.0.10-SNAPSHOT</currentVersion>
+ <currentVersion>1.1-SNAPSHOT</currentVersion>
<package>org.apache.maven.jcoveragereport</package>
<description>This plugin provides coverage analysis of your source-code based on the open-source jcoverage tool.</description>
<shortDescription>This plugin provides coverage analysis of your source-code based on the open-source jcoverage tool.</shortDescription>
@@ -118,7 +116,7 @@
<dependency>
<groupId>velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
<url>http://jakarta.apache.org/velocity/</url>
</dependency>
<dependency>
@@ -126,6 +124,9 @@
<artifactId>log4j</artifactId>
<version>1.2.8</version>
<url>http://jakarta.apache.org/log4j/</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>bcel</groupId>
@@ -148,7 +149,7 @@
<dependency>
<groupId>oro</groupId>
<artifactId>oro</artifactId>
- <version>2.0.7</version>
+ <version>2.0.8</version>
<url>http://jakarta.apache.org/oro/</url>
</dependency>
<dependency>
@@ -159,15 +160,15 @@
</dependency>
<dependency>
<groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.4.0</version>
- <url>http://xml.apache.org/xerces2-j/index.html</url>
+ <artifactId>xmlParserAPIs</artifactId>
+ <version>2.6.2</version>
+ <url>http://xml.apache.org/xerces2-j/</url>
</dependency>
<dependency>
<groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- <version>2.2.1</version>
- <url>http://xml.apache.org/xerces2-j/index.html</url>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.6.2</version>
+ <url>http://xml.apache.org/xerces2-j/</url>
</dependency>
<dependency>
<groupId>commons-jelly</groupId>
Modified: maven/maven-1/plugins/trunk/jcoverage/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jcoverage/xdocs/changes.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/jcoverage/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/jcoverage/xdocs/changes.xml Thu Oct 13 16:17:23 2005
@@ -24,7 +24,15 @@
<author email="evenisse@ifrance.com">Emmanuel Venisse</author>
</properties>
<body>
- <release version="1.0.10" date="IN CVS">
+ <release version="1.1" 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>oro v2.0.7 -> v2.0.8</li>
+ <li>velocity v1.3 -> v1.4</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="evenisse" type="fix">Open report in a new window.</action>
<action dev="evenisse" type="fix" issue="MPJCOVERAGE-20">Allow comma separeted values for maven.jcoverage.instrumentation.excludes.</action>
<action dev="evenisse" type="fix" issue="MPJCOVERAGE-16">Fix tests failures when user use maven.jcoverage.instrumentation.excludes</action>
Modified: maven/maven-1/plugins/trunk/jdepend/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jdepend/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/jdepend/project.xml (original)
+++ maven/maven-1/plugins/trunk/jdepend/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.
@@ -106,8 +105,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>jdepend</groupId>
@@ -116,16 +118,15 @@
</dependency>
<dependency>
<groupId>xerces</groupId>
- <artifactId>xerces</artifactId>
- <version>2.4.0</version>
+ <artifactId>xmlParserAPIs</artifactId>
+ <version>2.6.2</version>
+ <url>http://xml.apache.org/xerces2-j/</url>
</dependency>
<dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>1.0.b2</version>
- <properties>
- <classloader>root</classloader>
- </properties>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.6.2</version>
+ <url>http://xml.apache.org/xerces2-j/</url>
</dependency>
</dependencies>
</project>
Modified: maven/maven-1/plugins/trunk/jdepend/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jdepend/xdocs/changes.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/jdepend/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/jdepend/xdocs/changes.xml Thu Oct 13 16:17:23 2005
@@ -23,6 +23,14 @@
<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>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.5.1" date="2005-09-27">
<action dev="ltheussl" type="fix" issue="MPJDEPEND-4" due-to="Alexey Demakov">Exception in jsl when there are no cyclic dependencies.</action>
</release>
Modified: maven/maven-1/plugins/trunk/jdiff/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jdiff/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/jdiff/project.xml (original)
+++ maven/maven-1/plugins/trunk/jdiff/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.
@@ -89,6 +88,7 @@
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.6.2</version>
+ <url>http://xml.apache.org/xerces2-j/</url>
</dependency>
</dependencies>
</project>
Modified: maven/maven-1/plugins/trunk/jellydoc/plugin.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jellydoc/plugin.jelly?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/jellydoc/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/jellydoc/plugin.jelly Thu Oct 13 16:17:23 2005
@@ -113,8 +113,8 @@
<ant:pathelement path="${plugin.getDependencyPath('javadoc')}"/>
<ant:pathelement path="${plugin.getDependencyPath('nekohtml')}"/>
<ant:pathelement path="${plugin.getDependencyPath('dom4j')}"/>
- <ant:pathelement path="${plugin.getDependencyPath('xerces')}"/>
- <ant:pathelement path="${plugin.getDependencyPath('xml-apis')}"/>
+ <ant:pathelement path="${plugin.getDependencyPath('xercesImpl')}"/>
+ <ant:pathelement path="${plugin.getDependencyPath('xmlParserAPIs')}"/>
<ant:pathelement path="${plugin.getDependencyPath('commons-jelly')}"/>
</ant:path>
</goal>
Modified: maven/maven-1/plugins/trunk/jellydoc/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jellydoc/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/jellydoc/project.xml (original)
+++ maven/maven-1/plugins/trunk/jellydoc/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,15 +16,13 @@
* limitations under the License.
*/
-->
-
<project>
<extend>../plugin-parent/project.xml</extend>
<pomVersion>3</pomVersion>
<id>maven-jellydoc-plugin</id>
<name>Maven JellyDoc Plug-in</name>
- <currentVersion>1.3.2-SNAPSHOT</currentVersion>
+ <currentVersion>1.4-SNAPSHOT</currentVersion>
<!-- Gump integration -->
-
<gumpRepositoryId>jakarta</gumpRepositoryId>
<description>Creates a JavaDoc like report for any Jelly Tags used in a project.</description>
<shortDescription>Javadoc stuff for Jelly tags</shortDescription>
@@ -68,8 +65,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>javadoc</groupId>
@@ -82,23 +82,25 @@
<version>0.7.7</version>
</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/jellydoc/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jellydoc/xdocs/changes.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/jellydoc/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/jellydoc/xdocs/changes.xml Thu Oct 13 16:17:23 2005
@@ -25,6 +25,16 @@
<author email="kschrader@karmalab.org">Kurt Schrader</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="dion" type="fix">Use tools.jar for javadoc as it cannot be distributed from the repository</action>
</release>
Modified: maven/maven-1/plugins/trunk/jetty/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jetty/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/jetty/project.xml (original)
+++ maven/maven-1/plugins/trunk/jetty/project.xml Thu Oct 13 16:17:23 2005
@@ -81,12 +81,18 @@
<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>
<dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
<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>
</dependencies>
</project>
Modified: maven/maven-1/plugins/trunk/jetty/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jetty/xdocs/changes.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/jetty/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/jetty/xdocs/changes.xml Thu Oct 13 16:17:23 2005
@@ -25,6 +25,11 @@
</properties>
<body>
<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>commons-jelly-tags-xml v1.0 -> v1.1</li>
+ </ul>
+ </action>
<action dev="vmassol" type="fix" due-to="Peter Ryan" issue="MPJETTY-2">
Added tools.jar to the Jetty execution classpath to support JSP compilation.
</action>
Modified: maven/maven-1/plugins/trunk/jira/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jira/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/jira/project.xml (original)
+++ maven/maven-1/plugins/trunk/jira/project.xml Thu Oct 13 16:17:23 2005
@@ -40,22 +40,34 @@
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<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-jelly</groupId>
<artifactId>commons-jelly</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>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
+ <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>
<!-- Required for commons-httpclient -->
<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>maven</groupId>
Modified: maven/maven-1/plugins/trunk/jira/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jira/xdocs/changes.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/jira/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/jira/xdocs/changes.xml Thu Oct 13 16:17:23 2005
@@ -25,6 +25,11 @@
</properties>
<body>
<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>commons-logging v1.0.4 -> v1.0.3</li>
+ </ul>
+ </action>
<action dev="carlos" type="fix" issue="MPJIRA-11" due-to="Michael Franken">Enable retrieving component-specific issues.</action>
<action dev="carlos" type="fix" issue="MPJIRA-8" due-to="Michael Franken">Authentication support for access a private Jira instalation.</action>
</release>
Modified: maven/maven-1/plugins/trunk/junit-report/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/junit-report/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/junit-report/project.xml (original)
+++ maven/maven-1/plugins/trunk/junit-report/project.xml Thu Oct 13 16:17:23 2005
@@ -75,8 +75,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/junit-report/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/junit-report/xdocs/changes.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/junit-report/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/junit-report/xdocs/changes.xml Thu Oct 13 16:17:23 2005
@@ -25,7 +25,12 @@
<author email="evenisse@ifrance.com">Emmanuel Venisse</author>
</properties>
<body>
- <release version="1.5.1-SNAPSHOT" date="in CVS">
+ <release version="1.5.1-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>
<action dev="brett" type="fix">Fix documentation, add default goal</action>
<action dev="brett" type="fix" issue="MPJUNITREPORT-7">Fix HTML problems by disabling jsl's pretty printing</action>
</release>
Modified: maven/maven-1/plugins/trunk/jxr/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jxr/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/jxr/project.xml (original)
+++ maven/maven-1/plugins/trunk/jxr/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.
@@ -64,17 +63,23 @@
<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>
<!-- Transitive deps -->
<dependency>
<groupId>oro</groupId>
<artifactId>oro</artifactId>
- <version>2.0.7</version>
+ <version>2.0.8</version>
</dependency>
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-utils</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>velocity</groupId>
@@ -84,7 +89,10 @@
<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>
</dependencies>
<versions>
Modified: maven/maven-1/plugins/trunk/jxr/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jxr/xdocs/changes.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/jxr/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/jxr/xdocs/changes.xml Thu Oct 13 16:17:23 2005
@@ -24,6 +24,14 @@
<author email="evenisse@ifrance.com">Emmanuel Venisse</author>
</properties>
<body>
+ <release version="1.5-SNAPSHOT" date="In SVN">
+ <action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated :
+ <ul>
+ <li>commons-collections v3.1 -> v3.0</li>
+ <li>oro v2.0.7 -> v2.0.8</li>
+ </ul>
+ </action>
+ </release>
<release version="1.4.3" date="2005-08-08">
<action dev="carlos" type="fix" issue="MPJXR-20" due-to="Ola Sandness">Close streams properly on errors</action>
<action dev="carlos" type="fix" issue="MPJXR-26">Ignore Java 5 package-info.java files</action>
Modified: maven/maven-1/plugins/trunk/linkcheck/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/linkcheck/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/linkcheck/project.xml (original)
+++ maven/maven-1/plugins/trunk/linkcheck/project.xml Thu Oct 13 16:17:23 2005
@@ -90,11 +90,17 @@
<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-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>2.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-grant</groupId>
@@ -104,17 +110,26 @@
<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-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-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-jelly</groupId>
@@ -124,36 +139,53 @@
<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-ant</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
<url>http://jakarta.apache.org/commons/jelly/libs/ant/</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>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>
<dependency>
<!-- Required for commons-httpclient -->
-
<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>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>jtidy</groupId>
Modified: maven/maven-1/plugins/trunk/linkcheck/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/linkcheck/xdocs/changes.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/linkcheck/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/linkcheck/xdocs/changes.xml Thu Oct 13 16:17:23 2005
@@ -26,6 +26,17 @@
</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-collections v2.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-jelly-tags-ant v1.0 -> v1.1</li>
+ <li>commons-jelly-tags-xml v1.0 -> v1.1</li>
+ <li>dom4j v1.4-dev-8 -> v1.4</li>
+ <li>maven-model v3.0.0-SNAPSHOT -> v3.0.1</li>
+ </ul>
+ </action>
<action dev="brett" type="update">Make compatible with Maven 1.1</action>
<action dev="aheritier" type="fix" issue="MPLINKCHECK-21">java.lang.NumberFormatException if proxy port is setted to ""</action>
</release>
Modified: maven/maven-1/plugins/trunk/multiproject/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/multiproject/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/multiproject/project.xml (original)
+++ maven/maven-1/plugins/trunk/multiproject/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>
<extend>../plugin-parent/project.xml</extend>
<id>maven-multiproject-plugin</id>
@@ -100,7 +98,7 @@
</roles>
<timezone>+10</timezone>
</developer>
- <developer>
+ <developer>
<name>Lukas Theussl</name>
<id>ltheussl</id>
<email>ltheussl@apache.org</email>
@@ -121,19 +119,22 @@
<groupId>velocity</groupId>
<artifactId>velocity</artifactId>
<type>jar</type>
- <version>1.4-dev</version>
+ <version>1.4</version>
</dependency>
<dependency>
<groupId>maven</groupId>
<artifactId>maven</artifactId>
<type>jar</type>
- <version>1.0</version>
+ <version>1.0.2</version>
</dependency>
<dependency>
<groupId>maven</groupId>
<artifactId>maven-model</artifactId>
<type>jar</type>
- <version>3.0.0</version>
+ <version>3.0.1</version>
+ <properties>
+ <comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
+ </properties>
</dependency>
</dependencies>
</project>
Modified: maven/maven-1/plugins/trunk/multiproject/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/multiproject/xdocs/changes.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/multiproject/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/multiproject/xdocs/changes.xml Thu Oct 13 16:17:23 2005
@@ -26,6 +26,13 @@
</properties>
<body>
<release version="1.5-SNAPSHOT" date="in SVN">
+ <action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated :
+ <ul>
+ <li>maven v1.0 -> v1.0.2</li>
+ <li>maven-model v3.0.0 -> v3.0.1</li>
+ <li>velocity v1.4-dev -> v1.4</li>
+ </ul>
+ </action>
<action dev="ltheussl" type="fix" issue="MPMULTIPROJECT-44">multiproject:site fails if sub-projects has a &amp; on POM.</action>
<action dev="ltheussl" type="fix" issue="MPMULTIPROJECT-49">Can not mix multiproject goals with other/custom goals.</action>
</release>
Modified: maven/maven-1/plugins/trunk/pdf/plugin.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/pdf/plugin.jelly?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/pdf/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/pdf/plugin.jelly Thu Oct 13 16:17:23 2005
@@ -209,10 +209,10 @@
<arg value="footer_Height"/>
<arg value="${maven.pdf.cover.footerHeight}"/>
<classpath>
- <pathelement location="${plugin.getDependencyPath('xerces')}"/>
+ <pathelement location="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
<pathelement location="${plugin.getDependencyPath('xalan')}"/>
<j:if test="${java_version.compareTo('1.4') lt 0}">
- <pathelement location="${plugin.getDependencyPath('xml-apis')}"/>
+ <pathelement location="${plugin.getDependencyPath('xerces:xmlParserAPIs')}"/>
</j:if>
</classpath>
</java>
@@ -284,9 +284,9 @@
<classpath>
<pathelement location="${plugin.getDependencyPath('fop')}"/>
<j:if test="${java_version.compareTo('1.4') lt 0}">
- <pathelement location="${plugin.getDependencyPath('xml-apis')}"/>
+ <pathelement location="${plugin.getDependencyPath('xerces:xmlParserAPIs')}"/>
</j:if>
- <pathelement location="${plugin.getDependencyPath('xerces')}"/>
+ <pathelement location="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
<pathelement location="${plugin.getDependencyPath('xalan')}"/>
<pathelement location="${plugin.getDependencyPath('batik')}"/>
<pathelement location="${plugin.getDependencyPath('avalon-framework')}"/>
Modified: maven/maven-1/plugins/trunk/pdf/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/pdf/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/pdf/project.xml (original)
+++ maven/maven-1/plugins/trunk/pdf/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.
@@ -136,15 +135,15 @@
</dependency>
<dependency>
<groupId>xerces</groupId>
- <artifactId>xerces</artifactId>
- <version>2.4.0</version>
- <url>http://xml.apache.org/xerces-j/</url>
+ <artifactId>xmlParserAPIs</artifactId>
+ <version>2.6.2</version>
+ <url>http://xml.apache.org/xerces2-j/</url>
</dependency>
<dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>1.0.b2</version>
- <url>http://xml.apache.org/commons/</url>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.6.2</version>
+ <url>http://xml.apache.org/xerces2-j/</url>
</dependency>
<dependency>
<groupId>xalan</groupId>
Modified: maven/maven-1/plugins/trunk/pdf/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/pdf/xdocs/changes.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/pdf/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/pdf/xdocs/changes.xml Thu Oct 13 16:17:23 2005
@@ -25,6 +25,12 @@
</properties>
<body>
<release version="2.5-SNAPSHOT" date="in SVN">
+ <action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated :
+ <ul>
+ <li>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="aheritier" type="fix" issue="MPPDF-47">An error occurs if the project logo or the company logo aren't defined.</action>
<action dev="ltheussl" type="fix" issue="MPPDF-37">Page numbering not correct with more than 10 items in menu.</action>
<action dev="ltheussl" type="add" issue="MPPDF-48">New goal <code>pdf:navigation-validate</code> to validate the pdf navigation file.</action>
Modified: maven/maven-1/plugins/trunk/plugin-parent/project.properties
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/plugin-parent/project.properties?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/plugin-parent/project.properties (original)
+++ maven/maven-1/plugins/trunk/plugin-parent/project.properties Thu Oct 13 16:17:23 2005
@@ -79,4 +79,38 @@
maven.site.deploy.method=rsync
# Use the jpg image for the organization's logo
-maven.pdf.companyLogo=http://maven.apache.org/images/apache-maven-project.jpg
\ No newline at end of file
+maven.pdf.companyLogo=http://maven.apache.org/images/apache-maven-project.jpg
+
+
+# Override versions of dependencies defined in maven core
+# The maven's classloader doesn't allow plugins to use
+# a different version of dependencies loaded by the core.
+maven.jar.override = on
+# Set dependencies versions from maven 1.1 core
+maven.jar.ant=1.6.5
+maven.jar.ant-junit=1.6.5
+maven.jar.ant-launcher=1.6.5
+maven.jar.ant-trax=1.6.5
+maven.jar.commons-beanutils=1.6.1
+maven.jar.commons-cli=1.0-beta-2
+maven.jar.commons-collections=3.0
+maven.jar.commons-httpclient=2.0.2
+maven.jar.commons-io=1.0
+maven.jar.commons-jelly=1.0
+maven.jar.commons-jelly-tags-ant=1.1
+maven.jar.commons-jelly-tags-define=1.0
+maven.jar.commons-jelly-tags-util=1.1.1
+maven.jar.commons-jelly-tags-xml=1.1
+maven.jar.commons-jexl=1.0
+maven.jar.commons-lang=2.0
+maven.jar.commons-logging=1.0.3
+maven.jar.dom4j=1.4
+maven.jar.forehead=1.0-beta-5
+maven.jar.log4j=1.2.8
+maven.jar.maven-model=3.0.1
+maven.jar.plexus-utils=1.0.3
+maven.jar.wagon-file=1.0-alpha-4
+maven.jar.wagon-http=1.0-alpha-3
+maven.jar.wagon-provider-api=1.0-alpha-3
+
+maven.jar.maven = ${maven.home}/lib/maven.jar
\ No newline at end of file
Modified: maven/maven-1/plugins/trunk/plugin/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/plugin/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/plugin/project.xml (original)
+++ maven/maven-1/plugins/trunk/plugin/project.xml Thu Oct 13 16:17:23 2005
@@ -130,12 +130,18 @@
<artifactId>commons-lang</artifactId>
<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>
<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>
@@ -146,11 +152,14 @@
<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>jdom</groupId>
<artifactId>jdom</artifactId>
- <version>b10</version>
+ <version>1.0</version>
</dependency>
<dependency>
<groupId>saxpath</groupId>
@@ -163,14 +172,15 @@
<version>1.0-FCS-full</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>
<url>http://xml.apache.org/xerces2-j/</url>
</dependency>
<dependency>
- <id>xerces</id>
- <version>2.4.0</version>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.6.2</version>
<url>http://xml.apache.org/xerces2-j/</url>
</dependency>
<dependency>
Modified: maven/maven-1/plugins/trunk/plugin/src/plugin-test/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/plugin/src/plugin-test/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/plugin/src/plugin-test/project.xml (original)
+++ maven/maven-1/plugins/trunk/plugin/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-plugin-plugin</id>
@@ -55,7 +53,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>
@@ -67,7 +65,7 @@
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>2.0-rc1</version>
+ <version>2.0.2</version>
<url>http://jakarta.apache.org/commons/httpclient/</url>
</dependency>
</dependencies>
Modified: maven/maven-1/plugins/trunk/plugin/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/plugin/xdocs/changes.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/plugin/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/plugin/xdocs/changes.xml Thu Oct 13 16:17:23 2005
@@ -24,6 +24,14 @@
</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-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>xml-apis v 1.0.b2 -> xmlParserAPIs v2.6.2</li>
+ </ul>
+ </action>
<action dev="ltheussl" type="add" issue="MPPLUGIN-33">Allow plugin-test directory to be changed.</action>
<action dev="ltheussl" type="fix" issue="MPPLUGIN-25" due-to="Jamie McCrindle, Barrie Treloar">NTLM Proxy Problem.</action>
<action dev="carlos" type="fix" issue="MPPLUGIN-26">plugin:download didn't redownload SNAPSHOT plugins.</action>
Modified: maven/maven-1/plugins/trunk/pom/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/pom/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/pom/project.xml (original)
+++ maven/maven-1/plugins/trunk/pom/project.xml Thu Oct 13 16:17:23 2005
@@ -23,7 +23,7 @@
<pomVersion>3</pomVersion>
<id>maven-pom-plugin</id>
<name>Maven POM Plugin</name>
- <currentVersion>1.4.2-SNAPSHOT</currentVersion>
+ <currentVersion>1.5-SNAPSHOT</currentVersion>
<description/>
<shortDescription>Check Project Object Model</shortDescription>
<url>http://maven.apache.org/reference/plugins/pom/</url>
@@ -85,7 +85,10 @@
<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>commons-jelly</groupId>
@@ -95,7 +98,7 @@
<dependency>
<groupId>maven</groupId>
<artifactId>maven</artifactId>
- <version>1.0</version>
+ <version>1.0.2</version>
</dependency>
</dependencies>
</project>
Modified: maven/maven-1/plugins/trunk/pom/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/pom/xdocs/changes.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/pom/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/pom/xdocs/changes.xml Thu Oct 13 16:17:23 2005
@@ -24,7 +24,13 @@
</properties>
<body>
<releases>
- <release version="1.4.2-SNAPSHOT" date="in SVN">
+ <release version="1.5-SNAPSHOT" date="in SVN">
+ <action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated :
+ <ul>
+ <li>dom4j v1.4-dev-8 -> v1.4</li>
+ <li>maven v1.0 -> v1.0.2</li>
+ </ul>
+ </action>
</release>
<release version="1.4.1" date="2004-06-19">
<action dev="brett" type="fix">Build and run plugin against the installed version of Maven</action>
Modified: maven/maven-1/plugins/trunk/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/project.xml (original)
+++ maven/maven-1/plugins/trunk/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,11 +16,8 @@
* limitations under the License.
*/
-->
-
<project>
-
<!-- TODO: Make it inherit from plugin-parent? -->
-
<pomVersion>3</pomVersion>
<id>maven-master</id>
<name>Maven Plugins</name>
@@ -35,13 +31,11 @@
<inceptionYear>2001</inceptionYear>
<package>org.apache.maven</package>
<logo>http://maven.apache.org/images/maven-logo-2.gif</logo>
-
<issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10030</issueTrackingUrl>
<siteAddress>people.apache.org</siteAddress>
<siteDirectory>/www/maven.apache.org/reference/plugins/</siteDirectory>
<distributionSite>people.apache.org</distributionSite>
<distributionDirectory>/www/www.apache.org/dist/java-repository/</distributionDirectory>
-
<mailingLists>
<mailingList>
<name>Maven User List</name>
@@ -56,13 +50,11 @@
<archive>http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=dev@maven.apache.org</archive>
</mailingList>
</mailingLists>
-
<repository>
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/</developerConnection>
<url>http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/</url>
</repository>
-
<developers>
<developer>
<name>dIon Gillard</name>
@@ -92,7 +84,7 @@
<roles>
<role>Java Developer</role>
</roles>
- </developer>
+ </developer>
<developer>
<name>James Strachan</name>
<id>jstrachan</id>
@@ -162,9 +154,8 @@
<role>Developer</role>
</roles>
<timezone>+1</timezone>
- </developer>
+ </developer>
</developers>
-
<dependencies>
<dependency>
<groupId>commons-jelly</groupId>
@@ -172,18 +163,15 @@
<version>1.0</version>
</dependency>
</dependencies>
-
<build>
<nagEmailAddress>dev@maven.apache.org</nagEmailAddress>
<sourceDirectory>src/main</sourceDirectory>
<unitTestSourceDirectory>src/test</unitTestSourceDirectory>
-
<unitTest>
<includes>
<include>**/*Test.java</include>
</includes>
</unitTest>
-
<resources>
<resource>
<directory>..</directory>
@@ -207,7 +195,6 @@
</resource>
</resources>
</build>
-
<reports>
<report>maven-jdepend-plugin</report>
<report>maven-checkstyle-plugin</report>
@@ -226,5 +213,4 @@
<report>maven-multiproject-plugin</report>
<report>maven-multichanges-plugin</report>
</reports>
-
</project>
Modified: maven/maven-1/plugins/trunk/rar/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/rar/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/rar/project.xml (original)
+++ maven/maven-1/plugins/trunk/rar/project.xml Thu Oct 13 16:17:23 2005
@@ -65,8 +65,11 @@
<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/tags/util/</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/rar/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/rar/xdocs/changes.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/rar/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/rar/xdocs/changes.xml Thu Oct 13 16:17:23 2005
@@ -24,7 +24,12 @@
<author email="dion@multitask.com.au">dIon Gillard</author>
</properties>
<body>
- <release version="1.1-SNAPSHOT" date="in CVS">
+ <release version="1.1-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>
+ </ul>
+ </action>
<action dev="brett" type="update">Deprecate rar:load hook goal</action>
<action dev="dion" type="add">Add xdocs/changes.xml</action>
<action dev="dion" type="fix">Move versions element to correct location in POM</action>
Modified: maven/maven-1/plugins/trunk/release/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/release/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/release/project.xml (original)
+++ maven/maven-1/plugins/trunk/release/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-release-plugin</id>
<name>Maven Release Plug-in</name>
- <currentVersion>1.4.2-SNAPSHOT</currentVersion>
+ <currentVersion>1.5-SNAPSHOT</currentVersion>
<description/>
<shortDescription>Produce project release</shortDescription>
<url>http://maven.apache.org/reference/plugins/release/</url>
@@ -50,18 +48,24 @@
<dependency>
<groupId>maven</groupId>
<artifactId>maven</artifactId>
- <version>1.0-rc2</version>
+ <version>1.0.2</version>
</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>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>jaxen</groupId>
@@ -71,7 +75,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>saxpath</groupId>
@@ -79,9 +86,9 @@
<version>1.0-FCS</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>
<url>http://xml.apache.org/xerces2-j/</url>
</dependency>
<dependency>
Modified: maven/maven-1/plugins/trunk/release/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/release/xdocs/changes.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/release/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/release/xdocs/changes.xml Thu Oct 13 16:17:23 2005
@@ -25,6 +25,16 @@
<author email="dion@apache.org">dIon Gillard</author>
</properties>
<body>
+ <release version="1.5-SNAPSHOT" date="In SVN">
+ <action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated :
+ <ul>
+ <li>maven v1.0-rc2 -> v1.0.2</li>
+ <li>dom4j v1.4-dev-8 -> v1.4</li>
+ <li>commons-jelly v1.0-beta-4 -> v1.0</li>
+ <li>xml-apis v 1.0.b2 -> xmlParserAPIs v2.6.2</li>
+ </ul>
+ </action>
+ </release>
<release version="1.4.1" date="2004-10-23">
<action dev="carlos" type="fix" issue="MPRELEASE-9">Close output file in AbstractPomTransformer.write()</action>
</release>
Modified: maven/maven-1/plugins/trunk/repository/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/repository/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/repository/project.xml (original)
+++ maven/maven-1/plugins/trunk/repository/project.xml Thu Oct 13 16:17:23 2005
@@ -23,7 +23,7 @@
<pomVersion>3</pomVersion>
<id>maven-repository-plugin</id>
<name>Maven Repository Plug-in</name>
- <currentVersion>1.2.1-SNAPSHOT</currentVersion>
+ <currentVersion>1.3-SNAPSHOT</currentVersion>
<shortDescription>Tools to work with the central repo</shortDescription>
<url>http://maven.apache.org/reference/plugins/repository/</url>
<issueTrackingUrl>http://jira.codehaus.org/browse/MPREPO</issueTrackingUrl>
@@ -50,14 +50,20 @@
<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/</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-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>
<versions>
Modified: maven/maven-1/plugins/trunk/repository/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/repository/xdocs/changes.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/repository/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/repository/xdocs/changes.xml Thu Oct 13 16:17:23 2005
@@ -24,7 +24,13 @@
<author email="dion@apache.org">dIon Gillard</author>
</properties>
<body>
- <release version="1.2.1" date="in CVS">
+ <release version="1.3-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>
<action dev="dion" type="fix" issue="MPREPO-6">Fixed typo in docs</action>
</release>
<release version="1.2" date="2004-05-15">
Modified: maven/maven-1/plugins/trunk/scm/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/scm/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/scm/project.xml (original)
+++ maven/maven-1/plugins/trunk/scm/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>
<extend>../plugin-parent/project.xml</extend>
<id>maven-scm-plugin</id>
@@ -114,7 +112,10 @@
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.0.1</version>
+ <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>classworlds</groupId>
Modified: maven/maven-1/plugins/trunk/simian/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/simian/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/simian/project.xml (original)
+++ maven/maven-1/plugins/trunk/simian/project.xml Thu Oct 13 16:17:23 2005
@@ -110,20 +110,29 @@
<dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
- <version>1.5.3-1</version>
+ <version>1.6.5</version>
<url>http://ant.apache.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-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-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<url>http://jakarta.apache.org/commons/logging/</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/simian/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/simian/xdocs/changes.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/simian/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/simian/xdocs/changes.xml Thu Oct 13 16:17:23 2005
@@ -26,6 +26,12 @@
</properties>
<body>
<release version="1.6-SNAPSHOT" date="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 v1.0-beta-4 -> v1.0</li>
+ </ul>
+ </action>
<action dev="epugh" type="fix" issue="MPSIMIAN-15">Tag library warning when using simian 1.5</action>
<action dev="epugh" type="fix" issue="MPSIMIAN-12" due-to="James Dickinson">Simian report contains broken links to xref/xref-test directories</action>
</release>
Modified: maven/maven-1/plugins/trunk/site/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/site/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/site/project.xml (original)
+++ maven/maven-1/plugins/trunk/site/project.xml Thu Oct 13 16:17:23 2005
@@ -21,7 +21,7 @@
<pomVersion>3</pomVersion>
<id>maven-site-plugin</id>
<name>Maven Site Plugin</name>
- <currentVersion>1.6.2-SNAPSHOT</currentVersion>
+ <currentVersion>1.7-SNAPSHOT</currentVersion>
<description>Generate web site.</description>
<shortDescription>Generate web site</shortDescription>
<url>http://maven.apache.org/reference/plugins/site/</url>
@@ -94,6 +94,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>ant</groupId>
Modified: maven/maven-1/plugins/trunk/site/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/site/xdocs/changes.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/site/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/site/xdocs/changes.xml Thu Oct 13 16:17:23 2005
@@ -22,7 +22,7 @@
<author email="dion@multitask.com.au">dIon Gillard</author>
</properties>
<body>
- <release version="1.6.2-SNAPSHOT" date="In SVN">
+ <release version="1.7-SNAPSHOT" date="In SVN">
<action dev="ltheussl" type="fix" issue="MPSITE-40">Missing <code>maven.ssh.args</code> in <code>site:publish</code>.</action>
<action dev="ltheussl" type="add" issue="MPSITE-31">Make <code>chmod</code> options in <code>site:sshdeploy</code> configurable.</action>
<action dev="ltheussl" type="fix" issue="MPSITE-24" due-to="Julian Dunn">SSH arguments not used in <code>sshdeploy</code> with 'clean'.</action>
Modified: maven/maven-1/plugins/trunk/tasklist/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/tasklist/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/tasklist/project.xml (original)
+++ maven/maven-1/plugins/trunk/tasklist/project.xml Thu Oct 13 16:17:23 2005
@@ -113,8 +113,11 @@
<dependency>
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly</artifactId>
- <version>1.0-RC1</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-jelly</groupId>
Modified: maven/maven-1/plugins/trunk/tasklist/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/tasklist/xdocs/changes.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/tasklist/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/tasklist/xdocs/changes.xml Thu Oct 13 16:17:23 2005
@@ -26,6 +26,13 @@
<author email="aheritier@apache.org">Arnaud Heritier</author>
</properties>
<body>
+ <release version="2.5-SNAPSHOT" date="In SVN">
+ <action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated :
+ <ul>
+ <li>commons-jelly v1.0-RC1 -> v1.0</li>
+ </ul>
+ </action>
+ </release>
<release version="2.4" date="2005-06-15">
<action dev="aheritier" type="add" issue="MPTASKLIST-9" due-to="Dennis Lundberg">Show todos for fields</action>
<action dev="brett" type="fix" issue="MPTASKLIST-8" due-to="Martin van den Bemt">Fix xdoc title</action>
Modified: maven/maven-1/plugins/trunk/test/plugin.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/test/plugin.jelly?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/test/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/test/plugin.jelly Thu Oct 13 16:17:23 2005
@@ -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>
Modified: maven/maven-1/plugins/trunk/test/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/test/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/test/project.xml (original)
+++ maven/maven-1/plugins/trunk/test/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.
@@ -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>
Modified: maven/maven-1/plugins/trunk/test/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/test/xdocs/changes.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/test/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/test/xdocs/changes.xml Thu Oct 13 16:17:23 2005
@@ -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">
Modified: maven/maven-1/plugins/trunk/xdoc/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/project.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/project.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/project.xml Thu Oct 13 16:17:23 2005
@@ -180,11 +180,17 @@
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
<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>commons-jelly</groupId>
<artifactId>commons-jelly</artifactId>
- <version>1.0-RC1</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>
@@ -206,11 +212,17 @@
<artifactId>commons-jelly-tags-xml</artifactId>
<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>maven</groupId>
@@ -220,7 +232,10 @@
<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>
<dependency>
<groupId>velocity</groupId>
@@ -245,6 +260,9 @@
<dependency>
<id>forehead</id>
<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>
</project>
Modified: maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml?rev=320941&r1=320940&r2=320941&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml Thu Oct 13 16:17:23 2005
@@ -27,6 +27,12 @@
</properties>
<body>
<release version="1.10" 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 v1.0-RC1 -> v1.0</li>
+ <li>maven-model v3.0.0 -> v3.0.1</li>
+ </ul>
+ </action>
<action dev="ltheussl" type="fix" issue="MPXDOC-178" due-to="Phil Steitz"><code>maven.ui.navcol.width</code> has no effect.</action>
<action dev="ltheussl" type="fix" issue="MPXDOC-176">When there's no user provided documentation, some generated docs don't get copied to site.</action>
<action dev="ltheussl" type="fix" issue="MPXDOC-175" due-to="Phil Steitz">Menus with <code>type="header"</code> are not processed by <code>site.jsl</code>.</action>