modules/common/ant-bundle/pom.xml | 3 +++ modules/common/jboss-as/pom.xml | 3 ++- modules/core/dbutils/pom.xml | 6 ++++-- modules/enterprise/server/installer/pom.xml | 11 +++++++---- modules/enterprise/server/plugins/ant-bundle/pom.xml | 4 ++++ modules/enterprise/server/plugins/groovy-script/pom.xml | 1 + modules/helpers/perftest-support/pom.xml | 6 ++++-- modules/plugins/ant-bundle/pom.xml | 4 ++++ modules/plugins/jboss-as-5/pom.xml | 3 ++- modules/plugins/jboss-as/pom.xml | 6 ++++-- modules/plugins/raw-config-test/pom.xml | 2 ++ pom.xml | 7 +++---- 12 files changed, 40 insertions(+), 16 deletions(-) New commits: commit d15e5ceedb318119bc807d203f794ba56c0eabd3 Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: Wed Mar 27 08:56:49 2013 -0500 [BZ 923458] Revert ant version changes since they are used in bundles. diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml index 26e7795..4cf6703 100644 --- a/modules/common/ant-bundle/pom.xml +++ b/modules/common/ant-bundle/pom.xml @@ -53,17 +53,20 @@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> + <version>1.8.0</version> </dependency> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant-launcher</artifactId> + <version>1.8.0</version> </dependency> <!-- include some optional Ant tasks for users to be able to use --> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant-nodeps</artifactId> + <version>1.8.0</version> </dependency> <dependency> diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index a53545f..b9ee5be 100644 --- a/modules/common/jboss-as/pom.xml +++ b/modules/common/jboss-as/pom.xml @@ -16,8 +16,9 @@ <dependencies> <dependency> - <groupId>org.apache.ant</groupId> + <groupId>ant</groupId> <artifactId>ant</artifactId> + <version>1.6.5</version> </dependency> <dependency> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index f6d5f5a..085ba4c 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -37,8 +37,9 @@ <!-- 3rd Party Deps --> <dependency> - <groupId>org.apache.ant</groupId> + <groupId>ant</groupId> <artifactId>ant</artifactId> + <version>1.6.5</version> </dependency> <dependency> <groupId>commons-logging</groupId> @@ -46,9 +47,10 @@ <version>1.1.1</version> </dependency> <dependency> - <groupId>org.apache.ant</groupId> + <groupId>ant</groupId> <artifactId>ant-launcher</artifactId> <scope>test</scope> + <version>1.6.5</version> </dependency> <dependency> <groupId>i18nlog</groupId> diff --git a/modules/enterprise/server/installer/pom.xml b/modules/enterprise/server/installer/pom.xml index 4936d3f..0460892 100644 --- a/modules/enterprise/server/installer/pom.xml +++ b/modules/enterprise/server/installer/pom.xml @@ -63,13 +63,15 @@ <!-- we need to package this (and ant) in our module --> <dependency> - <groupId>org.apache.ant</groupId> + <groupId>ant</groupId> <artifactId>ant-launcher</artifactId> + <version>1.6.5</version> </dependency> <dependency> - <groupId>org.apache.ant</groupId> + <groupId>ant</groupId> <artifactId>ant</artifactId> + <version>1.6.5</version> </dependency> <dependency> @@ -134,11 +136,11 @@ <artifactId>rhq-jboss-as-dmr-client</artifactId> </artifactItem> <artifactItem> - <groupId>org.apache.ant</groupId> + <groupId>ant</groupId> <artifactId>ant-launcher</artifactId> </artifactItem> <artifactItem> - <groupId>org.apache.ant</groupId> + <groupId>ant</groupId> <artifactId>ant</artifactId> </artifactItem> <artifactItem> diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml index 5227e8c..489b37b 100644 --- a/modules/enterprise/server/plugins/ant-bundle/pom.xml +++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml @@ -75,22 +75,26 @@ <artifactItem> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> + <version>1.8.0</version> </artifactItem> <artifactItem> <groupId>org.apache.ant</groupId> <artifactId>ant-launcher</artifactId> + <version>1.8.0</version> </artifactItem> <!-- include some optional Ant tasks for users to be able to use --> <artifactItem> <groupId>org.apache.ant</groupId> <artifactId>ant-nodeps</artifactId> + <version>1.8.0</version> </artifactItem> <artifactItem> <groupId>ant-contrib</groupId> <artifactId>ant-contrib</artifactId> + <version>1.0b3</version> </artifactItem> <artifactItem> diff --git a/modules/enterprise/server/plugins/groovy-script/pom.xml b/modules/enterprise/server/plugins/groovy-script/pom.xml index ce163b8..ea20099 100644 --- a/modules/enterprise/server/plugins/groovy-script/pom.xml +++ b/modules/enterprise/server/plugins/groovy-script/pom.xml @@ -23,6 +23,7 @@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> + <version>1.7.1</version> </dependency> <dependency> <groupId>org.opensymphony.quartz</groupId> diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml index 43458a5..ed71426 100644 --- a/modules/helpers/perftest-support/pom.xml +++ b/modules/helpers/perftest-support/pom.xml @@ -14,12 +14,14 @@ </description> <dependencies> <dependency> - <groupId>org.apache.ant</groupId> + <groupId>ant</groupId> <artifactId>ant</artifactId> + <version>1.6.5</version> </dependency> <dependency> - <groupId>org.apache.ant</groupId> + <groupId>ant</groupId> <artifactId>ant-launcher</artifactId> + <version>1.6.5</version> <scope>runtime</scope> </dependency> <dependency> diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml index cc1a8a5..9c3e48d 100644 --- a/modules/plugins/ant-bundle/pom.xml +++ b/modules/plugins/ant-bundle/pom.xml @@ -47,22 +47,26 @@ <artifactItem> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> + <version>1.8.0</version> </artifactItem> <artifactItem> <groupId>org.apache.ant</groupId> <artifactId>ant-launcher</artifactId> + <version>1.8.0</version> </artifactItem> <!-- include some optional Ant tasks for users to be able to use --> <artifactItem> <groupId>org.apache.ant</groupId> <artifactId>ant-nodeps</artifactId> + <version>1.8.0</version> </artifactItem> <artifactItem> <groupId>ant-contrib</groupId> <artifactId>ant-contrib</artifactId> + <version>1.0b3</version> </artifactItem> <artifactItem> diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml index abc21d5..d9838cf 100644 --- a/modules/plugins/jboss-as-5/pom.xml +++ b/modules/plugins/jboss-as-5/pom.xml @@ -187,8 +187,9 @@ <artifactId>jbpm</artifactId> </artifactItem> <artifactItem> - <groupId>org.apache.ant</groupId> + <groupId>ant</groupId> <artifactId>ant</artifactId> + <version>1.6.5</version> </artifactItem> <artifactItem> <groupId>dom4j</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index 1fee627..bd58a06 100644 --- a/modules/plugins/jboss-as/pom.xml +++ b/modules/plugins/jboss-as/pom.xml @@ -124,8 +124,9 @@ <artifactId>jbpm</artifactId> </artifactItem> <artifactItem> - <groupId>org.apache.ant</groupId> + <groupId>ant</groupId> <artifactId>ant</artifactId> + <version>1.6.5</version> </artifactItem> <artifactItem> <groupId>org.rhq</groupId> @@ -150,8 +151,9 @@ <artifactId>jbpm</artifactId> </artifactItem> <artifactItem> - <groupId>org.apache.ant</groupId> + <groupId>ant</groupId> <artifactId>ant</artifactId> + <version>1.6.5</version> </artifactItem> <artifactItem> <groupId>dom4j</groupId> diff --git a/modules/plugins/raw-config-test/pom.xml b/modules/plugins/raw-config-test/pom.xml index 19a48fe..c615a39 100644 --- a/modules/plugins/raw-config-test/pom.xml +++ b/modules/plugins/raw-config-test/pom.xml @@ -69,10 +69,12 @@ <artifactItem> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> + <version>1.7.1</version> </artifactItem> <artifactItem> <groupId>org.apache.ant</groupId> <artifactId>ant-launcher</artifactId> + <version>1.7.1</version> </artifactItem> <artifactItem> <groupId>commons-configuration</groupId> commit 841631a84639d50e8a111b3574af1537d6fa6cb1 Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: Wed Mar 27 08:41:56 2013 -0500 Revert "fix installer ant references" This reverts commit 9d24ff5f20e37996594ebc6fa2f9d9bcc7c955ca. diff --git a/modules/enterprise/server/installer/pom.xml b/modules/enterprise/server/installer/pom.xml index 185cafe..4936d3f 100644 --- a/modules/enterprise/server/installer/pom.xml +++ b/modules/enterprise/server/installer/pom.xml @@ -20,6 +20,7 @@ <properties> <moduleName>org.rhq.${project.artifactId}</moduleName> <moduleDir>org/rhq/${project.artifactId}</moduleDir> + <ant.version>1.6.5</ant.version> <!-- the version used by dbutils that we need to depend on --> </properties> <dependencies> diff --git a/pom.xml b/pom.xml index 665f7b8..f3823c3 100644 --- a/pom.xml +++ b/pom.xml @@ -156,7 +156,6 @@ <commons-validator.version>1.1.4</commons-validator.version> <commons-collections.version>3.2.1</commons-collections.version> <commons-configuration.version>1.6</commons-configuration.version> - <ant.version>1.8.4</ant.version> <junit.version>4.8.2</junit.version> <liquibase-core.version>1.9.5</liquibase-core.version> @@ -824,13 +823,13 @@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>${ant.version}</version> + <version>1.8.4</version> </dependency> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant-launcher</artifactId> - <version>${ant.version}</version> + <version>1.8.4</version> </dependency> <dependency> @@ -921,7 +920,7 @@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>${ant.version}</version> + <version>1.8.4</version> </dependency> <!-- This includes the <if> task, and a bunch of other handy tasks. -->