Skip to content

Commit

Permalink
deps: bumps to latest versions
Browse files Browse the repository at this point in the history
Signed-off-by: Adrian Cole <adrian@tetrate.io>
  • Loading branch information
Adrian Cole committed Jan 24, 2024
1 parent 6bd0f25 commit 96690e4
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion aws-junit/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<dependency>
<groupId>org.elasticmq</groupId>
<artifactId>elasticmq-server_2.13</artifactId>
<version>1.5.4</version>
<version>1.5.6</version>
<exclusions>
<exclusion>
<groupId>ch.qos.logback</groupId>
Expand Down
2 changes: 1 addition & 1 deletion brave/instrumentation-aws-java-sdk-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<dependency>
<groupId>uk.org.webcompere</groupId>
<artifactId>system-stubs-jupiter</artifactId>
<version>2.1.5</version>
<version>2.1.6</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions build-bin/docker/docker_args
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}"
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@
<!-- matching armeria/grpc/zipkin -->
<zipkin.groupId>io.zipkin.zipkin2</zipkin.groupId>
<!-- when updating, update docker/Dockerfile and storage/src/test/java/zipkin2/storage/kafka/IT* -->
<zipkin.version>3.0.4</zipkin.version>
<zipkin.version>3.0.5</zipkin.version>
<zipkin-reporter.version>3.2.1</zipkin-reporter.version>
<spring-boot.version>3.2.1</spring-boot.version>
<spring-boot.version>3.2.2</spring-boot.version>
<jackson.version>2.16.1</jackson.version>
<!-- armeria.groupId allows you to test feature branches with jitpack -->
<armeria.groupId>com.linecorp.armeria</armeria.groupId>
Expand All @@ -95,8 +95,8 @@
<brave.groupId>io.zipkin.brave</brave.groupId>
<brave.version>6.0.0</brave.version>

<aws-java-sdk.version>1.12.638</aws-java-sdk.version>
<sdk-core.version>2.23.4</sdk-core.version>
<aws-java-sdk.version>1.12.643</aws-java-sdk.version>
<sdk-core.version>2.23.9</sdk-core.version>

<okhttp.version>4.12.0</okhttp.version>

Expand Down
2 changes: 1 addition & 1 deletion storage/xray-udp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
<version>2.8.0</version>
<version>2.9.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down

0 comments on commit 96690e4

Please sign in to comment.