Author: [email protected]
Date: Wed Nov 30 10:54:34 2011
New Revision: 1801
Log:
[AMDATUCASSANDRA-133] Removing the obsolete dependencies triggered two issues
which were already there but fixed by coincidence by these obsolete
dependencies; the hector pm included duplicate jar files and the SLF4J versions
used by cassandra and hector were different. Fixed these issues.
Modified:
trunk/amdatu-cassandra/cassandra-application/pom.xml
trunk/amdatu-cassandra/cassandra-persistencemanager-hector/pom.xml
trunk/amdatu-cassandra/cassandra-persistencemanager/pom.xml
trunk/amdatu-cassandra/pom.xml
Modified: trunk/amdatu-cassandra/cassandra-application/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-application/pom.xml (original)
+++ trunk/amdatu-cassandra/cassandra-application/pom.xml Wed Nov 30
10:54:34 2011
@@ -27,10 +27,6 @@
<name>Amdatu Cassandra - Apache Cassandra Application</name>
<description>This bundle embeds the Apache Cassandra libraries and exports
the Cassandra Daemon as an OSGi service</description>
- <properties>
-
<cassandra.lib.filename>cassandra-${cassandra.version}</cassandra.lib.filename>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.cassandra</groupId>
@@ -73,13 +69,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.5.6</version>
+ <version>${slf4j.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
- <version>1.5.6</version>
+ <version>${slf4j.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -140,7 +136,7 @@
org.apache.cassandra.*;version="1.0.0",
org.apache.thrift.*;version="1.0.0",
</Export-Package>
- </instructions>
+ </instructions>
</configuration>
</plugin>
</plugins>
Modified: trunk/amdatu-cassandra/cassandra-persistencemanager-hector/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-persistencemanager-hector/pom.xml
(original)
+++ trunk/amdatu-cassandra/cassandra-persistencemanager-hector/pom.xml Wed Nov
30 10:54:34 2011
@@ -43,28 +43,84 @@
<artifactId>org.amdatu.cassandra.test.unit.framework</artifactId>
<type>jar</type>
</dependency>
+
+ <!-- Hector core dependency -->
<dependency>
<groupId>me.prettyprint</groupId>
<artifactId>hector-core</artifactId>
<version>0.8.0-2</version>
<scope>compile</scope>
</dependency>
+
+ <!-- The Hector core receives this dependency from the cassandra
dependency, but
+ not on our case so we include it explicitly -->
+ <dependency>
+ <groupId>org.cliffc.high_scale_lib</groupId>
+ <artifactId>high-scale-lib</artifactId>
+ <version>1.1.2</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- Compile dependencies in hector-core not already provided by
cassandra-application
+ (copied from https://github.com/rantav/hector/blob/0.8.0/pom.xml) -->
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>1.5.3</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>r09</version>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.6.1</version>
+ <version>${slf4j.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
- <version>1.6.1</version>
+ <version>${slf4j.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jul-to-slf4j</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.16</version>
+ <groupId>com.github.stephenc.eaio-uuid</groupId>
+ <artifactId>uuid</artifactId>
+ <version>3.2.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.ecyrd.speed4j</groupId>
+ <artifactId>speed4j</artifactId>
+ <version>0.9</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>1.6.1</version>
<scope>compile</scope>
</dependency>
</dependencies>
@@ -101,8 +157,8 @@
me.prettyprint.hector.*;version="1.0.1",
me.prettyprint.cassandra.*;version="1.0.1"
</Export-Package>
- <Embed-Dependency>*;scope=compile</Embed-Dependency>
- <Embed-Transitive>true</Embed-Transitive>
+ <Embed-Dependency>!hector-core;scope=compile</Embed-Dependency>
+ <Embed-Transitive>false</Embed-Transitive>
</instructions>
</configuration>
</plugin>
Modified: trunk/amdatu-cassandra/cassandra-persistencemanager/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-persistencemanager/pom.xml (original)
+++ trunk/amdatu-cassandra/cassandra-persistencemanager/pom.xml Wed Nov 30
10:54:34 2011
@@ -27,6 +27,8 @@
<name>Amdatu Cassandra - Apache Cassandra Persistence Manager</name>
<description>Provides the Apache Cassandra Persistence Manager
API.</description>
+
+
<dependencies>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
@@ -61,7 +63,7 @@
*
</Import-Package>
<Export-Package>
- org.amdatu.cassandra.persistencemanager;version="1.1.0",
+ org.amdatu.cassandra.persistencemanager;version="1.1.0"
</Export-Package>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
Modified: trunk/amdatu-cassandra/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/pom.xml (original)
+++ trunk/amdatu-cassandra/pom.xml Wed Nov 30 10:54:34 2011
@@ -37,6 +37,9 @@
<!-- Version of cassandra itself -->
<cassandra.version>0.8.7</cassandra.version>
+
+ <!-- Version of SLF4J -->
+ <slf4j.version>1.6.1</slf4j.version>
</properties>
<scm>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
