diff --git a/instrumentation/cassandra/cassandra-4-common/testing/build.gradle.kts b/instrumentation/cassandra/cassandra-4-common/testing/build.gradle.kts index 8147a0167158..d8cac710ab13 100644 --- a/instrumentation/cassandra/cassandra-4-common/testing/build.gradle.kts +++ b/instrumentation/cassandra/cassandra-4-common/testing/build.gradle.kts @@ -5,6 +5,6 @@ plugins { dependencies { api(project(":testing-common")) + compileOnly("com.datastax.oss:java-driver-core:4.0.0") implementation("org.testcontainers:testcontainers") - implementation("com.datastax.oss:java-driver-core:4.0.0") } diff --git a/instrumentation/cassandra/cassandra-4.4/javaagent/build.gradle.kts b/instrumentation/cassandra/cassandra-4.4/javaagent/build.gradle.kts index 5f310ed60624..91b4dcf1f56e 100644 --- a/instrumentation/cassandra/cassandra-4.4/javaagent/build.gradle.kts +++ b/instrumentation/cassandra/cassandra-4.4/javaagent/build.gradle.kts @@ -9,12 +9,23 @@ muzzle { versions.set("[4.4,]") assertInverse.set(true) } + pass { + group.set("org.apache.cassandra") + module.set("java-driver-core") + versions.set("(,)") + assertInverse.set(true) + } } +val latestDepTest = findProperty("testLatestDeps") as Boolean dependencies { implementation(project(":instrumentation:cassandra:cassandra-4.4:library")) - library("com.datastax.oss:java-driver-core:4.4.0") + if (latestDepTest) { + library("org.apache.cassandra:java-driver-core:4.18.0") + } else { + library("com.datastax.oss:java-driver-core:4.4.0") + } compileOnly("com.google.auto.value:auto-value-annotations") annotationProcessor("com.google.auto.value:auto-value") diff --git a/instrumentation/cassandra/cassandra-4.4/library/build.gradle.kts b/instrumentation/cassandra/cassandra-4.4/library/build.gradle.kts index 13a5a8037356..79d0375fd9e5 100644 --- a/instrumentation/cassandra/cassandra-4.4/library/build.gradle.kts +++ b/instrumentation/cassandra/cassandra-4.4/library/build.gradle.kts @@ -2,8 +2,13 @@ plugins { id("otel.library-instrumentation") } +val latestDepTest = findProperty("testLatestDeps") as Boolean dependencies { - library("com.datastax.oss:java-driver-core:4.4.0") + if (latestDepTest) { + library("org.apache.cassandra:java-driver-core:4.18.0") + } else { + library("com.datastax.oss:java-driver-core:4.4.0") + } compileOnly("com.google.auto.value:auto-value-annotations") annotationProcessor("com.google.auto.value:auto-value") diff --git a/instrumentation/cassandra/cassandra-4.4/testing/build.gradle.kts b/instrumentation/cassandra/cassandra-4.4/testing/build.gradle.kts index faaad8aa7951..da0dd5e93c56 100644 --- a/instrumentation/cassandra/cassandra-4.4/testing/build.gradle.kts +++ b/instrumentation/cassandra/cassandra-4.4/testing/build.gradle.kts @@ -5,7 +5,7 @@ plugins { dependencies { api(project(":testing-common")) - implementation("com.datastax.oss:java-driver-core:4.4.0") + compileOnly("com.datastax.oss:java-driver-core:4.4.0") implementation("io.projectreactor:reactor-core:3.5.3") api(project(":instrumentation:cassandra:cassandra-4-common:testing"))