From 00f0f5ec1f096715aa11fdaf4341585eb1093f63 Mon Sep 17 00:00:00 2001
From: Adrian Cole <adrian@tetrate.io>
Date: Thu, 11 Jan 2024 13:36:18 +0800
Subject: [PATCH] deps: updates to zipkin 3

Signed-off-by: Adrian Cole <adrian@tetrate.io>
---
 cassandra3/pom.xml                            |  4 ++--
 .../storage/cassandra/CassandraExtension.java |  4 ++--
 elasticsearch/pom.xml                         |  4 ++--
 .../elasticsearch/ElasticsearchExtension.java |  4 ++--
 main/pom.xml                                  |  4 ++--
 mysql/pom.xml                                 |  4 ++--
 .../storage/mysql/v1/MySQLExtension.java      |  4 ++--
 pom.xml                                       | 19 ++++++++++++++-----
 8 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/cassandra3/pom.xml b/cassandra3/pom.xml
index 8c2cbe1..a5f4eab 100644
--- a/cassandra3/pom.xml
+++ b/cassandra3/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2016-2023 The OpenZipkin Authors
+    Copyright 2016-2024 The OpenZipkin Authors
 
     Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
     in compliance with the License. You may obtain a copy of the License at
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.zipkin.dependencies</groupId>
     <artifactId>zipkin-dependencies-parent</artifactId>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>zipkin-dependencies-cassandra3</artifactId>
