dion 2004/01/04 19:24:06
Modified: . Tag: MAVEN-1_0-BRANCH project.xml
src/bin Tag: MAVEN-1_0-BRANCH forehead.conf
Log:
- Upgrade to Ant 1.6
- Use commons-grant-1.0-beta5 for ant 1.6 support
Revision Changes Path
No revision
No revision
1.317.4.7 +145 -5 maven/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/project.xml,v
retrieving revision 1.317.4.6
retrieving revision 1.317.4.7
diff -u -r1.317.4.6 -r1.317.4.7
--- project.xml 28 Dec 2003 23:07:36 -0000 1.317.4.6
+++ project.xml 5 Jan 2004 03:24:06 -0000 1.317.4.7
@@ -401,17 +401,157 @@
<description>ouch</description>
</properties>
</dependency>
+ <!-- ant 1.6 deps -->
<dependency>
<id>ant</id>
- <version>1.5.3-1</version>
+ <version>1.6</version>
<url>http://ant.apache.org/</url>
</dependency>
<dependency>
<groupId>ant</groupId>
- <artifactId>ant-optional</artifactId>
- <version>1.5.3-1</version>
- <url>http://jakarta.apache.org/ant/</url>
+ <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>
+ <url>http://ant.apache.org/</url>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-junit</artifactId>
+ <version>1.6</version>
+ <url>http://ant.apache.org/</url>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-launcher</artifactId>
+ <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
+ -->
<dependency>
<id>commons-betwixt</id>
<version>1.0-beta-1.20030111.103454</version>
@@ -486,7 +626,7 @@
</dependency>
<dependency>
<id>commons-grant</id>
- <version>1.0-beta-4</version>
+ <version>1.0-beta-5</version>
<url>http://jakarta.apache.org/commons/sandbox/grant/</url>
</dependency>
<dependency>
No revision
No revision
1.21.4.1 +24 -3 maven/src/bin/forehead.conf
Index: forehead.conf
===================================================================
RCS file: /home/cvs/maven/src/bin/forehead.conf,v
retrieving revision 1.21
retrieving revision 1.21.4.1
diff -u -r1.21 -r1.21.4.1
--- forehead.conf 19 Aug 2003 04:14:42 -0000 1.21
+++ forehead.conf 5 Jan 2004 03:24:06 -0000 1.21.4.1
@@ -7,10 +7,31 @@
[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-1.6.jar
+ ${maven.home}/lib/ant-antlr-1.6.jar
+ ${maven.home}/lib/ant-apache-bsf-1.6.jar
+ ${maven.home}/lib/ant-apache-resolver-1.6.jar
+ ${maven.home}/lib/ant-commons-logging-1.6.jar
+ ${maven.home}/lib/ant-commons-net-1.6.jar
+ ${maven.home}/lib/ant-icontract-1.6.jar
+ ${maven.home}/lib/ant-jai-1.6.jar
+ ${maven.home}/lib/ant-jakarta-bcel-1.6.jar
+ ${maven.home}/lib/ant-jakarta-log4j-1.6.jar
+ ${maven.home}/lib/ant-jakarta-oro-1.6.jar
+ ${maven.home}/lib/ant-jakarta-regexp-1.6.jar
+ ${maven.home}/lib/ant-javamail-1.6.jar
+ ${maven.home}/lib/ant-jdepend-1.6.jar
+ ${maven.home}/lib/ant-jmf-1.6.jar
+ ${maven.home}/lib/ant-jsch-1.6.jar
+ ${maven.home}/lib/ant-junit-1.6.jar
+ ${maven.home}/lib/ant-launcher-1.6.jar
+ ${maven.home}/lib/ant-nodeps-1.6.jar
+ ${maven.home}/lib/ant-starteam-1.6.jar
+ ${maven.home}/lib/ant-swing-1.6.jar
+ ${maven.home}/lib/ant-trax-1.6.jar
+ ${maven.home}/lib/ant-weblogic-1.6.jar
+ ${maven.home}/lib/ant-xalan2-1.6.jar
${maven.home}/lib/endorsed/xml-apis-1.0.b2.jar
- ${maven.home}/lib/ant-optional-1.5.3-1.jar
${maven.home}/lib/endorsed/xerces-2.4.0.jar
[root.maven]
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
