Skip to content

Commit 25ea44e

Browse files
authored
Merge pull request #776 from DataDog/tyler/cassandra
Fix cassandra supported version
2 parents c363f64 + e0d95ce commit 25ea44e

File tree

6 files changed

+5
-4
lines changed

6 files changed

+5
-4
lines changed

dd-java-agent/instrumentation/datastax-cassandra-2.3/datastax-cassandra-2.3.gradle renamed to dd-java-agent/instrumentation/datastax-cassandra-3/datastax-cassandra-3.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ muzzle {
99
pass {
1010
group = "com.datastax.cassandra"
1111
module = "cassandra-driver-core"
12-
versions = "[2.3.0,)"
12+
versions = "[3.0,4.0)"
13+
assertInverse = true
1314
}
1415
}
1516

@@ -24,7 +25,7 @@ testSets {
2425
}
2526

2627
dependencies {
27-
compileOnly group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.2.0'
28+
compileOnly group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.0.0'
2829

2930
compile project(':dd-java-agent:agent-tooling')
3031

@@ -37,5 +38,5 @@ dependencies {
3738
testCompile group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.2.0'
3839
testCompile group: 'org.cassandraunit', name: 'cassandra-unit', version: '3.1.3.2'
3940

40-
latestDepTestCompile group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '+'
41+
latestDepTestCompile group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.+'
4142
}

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ include ':dd-java-agent:instrumentation:apache-httpclient-4'
2929
include ':dd-java-agent:instrumentation:aws-java-sdk-1.11.0'
3030
include ':dd-java-agent:instrumentation:aws-java-sdk-2.2'
3131
include ':dd-java-agent:instrumentation:couchbase-2.0'
32-
include ':dd-java-agent:instrumentation:datastax-cassandra-2.3'
32+
include ':dd-java-agent:instrumentation:datastax-cassandra-3'
3333
include ':dd-java-agent:instrumentation:dropwizard'
3434
include ':dd-java-agent:instrumentation:dropwizard:dropwizard-views'
3535
include ':dd-java-agent:instrumentation:elasticsearch'

0 commit comments

Comments
 (0)