diff --git a/cassandra3/src/test/java/zipkin2/storage/cassandra/CassandraExtension.java b/cassandra3/src/test/java/zipkin2/storage/cassandra/CassandraExtension.java
index d74469b..abe984a 100644
--- a/cassandra3/src/test/java/zipkin2/storage/cassandra/CassandraExtension.java
+++ b/cassandra3/src/test/java/zipkin2/storage/cassandra/CassandraExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 The OpenZipkin Authors
+ * Copyright 2016-2024 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -169,7 +169,7 @@ static boolean poolInFlight(CqlSession session) {
   // mostly waiting for https://github.com/testcontainers/testcontainers-java/issues/3537
   static final class CassandraContainer extends GenericContainer<CassandraContainer> {
     CassandraContainer() {
-      super(parse("ghcr.io/openzipkin/zipkin-cassandra:2.26.0"));
+      super(parse("ghcr.io/openzipkin/zipkin-cassandra:3.0.1"));
       if ("true".equals(System.getProperty("docker.skip"))) {
         throw new TestAbortedException("${docker.skip} == true");
       }
diff --git a/elasticsearch/pom.xml b/elasticsearch/pom.xml
index 410a5d8..dd808c0 100644
--- a/elasticsearch/pom.xml
+++ b/elasticsearch/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2016-2023 The OpenZipkin Authors
+    Copyright 2016-2024 The OpenZipkin Authors
 
     Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
     in compliance with the License. You may obtain a copy of the License at
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.zipkin.dependencies</groupId>
     <artifactId>zipkin-dependencies-parent</artifactId>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>zipkin-dependencies-elasticsearch</artifactId>
diff --git a/elasticsearch/src/test/java/zipkin2/elasticsearch/ElasticsearchExtension.java b/elasticsearch/src/test/java/zipkin2/elasticsearch/ElasticsearchExtension.java
index 47ee544..afc286a 100644
--- a/elasticsearch/src/test/java/zipkin2/elasticsearch/ElasticsearchExtension.java
+++ b/elasticsearch/src/test/java/zipkin2/elasticsearch/ElasticsearchExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 The OpenZipkin Authors
+ * Copyright 2016-2024 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -126,7 +126,7 @@ String hostPort() {
   // mostly waiting for https://github.com/testcontainers/testcontainers-java/issues/3537
   static final class ElasticsearchContainer extends GenericContainer<ElasticsearchContainer> {
     ElasticsearchContainer(int majorVersion) {
-      super(parse("ghcr.io/openzipkin/zipkin-elasticsearch" + majorVersion + ":2.26.0"));
+      super(parse("ghcr.io/openzipkin/zipkin-elasticsearch" + majorVersion + ":3.0.1"));
       if ("true".equals(System.getProperty("docker.skip"))) {
         throw new TestAbortedException("${docker.skip} == true");
       }
diff --git a/main/pom.xml b/main/pom.xml
index 1409b4b..5822400 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2016-2023 The OpenZipkin Authors
+    Copyright 2016-2024 The OpenZipkin Authors
 
     Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
     in compliance with the License. You may obtain a copy of the License at
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.zipkin.dependencies</groupId>
     <artifactId>zipkin-dependencies-parent</artifactId>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>zipkin-dependencies</artifactId>
diff --git a/mysql/pom.xml b/mysql/pom.xml
index 72494cf..622b19a 100644
--- a/mysql/pom.xml
+++ b/mysql/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2016-2023 The OpenZipkin Authors
+    Copyright 2016-2024 The OpenZipkin Authors
 
     Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
     in compliance with the License. You may obtain a copy of the License at
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.zipkin.dependencies</groupId>
     <artifactId>zipkin-dependencies-parent</artifactId>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>zipkin-dependencies-mysql</artifactId>
diff --git a/mysql/src/test/java/zipkin2/storage/mysql/v1/MySQLExtension.java b/mysql/src/test/java/zipkin2/storage/mysql/v1/MySQLExtension.java
index 982a112..226a845 100644
--- a/mysql/src/test/java/zipkin2/storage/mysql/v1/MySQLExtension.java
+++ b/mysql/src/test/java/zipkin2/storage/mysql/v1/MySQLExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 The OpenZipkin Authors
+ * Copyright 2016-2024 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -79,7 +79,7 @@ int port() {
   // mostly waiting for https://github.com/testcontainers/testcontainers-java/issues/3537
   static final class MySQLContainer extends GenericContainer<MySQLContainer> {
     MySQLContainer() {
-      super(parse("ghcr.io/openzipkin/zipkin-mysql:2.26.0"));
+      super(parse("ghcr.io/openzipkin/zipkin-mysql:3.0.1"));
       if ("true".equals(System.getProperty("docker.skip"))) {
         throw new TestAbortedException("${docker.skip} == true");
       }
diff --git a/pom.xml b/pom.xml
index 0ccd231..910857d 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2016-2023 The OpenZipkin Authors
+    Copyright 2016-2024 The OpenZipkin Authors
 
     Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
     in compliance with the License. You may obtain a copy of the License at
@@ -19,7 +19,7 @@
 
   <groupId>io.zipkin.dependencies</groupId>
   <artifactId>zipkin-dependencies-parent</artifactId>
-  <version>3.0.1-SNAPSHOT</version>
+  <version>3.1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <modules>
@@ -44,15 +44,24 @@
          See https://github.com/mojohaus/animal-sniffer/issues/62 -->
     <maven.compiler.release>11</maven.compiler.release>
 
+    <maven.compiler.testSource>11</maven.compiler.testSource>
+    <maven.compiler.testTarget>11</maven.compiler.testTarget>
+    <!-- We don't use animal-sniffer anymore as release obviates it.
+         See https://github.com/mojohaus/animal-sniffer/issues/62 -->
+    <maven.compiler.testRelease>11</maven.compiler.testRelease>
+
     <!-- override to set exclusions per-project -->
     <errorprone.args />
-    <errorprone.version>2.24.0</errorprone.version>
+    <errorprone.version>2.24.1</errorprone.version>
 
     <!-- Use a common scala binary version, and the highest spark patch version.
          Scala 2.13 is held back due to spark version conflicts until Elastic
          updates their version. Once 2.13 works, we can also use JDK 17 per
          https://issues.apache.org/jira/browse/SPARK-33772 and possibly 12 per
-         https://issues.apache.org/jira/browse/SPARK-43831 -->
+         https://issues.apache.org/jira/browse/SPARK-43831
+
+         Another way is for datastax to add 3.3 on Scala 2.13 per
+         https://datastax-oss.atlassian.net/browse/SPARKC-709 -->
     <scala.binary.version>2.12</scala.binary.version>
     <!-- Latest patch of highest common minor. 3.3, not 3.4 until ES updates.
          See https://github.com/elastic/elasticsearch-hadoop/issues/2187 -->
@@ -75,7 +84,7 @@
 
     <!-- These need to match zipkin, so that tests don't have classpath
          conflicts. When updating, also update IT*.java -->
-    <zipkin.version>2.26.0</zipkin.version>
+    <zipkin.version>3.0.1</zipkin.version>
     <armeria.version>1.26.4</armeria.version>
     <!-- Match Armeria version to avoid conflicts including running tests in the IDE -->
     <netty.version>4.1.100.Final</netty.version>