From d97c01453ec743eecb3d10c0d0beaa1a2c3da8df Mon Sep 17 00:00:00 2001 From: Crypt Keeper <64215+codefromthecrypt@users.noreply.github.com> Date: Fri, 12 Jan 2024 12:21:53 +0800 Subject: [PATCH] bumps to brave 6 and warns about zipkin dep version (#242) Signed-off-by: Adrian Cole --- .../java/zipkin2/reporter/activemq/ActiveMQExtension.java | 2 +- .../test/java/zipkin2/reporter/amqp/RabbitMQExtension.java | 2 +- .../main/java/zipkin2/reporter/KafkaSenderBenchmarks.java | 2 +- bom/pom.xml | 3 ++- build-bin/docker/configure_docker | 2 +- build-bin/git/login_git | 2 +- build-bin/git/version_from_trigger_tag | 6 +++--- build-bin/gpg/configure_gpg | 6 +++--- build-bin/maven/maven_deploy | 2 +- build-bin/maven/maven_go_offline | 2 +- build-bin/maven/maven_opts | 2 +- build-bin/maven/maven_release | 2 +- .../test/java/zipkin2/reporter/kafka/KafkaExtension.java | 2 +- .../java/zipkin2/reporter/libthrift/ZipkinExtension.java | 2 +- pom.xml | 5 +++-- 15 files changed, 22 insertions(+), 20 deletions(-) diff --git a/activemq-client/src/test/java/zipkin2/reporter/activemq/ActiveMQExtension.java b/activemq-client/src/test/java/zipkin2/reporter/activemq/ActiveMQExtension.java index 238858da..75db7a65 100644 --- a/activemq-client/src/test/java/zipkin2/reporter/activemq/ActiveMQExtension.java +++ b/activemq-client/src/test/java/zipkin2/reporter/activemq/ActiveMQExtension.java @@ -64,7 +64,7 @@ String brokerURL() { // mostly waiting for https://github.com/testcontainers/testcontainers-java/issues/3537 static final class ActiveMQContainer extends GenericContainer { ActiveMQContainer() { - super(parse("ghcr.io/openzipkin/zipkin-activemq:2.27.0")); + super(parse("ghcr.io/openzipkin/zipkin-activemq:3.0.1")); if ("true".equals(System.getProperty("docker.skip"))) { throw new TestAbortedException("${docker.skip} == true"); } diff --git a/amqp-client/src/test/java/zipkin2/reporter/amqp/RabbitMQExtension.java b/amqp-client/src/test/java/zipkin2/reporter/amqp/RabbitMQExtension.java index 4f561248..e0c2f91e 100644 --- a/amqp-client/src/test/java/zipkin2/reporter/amqp/RabbitMQExtension.java +++ b/amqp-client/src/test/java/zipkin2/reporter/amqp/RabbitMQExtension.java @@ -82,7 +82,7 @@ int port() { // mostly waiting for https://github.com/testcontainers/testcontainers-java/issues/3537 static final class RabbitMQContainer extends GenericContainer { RabbitMQContainer() { - super(parse("ghcr.io/openzipkin/zipkin-rabbitmq:2.27.0")); + super(parse("ghcr.io/openzipkin/zipkin-rabbitmq:3.0.1")); if ("true".equals(System.getProperty("docker.skip"))) { throw new TestAbortedException("${docker.skip} == true"); } diff --git a/benchmarks/src/main/java/zipkin2/reporter/KafkaSenderBenchmarks.java b/benchmarks/src/main/java/zipkin2/reporter/KafkaSenderBenchmarks.java index c8831324..f9553998 100644 --- a/benchmarks/src/main/java/zipkin2/reporter/KafkaSenderBenchmarks.java +++ b/benchmarks/src/main/java/zipkin2/reporter/KafkaSenderBenchmarks.java @@ -42,7 +42,7 @@ public class KafkaSenderBenchmarks extends SenderBenchmarks { static final class KafkaContainer extends GenericContainer { KafkaContainer() { - super(parse("ghcr.io/openzipkin/zipkin-kafka:2.27.0")); + super(parse("ghcr.io/openzipkin/zipkin-kafka:3.0.1")); waitStrategy = Wait.forHealthcheck(); // Kafka broker listener port (19092) needs to be exposed for test cases to access it. addFixedExposedPort(KAFKA_PORT, KAFKA_PORT, InternetProtocol.TCP); diff --git a/bom/pom.xml b/bom/pom.xml index 39fc736d..57dbd94e 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -27,7 +27,8 @@ ${project.basedir}/.. - 2.27.0 + + 2.27.1 https://github.com/openzipkin/zipkin-reporter-java diff --git a/build-bin/docker/configure_docker b/build-bin/docker/configure_docker index d355d8f9..ebf7fd92 100755 --- a/build-bin/docker/configure_docker +++ b/build-bin/docker/configure_docker @@ -1,6 +1,6 @@ #!/bin/sh # -# 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 diff --git a/build-bin/git/login_git b/build-bin/git/login_git index 825e8490..f3da0d66 100755 --- a/build-bin/git/login_git +++ b/build-bin/git/login_git @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2016-2020 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 diff --git a/build-bin/git/version_from_trigger_tag b/build-bin/git/version_from_trigger_tag index 0867185c..51256916 100755 --- a/build-bin/git/version_from_trigger_tag +++ b/build-bin/git/version_from_trigger_tag @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2016-2020 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 @@ -13,8 +13,6 @@ # the License. # -set -ue - # This script echos a `MAJOR.MINOR.PATCH` version tag based on.. # * arg1: XXXXX- prefix # * arg2: XXXXX-MAJOR.MINOR.PATCH git trigger tag @@ -23,6 +21,8 @@ set -ue # # Note: In CI, `build-bin/git/login_git` must be called before invoking this. +set -ue + trigger_tag_prefix=${1?required. Ex docker- to match docker-1.2.3} trigger_tag=${2?trigger_tag is required. Ex ${trigger_tag_prefix}1.2.3} diff --git a/build-bin/gpg/configure_gpg b/build-bin/gpg/configure_gpg index ba870487..39cb0b5b 100755 --- a/build-bin/gpg/configure_gpg +++ b/build-bin/gpg/configure_gpg @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2016-2020 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 @@ -13,10 +13,10 @@ # the License. # -set -ue - # This script prepares GPG, needed to sign jars for Sonatype deployment during `maven_deploy` +set -ue + # ensure GPG commands work non-interactively export GPG_TTY=$(tty) # import signing key used for jar files diff --git a/build-bin/maven/maven_deploy b/build-bin/maven/maven_deploy index 12f73244..f40343ef 100755 --- a/build-bin/maven/maven_deploy +++ b/build-bin/maven/maven_deploy @@ -1,6 +1,6 @@ #!/bin/sh # -# 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 diff --git a/build-bin/maven/maven_go_offline b/build-bin/maven/maven_go_offline index 57c86cd0..b4b403f5 100755 --- a/build-bin/maven/maven_go_offline +++ b/build-bin/maven/maven_go_offline @@ -1,6 +1,6 @@ #!/bin/sh # -# 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 diff --git a/build-bin/maven/maven_opts b/build-bin/maven/maven_opts index 2ba40b3b..3ebbccd6 100755 --- a/build-bin/maven/maven_opts +++ b/build-bin/maven/maven_opts @@ -1,6 +1,6 @@ #!/bin/sh # -# 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 diff --git a/build-bin/maven/maven_release b/build-bin/maven/maven_release index d4122b68..a138c083 100755 --- a/build-bin/maven/maven_release +++ b/build-bin/maven/maven_release @@ -1,6 +1,6 @@ #!/bin/sh # -# 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 diff --git a/kafka/src/test/java/zipkin2/reporter/kafka/KafkaExtension.java b/kafka/src/test/java/zipkin2/reporter/kafka/KafkaExtension.java index 0d451339..863eab69 100644 --- a/kafka/src/test/java/zipkin2/reporter/kafka/KafkaExtension.java +++ b/kafka/src/test/java/zipkin2/reporter/kafka/KafkaExtension.java @@ -90,7 +90,7 @@ String bootstrapServer() { // mostly waiting for https://github.com/testcontainers/testcontainers-java/issues/3537 static final class KafkaContainer extends GenericContainer { KafkaContainer() { - super(parse("ghcr.io/openzipkin/zipkin-kafka:2.27.0")); + super(parse("ghcr.io/openzipkin/zipkin-kafka:3.0.1")); if ("true".equals(System.getProperty("docker.skip"))) { throw new TestAbortedException("${docker.skip} == true"); } diff --git a/libthrift/src/test/java/zipkin2/reporter/libthrift/ZipkinExtension.java b/libthrift/src/test/java/zipkin2/reporter/libthrift/ZipkinExtension.java index b2f665da..5e6fa82f 100644 --- a/libthrift/src/test/java/zipkin2/reporter/libthrift/ZipkinExtension.java +++ b/libthrift/src/test/java/zipkin2/reporter/libthrift/ZipkinExtension.java @@ -76,7 +76,7 @@ Response get(String path) throws IOException { // mostly waiting for https://github.com/testcontainers/testcontainers-java/issues/3537 static final class ZipkinContainer extends GenericContainer { ZipkinContainer() { - super(parse("ghcr.io/openzipkin/zipkin:2.27.0")); + super(parse("ghcr.io/openzipkin/zipkin: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 251393f9..57ebf426 100755 --- a/pom.xml +++ b/pom.xml @@ -61,10 +61,11 @@ 2.24.1 - 2.27.0 + + 2.27.1 - 5.17.0 + 6.0.0 5.10.1 3.25.1