6:16 p.m.
Author: bdaw
Date: 2007-12-16 12:16:30 -0500 (Sun, 16 Dec 2007)
New Revision: 9350
Modified:
modules/test/trunk/build/pom.xml
modules/test/trunk/pom.xml
modules/test/trunk/tooling/ant/pom.xml
modules/test/trunk/tooling/maven2/pom.xml
modules/test/trunk/tooling/pom.xml
Log:
change ant dependency to avoid clash in other modules
Modified: modules/test/trunk/build/pom.xml
===================================================================
--- modules/test/trunk/build/pom.xml 2007-12-14 15:52:59 UTC (rev 9349)
+++ modules/test/trunk/build/pom.xml 2007-12-16 17:16:30 UTC (rev 9350)
@@ -59,7 +59,7 @@
<version.dom4j>1.6.1</version.dom4j>
<version.jboss.jbossas.core-libs>4.0.4.GA</version.jboss.jbossas.core-libs>
<version.jboss.remoting>2.2.1.GA</version.jboss.remoting>
- <version.ant>1.6.5</version.ant>
+ <version.ant>1.7.0</version.ant>
<version.maven>2.0.6</version.maven>
<version.junit>3.8.1</version.junit>
<version.log4j>1.2.14</version.log4j>
@@ -328,12 +328,12 @@
<version>${version.jboss.remoting}</version>
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant-junit</artifactId>
<version>${version.ant}</version>
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>${version.ant}</version>
</dependency>
Modified: modules/test/trunk/pom.xml
===================================================================
--- modules/test/trunk/pom.xml 2007-12-14 15:52:59 UTC (rev 9349)
+++ modules/test/trunk/pom.xml 2007-12-16 17:16:30 UTC (rev 9350)
@@ -28,7 +28,7 @@
<modules>
<module>build</module>
<module>unit</module>
- <module>tooling/ant</module>
+ <module>tooling/ant</module>
<module>tooling/maven2</module>
<module>mc</module>
<module>remote</module>
@@ -39,7 +39,4 @@
<module>test/agent</module>
</modules>
-
-
-
</project>
Modified: modules/test/trunk/tooling/ant/pom.xml
===================================================================
--- modules/test/trunk/tooling/ant/pom.xml 2007-12-14 15:52:59 UTC (rev 9349)
+++ modules/test/trunk/tooling/ant/pom.xml 2007-12-16 17:16:30 UTC (rev 9350)
@@ -13,11 +13,11 @@
<dependencies>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant-junit</artifactId>
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
</dependency>
<dependency>
Modified: modules/test/trunk/tooling/maven2/pom.xml
===================================================================
--- modules/test/trunk/tooling/maven2/pom.xml 2007-12-14 15:52:59 UTC (rev 9349)
+++ modules/test/trunk/tooling/maven2/pom.xml 2007-12-16 17:16:30 UTC (rev 9350)
@@ -29,11 +29,11 @@
<artifactId>maven-project</artifactId>
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant-junit</artifactId>
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
</dependency>
<dependency>
Modified: modules/test/trunk/tooling/pom.xml
===================================================================
--- modules/test/trunk/tooling/pom.xml 2007-12-14 15:52:59 UTC (rev 9349)
+++ modules/test/trunk/tooling/pom.xml 2007-12-16 17:16:30 UTC (rev 9350)
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-portal-modules-test</artifactId>
@@ -16,8 +15,5 @@
<modules>
<module>ant</module>
<module>maven2</module>
- </modules>
-</project>
-
-
-
+ </modules>
+</project>
\ No newline at end of file