Bumps dependencies prior to 3.2 release

Signed-off-by: Adrian Cole <[email protected]>

cassandra3/src/test/java/zipkin2/storage/cassandra/CassandraContainer.java

@@ -50,7 +50,7 @@ final class CassandraContainer extends GenericContainer<CassandraContainer> {
   );
 
   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));

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
 

elasticsearch/pom.xml

@@ -19,7 +19,6 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
-    <okhttp.version>4.12.0</okhttp.version>
   </properties>
 
   <dependencies>

elasticsearch/src/test/java/zipkin2/storage/elasticsearch/ElasticsearchContainer.java

@@ -33,7 +33,7 @@ class ElasticsearchContainer extends GenericContainer<ElasticsearchContainer> {
   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));

mysql/src/test/java/zipkin2/storage/mysql/v1/MySQLContainer.java

@@ -24,7 +24,7 @@ final class MySQLContainer extends GenericContainer<MySQLContainer> {
   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));

opensearch/pom.xml

@@ -19,7 +19,6 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
-    <okhttp.version>4.12.0</okhttp.version>
   </properties>
 
   <dependencies>

opensearch/src/test/java/zipkin2/storage/elasticsearch/OpensearchContainer.java

@@ -33,7 +33,7 @@ class OpensearchContainer extends GenericContainer<OpensearchContainer> {
   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-opensearch2" + majorVersion + ":3.4.0"));
     addExposedPort(9200);
     waitStrategy = Wait.forHealthcheck();
     withLogConsumer(new Slf4jLogConsumer(LOGGER));

pom.xml

@@ -66,11 +66,14 @@
 
     <!-- override to set exclusions per-project -->
     <errorprone.args />
-    <errorprone.version>2.26.1</errorprone.version>
+    <errorprone.version>2.27.1</errorprone.version>
 
     <!-- Use a common scala binary version, and the highest spark patch. -->
     <scala.binary.version>2.13</scala.binary.version>
-    <spark.version>3.4.2</spark.version>
+    <spark.version>3.4.3</spark.version>
+
+    <!-- Used in opensearch and elasticsearch -->
+    <okhttp.version>4.12.0</okhttp.version>
 
     <!-- This dependency is in elasticsearch-hadoop -->
     <elasticsearch-spark.version>8.14.0-SNAPSHOT</elasticsearch-spark.version>
@@ -85,49 +88,50 @@
     <java-driver.version>4.17.0</java-driver.version>
 
     <!-- Use zipkin's version of MariaDB client -->
-    <mariadb-java-client.version>3.3.3</mariadb-java-client.version>
+    <mariadb-java-client.version>3.4.0</mariadb-java-client.version>
 
     <!-- CVE fix versions: re-evaluate after spark bumps -->
     <avro.version>1.11.3</avro.version>
-    <commons-compress.version>1.26.1</commons-compress.version>
-    <guava.version>32.1.3-jre</guava.version>
+    <commons-compress.version>1.26.2</commons-compress.version>
+    <guava.version>33.2.0-jre</guava.version>
     <ivy.version>2.5.2</ivy.version>
-    <protobuf.version>3.25.1</protobuf.version>
-    <scala.version>2.13.13</scala.version>
+    <protobuf.version>3.25.3</protobuf.version>
+    <scala.version>2.13.14</scala.version>
     <snappy-java.version>1.1.10.5</snappy-java.version>
     <zookeeper.version>3.9.2</zookeeper.version>
 
     <junit-jupiter.version>5.10.2</junit-jupiter.version>
-    <testcontainers.version>1.19.7</testcontainers.version>
+    <testcontainers.version>1.19.8</testcontainers.version>
 
     <!-- These need to match zipkin, so that tests don't have classpath
          conflicts. When updating, also update IT*.java -->
-    <zipkin.version>3.3.0</zipkin.version>
-    <armeria.version>1.28.0</armeria.version>
+    <zipkin.version>3.4.0</zipkin.version>
+    <armeria.version>1.28.4</armeria.version>
     <!-- Match Armeria version to avoid conflicts including running tests in the IDE -->
-    <netty.version>4.1.108.Final</netty.version>
-    <jackson.version>2.17.0</jackson.version>
+    <netty.version>4.1.110.Final</netty.version>
+    <jackson.version>2.17.1</jackson.version>
     <assertj.version>3.25.3</assertj.version>
     <slf4j.version>2.0.13</slf4j.version>
 
     <license.skip>${skipTests}</license.skip>
 
     <go-offline-maven-plugin.version>1.2.8</go-offline-maven-plugin.version>
     <!-- TODO: cleanup any redundant ignores now also in the 4.0 release (once final) -->
-    <license-maven-plugin.version>4.3</license-maven-plugin.version>
+    <license-maven-plugin.version>4.5</license-maven-plugin.version>
+    <maven-assembly-plugin.version>3.7.1</maven-assembly-plugin.version>
     <maven-bundle-plugin.version>5.1.9</maven-bundle-plugin.version>
     <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
     <!-- Use same version as https://github.com/openzipkin/docker-java -->
     <maven-dependency-plugin.version>3.6.1</maven-dependency-plugin.version>
-    <maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
+    <maven-deploy-plugin.version>3.1.2</maven-deploy-plugin.version>
     <maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
     <!-- Use same version as https://github.com/openzipkin/docker-java -->
     <maven-help-plugin.version>3.4.0</maven-help-plugin.version>
-    <maven-install-plugin.version>3.1.1</maven-install-plugin.version>
+    <maven-install-plugin.version>3.1.2</maven-install-plugin.version>
     <maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
-    <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
+    <maven-jar-plugin.version>3.4.1</maven-jar-plugin.version>
     <maven-release-plugin.version>3.0.1</maven-release-plugin.version>
-    <maven-shade-plugin.version>3.5.2</maven-shade-plugin.version>
+    <maven-shade-plugin.version>3.5.3</maven-shade-plugin.version>
     <maven-source-plugin.version>3.3.1</maven-source-plugin.version>
     <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
     <nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>