[infinispan-commits] Infinispan SVN: r2105 - in branches/4.1.x: cachestore/bdbje and 17 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Tue Jul 27 11:18:26 EDT 2010
Author: manik.surtani at jboss.com
Date: 2010-07-27 11:18:23 -0400 (Tue, 27 Jul 2010)
New Revision: 2105
Modified:
branches/4.1.x/cachestore/bdbje/pom.xml
branches/4.1.x/cachestore/cloud/pom.xml
branches/4.1.x/cachestore/jdbc/pom.xml
branches/4.1.x/cachestore/jdbm/pom.xml
branches/4.1.x/client/hotrod-client/pom.xml
branches/4.1.x/core/pom.xml
branches/4.1.x/demos/ec2-ui/pom.xml
branches/4.1.x/demos/gridfs-webdav/pom.xml
branches/4.1.x/demos/gui/pom.xml
branches/4.1.x/jopr-plugin/pom.xml
branches/4.1.x/lucene-directory/pom.xml
branches/4.1.x/parent/pom.xml
branches/4.1.x/pom.xml
branches/4.1.x/query/pom.xml
branches/4.1.x/server/core/pom.xml
branches/4.1.x/server/memcached/pom.xml
branches/4.1.x/server/rest/pom.xml
branches/4.1.x/server/websocket/pom.xml
branches/4.1.x/tools/pom.xml
Log:
Cleaned up versions in POMs
Modified: branches/4.1.x/cachestore/bdbje/pom.xml
===================================================================
--- branches/4.1.x/cachestore/bdbje/pom.xml 2010-07-27 15:00:48 UTC (rev 2104)
+++ branches/4.1.x/cachestore/bdbje/pom.xml 2010-07-27 15:18:23 UTC (rev 2105)
@@ -17,7 +17,7 @@
<dependency>
<groupId>com.sleepycat</groupId>
<artifactId>je</artifactId>
- <version>4.0.92</version>
+ <version>${version.bdbje}</version>
</dependency>
</dependencies>
Modified: branches/4.1.x/cachestore/cloud/pom.xml
===================================================================
--- branches/4.1.x/cachestore/cloud/pom.xml 2010-07-27 15:00:48 UTC (rev 2104)
+++ branches/4.1.x/cachestore/cloud/pom.xml 2010-07-27 15:18:23 UTC (rev 2105)
@@ -14,8 +14,7 @@
<description>Infinispan CloudCacheStore module</description>
<properties>
- <test.src.dir>src/test/java</test.src.dir>
- <version.jclouds>1.0-beta-6</version.jclouds>
+ <test.src.dir>src/test/java</test.src.dir>
</properties>
<dependencies>
@@ -61,19 +60,19 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.0</version>
+ <version>${version.commons.compress}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava-collections</artifactId>
- <version>r03</version>
+ <version>${version.guava}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava-base</artifactId>
- <version>r03</version>
+ <version>${version.guava}</version>
</dependency>
</dependencies>
Modified: branches/4.1.x/cachestore/jdbc/pom.xml
===================================================================
--- branches/4.1.x/cachestore/jdbc/pom.xml 2010-07-27 15:00:48 UTC (rev 2104)
+++ branches/4.1.x/cachestore/jdbc/pom.xml 2010-07-27 15:18:23 UTC (rev 2105)
@@ -18,13 +18,13 @@
<dependency>
<groupId>c3p0</groupId>
<artifactId>c3p0</artifactId>
- <version>0.9.1.2</version>
+ <version>${version.c3p0}</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- <version>1.1.117</version>
+ <version>${version.h2.driver}</version>
<scope>test</scope>
</dependency>
@@ -32,7 +32,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.9</version>
+ <version>${version.mysql.driver}</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: branches/4.1.x/cachestore/jdbm/pom.xml
===================================================================
--- branches/4.1.x/cachestore/jdbm/pom.xml 2010-07-27 15:00:48 UTC (rev 2104)
+++ branches/4.1.x/cachestore/jdbm/pom.xml 2010-07-27 15:18:23 UTC (rev 2105)
@@ -20,7 +20,7 @@
<!-- Contains fixes not officially released by JDBM group -->
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-jdbm</artifactId>
- <version>1.5.4</version>
+ <version>${version.apacheds.jdbm}</version>
<exclusions>
<exclusion>
<groupId>org.apache.directory.shared</groupId>
Modified: branches/4.1.x/client/hotrod-client/pom.xml
===================================================================
--- branches/4.1.x/client/hotrod-client/pom.xml 2010-07-27 15:00:48 UTC (rev 2104)
+++ branches/4.1.x/client/hotrod-client/pom.xml 2010-07-27 15:18:23 UTC (rev 2105)
@@ -48,7 +48,7 @@
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
- <version>1.5.4</version>
+ <version>${version.commons.pool}</version>
</dependency>
<dependency>
Modified: branches/4.1.x/core/pom.xml
===================================================================
--- branches/4.1.x/core/pom.xml 2010-07-27 15:00:48 UTC (rev 2104)
+++ branches/4.1.x/core/pom.xml 2010-07-27 15:18:23 UTC (rev 2105)
@@ -15,15 +15,6 @@
<name>Infinispan Core</name>
<description>Infinispan core module</description>
- <properties>
- <version.jboss.common.core>2.2.14.GA</version.jboss.common.core>
- <version.jboss.marshalling>1.2.1.GA</version.jboss.marshalling>
- <version.jgroups>2.10.0.GA</version.jgroups>
- <version.jta>1.0.1.GA</version.jta>
- <version.org.jboss.naming>5.0.3.GA</version.org.jboss.naming>
- <version.rhq.pluginAnnotations>1.4.0.B01</version.rhq.pluginAnnotations>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.jgroups</groupId>
@@ -83,7 +74,7 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-math</artifactId>
<scope>test</scope>
- <version>2.0</version>
+ <version>${version.commons.math}</version>
</dependency>
</dependencies>
Modified: branches/4.1.x/demos/ec2-ui/pom.xml
===================================================================
--- branches/4.1.x/demos/ec2-ui/pom.xml 2010-07-27 15:00:48 UTC (rev 2104)
+++ branches/4.1.x/demos/ec2-ui/pom.xml 2010-07-27 15:18:23 UTC (rev 2105)
@@ -34,13 +34,13 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <version>${version.javax.servlet}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
- <version>1.2</version>
+ <version>${version.jstl}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: branches/4.1.x/demos/gridfs-webdav/pom.xml
===================================================================
--- branches/4.1.x/demos/gridfs-webdav/pom.xml 2010-07-27 15:00:48 UTC (rev 2104)
+++ branches/4.1.x/demos/gridfs-webdav/pom.xml 2010-07-27 15:18:23 UTC (rev 2105)
@@ -14,11 +14,6 @@
<name>Infinispan GridFileSystem WebDAV interface</name>
<description>WebDAV interface for Infinispan's GridFileSystem, packaged as a WAR file for deployment in a servlet container</description>
- <properties>
- <version.javax.servlet>2.5</version.javax.servlet>
- <version.webdav.servlet>2.0</version.webdav.servlet>
- </properties>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -32,6 +27,7 @@
<version>${version.webdav.servlet}</version>
</dependency>
+ <!-- required by Webdav-Servlet -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
Modified: branches/4.1.x/demos/gui/pom.xml
===================================================================
--- branches/4.1.x/demos/gui/pom.xml 2010-07-27 15:00:48 UTC (rev 2104)
+++ branches/4.1.x/demos/gui/pom.xml 2010-07-27 15:18:23 UTC (rev 2105)
@@ -15,11 +15,6 @@
<name>Infinispan GUI Demo</name>
<description>Infinispan - GUI Demo</description>
- <properties>
- <version.jgoodies.forms>1.0.5</version.jgoodies.forms>
- <version.com.intellij.forms_rt>6.0.5</version.com.intellij.forms_rt>
- </properties>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
Modified: branches/4.1.x/jopr-plugin/pom.xml
===================================================================
--- branches/4.1.x/jopr-plugin/pom.xml 2010-07-27 15:00:48 UTC (rev 2104)
+++ branches/4.1.x/jopr-plugin/pom.xml 2010-07-27 15:18:23 UTC (rev 2105)
@@ -22,12 +22,9 @@
<properties>
<scm.module.path>plugin/infinispan</scm.module.path>
<rhq.defaultDevContainerPath>/jon/dev-container</rhq.defaultDevContainerPath>
- <version.rhq>1.2.0.GA</version.rhq>
- <version.rhq.plugingen>1.4.0.B01</version.rhq.plugingen>
<version.mc4j>1.2.6</version.mc4j>
<version.hibernate.core>3.3.1.GA</version.hibernate.core>
- <version.hibernate.annotations>3.4.0.GA</version.hibernate.annotations>
- <version.javax.persistence>1.0</version.javax.persistence>
+ <version.hibernate.annotations>3.4.0.GA</version.hibernate.annotations>
</properties>
<dependencies>
Modified: branches/4.1.x/lucene-directory/pom.xml
===================================================================
--- branches/4.1.x/lucene-directory/pom.xml 2010-07-27 15:00:48 UTC (rev 2104)
+++ branches/4.1.x/lucene-directory/pom.xml 2010-07-27 15:18:23 UTC (rev 2105)
@@ -14,10 +14,6 @@
<name>Infinispan Lucene Directory Implementation</name>
<description>A Lucene directory implementation based on Infinispan</description>
- <properties>
- <version.lucene>2.9.3</version.lucene>
- </properties>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
Modified: branches/4.1.x/parent/pom.xml
===================================================================
--- branches/4.1.x/parent/pom.xml 2010-07-27 15:00:48 UTC (rev 2104)
+++ branches/4.1.x/parent/pom.xml 2010-07-27 15:18:23 UTC (rev 2105)
@@ -75,16 +75,52 @@
<jboss.snapshots.repo.url>https://repository.jboss.org/nexus/content/repositories/snapshots/</jboss.snapshots.repo.url>
<!-- Versions for dependencies -->
- <version.scala>2.8.0</version.scala>
- <version.testng>5.11</version.testng>
- <version.jcipannotations>1.0</version.jcipannotations>
+ <version.apacheds.jdbm>1.5.4</version.apacheds.jdbm>
+ <version.bdbje>4.0.92</version.bdbje>
+ <version.c3p0>0.9.1.2</version.c3p0>
+ <version.com.intellij.forms_rt>6.0.5</version.com.intellij.forms_rt>
+ <version.commons.compress>1.0</version.commons.compress>
+ <version.commons.pool>1.5.4</version.commons.pool>
+ <version.commons.httpclient>3.1</version.commons.httpclient>
+ <version.commons.logging>1.1</version.commons.logging>
+ <version.commons.math>2.0</version.commons.math>
+ <version.easymock>2.4</version.easymock>
<version.easymockclassext>2.4</version.easymockclassext>
- <version.easymock>2.4</version.easymock>
+ <version.gnu.getopt>1.0.13</version.gnu.getopt>
+ <version.guava>r03</version.guava>
+ <version.h2.driver>1.1.117</version.h2.driver>
+ <version.hibernate.search>3.2.0.Final</version.hibernate.search>
+ <version.jackson>1.4.1</version.jackson>
+ <version.javax.persistence>1.0</version.javax.persistence>
+ <version.javax.servlet>2.5</version.javax.servlet>
+ <version.jboss.common.core>2.2.14.GA</version.jboss.common.core>
+ <version.jboss.marshalling>1.2.1.GA</version.jboss.marshalling>
<version.jbossjta>4.9.0.GA</version.jbossjta>
<version.jbossjts>4.9.0.GA</version.jbossjts>
<version.jbossts-common>4.6.1.GA</version.jbossts-common>
- <version.commons-logging>1.1.1</version.commons-logging>
+ <version.jcipannotations>1.0</version.jcipannotations>
+ <version.jclouds>1.0-beta-6</version.jclouds>
+ <version.jetty>6.1.15</version.jetty>
+ <version.jgoodies.forms>1.0.5</version.jgoodies.forms>
+ <version.jgroups>2.10.0.GA</version.jgroups>
+ <version.json>20090211</version.json>
+ <version.jstl>1.2</version.jstl>
+ <version.jta>1.0.1.GA</version.jta>
<version.log4j>1.2.16</version.log4j>
+ <version.lucene>2.9.3</version.lucene>
+ <version.mysql.driver>5.1.9</version.mysql.driver>
+ <version.netty>3.2.1.Final</version.netty>
+ <version.org.jboss.naming>5.0.3.GA</version.org.jboss.naming>
+ <version.resteasy>2.0-beta-2</version.resteasy>
+ <version.rhq.pluginAnnotations>1.4.0.B01</version.rhq.pluginAnnotations>
+ <version.rhq.plugingen>1.4.0.B01</version.rhq.plugingen>
+ <version.rhq>1.2.0.GA</version.rhq>
+ <version.scala>2.8.0</version.scala>
+ <version.slf4j>1.5.8</version.slf4j>
+ <version.spymemcached>2.4.2</version.spymemcached>
+ <version.testng>5.11</version.testng>
+ <version.webdav.servlet>2.0</version.webdav.servlet>
+ <version.xsom>20081112</version.xsom>
<version.xstream>1.3.1</version.xstream>
</properties>
@@ -129,7 +165,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>${version.commons-logging}</version>
+ <version>${version.commons.logging}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: branches/4.1.x/pom.xml
===================================================================
--- branches/4.1.x/pom.xml 2010-07-27 15:00:48 UTC (rev 2104)
+++ branches/4.1.x/pom.xml 2010-07-27 15:18:23 UTC (rev 2105)
@@ -94,6 +94,7 @@
</execution>
</executions>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Modified: branches/4.1.x/query/pom.xml
===================================================================
--- branches/4.1.x/query/pom.xml 2010-07-27 15:00:48 UTC (rev 2104)
+++ branches/4.1.x/query/pom.xml 2010-07-27 15:18:23 UTC (rev 2105)
@@ -23,7 +23,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-search</artifactId>
- <version>3.2.0.Final</version>
+ <version>${version.hibernate.search}</version>
</dependency>
<dependency>
@@ -37,14 +37,14 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.5.8</version>
+ <version>${version.slf4j}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.5.8</version>
+ <version>${version.slf4j}</version>
<scope>test</scope>
</dependency>
Modified: branches/4.1.x/server/core/pom.xml
===================================================================
--- branches/4.1.x/server/core/pom.xml 2010-07-27 15:00:48 UTC (rev 2104)
+++ branches/4.1.x/server/core/pom.xml 2010-07-27 15:18:23 UTC (rev 2105)
@@ -14,11 +14,6 @@
<name>Infinispan Server Core Module</name>
<description>Infinispan server core module</description>
- <properties>
- <version.netty>3.2.1.Final</version.netty>
- <version.gnu.getopt>1.0.13</version.gnu.getopt>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.jboss.netty</groupId>
Modified: branches/4.1.x/server/memcached/pom.xml
===================================================================
--- branches/4.1.x/server/memcached/pom.xml 2010-07-27 15:00:48 UTC (rev 2104)
+++ branches/4.1.x/server/memcached/pom.xml 2010-07-27 15:18:23 UTC (rev 2105)
@@ -14,10 +14,6 @@
<name>Infinispan Server Memcached Module</name>
<description>Infinispan server memcached module</description>
- <properties>
- <version.spymemcached>2.4.2</version.spymemcached>
- </properties>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
Modified: branches/4.1.x/server/rest/pom.xml
===================================================================
--- branches/4.1.x/server/rest/pom.xml 2010-07-27 15:00:48 UTC (rev 2104)
+++ branches/4.1.x/server/rest/pom.xml 2010-07-27 15:18:23 UTC (rev 2105)
@@ -55,16 +55,6 @@
</build>
- <properties>
- <version.resteasy>2.0-beta-2</version.resteasy>
- <version.jackson>1.4.1</version.jackson>
- <version.xtream>1.3.1</version.xtream>
- <version.javax.servlet>2.5</version.javax.servlet>
- <version.jetty>6.1.15</version.jetty>
- <version.commons.httpclient>3.1</version.commons.httpclient>
- <version.slf4j>1.5.8</version.slf4j>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.jboss.resteasy</groupId>
@@ -81,7 +71,7 @@
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
- <version>${version.xtream}</version>
+ <version>${version.xstream}</version>
</dependency>
<dependency>
Modified: branches/4.1.x/server/websocket/pom.xml
===================================================================
--- branches/4.1.x/server/websocket/pom.xml 2010-07-27 15:00:48 UTC (rev 2104)
+++ branches/4.1.x/server/websocket/pom.xml 2010-07-27 15:18:23 UTC (rev 2105)
@@ -24,7 +24,7 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
- <version>20090211</version>
+ <version>${version.json}</version>
</dependency>
</dependencies>
Modified: branches/4.1.x/tools/pom.xml
===================================================================
--- branches/4.1.x/tools/pom.xml 2010-07-27 15:00:48 UTC (rev 2104)
+++ branches/4.1.x/tools/pom.xml 2010-07-27 15:18:23 UTC (rev 2105)
@@ -15,12 +15,6 @@
<name>Infinispan Tools</name>
<description>Infinispan - Tools for project</description>
- <properties>
- <version.rhq.plugingen>1.4.0.B01</version.rhq.plugingen>
- <version.xsom>20081112</version.xsom>
- <version.commons.logging>1.1</version.commons.logging>
- </properties>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
More information about the infinispan-commits
mailing list