modules/cli-tests/pom.xml | 4 +--
modules/core/client-api/pom.xml | 7 +++---
modules/core/plugin-container/pom.xml | 4 +--
modules/enterprise/agent/pom.xml | 10 +++++----
modules/enterprise/agentupdate/pom.xml | 4 ++-
modules/enterprise/remoting/cli/pom.xml | 4 +--
modules/enterprise/remoting/client-deps/pom.xml | 8 +++----
modules/enterprise/remoting/webservices/pom.xml | 6 ++---
modules/enterprise/server/plugins/alert-operations/pom.xml | 1
modules/enterprise/server/plugins/rhnhosted/pom.xml | 1
modules/plugins/jboss-cache-v3/pom.xml | 14 +++----------
11 files changed, 32 insertions(+), 31 deletions(-)
New commits:
commit 2b0fa555cf71363da2d71deec1e4be8e657b7816
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Mon Nov 22 10:25:40 2010 -0500
minor fixes to poms to clear up various Maven 3 warnings
diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml
index d593983..b97bbf1 100644
--- a/modules/cli-tests/pom.xml
+++ b/modules/cli-tests/pom.xml
@@ -22,9 +22,9 @@
<dependencies>
<dependency>
- <groupId>${groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>rhq-remoting-cli</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml
index 68dfc58..aa5c7fe 100644
--- a/modules/core/client-api/pom.xml
+++ b/modules/core/client-api/pom.xml
@@ -97,8 +97,9 @@
</plugin>
<plugin>
- <groupId>org.codehaus.groovy.maven</groupId>
- <artifactId>gmaven-plugin</artifactId>
+ <groupId>org.codehaus.groovy.maven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <version>1.0</version>
<executions>
<execution>
<goals>
@@ -107,8 +108,8 @@
</goals>
</execution>
</executions>
-
</plugin>
+
</plugins>
</build>
diff --git a/modules/core/plugin-container/pom.xml
b/modules/core/plugin-container/pom.xml
index 8d635c5..c2fc3f9 100644
--- a/modules/core/plugin-container/pom.xml
+++ b/modules/core/plugin-container/pom.xml
@@ -103,9 +103,9 @@
</dependency>
<dependency>
- <groupId>${groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>test-utils</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml
index caebb0d..b174311 100644
--- a/modules/enterprise/agent/pom.xml
+++ b/modules/enterprise/agent/pom.xml
@@ -150,8 +150,8 @@
<echo
file="${project.build.outputDirectory}/rhq-agent-version.properties"
append="false">Product-Name=${rhq.product.name}
Product-Version=${project.version}
-Module-Name=${pom.name}
-Module-Version=${pom.version}
+Module-Name=${project.name}
+Module-Version=${project.version}
Build-Date=${build.time}
Build-Jdk-Vendor=${java.vendor}
Build-Jdk=${java.version}
@@ -231,12 +231,13 @@ Build-Number=${buildNumber}
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.6</version>
</plugin>
</plugins>
</build>
-<profiles>
+ <profiles>
<profile>
<id>cobertura</id>
<activation>
@@ -320,7 +321,7 @@ Build-Number=${buildNumber}
</plugins>
</build>
</profile>
-</profiles>
+ </profiles>
<repositories>
<!-- This is for SIGAR 1.6.4. -->
@@ -339,6 +340,7 @@ Build-Number=${buildNumber}
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.6</version>
</plugin>
</plugins>
diff --git a/modules/enterprise/agentupdate/pom.xml
b/modules/enterprise/agentupdate/pom.xml
index 8d69060..3709fc1 100644
--- a/modules/enterprise/agentupdate/pom.xml
+++ b/modules/enterprise/agentupdate/pom.xml
@@ -140,6 +140,7 @@ rhq-agent.latest.build-number=${buildNumber}
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.6</version>
</plugin>
</plugins>
@@ -292,9 +293,10 @@ rhq-agent.latest.build-number=${buildNumber}
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.6</version>
</plugin>
</plugins>
</reporting>
-</project>
\ No newline at end of file
+</project>
diff --git a/modules/enterprise/remoting/cli/pom.xml
b/modules/enterprise/remoting/cli/pom.xml
index 2d8f486..d13cdc4 100644
--- a/modules/enterprise/remoting/cli/pom.xml
+++ b/modules/enterprise/remoting/cli/pom.xml
@@ -28,7 +28,7 @@
<dependencies>
<dependency>
- <groupId>${groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>rhq-remoting-client-api</artifactId>
<version>${project.version}</version>
</dependency>
@@ -106,7 +106,7 @@
<property name="project.groupId"
value="${project.groupId}" />
<property name="project.version"
value="${project.version}" />
<property name="settings.localRepository"
value="${settings.localRepository}" />
- <property name="rhq-remoting-ws.version"
value="${version}" />
+ <property name="rhq-remoting-ws.version"
value="${project.version}" />
<property name="commons-logging.version"
value="${commons-logging.version}" />
<property name="opencsv.version"
value="${opencsv.version}" />
<property name="concurrent.version"
value="${concurrent.version}" />
diff --git a/modules/enterprise/remoting/client-deps/pom.xml
b/modules/enterprise/remoting/client-deps/pom.xml
index 3dd52ab..b4b53f7 100644
--- a/modules/enterprise/remoting/client-deps/pom.xml
+++ b/modules/enterprise/remoting/client-deps/pom.xml
@@ -12,10 +12,10 @@
<dependencies>
<dependency>
- <groupId>${groupId}</groupId>
- <artifactId>rhq-remoting-client-api</artifactId>
- <version>${version}</version>
- <exclusions>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>rhq-remoting-client-api</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
<exclusion>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-user</artifactId>
diff --git a/modules/enterprise/remoting/webservices/pom.xml
b/modules/enterprise/remoting/webservices/pom.xml
index 24af2b3..43f9d6d 100644
--- a/modules/enterprise/remoting/webservices/pom.xml
+++ b/modules/enterprise/remoting/webservices/pom.xml
@@ -113,7 +113,7 @@
<property
name="rhq.client.build.include.client.jar"
value="${rhq.client.build.include.client.jar}" />
<property name="quartz.version"
value="${quartz.version}" />
<property name="ant.contrib.version"
value="${ant.contrib.version}" />
- <property name="webservice.version"
value="${version}" />
+ <property name="webservice.version"
value="${project.version}" />
</ant>
</tasks>
</configuration>
@@ -129,7 +129,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
-
<classesDirectory>${project.build.directory}/rhq-remoting-webservices-${version}
+
<classesDirectory>${project.build.directory}/rhq-remoting-webservices-${project.version}
</classesDirectory>
<includes>
@@ -205,7 +205,7 @@
</systemProperties>
<additionalClasspathElements>
<additionalClasspathElement>
-
${project.build.directory}/rhq-remoting-webservices-${version}.jar
+
${project.build.directory}/rhq-remoting-webservices-${project.version}.jar
</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml
b/modules/enterprise/server/plugins/alert-operations/pom.xml
index 6325a1d..8f07aca 100644
--- a/modules/enterprise/server/plugins/alert-operations/pom.xml
+++ b/modules/enterprise/server/plugins/alert-operations/pom.xml
@@ -79,6 +79,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xml-maven-plugin</artifactId>
+ <version>1.0-beta-3</version>
<executions>
<execution>
<!-- translate the tokens.xml file to confluence markup
-->
diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml
b/modules/enterprise/server/plugins/rhnhosted/pom.xml
index 4138e15..2a267a6 100644
--- a/modules/enterprise/server/plugins/rhnhosted/pom.xml
+++ b/modules/enterprise/server/plugins/rhnhosted/pom.xml
@@ -168,6 +168,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId>
+ <version>1.3</version>
<executions>
<execution>
<goals>
diff --git a/modules/plugins/jboss-cache-v3/pom.xml
b/modules/plugins/jboss-cache-v3/pom.xml
index 0b88999..38ee91c 100644
--- a/modules/plugins/jboss-cache-v3/pom.xml
+++ b/modules/plugins/jboss-cache-v3/pom.xml
@@ -57,7 +57,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jopr-jboss-as-5-plugin</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -80,15 +80,9 @@
</dependency>
<dependency>
- <groupId>jboss.messaging</groupId>
- <artifactId>jboss-messaging-client</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- <scope>test</scope>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
Show replies by date