modules/enterprise/binding/pom.xml | 3 --- modules/enterprise/remoting/cli/pom.xml | 3 +-- pom.xml | 16 +++++++++++++++- 3 files changed, 16 insertions(+), 6 deletions(-)
New commits: commit 3ef060a732f9ca6848a3347a847bfb639764bf42 Author: Jay Shaughnessy jshaughn@jshaughn.csb Date: Wed Sep 5 10:48:04 2012 -0400
POM Dependency work - move opencsv version to root pom as it is used in multiple child poms - this also fixes issue in CLI pom where opencsv.version had been accidentally removed - add infinispan.version in root pom to be provided AS7 module version - change resteasy version in root pom to match provided AS7 module version
Note that we will use provided AS7 module versions until it is shown that that version is insufficient. That will be done in test phase, later.
diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml index 04080cb..cd97310 100644 --- a/modules/enterprise/binding/pom.xml +++ b/modules/enterprise/binding/pom.xml @@ -11,8 +11,6 @@ <description>Abstraction of different facilities and default configurations for script bindings</description>
<properties> - <persistence-api.version>1.0</persistence-api.version> - <opencsv.version>1.8</opencsv.version> <filtered.location>src/main/java</filtered.location> </properties>
@@ -205,7 +203,6 @@ <dependency> <groupId>net.sf.opencsv</groupId> <artifactId>opencsv</artifactId> - <version>${opencsv.version}</version> </dependency>
<dependency> diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml index adc27a1..56544ad 100644 --- a/modules/enterprise/remoting/cli/pom.xml +++ b/modules/enterprise/remoting/cli/pom.xml @@ -13,7 +13,7 @@
<name>RHQ Enterprise Remote CLI</name> <description>RHQ Enterprise Remote Command Line Interface</description> - + <dependencies> <dependency> <groupId>${project.groupId}</groupId> @@ -50,7 +50,6 @@ <dependency> <groupId>net.sf.opencsv</groupId> <artifactId>opencsv</artifactId> - <version>${opencsv.version}</version> </dependency>
<dependency> diff --git a/pom.xml b/pom.xml index e45231f..e0f430e 100644 --- a/pom.xml +++ b/pom.xml @@ -106,13 +106,15 @@ <augeas.zip.location>${settings.localRepository}/net/augeas/augeas-native/${augeas.version}</augeas.zip.location> <augeas.zip.mask>*-${augeas.classifier}.zip</augeas.zip.mask> <ant.contrib.version>1.0b3</ant.contrib.version> - <resteasy.version>2.3.4.Final</resteasy.version> + <resteasy.version>2.3.2.Final</resteasy.version> <freemarker.version>2.3.18</freemarker.version> <powermock.version>1.4.11</powermock.version> <arquillian.version>1.0.1.Final</arquillian.version> <animal.sniffer.version>1.7</animal.sniffer.version> <xercesImpl.version>2.9.1-jbossas-2</xercesImpl.version> <!-- see BZ-820629 and CVE-2009-2625 --> <antlr.version>2.7.7</antlr.version> + <infinispan.version>5.1.2.FINAL</infinispan.version> + <opencsv.version>1.8</opencsv.version>
<rhq.db.admin.username>rhqadmin</rhq.db.admin.username> <rhq.db.admin.password>rhqadmin</rhq.db.admin.password> @@ -381,6 +383,18 @@ </dependency>
<dependency> + <groupId>org.infinispan</groupId> + <artifactId>infinispan-core</artifactId> + <version>${infinispan.version}</version> + </dependency> + + <dependency> + <groupId>net.sf.opencsv</groupId> + <artifactId>opencsv</artifactId> + <version>${opencsv.version}</version> + </dependency> + + <dependency> <groupId>org.hyperic</groupId> <artifactId>sigar</artifactId> <version>${sigar.version}</version>
rhq-commits@lists.fedorahosted.org