[exo-jcr-commits] exo-jcr SVN: r4476 - in jcr/trunk: applications/exo.jcr.applications.config and 4 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Fri Jun 3 17:18:48 EDT 2011
Author: nfilotto
Date: 2011-06-03 17:18:48 -0400 (Fri, 03 Jun 2011)
New Revision: 4476
Modified:
jcr/trunk/applications/exo.jcr.applications.config/pom.xml
jcr/trunk/applications/exo.jcr.ear/pom.xml
jcr/trunk/exo.jcr.component.core/pom.xml
jcr/trunk/exo.jcr.component.ext/pom.xml
jcr/trunk/packaging/module/src/main/javascript/jcr.packaging.module.js
jcr/trunk/pom.xml
Log:
EXOJCR-1372: Align dependencies with EAP 5.1 (jcr)
Modified: jcr/trunk/applications/exo.jcr.applications.config/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.config/pom.xml 2011-06-03 21:16:43 UTC (rev 4475)
+++ jcr/trunk/applications/exo.jcr.applications.config/pom.xml 2011-06-03 21:18:48 UTC (rev 4476)
@@ -89,5 +89,18 @@
<artifactId>jaxb-impl</artifactId>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.jgroups</groupId>
+ <artifactId>jgroups</artifactId>
+ <version>2.11.1.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>org.infinispan</groupId>
+ <artifactId>infinispan-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.infinispan</groupId>
+ <artifactId>infinispan-cachestore-jdbc</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: jcr/trunk/applications/exo.jcr.ear/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.ear/pom.xml 2011-06-03 21:16:43 UTC (rev 4475)
+++ jcr/trunk/applications/exo.jcr.ear/pom.xml 2011-06-03 21:18:48 UTC (rev 4476)
@@ -112,6 +112,19 @@
<artifactId>exo.jcr.component.webdav</artifactId>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.jgroups</groupId>
+ <artifactId>jgroups</artifactId>
+ <version>2.11.1.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>org.infinispan</groupId>
+ <artifactId>infinispan-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.infinispan</groupId>
+ <artifactId>infinispan-cachestore-jdbc</artifactId>
+ </dependency>
</dependencies>
<build>
<finalName>exo-jcr-ear</finalName>
Modified: jcr/trunk/exo.jcr.component.core/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/pom.xml 2011-06-03 21:16:43 UTC (rev 4475)
+++ jcr/trunk/exo.jcr.component.core/pom.xml 2011-06-03 21:18:48 UTC (rev 4476)
@@ -30,8 +30,14 @@
<name>eXo JCR :: Component :: Core Service</name>
<description>eXo JCR Service core component</description>
<properties>
- <jcr.test.configuration.file>/conf/standalone/test-configuration.xml</jcr.test.configuration.file>
+ <jcr.test.configuration.file>/conf/standalone/test-configuration-jbc.xml</jcr.test.configuration.file>
<jbosscache.shareable>true</jbosscache.shareable>
+ <jbc.specific.1>**/jbc/**</jbc.specific.1>
+ <jbc.specific.2>**/jbosscache/**</jbc.specific.2>
+ <ispn.specific.1>**/ispn/**</ispn.specific.1>
+ <ispn.specific.2>**/infinispan/**</ispn.specific.2>
+ <impl.specific.exclude.1>${ispn.specific.1}</impl.specific.exclude.1>
+ <impl.specific.exclude.2>${ispn.specific.2}</impl.specific.exclude.2>
</properties>
<dependencies>
<dependency>
@@ -162,6 +168,7 @@
<dependency>
<groupId>org.jgroups</groupId>
<artifactId>jgroups</artifactId>
+ <version>2.6.20.Final</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -201,10 +208,12 @@
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-cachestore-jdbc</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
@@ -701,7 +710,8 @@
org.apache.jackrabbit.test.api.nodetype.PredefinedNodeTypeTest#testConfiguration
org.apache.jackrabbit.test.api.nodetype.PredefinedNodeTypeTest#testVersionable
org.apache.jackrabbit.test.api.nodetype.PredefinedNodeTypeTest#testVersion
- org.apache.jackrabbit.test.api.NamespaceRegistryTest#testRegisterNamespace</value>
+ org.apache.jackrabbit.test.api.NamespaceRegistryTest#testRegisterNamespace
+ </value>
</property>
<!-- Uncomment the line below if you want to enable the statistics -->
<!--property>
@@ -757,6 +767,9 @@
<exclude>org/apache/jackrabbit/test/api/TestAll.java</exclude>
<exclude>org/apache/jackrabbit/test/api/**/Abstract*.java</exclude>
<exclude>org/apache/jackrabbit/test/api/**/FrozenNodeTest.java</exclude>
+ <!-- Implementation Specific Excludes -->
+ <exclude>${impl.specific.exclude.1}</exclude>
+ <exclude>${impl.specific.exclude.2}</exclude>
</excludes>
</configuration>
</plugin>
@@ -823,5 +836,62 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>sjdbc</id>
+ <properties>
+ <jcr.test.configuration.file>/conf/standalone/test-configuration-sjdbc-jbc.xml</jcr.test.configuration.file>
+ </properties>
+ </profile>
+ <profile>
+ <id>cluster</id>
+ <properties>
+ <jcr.test.configuration.file>/conf/standalone/cluster/test-configuration-jbc.xml</jcr.test.configuration.file>
+ </properties>
+ </profile>
+ <profile>
+ <id>ispn</id>
+ <properties>
+ <jcr.test.configuration.file>/conf/standalone/test-configuration.xml</jcr.test.configuration.file>
+ <impl.specific.exclude.1>${jbc.specific.1}</impl.specific.exclude.1>
+ <impl.specific.exclude.2>${jbc.specific.2}</impl.specific.exclude.2>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.jgroups</groupId>
+ <artifactId>jgroups</artifactId>
+ <version>2.11.1.Final</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>ispn-sjdbc</id>
+ <properties>
+ <jcr.test.configuration.file>/conf/standalone/test-configuration-sjdbc.xml</jcr.test.configuration.file>
+ <impl.specific.exclude.1>${jbc.specific.1}</impl.specific.exclude.1>
+ <impl.specific.exclude.2>${jbc.specific.2}</impl.specific.exclude.2>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.jgroups</groupId>
+ <artifactId>jgroups</artifactId>
+ <version>2.11.1.Final</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>ispn-cluster</id>
+ <properties>
+ <jcr.test.configuration.file>/conf/standalone/cluster/test-configuration.xml</jcr.test.configuration.file>
+ <impl.specific.exclude.1>${jbc.specific.1}</impl.specific.exclude.1>
+ <impl.specific.exclude.2>${jbc.specific.2}</impl.specific.exclude.2>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.jgroups</groupId>
+ <artifactId>jgroups</artifactId>
+ <version>2.11.1.Final</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
Modified: jcr/trunk/exo.jcr.component.ext/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.ext/pom.xml 2011-06-03 21:16:43 UTC (rev 4475)
+++ jcr/trunk/exo.jcr.component.ext/pom.xml 2011-06-03 21:18:48 UTC (rev 4476)
@@ -109,10 +109,6 @@
<artifactId>commons-chain</artifactId>
</dependency>
<dependency>
- <groupId>org.jgroups</groupId>
- <artifactId>jgroups</artifactId>
- </dependency>
- <dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
</dependency>
Modified: jcr/trunk/packaging/module/src/main/javascript/jcr.packaging.module.js
===================================================================
--- jcr/trunk/packaging/module/src/main/javascript/jcr.packaging.module.js 2011-06-03 21:16:43 UTC (rev 4475)
+++ jcr/trunk/packaging/module/src/main/javascript/jcr.packaging.module.js 2011-06-03 21:18:48 UTC (rev 4476)
@@ -21,9 +21,9 @@
addDependency(core.component.documents) .
addDependency(new Project("jcr", "jcr", "jar", "1.0")).
addDependency(new Project("concurrent", "concurrent", "jar", "1.3.4")).
- addDependency(new Project("org.jgroups", "jgroups", "jar", "2.11.1.Final")).
+ addDependency(new Project("org.jgroups", "jgroups", "jar", "2.6.20.Final")).
addDependency(new Project("commons-io", "commons-io", "jar", "1.3.2")).
- addDependency(new Project("org.jboss.cache","jbosscache-core","jar","3.2.6.GA")).
+ addDependency(new Project("org.jboss.cache","jbosscache-core","jar","3.2.7.GA")).
addDependency(new Project("jboss.jbossts","jbossjts","jar","4.6.1.GA")).
addDependency(new Project("jboss.jbossts","jbossts-common","jar","4.6.1.GA")).
addDependency(new Project("org.apache.ws.commons","ws-commons-util","jar","1.0.1")).
Modified: jcr/trunk/pom.xml
===================================================================
--- jcr/trunk/pom.xml 2011-06-03 21:16:43 UTC (rev 4475)
+++ jcr/trunk/pom.xml 2011-06-03 21:18:48 UTC (rev 4476)
@@ -344,11 +344,6 @@
<version>2.0.0</version>
</dependency>
<dependency>
- <groupId>org.jgroups</groupId>
- <artifactId>jgroups</artifactId>
- <version>2.11.1.Final</version>
- </dependency>
- <dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.2.1</version>
@@ -371,7 +366,7 @@
<dependency>
<groupId>org.jboss.cache</groupId>
<artifactId>jbosscache-core</artifactId>
- <version>3.2.6.GA</version>
+ <version>3.2.7.GA</version>
<exclusions>
<exclusion>
<groupId>jgroups</groupId>
More information about the exo-jcr-commits
mailing list