From 88e46839dfc9de9ce6bc7fd0f2e8843bad7852ea Mon Sep 17 00:00:00 2001 From: Adrian Cole <64215+codefromthecrypt@users.noreply.github.com> Date: Wed, 4 Dec 2024 22:13:30 +0800 Subject: [PATCH] Updates to latest maven versions aligned with latest docker images (#3785) This also updates example docker images to latest --------- Signed-off-by: Adrian Cole Signed-off-by: Andriy Redko Co-authored-by: Andriy Redko --- .github/ISSUE_TEMPLATE/bug.md | 2 +- .github/workflows/security.yml | 5 +++- .mvn/wrapper/maven-wrapper.properties | 2 +- .../server/ServerIntegratedBenchmark.java | 10 ++++---- build-bin/configure_lint | 3 ++- build-bin/docker-compose-zipkin.yml | 2 +- build-bin/docker/docker_args | 4 ++-- build-bin/maven/maven_unjar | 2 +- docker/Dockerfile | 2 +- docker/examples/docker-compose-prometheus.yml | 10 ++++---- docker/test-images/zipkin-activemq/Dockerfile | 6 ++--- .../test-images/zipkin-cassandra/Dockerfile | 6 ++--- .../test-images/zipkin-cassandra/install.sh | 4 ++-- .../zipkin-elasticsearch7/Dockerfile | 6 ++--- .../zipkin-elasticsearch8/Dockerfile | 6 ++--- docker/test-images/zipkin-eureka/Dockerfile | 2 +- docker/test-images/zipkin-eureka/pom.xml | 6 ++--- docker/test-images/zipkin-kafka/Dockerfile | 6 ++--- docker/test-images/zipkin-kafka/install.sh | 2 +- docker/test-images/zipkin-mysql/Dockerfile | 4 ++-- .../test-images/zipkin-opensearch2/Dockerfile | 6 ++--- docker/test-images/zipkin-rabbitmq/Dockerfile | 2 +- docker/test-images/zipkin-ui/Dockerfile | 4 ++-- docker/test-images/zipkin-uiproxy/Dockerfile | 4 ++-- pom.xml | 12 +++++----- .../collector/activemq/ActiveMQExtension.java | 2 +- .../collector/kafka/KafkaExtension.java | 2 +- .../collector/rabbitmq/RabbitMQExtension.java | 2 +- zipkin-lens/package-lock.json | 24 +++++++++---------- zipkin-lens/package.json | 2 +- zipkin-lens/pom.xml | 4 ++-- .../internal/eureka/BaseITZipkinEureka.java | 2 +- .../storage/cassandra/CassandraContainer.java | 2 +- .../integration/ElasticsearchExtension.java | 2 +- .../integration/OpenSearchExtension.java | 2 +- .../storage/mysql/v1/MySQLExtension.java | 2 +- 36 files changed, 84 insertions(+), 80 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md index d5d3d43a62f..938cd9246bb 100644 --- a/.github/ISSUE_TEMPLATE/bug.md +++ b/.github/ISSUE_TEMPLATE/bug.md @@ -10,7 +10,7 @@ If this is a UI issue... * Attach a screen shot or animated gif showing what you think is wrong * Include JSON of a trace that produces it, being careful to not include private data * You can literally include the JSON in [triple-backticks](https://help.github.com/en/github/writing-on-github/basic-writing-and-formatting-syntax#quoting-code) - * Otherwise, you can use a [gist](https://gist.github.com/) or pastebin such as [fluffy](https://fluffy.cc/) + * Otherwise, you can use a [gist](https://gist.github.com/) or pastebin Regardless, the best is to spend some time to write a failing test. Bugs with tests get fixed and stay fixed. diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml index ce8345e77de..511e35a5289 100644 --- a/.github/workflows/security.yml +++ b/.github/workflows/security.yml @@ -23,7 +23,7 @@ on: # yamllint disable-line rule:truthy jobs: security: name: security - runs-on: ubuntu-24.04 # newest available distribution, aka noble + runs-on: ubuntu-24.04 # newest available distribution, aka numbat # skip commits made by the release plugin if: "!contains(github.event.head_commit.message, 'maven-release-plugin')" steps: @@ -38,6 +38,9 @@ jobs: - name: Run Trivy vulnerability and secret scanner uses: aquasecurity/trivy-action@master id: trivy + env: # See https://github.com/aquasecurity/trivy/discussions/7668 + TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db + TRIVY_JAVA_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-java-db with: scan-type: 'fs' scan-ref: '.' # scan the entire repository diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 7462052527f..9548abd8e8c 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -16,5 +16,5 @@ # under the License. wrapperVersion=3.3.2 distributionType=bin -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar diff --git a/benchmarks/src/test/java/zipkin2/server/ServerIntegratedBenchmark.java b/benchmarks/src/test/java/zipkin2/server/ServerIntegratedBenchmark.java index 54319975b0d..bcdf96ac850 100644 --- a/benchmarks/src/test/java/zipkin2/server/ServerIntegratedBenchmark.java +++ b/benchmarks/src/test/java/zipkin2/server/ServerIntegratedBenchmark.java @@ -81,7 +81,7 @@ class ServerIntegratedBenchmark { @Test void elasticsearch() throws Exception { GenericContainer elasticsearch = - new GenericContainer<>(parse("ghcr.io/openzipkin/zipkin-elasticsearch7:3.4.0")) + new GenericContainer<>(parse("ghcr.io/openzipkin/zipkin-elasticsearch7:3.4.2")) .withNetwork(Network.SHARED) .withNetworkAliases("elasticsearch") .withLabel("name", "elasticsearch") @@ -95,7 +95,7 @@ class ServerIntegratedBenchmark { @Test void cassandra3() throws Exception { GenericContainer cassandra = - new GenericContainer<>(parse("ghcr.io/openzipkin/zipkin-cassandra:3.4.0")) + new GenericContainer<>(parse("ghcr.io/openzipkin/zipkin-cassandra:3.4.2")) .withNetwork(Network.SHARED) .withNetworkAliases("cassandra") .withLabel("name", "cassandra") @@ -109,7 +109,7 @@ class ServerIntegratedBenchmark { @Test void mysql() throws Exception { GenericContainer mysql = - new GenericContainer<>(parse("ghcr.io/openzipkin/zipkin-mysql:3.4.0")) + new GenericContainer<>(parse("ghcr.io/openzipkin/zipkin-mysql:3.4.2")) .withNetwork(Network.SHARED) .withNetworkAliases("mysql") .withLabel("name", "mysql") @@ -147,7 +147,7 @@ void runBenchmark(@Nullable GenericContainer storage, GenericContainer zip // Use a quay.io mirror to prevent build outages due to Docker Hub pull quotas // Use same version as in docker/examples/docker-compose-prometheus.yml GenericContainer prometheus = - new GenericContainer<>(parse("quay.io/prometheus/prometheus:v2.53.1")) + new GenericContainer<>(parse("quay.io/prometheus/prometheus:v2.55.1")) .withNetwork(Network.SHARED) .withNetworkAliases("prometheus") .withExposedPorts(9090) @@ -277,7 +277,7 @@ GenericContainer createZipkinContainer(@Nullable GenericContainer storage) final GenericContainer zipkin; if (RELEASE_VERSION == null) { - zipkin = new GenericContainer<>(parse("ghcr.io/openzipkin/java:21.0.4_p7")); + zipkin = new GenericContainer<>(parse("ghcr.io/openzipkin/java:21.0.5_p11")); List classpath = new ArrayList<>(); for (String item : System.getProperty("java.class.path").split(File.pathSeparator)) { Path path = Paths.get(item); diff --git a/build-bin/configure_lint b/build-bin/configure_lint index b7ad3b504bb..a6ce8d11437 100755 --- a/build-bin/configure_lint +++ b/build-bin/configure_lint @@ -1,7 +1,8 @@ #!/bin/sh -ue # Attempt to install markdown-link-check if absent -markdown-link-check -V || npm install -g markdown-link-check +# Pinned until https://github.com/tcort/markdown-link-check/issues/369 +markdown-link-check -V || npm install -g markdown-link-check@3.12.2 # Attempt to install yamllint if absent yamllint -v || pip install --user yamllint diff --git a/build-bin/docker-compose-zipkin.yml b/build-bin/docker-compose-zipkin.yml index 57f2f06ad39..1c99c52fe6e 100755 --- a/build-bin/docker-compose-zipkin.yml +++ b/build-bin/docker-compose-zipkin.yml @@ -14,7 +14,7 @@ services: # Use fixed service and container name 'sut; so our test script can copy/pasta sut: container_name: sut - image: ghcr.io/openzipkin/alpine:3.20.2 + image: ghcr.io/openzipkin/alpine:3.20.3 entrypoint: /bin/sh # Keep the container running until HEALTHCHECK passes command: "-c \"sleep 5m\"" diff --git a/build-bin/docker/docker_args b/build-bin/docker/docker_args index 02241b9f0cf..c8f9fa38887 100755 --- a/build-bin/docker/docker_args +++ b/build-bin/docker/docker_args @@ -37,7 +37,7 @@ if [ -n "${DOCKER_TARGET}" ]; then fi # When non-empty, becomes the base layer including tag appropriate for the image being built. -# e.g. ghcr.io/openzipkin/java:21.0.4_p7-jre +# e.g. ghcr.io/openzipkin/java:21.0.5_p11-jre # # This is not required to be a base (FROM scratch) image like ghcr.io/openzipkin/alpine:3.12.3 # See https://docs.docker.com/glossary/#parent-image @@ -51,7 +51,7 @@ if [ -n "${ALPINE_VERSION}" ]; then docker_args="${docker_args} --build-arg alpine_version=${ALPINE_VERSION}" fi -# When non-empty, becomes the build-arg java_version. e.g. "21.0.4_p7" +# When non-empty, becomes the build-arg java_version. e.g. "21.0.5_p11" # Used to align base layers from https://github.com/orgs/openzipkin/packages/container/package/java if [ -n "${JAVA_VERSION}" ]; then docker_args="${docker_args} --build-arg java_version=${JAVA_VERSION}" diff --git a/build-bin/maven/maven_unjar b/build-bin/maven/maven_unjar index 6d95f7984db..9f9b491c797 100755 --- a/build-bin/maven/maven_unjar +++ b/build-bin/maven/maven_unjar @@ -58,7 +58,7 @@ fi if ! test -f ${artifact_id}.jar && [ ${is_release} = "true" ]; then mvn_get="mvn -q --batch-mode -Denforcer.fail=false \ - org.apache.maven.plugins:maven-dependency-plugin:3.7.1:get \ + org.apache.maven.plugins:maven-dependency-plugin:3.8.1:get \ -Dtransitive=false -DgroupId=${group_id} -DartifactId=${artifact_id} -Dversion=${version}" if [ -n "${classifier}" ]; then diff --git a/docker/Dockerfile b/docker/Dockerfile index a2c517c54e0..4eb5f8b473d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -8,7 +8,7 @@ # Use latest version here: https://github.com/orgs/openzipkin/packages/container/package/java # This is defined in many places because Docker has no "env" script functionality unless you use # docker-compose: When updating, update everywhere. -ARG java_version=21.0.4_p7 +ARG java_version=21.0.5_p11 # 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. diff --git a/docker/examples/docker-compose-prometheus.yml b/docker/examples/docker-compose-prometheus.yml index d88dc832528..9ed4ae09c97 100644 --- a/docker/examples/docker-compose-prometheus.yml +++ b/docker/examples/docker-compose-prometheus.yml @@ -16,7 +16,7 @@ services: prometheus: # Use a quay.io mirror to prevent build outages due to Docker Hub pull quotas # Use latest from https://quay.io/repository/prometheus/prometheus?tab=tags - image: quay.io/prometheus/prometheus:v2.51.2 + image: quay.io/prometheus/prometheus:v2.55.1 container_name: prometheus ports: - 9090:9090 @@ -28,8 +28,8 @@ services: grafana: # Use a quay.io mirror to prevent build outages due to Docker Hub pull quotas - # Use latest from https://quay.io/repository/app-sre/grafana?tab=tags - image: quay.io/giantswarm/grafana:7.5.9 + # Use latest from https://quay.io/repository/giantswarm/grafana?tab=tags + image: quay.io/giantswarm/grafana:7.5.12 container_name: grafana ports: - 3000:3000 @@ -42,8 +42,8 @@ services: setup_grafana_datasource: # This is an arbitrary small image that has curl installed # Use a quay.io mirror to prevent build outages due to Docker Hub pull quotas - # Use latest from https://quay.io/repository/quay.io/rackspace/curl?tab=tags - image: quay.io/cilium/alpine-curl:v1.9.0 + # Use latest from https://quay.io/repository/cilium/alpine-curl?tab=tags + image: quay.io/cilium/alpine-curl:v1.10.0 container_name: setup_grafana_datasource depends_on: - grafana diff --git a/docker/test-images/zipkin-activemq/Dockerfile b/docker/test-images/zipkin-activemq/Dockerfile index 9f0a408b3b6..36be58818c8 100644 --- a/docker/test-images/zipkin-activemq/Dockerfile +++ b/docker/test-images/zipkin-activemq/Dockerfile @@ -8,7 +8,7 @@ # Use latest version here: https://github.com/orgs/openzipkin/packages/container/package/java # This is defined in many places because Docker has no "env" script functionality unless you use # docker-compose: When updating, update everywhere. -ARG java_version=21.0.4_p7 +ARG java_version=21.0.5_p11 # 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. @@ -23,7 +23,7 @@ FROM ghcr.io/openzipkin/java:${java_version} as install WORKDIR /install # Use latest version from https://activemq.apache.org/components/classic/download/ -ARG activemq_version=6.1.2 +ARG activemq_version=6.1.4 # Download the distribution RUN \ @@ -37,7 +37,7 @@ https://archive.apache.org/dist/activemq/${activemq_version}/apache-activemq-${a # which isn't in our JRE. FROM ghcr.io/openzipkin/java:${java_version} as zipkin-activemq LABEL org.opencontainers.image.description="ActiveMQ Classic on OpenJDK and Alpine Linux" -ARG activemq_version=6.1.2 +ARG activemq_version=6.1.4 LABEL activemq-version=$activemq_version # Add HEALTHCHECK and ENTRYPOINT scripts into the default search path diff --git a/docker/test-images/zipkin-cassandra/Dockerfile b/docker/test-images/zipkin-cassandra/Dockerfile index 4d8d38c574d..8916bb8449b 100644 --- a/docker/test-images/zipkin-cassandra/Dockerfile +++ b/docker/test-images/zipkin-cassandra/Dockerfile @@ -8,7 +8,7 @@ # Use latest version here: https://github.com/orgs/openzipkin/packages/container/package/java # This is defined in many places because Docker has no "env" script functionality unless you use # docker-compose: When updating, update everywhere. -ARG java_version=21.0.4_p7 +ARG java_version=21.0.5_p11 # 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. @@ -25,7 +25,7 @@ FROM ghcr.io/openzipkin/java:${java_version} as install # Use latest stable version: https://cassandra.apache.org/download/ # This is defined in many places because Docker has no "env" script functionality unless you use # docker-compose: When updating, update everywhere. -ARG cassandra_version=4.1.5 +ARG cassandra_version=4.1.7 ENV CASSANDRA_VERSION=$cassandra_version WORKDIR /install @@ -35,7 +35,7 @@ RUN /tmp/install.sh && rm /tmp/install.sh FROM ghcr.io/openzipkin/java:${java_version}-jre as zipkin-cassandra LABEL org.opencontainers.image.description="Cassandra on OpenJDK and Alpine Linux with Zipkin keyspaces pre-installed" -ARG cassandra_version=4.1.5 +ARG cassandra_version=4.1.7 LABEL cassandra-version=$cassandra_version ENV CASSANDRA_VERSION=$cassandra_version diff --git a/docker/test-images/zipkin-cassandra/install.sh b/docker/test-images/zipkin-cassandra/install.sh index c1929d69014..951af37128a 100755 --- a/docker/test-images/zipkin-cassandra/install.sh +++ b/docker/test-images/zipkin-cassandra/install.sh @@ -47,7 +47,7 @@ cat > pom.xml <<-'EOF' net.java.dev.jna jna - 5.14.0 + 5.15.0 @@ -60,7 +60,7 @@ cat > pom.xml <<-'EOF' EOF mvn -q --batch-mode -DoutputDirectory=lib \ -Dcassandra.version=${CASSANDRA_VERSION} \ - org.apache.maven.plugins:maven-dependency-plugin:3.7.1:copy-dependencies + org.apache.maven.plugins:maven-dependency-plugin:3.8.1:copy-dependencies rm pom.xml # Make sure you use relative paths in references like this, so that installation diff --git a/docker/test-images/zipkin-elasticsearch7/Dockerfile b/docker/test-images/zipkin-elasticsearch7/Dockerfile index 89aede2d332..3589972ee7f 100644 --- a/docker/test-images/zipkin-elasticsearch7/Dockerfile +++ b/docker/test-images/zipkin-elasticsearch7/Dockerfile @@ -8,7 +8,7 @@ # Use latest version here: https://github.com/orgs/openzipkin/packages/container/package/java # This is defined in many places because Docker has no "env" script functionality unless you use # docker-compose: When updating, update everywhere. -ARG java_version=21.0.4_p7 +ARG java_version=21.0.5_p11 # 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. @@ -26,7 +26,7 @@ WORKDIR /install # Use latest 7.x version from https://www.elastic.co/downloads/past-releases#elasticsearch-no-jdk # This is defined in many places because Docker has no "env" script functionality unless you use # docker-compose: When updating, update everywhere. -ARG elasticsearch7_version=7.17.23 +ARG elasticsearch7_version=7.17.25 # Download only the OSS distribution (lacks X-Pack) RUN \ @@ -41,7 +41,7 @@ COPY --from=scratch /config/ ./config/ # production -jre base layer used by zipkin and zipkin-slim. FROM ghcr.io/openzipkin/java:${java_version} as zipkin-elasticsearch7 LABEL org.opencontainers.image.description="Elasticsearch distribution on OpenJDK and Alpine Linux" -ARG elasticsearch7_version=7.17.23 +ARG elasticsearch7_version=7.17.25 LABEL elasticsearch-version=$elasticsearch7_version # The full license is also included in the image at /elasticsearch/LICENSE.txt. diff --git a/docker/test-images/zipkin-elasticsearch8/Dockerfile b/docker/test-images/zipkin-elasticsearch8/Dockerfile index 15b474717b4..35e48ad6f44 100644 --- a/docker/test-images/zipkin-elasticsearch8/Dockerfile +++ b/docker/test-images/zipkin-elasticsearch8/Dockerfile @@ -8,7 +8,7 @@ # Use latest version here: https://github.com/orgs/openzipkin/packages/container/package/java # This is defined in many places because Docker has no "env" script functionality unless you use # docker-compose: When updating, update everywhere. -ARG java_version=21.0.4_p7 +ARG java_version=21.0.5_p11 # 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. @@ -26,7 +26,7 @@ WORKDIR /install # Use latest 8.x version from https://www.elastic.co/downloads/past-releases#elasticsearch # This is defined in many places because Docker has no "env" script functionality unless you use # docker-compose: When updating, update everywhere. -ARG elasticsearch8_version=8.14.3 +ARG elasticsearch8_version=8.16.0 # Download only the OSS distribution (lacks X-Pack) RUN \ @@ -41,7 +41,7 @@ COPY --from=scratch /config/ ./config/ # production -jre base layer used by zipkin and zipkin-slim. FROM ghcr.io/openzipkin/java:${java_version} as zipkin-elasticsearch8 LABEL org.opencontainers.image.description="Elasticsearch distribution on OpenJDK and Alpine Linux" -ARG elasticsearch8_version=8.14.3 +ARG elasticsearch8_version=8.16.0 LABEL elasticsearch-version=$elasticsearch8_version # The full license is also included in the image at /elasticsearch/LICENSE.txt. diff --git a/docker/test-images/zipkin-eureka/Dockerfile b/docker/test-images/zipkin-eureka/Dockerfile index 288d54c7823..a84a4540997 100644 --- a/docker/test-images/zipkin-eureka/Dockerfile +++ b/docker/test-images/zipkin-eureka/Dockerfile @@ -8,7 +8,7 @@ # Use latest version here: https://github.com/orgs/openeureka/packages/container/package/java # This is defined in many places because Docker has no "env" script functionality unless you use # docker-compose: When updating, update everywhere. -ARG java_version=21.0.4_p7 +ARG java_version=21.0.5_p11 # 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. diff --git a/docker/test-images/zipkin-eureka/pom.xml b/docker/test-images/zipkin-eureka/pom.xml index 413c723b59c..3a744313e30 100644 --- a/docker/test-images/zipkin-eureka/pom.xml +++ b/docker/test-images/zipkin-eureka/pom.xml @@ -29,7 +29,7 @@ org.springframework.boot spring-boot-dependencies - 3.3.4 + 3.3.6 pom import @@ -37,12 +37,12 @@ com.google.guava guava - 33.2.1-jre + 33.3.1-jre com.thoughtworks.xstream xstream - 1.4.20 + 1.4.21 org.apache.httpcomponents diff --git a/docker/test-images/zipkin-kafka/Dockerfile b/docker/test-images/zipkin-kafka/Dockerfile index 6fe9777381a..bf24ae5c0c5 100644 --- a/docker/test-images/zipkin-kafka/Dockerfile +++ b/docker/test-images/zipkin-kafka/Dockerfile @@ -8,7 +8,7 @@ # Use latest version here: https://github.com/orgs/openzipkin/packages/container/package/java # This is defined in many places because Docker has no "env" script functionality unless you use # docker-compose: When updating, update everywhere. -ARG java_version=21.0.4_p7 +ARG java_version=21.0.5_p11 # 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. @@ -25,7 +25,7 @@ FROM ghcr.io/openzipkin/java:${java_version} as install # # This is defined in many places because Docker has no "env" script functionality unless you use # docker-compose: When updating, update everywhere. -ARG kafka_version=3.8.0 +ARG kafka_version=3.9.0 ENV KAFKA_VERSION=$kafka_version # Note: Scala 2.13+ supports JRE 14 ARG scala_version=2.13 @@ -38,7 +38,7 @@ RUN /tmp/install.sh && rm /tmp/install.sh # Share the same base image to reduce layers used in testing FROM ghcr.io/openzipkin/java:${java_version}-jre as zipkin-kafka LABEL org.opencontainers.image.description="Kafka and ZooKeeper on OpenJDK and Alpine Linux" -ARG kafka_version=3.8.0 +ARG kafka_version=3.9.0 LABEL kafka-version=$kafka_version # Add HEALTHCHECK and ENTRYPOINT scripts into the default search path diff --git a/docker/test-images/zipkin-kafka/install.sh b/docker/test-images/zipkin-kafka/install.sh index 59a8e3a6cf5..a9e7fcaeae8 100755 --- a/docker/test-images/zipkin-kafka/install.sh +++ b/docker/test-images/zipkin-kafka/install.sh @@ -43,7 +43,7 @@ cat > pom.xml <<-'EOF' EOF mvn -q --batch-mode -DoutputDirectory=lib \ -Dscala.version=${SCALA_VERSION} -Dkafka.version=${KAFKA_VERSION} \ - org.apache.maven.plugins:maven-dependency-plugin:3.7.1:copy-dependencies + org.apache.maven.plugins:maven-dependency-plugin:3.8.1:copy-dependencies rm pom.xml # Make sure you use relative paths in references like this, so that installation diff --git a/docker/test-images/zipkin-mysql/Dockerfile b/docker/test-images/zipkin-mysql/Dockerfile index fbc8b4442c0..aaa715ea93e 100644 --- a/docker/test-images/zipkin-mysql/Dockerfile +++ b/docker/test-images/zipkin-mysql/Dockerfile @@ -6,7 +6,7 @@ # Use latest version here: https://github.com/orgs/openzipkin/packages/container/package/alpine # This is defined in many places because Docker has no "env" script functionality unless you use # docker-compose: When updating, update everywhere. -ARG alpine_version=3.20.2 +ARG alpine_version=3.20.3 # 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. @@ -28,7 +28,7 @@ HEALTHCHECK --interval=1s --start-period=30s --timeout=5s CMD ["docker-healthche ENTRYPOINT ["start-mysql"] # Use latest from https://pkgs.alpinelinux.org/packages?name=mysql (without the -r[0-9]) -ARG mysql_version=11.4.3 +ARG mysql_version=11.4.4 LABEL mysql-version=$mysql_version ENV MYSQL_VERSION=$mysql_version diff --git a/docker/test-images/zipkin-opensearch2/Dockerfile b/docker/test-images/zipkin-opensearch2/Dockerfile index 95059a1e06d..4a8aff7f80d 100644 --- a/docker/test-images/zipkin-opensearch2/Dockerfile +++ b/docker/test-images/zipkin-opensearch2/Dockerfile @@ -8,7 +8,7 @@ # Use latest version here: https://github.com/orgs/openzipkin/packages/container/package/java # This is defined in many places because Docker has no "env" script functionality unless you use # docker-compose: When updating, update everywhere. -ARG java_version=21.0.4_p7 +ARG java_version=21.0.5_p11 # 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. @@ -26,7 +26,7 @@ WORKDIR /install # Use latest 2.x version from https://opensearch.org/downloads.html # This is defined in many places because Docker has no "env" script functionality unless you use # docker-compose: When updating, update everywhere. -ARG opensearch2_version=2.15.0 +ARG opensearch2_version=2.18.0 # Download only the OSS distribution (lacks X-Pack) RUN \ @@ -41,7 +41,7 @@ COPY --from=scratch /config/ ./config/ # production -jre base layer used by zipkin and zipkin-slim. FROM ghcr.io/openzipkin/java:${java_version} as zipkin-opensearch2 LABEL org.opencontainers.image.description="OpenSearch distribution on OpenJDK and Alpine Linux" -ARG opensearch2_version=2.15.0 +ARG opensearch2_version=2.18.0 LABEL opensearch-version=$opensearch2_version # The full license is also included in the image at /opensearch/LICENSE.txt. diff --git a/docker/test-images/zipkin-rabbitmq/Dockerfile b/docker/test-images/zipkin-rabbitmq/Dockerfile index 26ebfc6a60a..2034c07788e 100644 --- a/docker/test-images/zipkin-rabbitmq/Dockerfile +++ b/docker/test-images/zipkin-rabbitmq/Dockerfile @@ -4,7 +4,7 @@ # # Use latest from https://hub.docker.com/_/rabbitmq/tags?page=1&name=alpine -ARG rabbitmq_version=3.13.6 +ARG rabbitmq_version=3.13.7 # 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. diff --git a/docker/test-images/zipkin-ui/Dockerfile b/docker/test-images/zipkin-ui/Dockerfile index dda898f8590..ec3a19d9017 100644 --- a/docker/test-images/zipkin-ui/Dockerfile +++ b/docker/test-images/zipkin-ui/Dockerfile @@ -6,14 +6,14 @@ # Use latest version here: https://github.com/orgs/openzipkin/packages/container/package/alpine # This is defined in many places because Docker has no "env" script functionality unless you use # docker-compose: When updating, update everywhere. -ARG alpine_version=3.20.2 +ARG alpine_version=3.20.3 # java_version is used during the installation process to build or download the zipkin-lens jar. # # Use latest version here: https://github.com/orgs/openzipkin/packages/container/package/java # This is defined in many places because Docker has no "env" script functionality unless you use # docker-compose: When updating, update everywhere. -ARG java_version=21.0.4_p7 +ARG java_version=21.0.5_p11 # 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. diff --git a/docker/test-images/zipkin-uiproxy/Dockerfile b/docker/test-images/zipkin-uiproxy/Dockerfile index 3c42c4e24c9..6dc9f82c009 100644 --- a/docker/test-images/zipkin-uiproxy/Dockerfile +++ b/docker/test-images/zipkin-uiproxy/Dockerfile @@ -6,14 +6,14 @@ # Use latest version here: https://github.com/orgs/openzipkin/packages/container/package/alpine # This is defined in many places because Docker has no "env" script functionality unless you use # docker-compose: When updating, update everywhere. -ARG alpine_version=3.20.2 +ARG alpine_version=3.20.3 # java_version is used during the installation process to build or download the zipkin-lens jar. # # Use latest version here: https://github.com/orgs/openzipkin/packages/container/package/java # This is defined in many places because Docker has no "env" script functionality unless you use # docker-compose: When updating, update everywhere. -ARG java_version=21.0.4_p7 +ARG java_version=21.0.5_p11 # 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. diff --git a/pom.xml b/pom.xml index 9afbbf25cb5..e8adc023b71 100755 --- a/pom.xml +++ b/pom.xml @@ -47,9 +47,9 @@ 1.0.0 com.linecorp.armeria - 1.30.1 + 1.31.0 - 4.1.114.Final + 4.1.115.Final 2.17.2 @@ -61,8 +61,8 @@ 1.3.2 - 3.3.4 - 6.1.13 + 3.3.6 + 6.1.15 - 3.7.1 + 3.8.1 3.1.2 3.4.1 - 3.4.1 + 3.5.1 3.1.2 3.6.3 3.4.1 diff --git a/zipkin-collector/activemq/src/test/java/zipkin2/collector/activemq/ActiveMQExtension.java b/zipkin-collector/activemq/src/test/java/zipkin2/collector/activemq/ActiveMQExtension.java index cfaae51d48d..6d5d2798725 100644 --- a/zipkin-collector/activemq/src/test/java/zipkin2/collector/activemq/ActiveMQExtension.java +++ b/zipkin-collector/activemq/src/test/java/zipkin2/collector/activemq/ActiveMQExtension.java @@ -54,7 +54,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:3.4.0")); + super(parse("ghcr.io/openzipkin/zipkin-activemq:3.4.2")); withExposedPorts(ACTIVEMQ_PORT); waitStrategy = Wait.forListeningPorts(ACTIVEMQ_PORT); withStartupTimeout(Duration.ofSeconds(60)); diff --git a/zipkin-collector/kafka/src/test/java/zipkin2/collector/kafka/KafkaExtension.java b/zipkin-collector/kafka/src/test/java/zipkin2/collector/kafka/KafkaExtension.java index 0bb18f50e7f..98acea7438e 100644 --- a/zipkin-collector/kafka/src/test/java/zipkin2/collector/kafka/KafkaExtension.java +++ b/zipkin-collector/kafka/src/test/java/zipkin2/collector/kafka/KafkaExtension.java @@ -83,7 +83,7 @@ KafkaCollector.Builder newCollectorBuilder(String topic, int streams) { // 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:3.4.0")); + super(parse("ghcr.io/openzipkin/zipkin-kafka:3.4.2")); waitStrategy = Wait.forHealthcheck(); // 19092 is for connections from the Docker host and needs to be used as a fixed port. // TODO: someone who knows Kafka well, make ^^ comment better! diff --git a/zipkin-collector/rabbitmq/src/test/java/zipkin2/collector/rabbitmq/RabbitMQExtension.java b/zipkin-collector/rabbitmq/src/test/java/zipkin2/collector/rabbitmq/RabbitMQExtension.java index dd338d09e4d..07df7a834cd 100644 --- a/zipkin-collector/rabbitmq/src/test/java/zipkin2/collector/rabbitmq/RabbitMQExtension.java +++ b/zipkin-collector/rabbitmq/src/test/java/zipkin2/collector/rabbitmq/RabbitMQExtension.java @@ -74,7 +74,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:3.4.0")); + super(parse("ghcr.io/openzipkin/zipkin-rabbitmq:3.4.2")); withExposedPorts(RABBIT_PORT); waitStrategy = Wait.forLogMessage(".*Server startup complete.*", 1); withStartupTimeout(Duration.ofSeconds(60)); diff --git a/zipkin-lens/package-lock.json b/zipkin-lens/package-lock.json index 32286bd8054..0401965e530 100644 --- a/zipkin-lens/package-lock.json +++ b/zipkin-lens/package-lock.json @@ -53,7 +53,7 @@ "events": "^3.3.0", "fetch-mock": "^9.11.0", "history": "^4.10.1", - "http-proxy-middleware": "^1.0.3", + "http-proxy-middleware": "^2.0.7", "i18next": "^23.8.2", "i18next-browser-languagedetector": "^7.2.0", "lodash": "^4.17.20", @@ -4274,9 +4274,9 @@ } }, "node_modules/cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.6.tgz", + "integrity": "sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==", "dependencies": { "nice-try": "^1.0.4", "path-key": "^2.0.1", @@ -5320,7 +5320,7 @@ "@babel/code-frame": "^7.0.0", "ajv": "^6.10.0", "chalk": "^2.1.0", - "cross-spawn": "^6.0.5", + "cross-spawn": "^6.0.6", "debug": "^4.0.1", "doctrine": "^3.0.0", "eslint-scope": "^5.0.0", @@ -5891,7 +5891,7 @@ "resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz", "integrity": "sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==", "dependencies": { - "cross-spawn": "^7.0.3", + "cross-spawn": "^7.0.5", "get-stream": "^8.0.1", "human-signals": "^5.0.0", "is-stream": "^3.0.0", @@ -5909,9 +5909,9 @@ } }, "node_modules/execa/node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.5.tgz", + "integrity": "sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -6579,9 +6579,9 @@ } }, "node_modules/http-proxy-middleware": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-1.3.1.tgz", - "integrity": "sha512-13eVVDYS4z79w7f1+NPllJtOQFx/FdUW4btIvVRMaRlUY9VGstAbo5MOhLEuUgZFRHn3x50ufn25zkj/boZnEg==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz", + "integrity": "sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==", "dependencies": { "@types/http-proxy": "^1.17.5", "http-proxy": "^1.18.1", diff --git a/zipkin-lens/package.json b/zipkin-lens/package.json index c6ba122f55b..1a07d7f06d5 100755 --- a/zipkin-lens/package.json +++ b/zipkin-lens/package.json @@ -54,7 +54,7 @@ "events": "^3.3.0", "fetch-mock": "^9.11.0", "history": "^4.10.1", - "http-proxy-middleware": "^1.0.3", + "http-proxy-middleware": "^2.0.7", "i18next": "^23.8.2", "i18next-browser-languagedetector": "^7.2.0", "lodash": "^4.17.20", diff --git a/zipkin-lens/pom.xml b/zipkin-lens/pom.xml index 7da9d6b3a3f..4c48dca1636 100644 --- a/zipkin-lens/pom.xml +++ b/zipkin-lens/pom.xml @@ -23,9 +23,9 @@ false - 20.15.1 + 20.18.0 3.3.0 1.15.0 3.4.0 diff --git a/zipkin-server/src/test/java/zipkin2/server/internal/eureka/BaseITZipkinEureka.java b/zipkin-server/src/test/java/zipkin2/server/internal/eureka/BaseITZipkinEureka.java index 5b4e0dba105..2afe95afd1b 100644 --- a/zipkin-server/src/test/java/zipkin2/server/internal/eureka/BaseITZipkinEureka.java +++ b/zipkin-server/src/test/java/zipkin2/server/internal/eureka/BaseITZipkinEureka.java @@ -139,7 +139,7 @@ static final class EurekaContainer extends GenericContainer { static final int EUREKA_PORT = 8761; EurekaContainer(Map env) { - super(parse("ghcr.io/openzipkin/zipkin-eureka:3.4.0")); + super(parse("ghcr.io/openzipkin/zipkin-eureka:3.4.2")); withEnv(env); withExposedPorts(EUREKA_PORT); waitStrategy = Wait.forHealthcheck(); diff --git a/zipkin-storage/cassandra/src/test/java/zipkin2/storage/cassandra/CassandraContainer.java b/zipkin-storage/cassandra/src/test/java/zipkin2/storage/cassandra/CassandraContainer.java index ae6acd3e52b..1364b0d4aea 100644 --- a/zipkin-storage/cassandra/src/test/java/zipkin2/storage/cassandra/CassandraContainer.java +++ b/zipkin-storage/cassandra/src/test/java/zipkin2/storage/cassandra/CassandraContainer.java @@ -33,7 +33,7 @@ class CassandraContainer extends GenericContainer { CqlSession globalSession; CassandraContainer() { - super(parse("ghcr.io/openzipkin/zipkin-cassandra:3.4.0")); + super(parse("ghcr.io/openzipkin/zipkin-cassandra:3.4.2")); addExposedPort(9042); waitStrategy = Wait.forHealthcheck(); withLogConsumer(new Slf4jLogConsumer(LOGGER)); diff --git a/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/ElasticsearchExtension.java b/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/ElasticsearchExtension.java index fdae33a7aa2..7e0b2b28306 100644 --- a/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/ElasticsearchExtension.java +++ b/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/ElasticsearchExtension.java @@ -22,7 +22,7 @@ class ElasticsearchExtension extends ElasticsearchBaseExtension { // mostly waiting for https://github.com/testcontainers/testcontainers-java/issues/3537 static final class ElasticsearchContainer extends GenericContainer { ElasticsearchContainer(int majorVersion) { - super(parse("ghcr.io/openzipkin/zipkin-elasticsearch" + majorVersion + ":3.4.0")); + super(parse("ghcr.io/openzipkin/zipkin-elasticsearch" + majorVersion + ":3.4.2")); addExposedPort(9200); waitStrategy = Wait.forHealthcheck(); withLogConsumer(new Slf4jLogConsumer(LOGGER)); diff --git a/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/OpenSearchExtension.java b/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/OpenSearchExtension.java index d6bbba92d29..ad20f2c6c7c 100644 --- a/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/OpenSearchExtension.java +++ b/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/OpenSearchExtension.java @@ -22,7 +22,7 @@ class OpenSearchExtension extends ElasticsearchBaseExtension { // mostly waiting for https://github.com/testcontainers/testcontainers-java/issues/3537 static final class OpenSearchContainer extends GenericContainer { OpenSearchContainer(int majorVersion) { - super(parse("ghcr.io/openzipkin/zipkin-opensearch" + majorVersion + ":3.4.0")); + super(parse("ghcr.io/openzipkin/zipkin-opensearch" + majorVersion + ":3.4.2")); addExposedPort(9200); waitStrategy = Wait.forHealthcheck(); withLogConsumer(new Slf4jLogConsumer(LOGGER)); diff --git a/zipkin-storage/mysql-v1/src/test/java/zipkin2/storage/mysql/v1/MySQLExtension.java b/zipkin-storage/mysql-v1/src/test/java/zipkin2/storage/mysql/v1/MySQLExtension.java index 39237e34a50..c5ac49dbb33 100644 --- a/zipkin-storage/mysql-v1/src/test/java/zipkin2/storage/mysql/v1/MySQLExtension.java +++ b/zipkin-storage/mysql-v1/src/test/java/zipkin2/storage/mysql/v1/MySQLExtension.java @@ -103,7 +103,7 @@ int port() { // mostly waiting for https://github.com/testcontainers/testcontainers-java/issues/3537 static final class MySQLContainer extends GenericContainer { MySQLContainer() { - super(parse("ghcr.io/openzipkin/zipkin-mysql:3.4.0")); + super(parse("ghcr.io/openzipkin/zipkin-mysql:3.4.2")); addExposedPort(3306); waitStrategy = Wait.forHealthcheck(); withLogConsumer(new Slf4jLogConsumer(LOGGER));