diff --git a/build-bin/docker/docker_args b/build-bin/docker/docker_args index b5e56cb..4d83bb1 100755 --- a/build-bin/docker/docker_args +++ b/build-bin/docker/docker_args @@ -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 @@ -46,7 +46,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.1_p12-jre +# e.g. ghcr.io/openzipkin/java:21.0.2_p13-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 @@ -60,7 +60,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.1_p12" +# When non-empty, becomes the build-arg java_version. e.g. "21.0.2_p13" # 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/docker/Dockerfile b/docker/Dockerfile index 5eacd54..0871d01 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -13,14 +13,14 @@ # # zipkin version should match zipkin.version in /pom.xml -ARG zipkin_version=3.0.3 +ARG zipkin_version=3.0.5 # java_version is used during the installation process to build or download the module 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.1_p12 +ARG java_version=21.0.2_p13 # 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/module/pom.xml b/module/pom.xml index b2abbd2..34faaa2 100644 --- a/module/pom.xml +++ b/module/pom.xml @@ -51,18 +51,6 @@ com.google.auth google-auth-library-oauth2-http ${google-auth-library-oauth2-http.version} - - - commons-codec - commons-codec - - - - - - commons-codec - commons-codec - ${commons-codec.version} io.zipkin.zipkin2 - 3.0.3 + 3.0.5 3.2.1 - 3.2.1 + 3.2.2 com.linecorp.armeria 1.26.4 @@ -88,28 +88,26 @@ io.zipkin.brave 6.0.0 - - 1.58.0 + + 1.60.0 3.24.0 32.0.1-android - 1.20.0 - - 1.16.0 - 2.29.0 + 1.22.0 + 2.31.0 - 2.32.0 + 2.34.0 - 1.125.13 - 1.107.13 + 1.126.0 + 1.108.0 3.25.1 4.2.0 5.10.1 - 5.8.0 + 5.9.0 diff --git a/sender-stackdriver/pom.xml b/sender-stackdriver/pom.xml index 9f81178..31bd4b2 100644 --- a/sender-stackdriver/pom.xml +++ b/sender-stackdriver/pom.xml @@ -97,20 +97,6 @@ com.google.auth google-auth-library-oauth2-http ${google-auth-library-oauth2-http.version} - - - commons-codec - commons-codec - - - test - - - - commons-codec - commons-codec - ${commons-codec.version} - test org.awaitility