Merge pull request #70 from palantir/feature/remove-shaded-cass

Remove shaded Cassandra driver

atlasdb-cassandra-tests/build.gradle

@@ -6,10 +6,11 @@ apply from: "../gradle/shared.gradle"
 [test, check].each { it.onlyIf { !System.getenv().containsKey('CI') } }
 
 dependencies {
- testCompile(project(":atlasdb-cassandra"))
+ testCompile project(":atlasdb-cassandra")
  testCompile project(":atlasdb-tests-shared")
- testCompile 'org.apache.cassandra:cassandra-all:2.1.5'
- testCompile 'com.palantir.shaded.com.datastax.cassandra:datastax-cassandra-driver-core:0.3.1'
+
+ testCompile 'org.apache.cassandra:cassandra-all:2.1.7'
+ testCompile 'com.datastax.cassandra:cassandra-driver-core:2.1.7'
 }
 
 jacoco {
@@ -36,19 +37,3 @@ jacocoTestReport {
  }
 }
 
-// Add a classifier to properly pick up the datastax dependency
-publishing {
- publications {
- local(MavenPublication) {
- pom.withXml {
- def node = asNode();
- node.depthFirst().each { n ->
- if (n instanceof Node && n.text() == "datastax-cassandra-driver-core") {
- n.parent().appendNode('classifier', 'all')
- return;
- }
- }
- }
- }
- }
-}

atlasdb-cassandra/build.gradle

@@ -6,8 +6,9 @@ dependencies {
  compile project(":atlasdb-client")
  compile project(":atlasdb-spi")
  compile project(':timestamp-impl')
- compile(group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '2.1.5')
- compile('org.apache.cassandra:cassandra-all:2.1.5')
+
+ compile 'org.apache.cassandra:cassandra-all:2.1.7'
+ compile 'com.datastax.cassandra:cassandra-driver-core:2.1.7'
 
  processor 'org.immutables:value:2.0.21'
 }

settings.gradle

@@ -25,4 +25,3 @@ include ":leader-election-impl"
 include ":examples:profile-client"
 include ":examples:profile-client-protobufs"
 include ":bookkeeper-transaction"
-include ":datastax-cassandra-driver-core"