deps: updates to zipkin 2.25.2 (#214)

This tests latests ES 7,x Signed-off-by: Adrian Cole <[email protected]>
openzipkin · Dec 18, 2023 · b521910 · b521910
1 parent 3cbeec7
commit b521910
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/cassandra3/src/test/java/zipkin2/storage/cassandra/CassandraExtension.java b/cassandra3/src/test/java/zipkin2/storage/cassandra/CassandraExtension.java
@@ -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.25.1"));
+      super(parse("ghcr.io/openzipkin/zipkin-cassandra:2.25.2"));
       if ("true".equals(System.getProperty("docker.skip"))) {
         throw new TestAbortedException("${docker.skip} == true");
       }

diff --git a/elasticsearch/src/test/java/zipkin2/elasticsearch/ElasticsearchExtension.java b/elasticsearch/src/test/java/zipkin2/elasticsearch/ElasticsearchExtension.java
@@ -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.25.1"));
+      super(parse("ghcr.io/openzipkin/zipkin-elasticsearch" + majorVersion + ":2.25.2"));
       if ("true".equals(System.getProperty("docker.skip"))) {
         throw new TestAbortedException("${docker.skip} == true");
       }

diff --git a/elasticsearch/src/test/java/zipkin2/elasticsearch/IgnoredDeprecationWarnings.java b/elasticsearch/src/test/java/zipkin2/elasticsearch/IgnoredDeprecationWarnings.java
@@ -30,6 +30,9 @@ abstract class IgnoredDeprecationWarnings {
   // These will be matched using header.contains(ignored[i]), so find a unique substring of the
   // warning header for it to be ignored
   static List<Pattern> IGNORE_THESE_WARNINGS = asList(
+    // Basic license doesn't include x-pack.
+    // https://www.elastic.co/guide/en/elasticsearch/reference/7.17/security-minimal-setup.html#_enable_elasticsearch_security_features
+    compile("Elasticsearch built-in security features are not enabled."),
     compile("Elasticsearch 7\\.x will read, but not allow creation of new indices containing ':'"),
     compile("has index patterns \\[.*] matching patterns from existing older templates"),
     compile("has index patterns \\[.*] matching patterns from existing composable templates")

diff --git a/mysql/src/test/java/zipkin2/storage/mysql/v1/MySQLExtension.java b/mysql/src/test/java/zipkin2/storage/mysql/v1/MySQLExtension.java
@@ -78,7 +78,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.25.1"));
+      super(parse("ghcr.io/openzipkin/zipkin-mysql:2.25.2"));
       if ("true".equals(System.getProperty("docker.skip"))) {
         throw new TestAbortedException("${docker.skip} == true");
       }

diff --git a/pom.xml b/pom.xml
@@ -56,7 +56,7 @@
 
     <!-- These need to match zipkin, so that tests don't have classpath
          conflicts. When updating, also update IT*.java -->
-    <zipkin.version>2.25.1</zipkin.version>
+    <zipkin.version>2.25.2</zipkin.version>
     <armeria.version>1.26.4</armeria.version>
     <jackson.version>2.16.0</jackson.version>
     <assertj.version>3.24.2</assertj.version>