Skip to content

Commit

Permalink
bumps dependencies, notable to zipkin 3.4 and spring boot 3.3 (#222)
Browse files Browse the repository at this point in the history
Signed-off-by: Adrian Cole <adrian@tetrate.io>
  • Loading branch information
codefromthecrypt authored May 26, 2024
1 parent 10054b7 commit 274675a
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions aws-junit/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<!-- CVE fix versions -->
<!-- TODO: considering switching to something that doesn't use scala, such
as testcontainers+localstack, as CVEs are common here. -->
<scala.version>2.13.13</scala.version>
<scala.version>2.13.14</scala.version>

<!-- Only used in this repo's tests, which use floor JDK 17 -->
<maven.compiler.source>17</maven.compiler.source>
Expand Down Expand Up @@ -64,7 +64,7 @@
<dependency>
<groupId>org.elasticmq</groupId>
<artifactId>elasticmq-server_2.13</artifactId>
<version>1.6.0</version>
<version>1.6.1</version>
<exclusions>
<exclusion>
<groupId>ch.qos.logback</groupId>
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
#

# zipkin version should match zipkin.version in /pom.xml
ARG zipkin_version=3.3.0
ARG zipkin_version=3.4.0

# 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.2_p13
ARG java_version=21.0.3_p9

# 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
20 changes: 10 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,15 @@
<!-- 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.3.0</zipkin.version>
<zipkin.version>3.4.0</zipkin.version>
<zipkin-reporter.version>3.4.0</zipkin-reporter.version>
<spring-boot.version>3.2.4</spring-boot.version>
<jackson.version>2.17.0</jackson.version>
<spring-boot.version>3.3.0</spring-boot.version>
<jackson.version>2.17.1</jackson.version>
<!-- This allows you to test feature branches with jitpack -->
<armeria.groupId>com.linecorp.armeria</armeria.groupId>
<armeria.version>1.28.0</armeria.version>
<armeria.version>1.28.4</armeria.version>
<!-- Match Armeria version to avoid conflicts including running tests in the IDE -->
<netty.version>4.1.108.Final</netty.version>
<netty.version>4.1.110.Final</netty.version>
<log4j.version>2.23.1</log4j.version>

<!-- This allows you to test feature branches with jitpack -->
Expand All @@ -86,19 +86,19 @@
<brave.groupId>io.zipkin.brave</brave.groupId>
<brave.version>6.0.3</brave.version>

<aws-java-sdk.version>1.12.701</aws-java-sdk.version>
<sdk-core.version>2.25.31</sdk-core.version>
<aws-java-sdk.version>1.12.730</aws-java-sdk.version>
<sdk-core.version>2.25.60</sdk-core.version>

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

<assertj.version>3.25.3</assertj.version>
<awaitility.version>4.2.1</awaitility.version>
<junit-jupiter.version>5.10.2</junit-jupiter.version>
<mockito.version>5.11.0</mockito.version>
<mockito.version>5.12.0</mockito.version>

<!-- override to set exclusions per-project -->
<errorprone.args />
<errorprone.version>2.26.1</errorprone.version>
<errorprone.version>2.27.1</errorprone.version>
<auto-value.version>1.10.4</auto-value.version>

<license.skip>${skipTests}</license.skip>
Expand Down Expand Up @@ -581,7 +581,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.2.3</version>
<version>3.2.4</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand Down

0 comments on commit 274675a

Please sign in to comment.