12:23 p.m.
code-coverage/pom.xml | 7
etc/classloaders-test/plugin1/pom.xml | 18 -
etc/classloaders-test/plugin2/pom.xml | 18 -
modules/common/ant-bundle/pom.xml | 3
modules/common/jboss-as/pom.xml | 4
modules/core/client-api/pom.xml | 1
modules/core/dbutils/pom.xml | 8
modules/core/gui/pom.xml | 6
modules/enterprise/agent/pom.xml | 2
modules/enterprise/agentupdate/pom.xml | 2
modules/enterprise/comm/pom.xml | 2
modules/enterprise/gui/content_http-war/pom.xml | 7
modules/enterprise/gui/coregui/pom.xml | 1
modules/enterprise/gui/portal-war/pom.xml | 7
modules/enterprise/gui/remoting-war/pom.xml | 1
modules/enterprise/gui/rest-war/pom.xml | 2
modules/enterprise/remoting/cli/pom.xml | 4
modules/enterprise/remoting/client-deps/pom.xml | 10
modules/enterprise/scripting/javascript/pom.xml | 1
modules/enterprise/scripting/python/pom.xml | 1
modules/enterprise/server/client-api/pom.xml | 1
modules/enterprise/server/installer/pom.xml | 10
modules/enterprise/server/jar/pom.xml | 15 -
modules/enterprise/server/plugins/alert-roles/pom.xml | 1
modules/enterprise/server/plugins/ant-bundle/pom.xml | 3
modules/enterprise/server/plugins/cobbler/pom.xml | 1
modules/enterprise/server/plugins/groovy-script/pom.xml | 1
modules/enterprise/server/sars/agent-sar/pom.xml | 1
modules/helpers/perftest-support/pom.xml | 7
modules/helpers/rest-docs-generator/pom.xml | 1
modules/integration-tests/jndi-access/jndi-access-test/pom.xml | 1
modules/integration-tests/mod_cluster-plugin-test/pom.xml | 3
modules/plugins/ant-bundle/pom.xml | 3
modules/plugins/jboss-as-5/pom.xml | 9
modules/plugins/jboss-as/pom.xml | 12 -
modules/plugins/jboss-cache-v3/pom.xml | 3
modules/plugins/pom.xml | 1
modules/plugins/raw-config-test/pom.xml | 2
modules/test-utils/pom.xml | 2
pom.xml | 120 +++++++++-
40 files changed, 147 insertions(+), 155 deletions(-)
New commits:
commit 3354fcc2e4f806194b523942ccb63ca6adf00415
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Tue Mar 26 12:21:50 2013 -0500
[BZ 923458] More maven dependency and plugin version updates.
diff --git a/code-coverage/pom.xml b/code-coverage/pom.xml
index cacf523..efa72b1 100644
--- a/code-coverage/pom.xml
+++ b/code-coverage/pom.xml
@@ -18,7 +18,7 @@
<property>
<name>code-coverage</name>
</property>
- </activation>
+ </activation>
<build>
<plugins>
<plugin>
@@ -60,7 +60,6 @@
<artifactItem>
<groupId>org.jacoco</groupId>
<artifactId>org.jacoco.ant</artifactId>
- <version>${jacoco.version}</version>
</artifactItem>
</artifactItems>
<stripVersion>true</stripVersion>
@@ -179,7 +178,7 @@
<include
name="**/target/generated-sources/*" />
</dirset>
</sourcefiles>
- </group>
+ </group>
</structure>
<html
destdir="${project.reporting.outputDirectory}/coverage-report/overall" />
<xml
destfile="${project.reporting.outputDirectory}/coverage-report/overall/coverage-report.xml"
/>
@@ -193,7 +192,6 @@
<dependency>
<groupId>org.jacoco</groupId>
<artifactId>org.jacoco.ant</artifactId>
- <version>${jacoco.version}</version>
</dependency>
</dependencies>
</plugin>
@@ -202,4 +200,3 @@
</profile>
</profiles>
</project>
-
\ No newline at end of file
diff --git a/etc/classloaders-test/plugin1/pom.xml
b/etc/classloaders-test/plugin1/pom.xml
index 3521a91..cc0dd51 100644
--- a/etc/classloaders-test/plugin1/pom.xml
+++ b/etc/classloaders-test/plugin1/pom.xml
@@ -74,24 +74,6 @@
<scope>provided</scope>
</dependency>
- <!--
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- <scope>provided</scope>
- </dependency>
- -->
-
- <!--
- <dependency>
- <groupId>i18nlog</groupId>
- <artifactId>i18nlog</artifactId>
- <version>1.0.9</version>
- <scope>provided</scope>
- </dependency>
- -->
-
<!-- Define any third-party dependencies your plugin has here. -->
<dependency>
<groupId>dummy</groupId>
diff --git a/etc/classloaders-test/plugin2/pom.xml
b/etc/classloaders-test/plugin2/pom.xml
index 7c2add2..e4549d3 100644
--- a/etc/classloaders-test/plugin2/pom.xml
+++ b/etc/classloaders-test/plugin2/pom.xml
@@ -74,24 +74,6 @@
<scope>provided</scope>
</dependency>
- <!--
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- <scope>provided</scope>
- </dependency>
- -->
-
- <!--
- <dependency>
- <groupId>i18nlog</groupId>
- <artifactId>i18nlog</artifactId>
- <version>1.0.9</version>
- <scope>provided</scope>
- </dependency>
- -->
-
<!-- Define any third-party dependencies your plugin has here. -->
<dependency>
<groupId>dummy</groupId>
diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml
index 4cf6703..26e7795 100644
--- a/modules/common/ant-bundle/pom.xml
+++ b/modules/common/ant-bundle/pom.xml
@@ -53,20 +53,17 @@
<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 d3bf151..a53545f 100644
--- a/modules/common/jboss-as/pom.xml
+++ b/modules/common/jboss-as/pom.xml
@@ -16,10 +16,10 @@
<dependencies>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.6.5</version>
</dependency>
+
<dependency>
<groupId>jboss</groupId>
<artifactId>jbpm</artifactId>
diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml
index c03f268..acd19c9 100644
--- a/modules/core/client-api/pom.xml
+++ b/modules/core/client-api/pom.xml
@@ -49,7 +49,6 @@
<dependency>
<groupId>commons-jxpath</groupId>
<artifactId>commons-jxpath</artifactId>
- <version>1.3</version>
<scope>test</scope>
</dependency>
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index 41351ed..f6d5f5a 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -34,12 +34,11 @@
<artifactId>rhq-core-util</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<!-- 3rd Party Deps -->
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.6.5</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -47,9 +46,8 @@
<version>1.1.1</version>
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
- <version>1.6.5</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml
index 365535a..b3b7706 100644
--- a/modules/core/gui/pom.xml
+++ b/modules/core/gui/pom.xml
@@ -16,10 +16,6 @@
<description>JSF utility classes, validators, converters, etc. that are used by
both enterprise and embedded
</description>
- <properties>
- <!-- dependency versions -->
- <el.version>1.0</el.version>
- </properties>
<dependencies>
@@ -65,9 +61,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.0</version>
<scope>provided</scope>
- <!-- by JBossAS -->
</dependency>
<dependency>
diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml
index d1200f6..cb1fad0 100644
--- a/modules/enterprise/agent/pom.xml
+++ b/modules/enterprise/agent/pom.xml
@@ -63,7 +63,6 @@
<dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
- <version>${jline.version}</version>
</dependency>
<!-- 3rd Party Deps -->
@@ -87,7 +86,6 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
- <version>${jboss-logging.version}</version> <!-- just using the one
that is also used by AS7 -->
</dependency>
</dependencies>
diff --git a/modules/enterprise/agentupdate/pom.xml
b/modules/enterprise/agentupdate/pom.xml
index 3b66b92..ddec938 100644
--- a/modules/enterprise/agentupdate/pom.xml
+++ b/modules/enterprise/agentupdate/pom.xml
@@ -37,14 +37,12 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>${ant.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
- <version>${ant.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml
index 822d405..c312dc1 100644
--- a/modules/enterprise/comm/pom.xml
+++ b/modules/enterprise/comm/pom.xml
@@ -43,7 +43,6 @@
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
- <version>1.6</version>
<exclusions>
<exclusion>
<groupId>xml-apis</groupId>
@@ -87,7 +86,6 @@
<dependency>
<groupId>oswego-concurrent</groupId>
<artifactId>concurrent</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement
section. -->
</dependency>
</dependencies>
diff --git a/modules/enterprise/gui/content_http-war/pom.xml
b/modules/enterprise/gui/content_http-war/pom.xml
index 19208e8..333aa5d 100644
--- a/modules/enterprise/gui/content_http-war/pom.xml
+++ b/modules/enterprise/gui/content_http-war/pom.xml
@@ -62,7 +62,7 @@
<scope>provided</scope> <!-- by JBossAS -->
</dependency>
- <!-- adding so we can extend DefaultServlet
+ <!-- adding so we can extend DefaultServlet
Chose version 2.0.1 so it's compatible with info here for JBoss 4.2.3
http://community.jboss.org/wiki/VersionOfTomcatInJBossAS-->
<dependency>
@@ -76,11 +76,10 @@
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
-
+
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.2</version>
</dependency>
<dependency>
@@ -104,7 +103,6 @@
<dependency>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
- <version>1.1.4</version>
</dependency>
<dependency>
@@ -120,7 +118,6 @@
<plugin>
<artifactId>maven-war-plugin</artifactId>
- <version>2.1-alpha-1</version>
<configuration>
<archive>
<manifest>
diff --git a/modules/enterprise/gui/coregui/pom.xml
b/modules/enterprise/gui/coregui/pom.xml
index d890830..a3dfde1 100644
--- a/modules/enterprise/gui/coregui/pom.xml
+++ b/modules/enterprise/gui/coregui/pom.xml
@@ -151,7 +151,6 @@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.2</version>
</dependency>
<dependency>
diff --git a/modules/enterprise/gui/portal-war/pom.xml
b/modules/enterprise/gui/portal-war/pom.xml
index 6c12259..4ee28ed 100644
--- a/modules/enterprise/gui/portal-war/pom.xml
+++ b/modules/enterprise/gui/portal-war/pom.xml
@@ -17,7 +17,6 @@
<properties>
<!-- dependency versions -->
- <el.version>1.0</el.version>
<jsf-facelets.version>1.1.15.B1</jsf-facelets.version>
<!-- plugin versions -->
@@ -75,19 +74,16 @@
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
- <version>1.2.1</version>
</dependency>
<dependency>
<groupId>commons-el</groupId>
<artifactId>commons-el</artifactId>
- <version>1.0</version>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.2</version>
</dependency>
<dependency>
@@ -129,7 +125,6 @@
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
- <version>${el.version}</version>
<scope>provided</scope> <!-- by JBossAS Tomcat -->
</dependency>
@@ -143,7 +138,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.0</version>
<scope>provided</scope> <!-- by JBossAS -->
</dependency>
@@ -289,7 +283,6 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
- <version>1.6.4</version>
</dependency>
</dependencies>
diff --git a/modules/enterprise/gui/remoting-war/pom.xml
b/modules/enterprise/gui/remoting-war/pom.xml
index 9570336..70ece03 100644
--- a/modules/enterprise/gui/remoting-war/pom.xml
+++ b/modules/enterprise/gui/remoting-war/pom.xml
@@ -29,7 +29,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
<scope>provided</scope> <!-- by JBossAS -->
</dependency>
</dependencies>
diff --git a/modules/enterprise/gui/rest-war/pom.xml
b/modules/enterprise/gui/rest-war/pom.xml
index 0797145..5d3dbfc 100644
--- a/modules/enterprise/gui/rest-war/pom.xml
+++ b/modules/enterprise/gui/rest-war/pom.xml
@@ -35,7 +35,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
<scope>provided</scope> <!-- by JBossAS -->
</dependency>
@@ -48,7 +47,6 @@
<dependency>
<groupId>org.jboss.spec.javax.ejb</groupId>
<artifactId>jboss-ejb-api_3.1_spec</artifactId>
- <version>1.0.2.Final</version>
</dependency>
</dependencies>
diff --git a/modules/enterprise/remoting/cli/pom.xml
b/modules/enterprise/remoting/cli/pom.xml
index fc164c9..e371826 100644
--- a/modules/enterprise/remoting/cli/pom.xml
+++ b/modules/enterprise/remoting/cli/pom.xml
@@ -57,20 +57,16 @@
<dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
- <version>${jline.version}</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>${testng.version}</version>
- <!-- Yes, this is actually meant to be compile, and not test, scoped. -->
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
<scope>runtime</scope>
</dependency>
diff --git a/modules/enterprise/remoting/client-deps/pom.xml
b/modules/enterprise/remoting/client-deps/pom.xml
index 61b7c19..b411a87 100644
--- a/modules/enterprise/remoting/client-deps/pom.xml
+++ b/modules/enterprise/remoting/client-deps/pom.xml
@@ -45,11 +45,11 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>oswego-concurrent</groupId>
- <artifactId>concurrent</artifactId>
- <version>1.3.4-jboss-update1</version>
- </dependency>
+
+ <dependency>
+ <groupId>oswego-concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ </dependency>
<dependency>
<groupId>i18nlog</groupId>
diff --git a/modules/enterprise/scripting/javascript/pom.xml
b/modules/enterprise/scripting/javascript/pom.xml
index b1d6553..32eb12d 100644
--- a/modules/enterprise/scripting/javascript/pom.xml
+++ b/modules/enterprise/scripting/javascript/pom.xml
@@ -36,7 +36,6 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>jarjar-maven-plugin</artifactId>
- <version>1.5</version>
<executions>
<execution>
<phase>package</phase>
diff --git a/modules/enterprise/scripting/python/pom.xml
b/modules/enterprise/scripting/python/pom.xml
index 8e7ff39..f6a1149c 100644
--- a/modules/enterprise/scripting/python/pom.xml
+++ b/modules/enterprise/scripting/python/pom.xml
@@ -35,7 +35,6 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>jarjar-maven-plugin</artifactId>
- <version>1.5</version>
<executions>
<execution>
<phase>package</phase>
diff --git a/modules/enterprise/server/client-api/pom.xml
b/modules/enterprise/server/client-api/pom.xml
index c645073..6bb6ea2 100644
--- a/modules/enterprise/server/client-api/pom.xml
+++ b/modules/enterprise/server/client-api/pom.xml
@@ -31,7 +31,6 @@
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
- <version>1.0</version>
<scope>provided</scope>
</dependency>
diff --git a/modules/enterprise/server/installer/pom.xml
b/modules/enterprise/server/installer/pom.xml
index 5e5cdd1..4936d3f 100644
--- a/modules/enterprise/server/installer/pom.xml
+++ b/modules/enterprise/server/installer/pom.xml
@@ -63,15 +63,13 @@
<!-- we need to package this (and ant) in our module -->
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
- <version>${ant.version}</version>
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>${ant.version}</version>
</dependency>
<dependency>
@@ -136,11 +134,11 @@
<artifactId>rhq-jboss-as-dmr-client</artifactId>
</artifactItem>
<artifactItem>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
</artifactItem>
<artifactItem>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
</artifactItem>
<artifactItem>
diff --git a/modules/enterprise/server/jar/pom.xml
b/modules/enterprise/server/jar/pom.xml
index b86af52..1a70da8 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -175,15 +175,10 @@
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
- <version>1.6.1</version>
</dependency>
<!-- Required by a couple APL classes - TODO: Remove this once APL has been
removed. -->
<!-- also required by EJB3 Embedded (test scope) -->
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
<dependency>
<groupId>commons-httpclient</groupId>
@@ -290,13 +285,6 @@
<scope>provided</scope> <!-- by JBossAS itself, which the container
build has packaged with 1.6.5 -->
</dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <version>2.2</version>
- <scope>test</scope>
- <!-- somehow this is needed otherwise the hibernate stuff doesn't
initialize in our tests -->
- </dependency>
<dependency>
<groupId>org.snmp4j</groupId>
@@ -308,7 +296,6 @@
<dependency>
<groupId>oswego-concurrent</groupId>
<artifactId>concurrent</artifactId>
- <version>1.3.4</version>
</dependency>
<dependency>
@@ -868,7 +855,6 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
- <version>${jboss-logging.version}</version>
</dependency>
</dependencies>
@@ -996,7 +982,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>clirr-maven-plugin</artifactId>
- <version>${clirr.version}</version>
<configuration>
<includes>
<include>**/*Remote</include>
diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml
b/modules/enterprise/server/plugins/alert-roles/pom.xml
index 4f8c6a5..31acb49 100644
--- a/modules/enterprise/server/plugins/alert-roles/pom.xml
+++ b/modules/enterprise/server/plugins/alert-roles/pom.xml
@@ -18,7 +18,6 @@
<dependency>
<groupId>jboss.jboss-embeddable-ejb3</groupId>
<artifactId>jboss-ejb3-all</artifactId>
- <version>1.0.0.Alpha9</version>
<scope>compile</scope>
</dependency>
diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml
b/modules/enterprise/server/plugins/ant-bundle/pom.xml
index 4226e21..5227e8c 100644
--- a/modules/enterprise/server/plugins/ant-bundle/pom.xml
+++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml
@@ -75,20 +75,17 @@
<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>
diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml
b/modules/enterprise/server/plugins/cobbler/pom.xml
index 2c81751..94cbe7d 100644
--- a/modules/enterprise/server/plugins/cobbler/pom.xml
+++ b/modules/enterprise/server/plugins/cobbler/pom.xml
@@ -30,7 +30,6 @@
<dependency>
<groupId>jboss.jboss-embeddable-ejb3</groupId>
<artifactId>jboss-ejb3-all</artifactId>
- <version>1.0.0.Alpha9</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/modules/enterprise/server/plugins/groovy-script/pom.xml
b/modules/enterprise/server/plugins/groovy-script/pom.xml
index ea20099..ce163b8 100644
--- a/modules/enterprise/server/plugins/groovy-script/pom.xml
+++ b/modules/enterprise/server/plugins/groovy-script/pom.xml
@@ -23,7 +23,6 @@
<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/enterprise/server/sars/agent-sar/pom.xml
b/modules/enterprise/server/sars/agent-sar/pom.xml
index 6f2cc2e..e5639f9 100644
--- a/modules/enterprise/server/sars/agent-sar/pom.xml
+++ b/modules/enterprise/server/sars/agent-sar/pom.xml
@@ -36,7 +36,6 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <!-- make sure you match that which is used by standalone agent! -->
</dependency>
<dependency>
diff --git a/modules/helpers/perftest-support/pom.xml
b/modules/helpers/perftest-support/pom.xml
index 4136b47..43458a5 100644
--- a/modules/helpers/perftest-support/pom.xml
+++ b/modules/helpers/perftest-support/pom.xml
@@ -14,14 +14,12 @@
</description>
<dependencies>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.6.5</version>
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
- <version>1.6.5</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -68,7 +66,6 @@
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
- <version>1.0</version>
</dependency>
<dependency>
<groupId>org.rhq</groupId>
diff --git a/modules/helpers/rest-docs-generator/pom.xml
b/modules/helpers/rest-docs-generator/pom.xml
index 1dff5bd..e72aab4 100644
--- a/modules/helpers/rest-docs-generator/pom.xml
+++ b/modules/helpers/rest-docs-generator/pom.xml
@@ -51,7 +51,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
<executions>
<execution>
<!-- Compile the sources i.e. the processor plugin-->
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
index 9469947..03dfcc9 100644
--- a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
+++ b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
@@ -24,7 +24,6 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.14</version>
<scope>runtime</scope>
</dependency>
diff --git a/modules/integration-tests/mod_cluster-plugin-test/pom.xml
b/modules/integration-tests/mod_cluster-plugin-test/pom.xml
index b3370a3..e09207a 100644
--- a/modules/integration-tests/mod_cluster-plugin-test/pom.xml
+++ b/modules/integration-tests/mod_cluster-plugin-test/pom.xml
@@ -57,7 +57,7 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.jboss.on</groupId>
<artifactId>jopr-tomcat-plugin</artifactId>
@@ -113,7 +113,6 @@
<dependency>
<groupId>oswego-concurrent</groupId>
<artifactId>concurrent</artifactId>
- <version>1.3.4-jboss</version>
<scope>test</scope>
</dependency>
diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml
index 0c750b6..cc1a8a5 100644
--- a/modules/plugins/ant-bundle/pom.xml
+++ b/modules/plugins/ant-bundle/pom.xml
@@ -47,20 +47,17 @@
<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>
diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml
index 3eb65a7..abc21d5 100644
--- a/modules/plugins/jboss-as-5/pom.xml
+++ b/modules/plugins/jboss-as-5/pom.xml
@@ -187,9 +187,8 @@
<artifactId>jbpm</artifactId>
</artifactItem>
<artifactItem>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.6.5</version>
</artifactItem>
<artifactItem>
<groupId>dom4j</groupId>
@@ -443,14 +442,14 @@
</properties>
<dependencies>
-
+
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-depchain</artifactId>
<type>pom</type>
<scope>test</scope>
</dependency>
-
+
</dependencies>
<build>
@@ -665,7 +664,7 @@
</plugins>
</build>
- </profile>
+ </profile>
</profiles>
diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml
index 8a5b6c9..1fee627 100644
--- a/modules/plugins/jboss-as/pom.xml
+++ b/modules/plugins/jboss-as/pom.xml
@@ -18,7 +18,7 @@
<properties>
<rhq.internal>false</rhq.internal>
</properties>
-
+
<dependencies>
<!-- internal -->
<!-- TODO: Move this up to the parent pom. -->
@@ -99,7 +99,7 @@
</goals>
<configuration>
<artifactItems>
- <!--
+ <!--
<artifactItem>
<groupId>jboss</groupId>
<artifactId>jboss-common</artifactId>
@@ -124,9 +124,8 @@
<artifactId>jbpm</artifactId>
</artifactItem>
<artifactItem>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.6.5</version>
</artifactItem>
<artifactItem>
<groupId>org.rhq</groupId>
@@ -151,9 +150,8 @@
<artifactId>jbpm</artifactId>
</artifactItem>
<artifactItem>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.6.5</version>
</artifactItem>
<artifactItem>
<groupId>dom4j</groupId>
@@ -197,7 +195,7 @@
<executions>
<execution>
<phase>pre-integration-test</phase>
-
+
<configuration>
<target>
<echo>Setting up plugin dependencies...</echo>
diff --git a/modules/plugins/jboss-cache-v3/pom.xml
b/modules/plugins/jboss-cache-v3/pom.xml
index 34bdffe..c83611c 100644
--- a/modules/plugins/jboss-cache-v3/pom.xml
+++ b/modules/plugins/jboss-cache-v3/pom.xml
@@ -114,7 +114,6 @@
<dependency>
<groupId>oswego-concurrent</groupId>
<artifactId>concurrent</artifactId>
- <version>1.3.4-jboss</version>
<scope>test</scope>
</dependency>
@@ -494,7 +493,7 @@
</build>
</profile>
</profiles>
-
+
<reporting>
<plugins>
<plugin>
diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml
index 9af3938..9d6a147 100644
--- a/modules/plugins/pom.xml
+++ b/modules/plugins/pom.xml
@@ -60,7 +60,6 @@
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
- <version>1.0</version>
<scope>provided</scope> <!-- by RHQ container -->
</dependency>
diff --git a/modules/plugins/raw-config-test/pom.xml
b/modules/plugins/raw-config-test/pom.xml
index c615a39..19a48fe 100644
--- a/modules/plugins/raw-config-test/pom.xml
+++ b/modules/plugins/raw-config-test/pom.xml
@@ -69,12 +69,10 @@
<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>
diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml
index 07e3aa1..f536119 100644
--- a/modules/test-utils/pom.xml
+++ b/modules/test-utils/pom.xml
@@ -17,7 +17,6 @@
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
- <version>1.0</version>
</dependency>
<dependency>
<groupId>javax.transaction</groupId>
@@ -37,7 +36,6 @@
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
- <version>1.8.2</version>
</dependency>
<dependency>
<groupId>org.unitils</groupId>
diff --git a/pom.xml b/pom.xml
index 0d6a847..f3823c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -163,6 +163,7 @@
<servlet-api.version>2.4</servlet-api.version>
<mockito-core.version>1.9.0</mockito-core.version>
+ <el.version>1.0</el.version>
<rhq.db.admin.username>rhqadmin</rhq.db.admin.username>
<rhq.db.admin.password>rhqadmin</rhq.db.admin.password>
@@ -447,6 +448,12 @@
<version>${commons-httpclient.version}</version>
</dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.8.2</version>
+ </dependency>
+
<!-- GNU GetOpt (any modules that need to do command-line argument parsing
should use this) -->
<dependency>
<groupId>gnu-getopt</groupId>
@@ -764,6 +771,102 @@
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.jacoco</groupId>
+ <artifactId>org.jacoco.ant</artifactId>
+ <version>${jacoco.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-jxpath</groupId>
+ <artifactId>commons-jxpath</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ <version>${jline.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss.jboss-embeddable-ejb3</groupId>
+ <artifactId>jboss-ejb3-all</artifactId>
+ <version>1.0.0.Alpha9</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <version>${jboss-logging.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.8.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-launcher</artifactId>
+ <version>1.8.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.2.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-el</groupId>
+ <artifactId>commons-el</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>${el.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.0.1</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -827,7 +930,7 @@
<version>${ant.contrib.version}</version>
<exclusions>
<exclusion>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
</exclusion>
</exclusions>
@@ -861,7 +964,7 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>3.0</version>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
@@ -938,6 +1041,11 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.sonatype.plugins</groupId>
+ <artifactId>jarjar-maven-plugin</artifactId>
+ <version>1.5</version>
+ </plugin>
+ <plugin>
<artifactId>maven-war-plugin</artifactId>
<version>2.1</version>
</plugin>
@@ -1599,7 +1707,6 @@
<artifactItem>
<groupId>org.jacoco</groupId>
<artifactId>org.jacoco.ant</artifactId>
- <version>${jacoco.version}</version>
</artifactItem>
</artifactItems>
<stripVersion>true</stripVersion>
@@ -1659,7 +1766,6 @@
<dependency>
<groupId>org.jacoco</groupId>
<artifactId>org.jacoco.ant</artifactId>
- <version>${jacoco.version}</version>
</dependency>
</dependencies>
</plugin>
@@ -1935,6 +2041,12 @@
<version>2.6</version>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <version>${clirr.version}</version>
+ </plugin>
+
<!--
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>