diff --git a/aws-junit/pom.xml b/aws-junit/pom.xml index 89f999b1..847a9082 100644 --- a/aws-junit/pom.xml +++ b/aws-junit/pom.xml @@ -58,7 +58,7 @@ org.elasticmq elasticmq-server_2.13 - 1.5.4 + 1.5.6 ch.qos.logback diff --git a/brave/instrumentation-aws-java-sdk-core/pom.xml b/brave/instrumentation-aws-java-sdk-core/pom.xml index 6b20a360..66d92d5e 100644 --- a/brave/instrumentation-aws-java-sdk-core/pom.xml +++ b/brave/instrumentation-aws-java-sdk-core/pom.xml @@ -77,7 +77,7 @@ uk.org.webcompere system-stubs-jupiter - 2.1.5 + 2.1.6 test diff --git a/build-bin/docker/docker_args b/build-bin/docker/docker_args index 952aebd2..4d83bb14 100755 --- a/build-bin/docker/docker_args +++ b/build-bin/docker/docker_args @@ -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 72c46fd0..bc0dac9e 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.4 +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/pom.xml b/pom.xml index 24514b53..e4bc9b1c 100644 --- a/pom.xml +++ b/pom.xml @@ -78,9 +78,9 @@ io.zipkin.zipkin2 - 3.0.4 + 3.0.5 3.2.1 - 3.2.1 + 3.2.2 2.16.1 com.linecorp.armeria @@ -95,8 +95,8 @@ io.zipkin.brave 6.0.0 - 1.12.638 - 2.23.4 + 1.12.643 + 2.23.9 4.12.0 diff --git a/storage/xray-udp/pom.xml b/storage/xray-udp/pom.xml index d35a968c..77a0ea69 100644 --- a/storage/xray-udp/pom.xml +++ b/storage/xray-udp/pom.xml @@ -49,7 +49,7 @@ com.jayway.jsonpath json-path - 2.8.0 + 2.9.0 test