Author: nzamosenchuk
Date: 2012-02-01 09:03:00 -0500 (Wed, 01 Feb 2012)
New Revision: 5555
Modified:
jcr/branches/1.15.x/applications/exo.jcr.applications.config/pom.xml
jcr/branches/1.15.x/applications/exo.jcr.ear/pom.xml
Log:
EXOJCR-1696 : fix dependency management for jboss-logging and jgroups. Introduced profile
'ispn' for applications and ear.
Modified: jcr/branches/1.15.x/applications/exo.jcr.applications.config/pom.xml
===================================================================
--- jcr/branches/1.15.x/applications/exo.jcr.applications.config/pom.xml 2012-02-01
13:59:32 UTC (rev 5554)
+++ jcr/branches/1.15.x/applications/exo.jcr.applications.config/pom.xml 2012-02-01
14:03:00 UTC (rev 5555)
@@ -89,30 +89,17 @@
<artifactId>jaxb-impl</artifactId>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.jgroups</groupId>
- <artifactId>jgroups</artifactId>
- <version>2.12.1.3.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-cachestore-jdbc</artifactId>
- </dependency>
- <!-- Excludes jboss-logging-spi since it is in conflict with the
- latest version that is required by infinispan -->
- <dependency>
- <groupId>org.jboss.cache</groupId>
- <artifactId>jbosscache-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>ispn</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.exoplatform.jcr</groupId>
+
<artifactId>exo.jcr.component.core.impl.infinispan.v5</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
Modified: jcr/branches/1.15.x/applications/exo.jcr.ear/pom.xml
===================================================================
--- jcr/branches/1.15.x/applications/exo.jcr.ear/pom.xml 2012-02-01 13:59:32 UTC (rev
5554)
+++ jcr/branches/1.15.x/applications/exo.jcr.ear/pom.xml 2012-02-01 14:03:00 UTC (rev
5555)
@@ -113,36 +113,23 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.jgroups</groupId>
- <artifactId>jgroups</artifactId>
- <version>2.12.1.3.Final</version>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-cachestore-jdbc</artifactId>
- </dependency>
- <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<scope>runtime</scope>
</dependency>
- <!-- Excludes jboss-logging-spi since it is in conflict with the
- latest version that is required by infinispan -->
- <dependency>
- <groupId>org.jboss.cache</groupId>
- <artifactId>jbosscache-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>ispn</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.exoplatform.jcr</groupId>
+
<artifactId>exo.jcr.component.core.impl.infinispan.v5</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
<build>
<finalName>exo.jcr.ear</finalName>
<plugins>
Show replies by date