[infinispan-commits] Infinispan SVN: r749 - in trunk: cachestore/jdbc and 4 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Sat Aug 29 10:59:44 EDT 2009
Author: mircea.markus
Date: 2009-08-29 10:59:43 -0400 (Sat, 29 Aug 2009)
New Revision: 749
Modified:
trunk/cachestore/bdbje/pom.xml
trunk/cachestore/jdbc/pom.xml
trunk/cachestore/jdbm/pom.xml
trunk/cachestore/s3/pom.xml
trunk/core/pom.xml
trunk/parent/pom.xml
Log:
mvn improvement - factorize log4j and xstream versions into parent. Reduce each module's dependency's by using dependencyManagement
Modified: trunk/cachestore/bdbje/pom.xml
===================================================================
--- trunk/cachestore/bdbje/pom.xml 2009-08-28 15:55:40 UTC (rev 748)
+++ trunk/cachestore/bdbje/pom.xml 2009-08-29 14:59:43 UTC (rev 749)
@@ -35,11 +35,9 @@
<version>3.3.75</version>
</dependency>
- <!-- used to serialize non-serializable objects for a dummy marshaller -->
<dependency>
<groupId>xstream</groupId>
<artifactId>xstream</artifactId>
- <version>1.2</version>
<scope>test</scope>
</dependency>
Modified: trunk/cachestore/jdbc/pom.xml
===================================================================
--- trunk/cachestore/jdbc/pom.xml 2009-08-28 15:55:40 UTC (rev 748)
+++ trunk/cachestore/jdbc/pom.xml 2009-08-29 14:59:43 UTC (rev 749)
@@ -15,10 +15,6 @@
<name>Infinispan JDBC CacheStore</name>
<description>Infinispan JDBC CacheStore module</description>
- <properties>
- <version.log4j>1.2.14</version.log4j>
- </properties>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -43,7 +39,6 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>${version.log4j}</version>
<scope>test</scope>
</dependency>
@@ -58,7 +53,6 @@
<dependency>
<groupId>xstream</groupId>
<artifactId>xstream</artifactId>
- <version>1.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: trunk/cachestore/jdbm/pom.xml
===================================================================
--- trunk/cachestore/jdbm/pom.xml 2009-08-28 15:55:40 UTC (rev 748)
+++ trunk/cachestore/jdbm/pom.xml 2009-08-29 14:59:43 UTC (rev 749)
@@ -52,7 +52,6 @@
<dependency>
<groupId>xstream</groupId>
<artifactId>xstream</artifactId>
- <version>1.2</version>
<scope>test</scope>
</dependency>
Modified: trunk/cachestore/s3/pom.xml
===================================================================
--- trunk/cachestore/s3/pom.xml 2009-08-28 15:55:40 UTC (rev 748)
+++ trunk/cachestore/s3/pom.xml 2009-08-29 14:59:43 UTC (rev 749)
@@ -18,9 +18,7 @@
<jclouds.aws.accesskeyid></jclouds.aws.accesskeyid>
<jclouds.aws.secretaccesskey></jclouds.aws.secretaccesskey>
<version.jclouds>1.0-beta-2</version.jclouds>
- <version.log4j>1.2.14</version.log4j>
<version.commons.io>1.4</version.commons.io>
- <version.xstream>1.2</version.xstream>
</properties>
<dependencies>
@@ -56,25 +54,16 @@
<version>${version.jclouds}</version>
</dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${version.commons.io}</version>
- <scope>test</scope>
- </dependency>
-
<!-- used to serialize non-serializable objects for a dummy marshaller -->
<dependency>
<groupId>xstream</groupId>
<artifactId>xstream</artifactId>
- <version>${version.xstream}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>${version.log4j}</version>
<scope>test</scope>
</dependency>
Modified: trunk/core/pom.xml
===================================================================
--- trunk/core/pom.xml 2009-08-28 15:55:40 UTC (rev 748)
+++ trunk/core/pom.xml 2009-08-29 14:59:43 UTC (rev 749)
@@ -17,17 +17,21 @@
<description>Infinispan core module</description>
<properties>
- <version.log4j>1.2.14</version.log4j>
<version.jboss.common.core>2.2.14.GA</version.jboss.common.core>
- <version.jboss.logging.spi>2.1.0.GA</version.jboss.logging.spi>
<version.jboss.marshalling>1.2.0.CR3</version.jboss.marshalling>
<version.jgroups>2.8.0.CR1</version.jgroups>
<version.jta>1.0.1.GA</version.jta>
- <version.xstream>1.2</version.xstream>
</properties>
<dependencies>
+
<dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.1</version>
+ </dependency>
+
+ <dependency>
<groupId>jgroups</groupId>
<artifactId>jgroups</artifactId>
<version>${version.jgroups}</version>
@@ -44,34 +48,26 @@
</dependency>
<dependency>
+ <groupId>org.jboss.marshalling</groupId>
+ <artifactId>river</artifactId>
+ <version>${version.jboss.marshalling}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
<version>${version.jboss.common.core}</version>
</dependency>
- <!-- needed by JBoss Common Core -->
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- <version>${version.jboss.logging.spi}</version>
- </dependency>
-
- <dependency>
<groupId>org.jboss.marshalling</groupId>
<artifactId>marshalling-api</artifactId>
<version>${version.jboss.marshalling}</version>
</dependency>
<dependency>
- <groupId>org.jboss.marshalling</groupId>
- <artifactId>river</artifactId>
- <version>${version.jboss.marshalling}</version>
- </dependency>
-
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>${version.log4j}</version>
<optional>true</optional>
</dependency>
@@ -79,9 +75,15 @@
<dependency>
<groupId>xstream</groupId>
<artifactId>xstream</artifactId>
- <version>${version.xstream}</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.1.3</version>
+ </dependency>
+
</dependencies>
<build>
<plugins>
Modified: trunk/parent/pom.xml
===================================================================
--- trunk/parent/pom.xml 2009-08-28 15:55:40 UTC (rev 748)
+++ trunk/parent/pom.xml 2009-08-29 14:59:43 UTC (rev 749)
@@ -67,15 +67,9 @@
<defaultTestGroup>functional,unit</defaultTestGroup>
</properties>
+
<dependencies>
<dependency>
- <groupId>net.jcip</groupId>
- <artifactId>jcip-annotations</artifactId>
- <version>1.0</version>
- <optional>true</optional>
- </dependency>
- <!-- 5.8 is needed for proper parallel test execution -->
- <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>5.9</version>
@@ -83,6 +77,12 @@
<classifier>jdk15</classifier>
</dependency>
<dependency>
+ <groupId>net.jcip</groupId>
+ <artifactId>jcip-annotations</artifactId>
+ <version>1.0</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymockclassextension</artifactId>
<version>2.4</version>
@@ -90,46 +90,46 @@
</dependency>
<dependency>
<groupId>org.easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
+ <artifactId>easymock</artifactId>
<version>2.4</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>jboss.jbossts</groupId>
- <artifactId>jbossjta</artifactId>
- <version>4.4.0.GA</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jboss.jbossts</groupId>
- <artifactId>jbossjts</artifactId>
- <version>4.6.1.GA</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jboss.jbossts</groupId>
- <artifactId>jbossts-common</artifactId>
- <version>4.6.1.GA</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.1.3</version>
- </dependency>
</dependencies>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>jboss.jbossts</groupId>
+ <artifactId>jbossjta</artifactId>
+ <version>4.4.0.GA</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jboss.jbossts</groupId>
+ <artifactId>jbossjts</artifactId>
+ <version>4.6.1.GA</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jboss.jbossts</groupId>
+ <artifactId>jbossts-common</artifactId>
+ <version>4.6.1.GA</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ <dependency>
+ <groupId>xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>1.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<build>
<plugins>
<!-- enforce java 1.5 and maven 2.1.0 -->
More information about the infinispan-commits
mailing list