modules/plugins/augeas/pom.xml | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
New commits:
commit 749156f88d2e834ab5ec835eec4eb4ce3d68aedb
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Fri Jun 25 13:27:50 2010 -0400
make sure augeas 0.0.2 jar, not 0.0.1 jar, is copied into plugin jar's lib dir
diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml
index 531df2c..915106a 100644
--- a/modules/plugins/augeas/pom.xml
+++ b/modules/plugins/augeas/pom.xml
@@ -17,6 +17,10 @@
<name>RHQ Augeas Plugin</name>
<description>An abstract plugin for configuring resources via
Augeas</description>
+ <properties>
+ <augeas.version>0.0.2</augeas.version>
+ </properties>
+
<dependencies>
<dependency>
@@ -30,11 +34,13 @@
<artifactId>rhq-platform-plugin</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
+
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>1.4</version>
</dependency>
+
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
@@ -45,7 +51,7 @@
<dependency>
<groupId>net.augeas</groupId>
<artifactId>augeas</artifactId>
- <version>0.0.2</version>
+ <version>${augeas.version}</version>
</dependency>
<dependency>
@@ -79,7 +85,7 @@
<artifactItem>
<groupId>net.augeas</groupId>
<artifactId>augeas</artifactId>
- <version>0.0.1</version>
+ <version>${augeas.version}</version>
</artifactItem>
</artifactItems>
@@ -122,7 +128,6 @@
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
<executions>
<execution>
commit 7d42b8feaa0bd3071cf36cf79ea58b07bf7673c9
Merge: ed7b01a... d79a2a8...
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Fri Jun 25 13:25:49 2010 -0400
Merge branch 'release-3.0.0' of
ssh://git.fedorahosted.org/git/rhq/rhq into
release-3.0.0
commit ed7b01ad0a995bd10219031bc19be268109d1610
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Fri Jun 25 11:25:46 2010 -0400
use augeas.version prop rather than hard-coding Augeas version
diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml
index 963223b..531df2c 100644
--- a/modules/plugins/augeas/pom.xml
+++ b/modules/plugins/augeas/pom.xml
@@ -60,7 +60,6 @@
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.0</version>
<executions>
<execution>
<id>copy-plugin-libs</id>
@@ -74,7 +73,7 @@
<artifactItem>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
- <version>3.2.2</version>
+ <version>${jna.version}</version>
</artifactItem>
<artifactItem>
@@ -180,7 +179,6 @@
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.0</version>
<executions>
<execution>
<id>copy-commons-io-jar</id>