From e9725af236ea47991bfa27da110d680d0dd8f485 Mon Sep 17 00:00:00 2001 From: Adrian Cole <64215+codefromthecrypt@users.noreply.github.com> Date: Sat, 20 Apr 2024 07:34:18 -1000 Subject: [PATCH] deps: bumps to latest versions (#3767) this fixes the CVE in the eureka test image as well, so other PRs can rebase on it. --------- Signed-off-by: Adrian Cole --- .../test/java/zipkin2/server/ServerIntegratedBenchmark.java | 6 +++--- docker/test-images/zipkin-eureka/pom.xml | 2 +- pom.xml | 6 +++--- .../java/zipkin2/collector/activemq/ActiveMQExtension.java | 2 +- .../test/java/zipkin2/collector/kafka/KafkaExtension.java | 2 +- .../java/zipkin2/collector/rabbitmq/RabbitMQExtension.java | 2 +- zipkin-lens/pom.xml | 2 +- .../zipkin2/server/internal/eureka/BaseITZipkinEureka.java | 2 +- .../java/zipkin2/storage/cassandra/CassandraContainer.java | 2 +- .../elasticsearch/integration/ElasticsearchExtension.java | 2 +- .../test/java/zipkin2/storage/mysql/v1/MySQLExtension.java | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/benchmarks/src/test/java/zipkin2/server/ServerIntegratedBenchmark.java b/benchmarks/src/test/java/zipkin2/server/ServerIntegratedBenchmark.java index 36da9c103c..55670aa3d2 100644 --- a/benchmarks/src/test/java/zipkin2/server/ServerIntegratedBenchmark.java +++ b/benchmarks/src/test/java/zipkin2/server/ServerIntegratedBenchmark.java @@ -81,7 +81,7 @@ class ServerIntegratedBenchmark { @Test void elasticsearch() throws Exception { GenericContainer elasticsearch = - new GenericContainer<>(parse("ghcr.io/openzipkin/zipkin-elasticsearch7:3.1.1")) + new GenericContainer<>(parse("ghcr.io/openzipkin/zipkin-elasticsearch7:3.3.0")) .withNetwork(Network.SHARED) .withNetworkAliases("elasticsearch") .withLabel("name", "elasticsearch") @@ -95,7 +95,7 @@ class ServerIntegratedBenchmark { @Test void cassandra3() throws Exception { GenericContainer cassandra = - new GenericContainer<>(parse("ghcr.io/openzipkin/zipkin-cassandra:3.1.1")) + new GenericContainer<>(parse("ghcr.io/openzipkin/zipkin-cassandra:3.3.0")) .withNetwork(Network.SHARED) .withNetworkAliases("cassandra") .withLabel("name", "cassandra") @@ -109,7 +109,7 @@ class ServerIntegratedBenchmark { @Test void mysql() throws Exception { GenericContainer mysql = - new GenericContainer<>(parse("ghcr.io/openzipkin/zipkin-mysql:3.1.1")) + new GenericContainer<>(parse("ghcr.io/openzipkin/zipkin-mysql:3.3.0")) .withNetwork(Network.SHARED) .withNetworkAliases("mysql") .withLabel("name", "mysql") diff --git a/docker/test-images/zipkin-eureka/pom.xml b/docker/test-images/zipkin-eureka/pom.xml index 06f4d570d8..615e217501 100644 --- a/docker/test-images/zipkin-eureka/pom.xml +++ b/docker/test-images/zipkin-eureka/pom.xml @@ -29,7 +29,7 @@ org.springframework.boot spring-boot-dependencies - 3.2.4 + 3.2.5 pom import diff --git a/pom.xml b/pom.xml index 29b57c9f34..8410c544dc 100755 --- a/pom.xml +++ b/pom.xml @@ -47,9 +47,9 @@ 1.0.0 com.linecorp.armeria - 1.28.0 + 1.28.2 - 4.1.108.Final + 4.1.109.Final 2.17.0 @@ -61,7 +61,7 @@ 1.3.2 - 3.2.4 + 3.2.5 6.1.6 - 20.12.1 + 20.12.2 3.2.0 1.15.0 3.3.2 diff --git a/zipkin-server/src/test/java/zipkin2/server/internal/eureka/BaseITZipkinEureka.java b/zipkin-server/src/test/java/zipkin2/server/internal/eureka/BaseITZipkinEureka.java index 4243e2632e..daec07841c 100644 --- a/zipkin-server/src/test/java/zipkin2/server/internal/eureka/BaseITZipkinEureka.java +++ b/zipkin-server/src/test/java/zipkin2/server/internal/eureka/BaseITZipkinEureka.java @@ -139,7 +139,7 @@ static final class EurekaContainer extends GenericContainer { static final int EUREKA_PORT = 8761; EurekaContainer(Map env) { - super(parse("ghcr.io/openzipkin/zipkin-eureka:3.1.1")); + super(parse("ghcr.io/openzipkin/zipkin-eureka:3.3.0")); withEnv(env); withExposedPorts(EUREKA_PORT); waitStrategy = Wait.forHealthcheck(); diff --git a/zipkin-storage/cassandra/src/test/java/zipkin2/storage/cassandra/CassandraContainer.java b/zipkin-storage/cassandra/src/test/java/zipkin2/storage/cassandra/CassandraContainer.java index f89cf4fd37..9230212d8d 100644 --- a/zipkin-storage/cassandra/src/test/java/zipkin2/storage/cassandra/CassandraContainer.java +++ b/zipkin-storage/cassandra/src/test/java/zipkin2/storage/cassandra/CassandraContainer.java @@ -33,7 +33,7 @@ class CassandraContainer extends GenericContainer { CqlSession globalSession; CassandraContainer() { - super(parse("ghcr.io/openzipkin/zipkin-cassandra:3.1.1")); + super(parse("ghcr.io/openzipkin/zipkin-cassandra:3.3.0")); addExposedPort(9042); waitStrategy = Wait.forHealthcheck(); withLogConsumer(new Slf4jLogConsumer(LOGGER)); diff --git a/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/ElasticsearchExtension.java b/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/ElasticsearchExtension.java index 15b405d81f..753209fe97 100644 --- a/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/ElasticsearchExtension.java +++ b/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/ElasticsearchExtension.java @@ -117,7 +117,7 @@ String baseUrl() { // mostly waiting for https://github.com/testcontainers/testcontainers-java/issues/3537 static final class ElasticsearchContainer extends GenericContainer { ElasticsearchContainer(int majorVersion) { - super(parse("ghcr.io/openzipkin/zipkin-elasticsearch" + majorVersion + ":3.1.1")); + super(parse("ghcr.io/openzipkin/zipkin-elasticsearch" + majorVersion + ":3.3.0")); addExposedPort(9200); waitStrategy = Wait.forHealthcheck(); withLogConsumer(new Slf4jLogConsumer(LOGGER)); diff --git a/zipkin-storage/mysql-v1/src/test/java/zipkin2/storage/mysql/v1/MySQLExtension.java b/zipkin-storage/mysql-v1/src/test/java/zipkin2/storage/mysql/v1/MySQLExtension.java index 057bd33566..22647bafd6 100644 --- a/zipkin-storage/mysql-v1/src/test/java/zipkin2/storage/mysql/v1/MySQLExtension.java +++ b/zipkin-storage/mysql-v1/src/test/java/zipkin2/storage/mysql/v1/MySQLExtension.java @@ -103,7 +103,7 @@ int port() { // mostly waiting for https://github.com/testcontainers/testcontainers-java/issues/3537 static final class MySQLContainer extends GenericContainer { MySQLContainer() { - super(parse("ghcr.io/openzipkin/zipkin-mysql:3.1.1")); + super(parse("ghcr.io/openzipkin/zipkin-mysql:3.3.0")); addExposedPort(3306); waitStrategy = Wait.forHealthcheck(); withLogConsumer(new Slf4jLogConsumer(LOGGER));