diff --git a/cassandra3/src/test/java/zipkin2/storage/cassandra/CassandraContainer.java b/cassandra3/src/test/java/zipkin2/storage/cassandra/CassandraContainer.java index 3ea38c2..4899781 100644 --- a/cassandra3/src/test/java/zipkin2/storage/cassandra/CassandraContainer.java +++ b/cassandra3/src/test/java/zipkin2/storage/cassandra/CassandraContainer.java @@ -50,7 +50,7 @@ final class CassandraContainer extends GenericContainer { ); CassandraContainer() { - super(parse("ghcr.io/openzipkin/zipkin-cassandra:3.3.0")); + super(parse("ghcr.io/openzipkin/zipkin-cassandra:3.4.0")); addExposedPort(9042); waitStrategy = Wait.forHealthcheck(); withLogConsumer(new Slf4jLogConsumer(LOGGER)); diff --git a/docker/Dockerfile b/docker/Dockerfile index 725ebd2..dc51e78 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -10,7 +10,7 @@ # docker-compose: When updating, update everywhere. # # Note: JDK 17 until Spark 4 per SPARK-43831 -ARG java_version=17.0.10_p7 +ARG java_version=17.0.11_p9 # We copy files from the context into a scratch container first to avoid a problem where docker and # docker-compose don't share layer hashes https://github.com/docker/compose/issues/883 normally. @@ -39,7 +39,7 @@ RUN /code/build-bin/maven/maven_build_or_unjar io.zipkin.dependencies zipkin-dep # Try -jre again once Spark 4.0 is released. Spark 3.x uses old Hadoop in the # Elasticsearch driver which needs com.sun.security.auth.module.UnixLoginModule -FROM ghcr.io/openzipkin/java:17.0.10_p7 as zipkin-dependencies +FROM ghcr.io/openzipkin/java:17.0.11_p9 as zipkin-dependencies LABEL org.opencontainers.image.description="Zipkin Dependencies Aggregator on OpenJDK and Alpine Linux" LABEL org.opencontainers.image.source=https://github.com/openzipkin/zipkin-dependencies diff --git a/elasticsearch/pom.xml b/elasticsearch/pom.xml index 6a92241..0874bcc 100644 --- a/elasticsearch/pom.xml +++ b/elasticsearch/pom.xml @@ -19,7 +19,6 @@ ${project.basedir}/.. - 4.12.0 diff --git a/elasticsearch/src/test/java/zipkin2/storage/elasticsearch/ElasticsearchContainer.java b/elasticsearch/src/test/java/zipkin2/storage/elasticsearch/ElasticsearchContainer.java index 1f8dabd..a5fb011 100644 --- a/elasticsearch/src/test/java/zipkin2/storage/elasticsearch/ElasticsearchContainer.java +++ b/elasticsearch/src/test/java/zipkin2/storage/elasticsearch/ElasticsearchContainer.java @@ -33,7 +33,7 @@ class ElasticsearchContainer extends GenericContainer { static final Logger LOGGER = LoggerFactory.getLogger(ElasticsearchContainer.class); ElasticsearchContainer(int majorVersion) { - super(parse("ghcr.io/openzipkin/zipkin-elasticsearch" + majorVersion + ":3.3.0")); + super(parse("ghcr.io/openzipkin/zipkin-elasticsearch" + majorVersion + ":3.4.0")); addExposedPort(9200); waitStrategy = Wait.forHealthcheck(); withLogConsumer(new Slf4jLogConsumer(LOGGER)); diff --git a/mysql/src/test/java/zipkin2/storage/mysql/v1/MySQLContainer.java b/mysql/src/test/java/zipkin2/storage/mysql/v1/MySQLContainer.java index 43573f6..1d25dff 100644 --- a/mysql/src/test/java/zipkin2/storage/mysql/v1/MySQLContainer.java +++ b/mysql/src/test/java/zipkin2/storage/mysql/v1/MySQLContainer.java @@ -24,7 +24,7 @@ final class MySQLContainer extends GenericContainer { static final Logger LOGGER = LoggerFactory.getLogger(MySQLContainer.class); MySQLContainer() { - super(parse("ghcr.io/openzipkin/zipkin-mysql:3.3.0")); + super(parse("ghcr.io/openzipkin/zipkin-mysql:3.4.0")); addExposedPort(3306); waitStrategy = Wait.forHealthcheck(); withLogConsumer(new Slf4jLogConsumer(LOGGER)); diff --git a/opensearch/pom.xml b/opensearch/pom.xml index 01c335a..fb0b59b 100644 --- a/opensearch/pom.xml +++ b/opensearch/pom.xml @@ -19,7 +19,6 @@ ${project.basedir}/.. - 4.12.0 diff --git a/opensearch/src/test/java/zipkin2/storage/elasticsearch/OpensearchContainer.java b/opensearch/src/test/java/zipkin2/storage/elasticsearch/OpensearchContainer.java index cb7ae44..14d6d92 100644 --- a/opensearch/src/test/java/zipkin2/storage/elasticsearch/OpensearchContainer.java +++ b/opensearch/src/test/java/zipkin2/storage/elasticsearch/OpensearchContainer.java @@ -33,7 +33,7 @@ class OpensearchContainer extends GenericContainer { static final Logger LOGGER = LoggerFactory.getLogger(OpensearchContainer.class); OpensearchContainer(int majorVersion) { - super(parse("ghcr.io/openzipkin/zipkin-opensearch" + majorVersion + ":3.3.0")); + super(parse("ghcr.io/openzipkin/zipkin-opensearch" + majorVersion + ":3.4.0")); addExposedPort(9200); waitStrategy = Wait.forHealthcheck(); withLogConsumer(new Slf4jLogConsumer(LOGGER)); diff --git a/pom.xml b/pom.xml index fe1012d..e833806 100755 --- a/pom.xml +++ b/pom.xml @@ -66,11 +66,14 @@ - 2.26.1 + 2.27.1 2.13 - 3.4.2 + 3.4.3 + + + 4.12.0 8.14.0-SNAPSHOT @@ -85,28 +88,28 @@ 4.17.0 - 3.3.3 + 3.4.0 1.11.3 - 1.26.1 - 32.1.3-jre + 1.26.2 + 33.2.0-jre 2.5.2 - 3.25.1 - 2.13.13 + 3.25.3 + 2.13.14 1.1.10.5 3.9.2 5.10.2 - 1.19.7 + 1.19.8 - 3.3.0 - 1.28.0 + 3.4.0 + 1.28.4 - 4.1.108.Final - 2.17.0 + 4.1.110.Final + 2.17.1 3.25.3 2.0.13 @@ -114,20 +117,20 @@ 1.2.8 - 4.3 + 4.5 5.1.9 3.13.0 3.6.1 - 3.1.1 + 3.1.2 3.4.1 3.4.0 - 3.1.1 + 3.1.2 3.6.3 - 3.3.0 + 3.4.1 3.0.1 - 3.5.2 + 3.5.3 3.3.1 3.2.5 1.6.13