Skip to content

Commit 8245d8e

Browse files
renovate[bot]laurit
renovate[bot]
and
laurit
authored
fix(deps): update testcontainers-java monorepo to v1.20.2 (patch) (#12370)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lauri Tulmin <[email protected]>
1 parent 467a272 commit 8245d8e

File tree

12 files changed

+29
-29
lines changed

12 files changed

+29
-29
lines changed

‎benchmark-overhead/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ repositories {
1818
dependencies {
1919
implementation(enforcedPlatform("org.junit:junit-bom:5.11.1"))
2020

21-
testImplementation("org.testcontainers:testcontainers:1.20.1")
22-
testImplementation("org.testcontainers:postgresql:1.20.1")
21+
testImplementation("org.testcontainers:testcontainers:1.20.2")
22+
testImplementation("org.testcontainers:postgresql:1.20.2")
2323
testImplementation("org.junit.jupiter:junit-jupiter-api")
2424
testImplementation("org.junit.jupiter:junit-jupiter-params")
2525
testImplementation("com.squareup.okhttp3:okhttp:4.12.0")

‎dependencyManagement/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ val DEPENDENCY_BOMS = listOf(
3434
"io.opentelemetry:opentelemetry-bom:${otelSdkVersion}",
3535
"io.opentelemetry:opentelemetry-bom-alpha:${otelSdkAlphaVersion}",
3636
"org.junit:junit-bom:5.11.1",
37-
"org.testcontainers:testcontainers-bom:1.20.1",
37+
"org.testcontainers:testcontainers-bom:1.20.2",
3838
"org.spockframework:spock-bom:2.4-M4-groovy-4.0"
3939
)
4040

‎examples/distro/smoke-tests/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
}
44

55
dependencies {
6-
testImplementation("org.testcontainers:testcontainers:1.20.1")
6+
testImplementation("org.testcontainers:testcontainers:1.20.2")
77
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.18.0")
88
testImplementation("com.google.protobuf:protobuf-java-util:3.25.5")
99
testImplementation("com.squareup.okhttp3:okhttp:4.12.0")

‎examples/extension/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ dependencies {
9999
implementation 'org.apache.commons:commons-lang3:3.17.0'
100100

101101
//All dependencies below are only for tests
102-
testImplementation("org.testcontainers:testcontainers:1.20.1")
102+
testImplementation("org.testcontainers:testcontainers:1.20.2")
103103
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.18.0")
104104
testImplementation("com.google.protobuf:protobuf-java-util:3.25.5")
105105
testImplementation("com.squareup.okhttp3:okhttp:4.12.0")

‎instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/CassandraTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.junit.jupiter.api.extension.RegisterExtension;
2424
import org.springframework.boot.SpringApplication;
2525
import org.springframework.context.ConfigurableApplicationContext;
26-
import org.testcontainers.containers.CassandraContainer;
26+
import org.testcontainers.cassandra.CassandraContainer;
2727
import org.testcontainers.junit.jupiter.Container;
2828
import org.testcontainers.junit.jupiter.Testcontainers;
2929

@@ -37,8 +37,8 @@ class CassandraTest extends AbstractHttpServerUsingTest<ConfigurableApplicationC
3737
private ConfigurableApplicationContext appContext;
3838

3939
@Container
40-
private static final CassandraContainer<?> cassandra =
41-
new CassandraContainer<>("cassandra:3.11.2").withExposedPorts(9042);
40+
private static final CassandraContainer cassandra =
41+
new CassandraContainer("cassandra:3.11.2").withExposedPorts(9042);
4242

4343
private static String host;
4444

‎instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/src/main/java/io/opentelemetry/instrumentation/kafka/internal/AbstractOpenTelemetryMetricsReporterTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@
5151
import org.junit.jupiter.api.Test;
5252
import org.slf4j.Logger;
5353
import org.slf4j.LoggerFactory;
54-
import org.testcontainers.containers.KafkaContainer;
5554
import org.testcontainers.containers.output.Slf4jLogConsumer;
5655
import org.testcontainers.containers.wait.strategy.Wait;
5756
import org.testcontainers.junit.jupiter.Testcontainers;
57+
import org.testcontainers.kafka.KafkaContainer;
5858
import org.testcontainers.utility.DockerImageName;
5959

6060
@SuppressWarnings("OtelInternalJavadoc")
@@ -86,10 +86,10 @@ void beforeAll() {
8686
}
8787

8888
kafka =
89-
new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.7.0"))
89+
new KafkaContainer(DockerImageName.parse("apache/kafka:3.8.0"))
9090
.withEnv("KAFKA_HEAP_OPTS", "-Xmx256m")
9191
.withLogConsumer(new Slf4jLogConsumer(logger))
92-
.waitingFor(Wait.forLogMessage(".*started \\(kafka.server.KafkaServer\\).*", 1))
92+
.waitingFor(Wait.forLogMessage(".*started \\(kafka.server.Kafka.*Server\\).*", 1))
9393
.withStartupTimeout(Duration.ofMinutes(1));
9494
kafka.start();
9595
producer = new KafkaProducer<>(producerConfig());

‎instrumentation/kafka/kafka-clients/kafka-clients-0.11/testing/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaClientBaseTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@
4343
import org.junit.jupiter.api.TestInstance;
4444
import org.slf4j.Logger;
4545
import org.slf4j.LoggerFactory;
46-
import org.testcontainers.containers.KafkaContainer;
4746
import org.testcontainers.containers.output.Slf4jLogConsumer;
4847
import org.testcontainers.containers.wait.strategy.Wait;
48+
import org.testcontainers.kafka.KafkaContainer;
4949
import org.testcontainers.utility.DockerImageName;
5050

5151
@SuppressWarnings("OtelInternalJavadoc")
@@ -66,10 +66,10 @@ public abstract class KafkaClientBaseTest {
6666
@BeforeAll
6767
void setupClass() throws ExecutionException, InterruptedException, TimeoutException {
6868
kafka =
69-
new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.7.0"))
69+
new KafkaContainer(DockerImageName.parse("apache/kafka:3.8.0"))
7070
.withEnv("KAFKA_HEAP_OPTS", "-Xmx256m")
7171
.withLogConsumer(new Slf4jLogConsumer(logger))
72-
.waitingFor(Wait.forLogMessage(".*started \\(kafka.server.KafkaServer\\).*", 1))
72+
.waitingFor(Wait.forLogMessage(".*started \\(kafka.server.Kafka.*Server\\).*", 1))
7373
.withStartupTimeout(Duration.ofMinutes(1));
7474
kafka.start();
7575

‎instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsBaseTest.groovy‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ import org.apache.kafka.common.serialization.StringDeserializer
1818
import org.apache.kafka.common.serialization.StringSerializer
1919
import org.slf4j.Logger
2020
import org.slf4j.LoggerFactory
21-
import org.testcontainers.containers.KafkaContainer
2221
import org.testcontainers.containers.output.Slf4jLogConsumer
2322
import org.testcontainers.containers.wait.strategy.Wait
23+
import org.testcontainers.kafka.KafkaContainer
2424
import org.testcontainers.utility.DockerImageName
2525
import spock.lang.Shared
2626

@@ -44,10 +44,10 @@ class KafkaStreamsBaseTest extends AgentInstrumentationSpecification {
4444
static CountDownLatch consumerReady = new CountDownLatch(1)
4545

4646
def setupSpec() {
47-
kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.7.0"))
47+
kafka = new KafkaContainer(DockerImageName.parse("apache/kafka:3.8.0"))
4848
.withEnv("KAFKA_HEAP_OPTS", "-Xmx256m")
4949
.withLogConsumer(new Slf4jLogConsumer(logger))
50-
.waitingFor(Wait.forLogMessage(".*started \\(kafka.server.KafkaServer\\).*", 1))
50+
.waitingFor(Wait.forLogMessage(".*started \\(kafka.server.Kafka.*Server\\).*", 1))
5151
.withStartupTimeout(Duration.ofMinutes(1))
5252
kafka.start()
5353

‎instrumentation/reactor/reactor-kafka-1.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/kafka/v1_0/AbstractReactorKafkaTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
import org.junit.jupiter.api.extension.RegisterExtension;
4242
import org.slf4j.Logger;
4343
import org.slf4j.LoggerFactory;
44-
import org.testcontainers.containers.KafkaContainer;
4544
import org.testcontainers.containers.output.Slf4jLogConsumer;
4645
import org.testcontainers.containers.wait.strategy.Wait;
46+
import org.testcontainers.kafka.KafkaContainer;
4747
import org.testcontainers.utility.DockerImageName;
4848
import reactor.core.Disposable;
4949
import reactor.core.publisher.Flux;
@@ -69,10 +69,10 @@ public abstract class AbstractReactorKafkaTest {
6969
@BeforeAll
7070
static void setUpAll() {
7171
kafka =
72-
new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.7.0"))
72+
new KafkaContainer(DockerImageName.parse("apache/kafka:3.8.0"))
7373
.withEnv("KAFKA_HEAP_OPTS", "-Xmx256m")
7474
.withLogConsumer(new Slf4jLogConsumer(logger))
75-
.waitingFor(Wait.forLogMessage(".*started \\(kafka.server.KafkaServer\\).*", 1))
75+
.waitingFor(Wait.forLogMessage(".*started \\(kafka.server.Kafka.*Server\\).*", 1))
7676
.withStartupTimeout(Duration.ofMinutes(1));
7777
kafka.start();
7878

‎instrumentation/spring/spring-kafka-2.7/testing/src/main/java/io/opentelemetry/testing/AbstractSpringKafkaTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
import org.springframework.kafka.core.KafkaOperations;
3131
import org.springframework.kafka.core.KafkaTemplate;
3232
import org.springframework.util.concurrent.ListenableFuture;
33-
import org.testcontainers.containers.KafkaContainer;
3433
import org.testcontainers.containers.wait.strategy.Wait;
34+
import org.testcontainers.kafka.KafkaContainer;
3535
import org.testcontainers.utility.DockerImageName;
3636

3737
public abstract class AbstractSpringKafkaTest {
@@ -46,9 +46,9 @@ public abstract class AbstractSpringKafkaTest {
4646
@BeforeAll
4747
static void setUpKafka() {
4848
kafka =
49-
new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.7.0"))
49+
new KafkaContainer(DockerImageName.parse("apache/kafka:3.8.0"))
5050
.withEnv("KAFKA_HEAP_OPTS", "-Xmx256m")
51-
.waitingFor(Wait.forLogMessage(".*started \\(kafka.server.KafkaServer\\).*", 1))
51+
.waitingFor(Wait.forLogMessage(".*started \\(kafka.server.Kafka.*Server\\).*", 1))
5252
.withStartupTimeout(Duration.ofMinutes(1));
5353
kafka.start();
5454
}

0 commit comments

Comments
 (0)