Add some testcontainers dependencies to dependencyManagement dep set
MODIFY
dependencyManagement/build.gradle.kts
dependencyManagement/build.gradle.kts
@@ -81,7 +81,7 @@ val DEPENDENCY_SETS = listOf(
DependencySet(
"org.testcontainers",
"1.15.3",
- listOf("testcontainers", "junit-jupiter")
+ listOf("testcontainers", "junit-jupiter", "cassandra", "couchbase", "elasticsearch", "kafka", "localstack", "selenium")
)
)

MODIFY
instrumentation/apache-camel-2.20/javaagent/build.gradle.kts
instrumentation/apache-camel-2.20/javaagent/build.gradle.kts
@@ -43,8 +43,8 @@ dependencies {
testImplementation("javax.xml.bind:jaxb-api:2.3.1")
testImplementation("org.elasticmq:elasticmq-rest-sqs_2.12:1.0.0")
- testImplementation("org.testcontainers:localstack:${versions["org.testcontainers"]}")
- testImplementation("org.testcontainers:cassandra:${versions["org.testcontainers"]}")
+ testImplementation("org.testcontainers:localstack")
+ testImplementation("org.testcontainers:cassandra")
latestDepTestLibrary("org.apache.camel:camel-core:2.+")
latestDepTestLibrary("org.apache.camel:camel-spring-boot-starter:2.+")

MODIFY
instrumentation/aws-sdk/aws-sdk-1.11/javaagent/build.gradle.kts
instrumentation/aws-sdk/aws-sdk-1.11/javaagent/build.gradle.kts
@@ -46,8 +46,6 @@ configurations {
}
}
-val versions: Map<String, String> by project
-
dependencies {
compileOnly("io.opentelemetry:opentelemetry-extension-aws")
@@ -73,7 +71,7 @@ dependencies {
testImplementation("com.fasterxml.jackson.dataformat:jackson-dataformat-cbor")
// needed for SNS
- testImplementation("org.testcontainers:localstack:${versions["org.testcontainers"]}")
+ testImplementation("org.testcontainers:localstack")
// needed by S3
testImplementation("javax.xml.bind:jaxb-api:2.3.1")

MODIFY
instrumentation/couchbase/couchbase-3.1.6/javaagent/build.gradle.kts
instrumentation/couchbase/couchbase-3.1.6/javaagent/build.gradle.kts
@@ -13,8 +13,6 @@ muzzle {
}
}
-val versions: Map<String, String> by project
-
sourceSets {
main {
val shadedDep = project(":instrumentation:couchbase:couchbase-3.1.6:tracing-opentelemetry-shaded")
@@ -29,7 +27,7 @@ dependencies {
testLibrary("com.couchbase.client:java-client:3.1.6")
- testImplementation("org.testcontainers:couchbase:${versions["org.testcontainers"]}")
+ testImplementation("org.testcontainers:couchbase")
latestDepTestLibrary("com.couchbase.client:java-client:3.1.6")
latestDepTestLibrary("com.couchbase.client:core-io:2.1.6")

MODIFY
instrumentation/couchbase/couchbase-3.1/javaagent/build.gradle.kts
instrumentation/couchbase/couchbase-3.1/javaagent/build.gradle.kts
@@ -13,8 +13,6 @@ muzzle {
}
}
-val versions: Map<String, String> by project
-
sourceSets {
main {
val shadedDep = project(":instrumentation:couchbase:couchbase-3.1:tracing-opentelemetry-shaded")
@@ -29,7 +27,7 @@ dependencies {
testLibrary("com.couchbase.client:java-client:3.1.0")
- testImplementation("org.testcontainers:couchbase:${versions["org.testcontainers"]}")
+ testImplementation("org.testcontainers:couchbase")
latestDepTestLibrary("com.couchbase.client:java-client:3.1.5")
latestDepTestLibrary("com.couchbase.client:core-io:2.1.5")

MODIFY
instrumentation/couchbase/couchbase-3.2/javaagent/build.gradle.kts
instrumentation/couchbase/couchbase-3.2/javaagent/build.gradle.kts
@@ -13,8 +13,6 @@ muzzle {
}
}
-val versions: Map<String, String> by project
-
sourceSets {
main {
val shadedDep = project(":instrumentation:couchbase:couchbase-3.2:tracing-opentelemetry-shaded")
@@ -29,7 +27,7 @@ dependencies {
testLibrary("com.couchbase.client:java-client:3.2.0")
- testImplementation("org.testcontainers:couchbase:${versions["org.testcontainers"]}")
+ testImplementation("org.testcontainers:couchbase")
}
tasks {

MODIFY
instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/build.gradle.kts
instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/build.gradle.kts
@@ -18,8 +18,6 @@ muzzle {
}
}
-val versions: Map<String, String> by project
-
dependencies {
compileOnly("org.elasticsearch.client:rest:5.0.0")
@@ -31,7 +29,7 @@ dependencies {
testImplementation("org.apache.logging.log4j:log4j-core:2.11.0")
testImplementation("org.apache.logging.log4j:log4j-api:2.11.0")
- testImplementation("org.testcontainers:elasticsearch:${versions["org.testcontainers"]}")
+ testImplementation("org.testcontainers:elasticsearch")
testLibrary("org.elasticsearch.client:rest:5.0.0")
latestDepTestLibrary("org.elasticsearch.client:elasticsearch-rest-client:6.3.+")

MODIFY
instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/build.gradle.kts
instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/build.gradle.kts
@@ -17,8 +17,6 @@ muzzle {
}
}
-val versions: Map<String, String> by project
-
dependencies {
library("org.elasticsearch.client:elasticsearch-rest-client:6.4.0")
@@ -33,7 +31,7 @@ dependencies {
testImplementation("org.apache.logging.log4j:log4j-core:2.11.0")
testImplementation("org.apache.logging.log4j:log4j-api:2.11.0")
- testImplementation("org.testcontainers:elasticsearch:${versions["org.testcontainers"]}")
+ testImplementation("org.testcontainers:elasticsearch")
testLibrary("org.elasticsearch.client:elasticsearch-rest-client:6.4.0")
latestDepTestLibrary("org.elasticsearch.client:elasticsearch-rest-client:6.+")

MODIFY
instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/build.gradle.kts
instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/build.gradle.kts
@@ -17,8 +17,6 @@ muzzle {
}
}
-val versions: Map<String, String> by project
-
dependencies {
library("org.elasticsearch.client:elasticsearch-rest-client:7.0.0")
@@ -33,7 +31,7 @@ dependencies {
testImplementation("org.apache.logging.log4j:log4j-core:2.11.0")
testImplementation("org.apache.logging.log4j:log4j-api:2.11.0")
- testImplementation("org.testcontainers:elasticsearch:${versions["org.testcontainers"]}")
+ testImplementation("org.testcontainers:elasticsearch")
}
tasks {

MODIFY
instrumentation/gwt-2.0/javaagent/build.gradle.kts
instrumentation/gwt-2.0/javaagent/build.gradle.kts
@@ -23,8 +23,6 @@ sourceSets {
}
}
-val versions: Map<String, String> by project
-
dependencies {
// these are needed for compileGwt task
if (findProperty("testLatestDeps") as Boolean) {
@@ -41,7 +39,7 @@ dependencies {
testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent"))
testInstrumentation(project(":instrumentation:jetty:jetty-8.0:javaagent"))
- testImplementation("org.testcontainers:selenium:${versions["org.testcontainers"]}")
+ testImplementation("org.testcontainers:selenium")
testImplementation("org.seleniumhq.selenium:selenium-java:3.141.59")
testImplementation("org.eclipse.jetty:jetty-webapp:9.4.35.v20201120")

MODIFY
instrumentation/kafka-clients/kafka-clients-0.11/javaagent/build.gradle.kts
instrumentation/kafka-clients/kafka-clients-0.11/javaagent/build.gradle.kts
@@ -11,8 +11,6 @@ muzzle {
}
}
-val versions: Map<String, String> by project
-
dependencies {
compileOnly("com.google.auto.value:auto-value-annotations")
annotationProcessor("com.google.auto.value:auto-value")
@@ -21,7 +19,7 @@ dependencies {
library("org.apache.kafka:kafka-clients:0.11.0.0")
- testImplementation("org.testcontainers:kafka:${versions["org.testcontainers"]}")
+ testImplementation("org.testcontainers:kafka")
}
tasks {

MODIFY
instrumentation/kafka-streams-0.11/javaagent/build.gradle.kts
instrumentation/kafka-streams-0.11/javaagent/build.gradle.kts
@@ -11,8 +11,6 @@ muzzle {
}
}
-val versions: Map<String, String> by project
-
dependencies {
implementation(project(":instrumentation:kafka-clients:kafka-clients-common:javaagent"))
@@ -21,7 +19,7 @@ dependencies {
// Include kafka-clients instrumentation for tests.
testInstrumentation(project(":instrumentation:kafka-clients:kafka-clients-0.11:javaagent"))
- testImplementation("org.testcontainers:kafka:${versions["org.testcontainers"]}")
+ testImplementation("org.testcontainers:kafka")
latestDepTestLibrary("org.apache.kafka:kafka-streams:2.+")
}

MODIFY
instrumentation/spring/spring-kafka-2.7/javaagent/build.gradle.kts
instrumentation/spring/spring-kafka-2.7/javaagent/build.gradle.kts
@@ -11,8 +11,6 @@ muzzle {
}
}
-val versions: Map<String, String> by project
-
dependencies {
compileOnly("com.google.auto.value:auto-value-annotations")
annotationProcessor("com.google.auto.value:auto-value")
@@ -23,7 +21,7 @@ dependencies {
testInstrumentation(project(":instrumentation:kafka-clients:kafka-clients-0.11:javaagent"))
- testImplementation("org.testcontainers:kafka:${versions["org.testcontainers"]}")
+ testImplementation("org.testcontainers:kafka")
testLibrary("org.springframework.boot:spring-boot-starter-test:2.5.3")
testLibrary("org.springframework.boot:spring-boot-starter:2.5.3")

MODIFY
instrumentation/vaadin-14.2/testing/build.gradle.kts
instrumentation/vaadin-14.2/testing/build.gradle.kts
@@ -2,12 +2,10 @@ plugins {
id("otel.javaagent-testing")
}
-val versions: Map<String, String> by project
-
dependencies {
compileOnly("com.vaadin:vaadin-spring-boot-starter:14.2.0")
- api("org.testcontainers:selenium:${versions["org.testcontainers"]}")
+ api("org.testcontainers:selenium")
implementation(project(":testing-common"))
implementation("org.seleniumhq.selenium:selenium-java:3.141.59")
}

Add some testcontainers dependencies to dependencyManagement dep set (#4185)