brett 2004/01/28 17:02:43
Modified: . Tag: MAVEN-1_0-BRANCH maven.xml project.xml
src/bin Tag: MAVEN-1_0-BRANCH forehead.conf
Log:
rollback to ant 1.5.3-1 as it breaks clover, and anything else poking tasks into the
"root" classloader.
Easy fixed in the plugin, but should only be done in 1.1
Revision Changes Path
No revision
No revision
1.97.2.7 +1 -3 maven/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven/maven.xml,v
retrieving revision 1.97.2.6
retrieving revision 1.97.2.7
diff -u -r1.97.2.6 -r1.97.2.7
--- maven.xml 27 Jan 2004 22:29:12 -0000 1.97.2.6
+++ maven.xml 29 Jan 2004 01:02:42 -0000 1.97.2.7
@@ -69,12 +69,10 @@
name="maven:plugins-test"
description="Test each Maven plugin">
- <!-- TODO [RC2] - put back clover - it seems broken at present -->
-
<maven:reactor
basedir="${maven.plugins.directory}"
includes="${maven.plugins.includes}"
- excludes="${maven.plugins.excludes},clover/**"
+ excludes="${maven.plugins.excludes}"
goals="plugin:test"
banner="Testing"
ignoreFailures="false"
1.317.4.10 +12 -4 maven/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/project.xml,v
retrieving revision 1.317.4.9
retrieving revision 1.317.4.10
diff -u -r1.317.4.9 -r1.317.4.10
--- project.xml 26 Jan 2004 22:53:46 -0000 1.317.4.9
+++ project.xml 29 Jan 2004 01:02:42 -0000 1.317.4.10
@@ -401,7 +401,18 @@
<description>ouch</description>
</properties>
</dependency>
- <!-- ant 1.6 deps -->
+ <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://jakarta.apache.org/ant/</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>
@@ -545,7 +556,6 @@
<version>1.6</version>
<url>http://ant.apache.org/</url>
</dependency>
- <!--
ant-netrexx.jar
ant-stylebook.jar
ant-vaj.jar
@@ -737,9 +747,7 @@
<report>maven-pmd-plugin</report>
<report>maven-simian-plugin</report>
<report>maven-faq-plugin</report>
-<!--
<report>maven-multiproject-plugin</report>
--->
</reports>
<!-- For maven internal testing -->
No revision
No revision
1.21.4.2 +1 -24 maven/src/bin/forehead.conf
Index: forehead.conf
===================================================================
RCS file: /home/cvs/maven/src/bin/forehead.conf,v
retrieving revision 1.21.4.1
retrieving revision 1.21.4.2
diff -u -r1.21.4.1 -r1.21.4.2
--- forehead.conf 5 Jan 2004 03:24:06 -0000 1.21.4.1
+++ forehead.conf 29 Jan 2004 01:02:43 -0000 1.21.4.2
@@ -7,30 +7,7 @@
[root]
${tools.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/ant-*.jar
${maven.home}/lib/endorsed/xml-apis-1.0.b2.jar
${maven.home}/lib/endorsed/xerces-2.4.0.jar
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
