[infinispan-commits] Infinispan SVN: r1974 - in trunk: demos/gridfs-webdav and 5 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Mon Jul 5 07:00:21 EDT 2010
Author: manik.surtani at jboss.com
Date: 2010-07-05 07:00:20 -0400 (Mon, 05 Jul 2010)
New Revision: 1974
Modified:
trunk/core/pom.xml
trunk/demos/gridfs-webdav/pom.xml
trunk/demos/gui/pom.xml
trunk/demos/lucene-directory-demo/pom.xml
trunk/parent/pom.xml
trunk/server/core/pom.xml
trunk/src/main/resources/assemblies/all.xml
trunk/src/main/resources/assemblies/bin.xml
Log:
[ISPN-525] (Consider shipping log4j jar in root lib/ directory)
Modified: trunk/core/pom.xml
===================================================================
--- trunk/core/pom.xml 2010-07-05 10:53:43 UTC (rev 1973)
+++ trunk/core/pom.xml 2010-07-05 11:00:20 UTC (rev 1974)
@@ -18,7 +18,7 @@
<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.Beta2</version.jgroups>
+ <version.jgroups>2.10.0.CR1</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>
@@ -26,7 +26,7 @@
<dependencies>
<dependency>
- <groupId>jgroups</groupId>
+ <groupId>org.jgroups</groupId>
<artifactId>jgroups</artifactId>
<version>${version.jgroups}</version>
</dependency>
Modified: trunk/demos/gridfs-webdav/pom.xml
===================================================================
--- trunk/demos/gridfs-webdav/pom.xml 2010-07-05 10:53:43 UTC (rev 1973)
+++ trunk/demos/gridfs-webdav/pom.xml 2010-07-05 11:00:20 UTC (rev 1974)
@@ -34,12 +34,6 @@
<!-- required by Webdav-Servlet -->
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
-
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>${version.javax.servlet}</version>
Modified: trunk/demos/gui/pom.xml
===================================================================
--- trunk/demos/gui/pom.xml 2010-07-05 10:53:43 UTC (rev 1973)
+++ trunk/demos/gui/pom.xml 2010-07-05 11:00:20 UTC (rev 1974)
@@ -18,7 +18,6 @@
<properties>
<version.jgoodies.forms>1.0.5</version.jgoodies.forms>
<version.com.intellij.forms_rt>6.0.5</version.com.intellij.forms_rt>
- <version.apache.log4j>1.2.14</version.apache.log4j>
</properties>
<dependencies>
@@ -37,11 +36,6 @@
<artifactId>forms_rt</artifactId>
<version>${version.com.intellij.forms_rt}</version>
</dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${version.apache.log4j}</version>
- </dependency>
</dependencies>
<build>
Modified: trunk/demos/lucene-directory-demo/pom.xml
===================================================================
--- trunk/demos/lucene-directory-demo/pom.xml 2010-07-05 10:53:43 UTC (rev 1973)
+++ trunk/demos/lucene-directory-demo/pom.xml 2010-07-05 11:00:20 UTC (rev 1974)
@@ -45,11 +45,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>infinispan-core</artifactId>
<version>${project.version}</version>
Modified: trunk/parent/pom.xml
===================================================================
--- trunk/parent/pom.xml 2010-07-05 10:53:43 UTC (rev 1973)
+++ trunk/parent/pom.xml 2010-07-05 11:00:20 UTC (rev 1974)
@@ -71,75 +71,84 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<defaultTestGroup>functional,unit</defaultTestGroup>
<testNGListener>org.infinispan.test.fwk.UnitTestTestNGListener</testNGListener>
- <jboss.releases.repo.url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/
- </jboss.releases.repo.url>
- <jboss.snapshots.repo.url>https://repository.jboss.org/nexus/content/repositories/snapshots/
- </jboss.snapshots.repo.url>
- <version.scala>2.8.0.RC7</version.scala>
+ <jboss.releases.repo.url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</jboss.releases.repo.url>
+ <jboss.snapshots.repo.url>https://repository.jboss.org/nexus/content/repositories/snapshots/</jboss.snapshots.repo.url>
+
+ <!-- Versions for dependencies -->
+ <version.scala>2.8.0.RC7</version.scala>
+ <version.testng>5.11</version.testng>
+ <version.jcipannotations>1.0</version.jcipannotations>
+ <version.easymockclassext>2.4</version.easymockclassext>
+ <version.easymock>2.4</version.easymock>
+ <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.log4j>1.2.16</version.log4j>
+ <version.xstream>1.3.1</version.xstream>
</properties>
<dependencies>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>5.11</version>
+ <version>${version.testng}</version>
<scope>test</scope>
<classifier>jdk15</classifier>
</dependency>
<dependency>
<groupId>net.jcip</groupId>
<artifactId>jcip-annotations</artifactId>
- <version>1.0</version>
+ <version>${version.jcipannotations}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymockclassextension</artifactId>
- <version>2.4</version>
+ <version>${version.easymockclassext}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>2.4</version>
+ <version>${version.easymock}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jboss.jbossts</groupId>
<artifactId>jbossjta</artifactId>
- <version>4.9.0.GA</version>
+ <version>${version.jbossjta}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jboss.jbossts</groupId>
<artifactId>jbossjts</artifactId>
- <version>4.9.0.GA</version>
+ <version>${version.jbossjts}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1</version>
+ <version>${version.commons-logging}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jboss.jbossts</groupId>
<artifactId>jbossts-common</artifactId>
- <version>4.6.1.GA</version>
+ <version>${version.jbossts-common}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.14</version>
- <scope>provided</scope>
+ <version>${version.log4j}</version>
</dependency>
<!-- used to serialize non-serializable objects for a dummy marshaller -->
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
- <version>1.3.1</version>
+ <version>${version.xstream}</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: trunk/server/core/pom.xml
===================================================================
--- trunk/server/core/pom.xml 2010-07-05 10:53:43 UTC (rev 1973)
+++ trunk/server/core/pom.xml 2010-07-05 11:00:20 UTC (rev 1974)
@@ -17,7 +17,6 @@
<properties>
<version.netty>3.2.0.Final</version.netty>
<version.gnu.getopt>1.0.13</version.gnu.getopt>
- <version.apache.log4j>1.2.15</version.apache.log4j>
</properties>
<dependencies>
Modified: trunk/src/main/resources/assemblies/all.xml
===================================================================
--- trunk/src/main/resources/assemblies/all.xml 2010-07-05 10:53:43 UTC (rev 1973)
+++ trunk/src/main/resources/assemblies/all.xml 2010-07-05 11:00:20 UTC (rev 1974)
@@ -249,6 +249,7 @@
<exclude>org.infinispan:infinispan-core</exclude>
<exclude>org.infinispan:infinispan-server-rest</exclude>
<exclude>org.infinispan:infinispan-gridfs-webdav</exclude>
+ <exclude>log4j:log4j</exclude>
</excludes>
<useTransitiveDependencies>true</useTransitiveDependencies>
<useTransitiveFiltering>true</useTransitiveFiltering>
Modified: trunk/src/main/resources/assemblies/bin.xml
===================================================================
--- trunk/src/main/resources/assemblies/bin.xml 2010-07-05 10:53:43 UTC (rev 1973)
+++ trunk/src/main/resources/assemblies/bin.xml 2010-07-05 11:00:20 UTC (rev 1974)
@@ -218,6 +218,7 @@
<exclude>net.jcip:jcip-annotations</exclude>
<exclude>org.rhq.helpers:rhq-pluginAnnotations</exclude>
<exclude>javax.transaction:jta</exclude>
+ <exclude>log4j:log4j</exclude>
</excludes>
<useTransitiveDependencies>true</useTransitiveDependencies>
<useTransitiveFiltering>true</useTransitiveFiltering>
More information about the infinispan-commits
mailing list