Author: [email protected]
Date: Fri Feb 10 15:20:41 2012
New Revision: 2080
Log:
[AMDATUCASSANDRA-157] Fixed remaining SLF4J error by excluding log4j-simple
that came from the fore itest dependency. Also fixed the compile error when
using maven 2 (which did not occur using maven 3)
Modified:
trunk/amdatu-cassandra/cassandra-stores/pom.xml
trunk/amdatu-cassandra/test-integration/pom.xml
Modified: trunk/amdatu-cassandra/cassandra-stores/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-stores/pom.xml (original)
+++ trunk/amdatu-cassandra/cassandra-stores/pom.xml Fri Feb 10 15:20:41 2012
@@ -49,6 +49,11 @@
<artifactId>org.amdatu.cassandra.persistencemanager.hector</artifactId>
<type>bundle</type>
</dependency>
+ <dependency>
+ <groupId>org.amdatu.cassandra</groupId>
+ <artifactId>org.amdatu.cassandra.client</artifactId>
+ <type>bundle</type>
+ </dependency>
<!-- Unit testing -->
<dependency>
@@ -63,12 +68,6 @@
<type>jar</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.client</artifactId>
- <type>bundle</type>
- <scope>test</scope>
- </dependency>
</dependencies>
<modules>
Modified: trunk/amdatu-cassandra/test-integration/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/test-integration/pom.xml (original)
+++ trunk/amdatu-cassandra/test-integration/pom.xml Fri Feb 10 15:20:41 2012
@@ -53,6 +53,14 @@
<version>${org.amdatu.core.version}</version>
<scope>compile</scope>
<type>bundle</type>
+ <exclusions>
+ <exclusion>
+ <!-- Explicitly exclude slf4j-simple adapter, as it is referenced
from
+ the core itest base while we are using slf4j-jdk14 -->
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.amdatu.web</groupId>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
