You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/03/03 03:48:11 UTC
svn commit: r156000 - in maven/maven-1/core/trunk: project.xml
src/bin/forehead.conf src/java/org/apache/maven/AntProjectBuilder.java
xdocs/changes.xml xdocs/reference/backwards-compatibility.xml
Author: brett
Date: Wed Mar 2 18:48:09 2005
New Revision: 156000
URL: http://svn.apache.org/viewcvs?view=rev&rev=156000
Log:
PR: MAVEN-1400
bundle Ant 1.6.2
Modified:
maven/maven-1/core/trunk/project.xml
maven/maven-1/core/trunk/src/bin/forehead.conf
maven/maven-1/core/trunk/src/java/org/apache/maven/AntProjectBuilder.java
maven/maven-1/core/trunk/xdocs/changes.xml
maven/maven-1/core/trunk/xdocs/reference/backwards-compatibility.xml
Modified: maven/maven-1/core/trunk/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/project.xml?view=diff&r1=155999&r2=156000
==============================================================================
--- maven/maven-1/core/trunk/project.xml (original)
+++ maven/maven-1/core/trunk/project.xml Wed Mar 2 18:48:09 2005
@@ -464,109 +464,7 @@
</dependency>
<dependency>
<id>ant</id>
- <version>1.5.3-1</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-optional</artifactId>
- <version>1.5.3-1</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <!-- ant 1.6 deps - Ant 1.6 messes up any use of the "root" classloader for taskdefs
- <dependency>
- <id>ant</id>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-antlr</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-apache-bsf</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-apache-resolver</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-commons-logging</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-commons-net</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-icontract</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-jai</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-jakarta-bcel</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-jakarta-log4j</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-jakarta-oro</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-jakarta-regexp</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-javamail</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-jdepend</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-jmf</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-jsch</artifactId>
- <version>1.6</version>
+ <version>1.6.2</version>
<url>http://ant.apache.org/</url>
</dependency>
<dependency>
@@ -581,48 +479,6 @@
<version>1.6</version>
<url>http://ant.apache.org/</url>
</dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-nodeps</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-starteam</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-swing</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-trax</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-weblogic</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-xalan2</artifactId>
- <version>1.6</version>
- <url>http://ant.apache.org/</url>
- </dependency>
- ant-netrexx.jar
- ant-stylebook.jar
- ant-vaj.jar
- ant-xalan1.jar
- ant-xslp.jar
- -->
<!-- TODO: can be removed? -->
<dependency>
<id>commons-digester</id>
@@ -637,7 +493,7 @@
<dependency>
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-ant</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
<url>http://jakarta.apache.org/commons/jelly/tags/ant/</url>
</dependency>
<dependency>
@@ -697,11 +553,6 @@
<url>http://jakarta.apache.org/commons/</url>
</dependency>
<dependency>
- <id>commons-grant</id>
- <version>1.0-beta-4</version>
- <url>http://jakarta.apache.org/commons/sandbox/grant/</url>
- </dependency>
- <dependency>
<id>commons-io</id>
<version>1.0</version>
<url>http://jakarta.apache.org/commons/</url>
@@ -844,7 +695,9 @@
<report>maven-jxr-plugin</report>
<report>maven-junit-report-plugin</report>
<report>maven-license-plugin</report>
+<!--
<report>maven-linkcheck-plugin</report>
+-->
<report>maven-tasklist-plugin</report>
<report>maven-pmd-plugin</report>
<report>maven-simian-plugin</report>
Modified: maven/maven-1/core/trunk/src/bin/forehead.conf
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/src/bin/forehead.conf?view=diff&r1=155999&r2=156000
==============================================================================
--- maven/maven-1/core/trunk/src/bin/forehead.conf (original)
+++ maven/maven-1/core/trunk/src/bin/forehead.conf Wed Mar 2 18:48:09 2005
@@ -22,9 +22,7 @@
[root]
${tools.jar}
- ${maven.home}/lib/commons-grant-1.0-beta-4.jar
- ${maven.home}/lib/ant-1.5.3-1.jar
- ${maven.home}/lib/ant-optional-1.5.3-1.jar
+ ${maven.home}/lib/ant-*.jar
${maven.home}/lib/commons-logging-1.0.3.jar
${maven.home}/lib/log4j-1.2.8.jar
${maven.home}/lib/endorsed/*.jar
Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/AntProjectBuilder.java
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/src/java/org/apache/maven/AntProjectBuilder.java?view=diff&r1=155999&r2=156000
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/AntProjectBuilder.java (original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/AntProjectBuilder.java Wed Mar 2 18:48:09 2005
@@ -19,7 +19,7 @@
import org.apache.commons.jelly.tags.ant.AntTagLibrary;
import org.apache.commons.jelly.tags.ant.JellyPropsHandler;
-import org.apache.commons.grant.GrantProject;
+import org.apache.commons.jelly.tags.ant.GrantProject;
import org.apache.maven.jelly.JellyBuildListener;
import org.apache.maven.jelly.MavenJellyContext;
import org.apache.maven.project.Project;
Modified: maven/maven-1/core/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/changes.xml?view=diff&r1=155999&r2=156000
==============================================================================
--- maven/maven-1/core/trunk/xdocs/changes.xml (original)
+++ maven/maven-1/core/trunk/xdocs/changes.xml Wed Mar 2 18:48:09 2005
@@ -26,6 +26,7 @@
<body>
<release version="1.1-SNAPSHOT" date="in CVS HEAD">
+ <action dev="brett" type="update" issue="MAVEN-1400">Upgrade to Ant 1.6.2</action>
<action dev="brett" type="update" issue="MAVEN-1395">Use Wagon for downloading functionality, making HttpUtils deprecated and just a simple wrapper</action>
<action dev="brett" type="fix">Correctly remove a plugin from the callback cache when invalidating, preventing future cache corruption after plugin installation and "goal not found" messages.</action>
<action dev="brett" type="update">When running with -X or -q, set the Jelly log library output to
Modified: maven/maven-1/core/trunk/xdocs/reference/backwards-compatibility.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/reference/backwards-compatibility.xml?view=diff&r1=155999&r2=156000
==============================================================================
--- maven/maven-1/core/trunk/xdocs/reference/backwards-compatibility.xml (original)
+++ maven/maven-1/core/trunk/xdocs/reference/backwards-compatibility.xml Wed Mar 2 18:48:09 2005
@@ -33,6 +33,13 @@
</p>
<subsection name="Changes Between Maven 1.0 and Maven 1.1">
<p>
+ <b>Bundled Ant version changed from 1.5.3-1 to 1.6.2</b>
+ </p>
+ <p>
+ While in most cases this change should be transparent, those using optional tasks will need to add them as
+ a dependency to their plugin/project, as not all optional tasks are bundled with Maven any more.
+ </p>
+ <p>
<b>Upgrading <code>maven.jar</code></b>
</p>
<p>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org