Skip to content

Commit

Permalink
Update other dependencies
Browse files Browse the repository at this point in the history
Signed-off-by: Andriy Redko <[email protected]>
  • Loading branch information
reta committed May 24, 2024
1 parent 510afc3 commit 99a710d
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 12 deletions.
20 changes: 10 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@
<zipkin-proto3.version>1.0.0</zipkin-proto3.version>

<armeria.groupId>com.linecorp.armeria</armeria.groupId>
<armeria.version>1.28.2</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.109.Final</netty.version>
<netty.version>4.1.110.Final</netty.version>

<!-- It's easy for Jackson dependencies to get misaligned, so we manage it ourselves. -->
<jackson.version>2.17.0</jackson.version>
<jackson.version>2.17.1</jackson.version>

<java-driver.version>4.18.0</java-driver.version>
<micrometer.version>1.12.5</micrometer.version>
<java-driver.version>4.18.1</java-driver.version>
<micrometer.version>1.13.0</micrometer.version>

<!-- Used for Generated annotations -->
<javax-annotation-api.version>1.3.2</javax-annotation-api.version>
Expand All @@ -69,31 +69,31 @@
MariaDB has a friendlier license, LGPL, which is less scary in audits.
-->
<mariadb-java-client.version>3.3.3</mariadb-java-client.version>
<mariadb-java-client.version>3.4.0</mariadb-java-client.version>
<HikariCP.version>5.1.0</HikariCP.version>
<slf4j.version>2.0.13</slf4j.version>
<auto-value.version>1.10.4</auto-value.version>
<git-commit-id.version>4.9.10</git-commit-id.version>

<!-- Test only dependencies -->
<junit-jupiter.version>5.10.2</junit-jupiter.version>
<mockito.version>5.11.0</mockito.version>
<mockito.version>5.12.0</mockito.version>
<assertj.version>3.25.3</assertj.version>
<awaitility.version>4.2.1</awaitility.version>
<testcontainers.version>1.19.7</testcontainers.version>
<testcontainers.version>1.19.8</testcontainers.version>
<okhttp.version>4.12.0</okhttp.version>
<kryo.version>5.6.0</kryo.version>
<!-- Only used for proto interop testing; wire-maven-plugin is usually behind latest. -->
<wire.version>4.9.9</wire.version>
<gson.version>2.10.1</gson.version>
<gson.version>2.11.0</gson.version>
<unpack-proto.directory>${project.build.directory}/test/proto</unpack-proto.directory>

<license.skip>${skipTests}</license.skip>

<build-helper-maven-plugin.version>3.5.0</build-helper-maven-plugin.version>
<go-offline-maven-plugin.version>1.2.8</go-offline-maven-plugin.version>
<!-- TODO: cleanup any redundant ignores now also in the 4.0 release (once final) -->
<license-maven-plugin.version>4.3</license-maven-plugin.version>
<license-maven-plugin.version>4.5</license-maven-plugin.version>
<maven-assembly-plugin.version>3.7.1</maven-assembly-plugin.version>
<maven-bundle-plugin.version>5.1.9</maven-bundle-plugin.version>
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
Expand Down
5 changes: 4 additions & 1 deletion zipkin-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,10 @@
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
</dependency>

<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus-simpleclient</artifactId>
</dependency>
<dependency>
<groupId>com.netflix.concurrency-limits</groupId>
<artifactId>concurrency-limits-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion zipkin-storage/mysql-v1/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<properties>
<main.basedir>${project.basedir}/../..</main.basedir>

<jooq.version>3.19.7</jooq.version>
<jooq.version>3.19.8</jooq.version>

<!-- jOOQ doesn't add the Generated annotation, so we have to explicitly disable rules -->
<errorprone.args>-Xep:InconsistentCapitalization:OFF</errorprone.args>
Expand Down
2 changes: 2 additions & 0 deletions zipkin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,12 @@
<filter>
<artifact>com.google.code.gson:gson</artifact>
<includes>
<include>com/google/gson/Strictness.class</include>
<include>com/google/gson/stream/JsonReader*.class</include>
<include>com/google/gson/stream/JsonToken.class</include>
<include>com/google/gson/stream/MalformedJsonException.class</include>
<include>com/google/gson/internal/JsonReaderInternalAccess.class</include>
<include>com/google/gson/internal/TroubleshootingGuide.class</include>
</includes>
</filter>
</filters>
Expand Down

0 comments on commit 99a710d

Please sign in to comment.