Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Spring Boot to 3.4.1 and other dependency updates #3787

Merged
merged 2 commits into from
Jan 6, 2025
Merged

Update Spring Boot to 3.4.1 and other dependency updates #3787

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d49932c
Update Spring Boot to 3.4.1 and other dependency updates
reta Jan 5, 2025
adf6dd5
Address code review comments
reta Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion benchmarks/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>io.zipkin</groupId>
<artifactId>zipkin-parent</artifactId>
<version>3.4.4-SNAPSHOT</version>
<version>3.5.0-SNAPSHOT</version>
codefromthecrypt marked this conversation as resolved.
Show resolved Hide resolved
</parent>

<artifactId>benchmarks</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions docker/test-images/zipkin-eureka/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>3.3.6</version>
<version>3.4.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -56,7 +56,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
<version>4.1.3</version>
<version>4.2.0</version>
<exclusions>
<!-- dodge spring-jcl conflict error -->
<exclusion>
Expand Down
24 changes: 12 additions & 12 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<groupId>io.zipkin</groupId>
<artifactId>zipkin-parent</artifactId>
<version>3.4.4-SNAPSHOT</version>
<version>3.5.0-SNAPSHOT</version>
<packaging>pom</packaging>

<modules>
Expand Down Expand Up @@ -47,42 +47,42 @@
<zipkin-proto3.version>1.0.0</zipkin-proto3.version>

<armeria.groupId>com.linecorp.armeria</armeria.groupId>
<armeria.version>1.31.0</armeria.version>
<armeria.version>1.31.3</armeria.version>
<!-- Match Armeria version to avoid conflicts including running tests in the IDE -->
<netty.version>4.1.115.Final</netty.version>
<netty.version>4.1.116.Final</netty.version>

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

<java-driver.version>4.18.1</java-driver.version>
<micrometer.version>1.13.4</micrometer.version>
<micrometer.version>1.14.2</micrometer.version>

<!-- Used for Generated annotations -->
<javax-annotation-api.version>1.3.2</javax-annotation-api.version>

<!-- update together -->
<spring-boot.version>3.3.6</spring-boot.version>
<spring.version>6.1.15</spring.version>
<spring-boot.version>3.4.1</spring-boot.version>
<spring.version>6.2.1</spring.version>

<!-- MySQL connector is GPL, even if it has an OSS exception.
https://www.mysql.com/about/legal/licensing/foss-exception/

MariaDB has a friendlier license, LGPL, which is less scary in audits.
-->
<mariadb-java-client.version>3.4.1</mariadb-java-client.version>
<mariadb-java-client.version>3.5.1</mariadb-java-client.version>
<HikariCP.version>5.1.0</HikariCP.version>
<slf4j.version>2.0.16</slf4j.version>
<auto-value.version>1.11.0</auto-value.version>
<git-commit-id.version>4.9.10</git-commit-id.version>

<!-- Test only dependencies -->
<junit-jupiter.version>5.11.2</junit-jupiter.version>
<mockito.version>5.14.1</mockito.version>
<assertj.version>3.26.3</assertj.version>
<junit-jupiter.version>5.11.4</junit-jupiter.version>
<mockito.version>5.15.2</mockito.version>
<assertj.version>3.27.2</assertj.version>
<awaitility.version>4.2.2</awaitility.version>
<testcontainers.version>1.20.2</testcontainers.version>
<okhttp.version>4.12.0</okhttp.version>
<kryo.version>5.6.1</kryo.version>
<kryo.version>5.6.2</kryo.version>
<!-- Only used for proto interop testing; wire-maven-plugin is usually behind latest. -->
<wire.version>5.1.0</wire.version>
<gson.version>2.11.0</gson.version>
Expand Down
2 changes: 1 addition & 1 deletion zipkin-collector/activemq/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>io.zipkin.zipkin2</groupId>
<artifactId>zipkin-collector-parent</artifactId>
<version>3.4.4-SNAPSHOT</version>
<version>3.5.0-SNAPSHOT</version>
</parent>

<artifactId>zipkin-collector-activemq</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion zipkin-collector/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>io.zipkin.zipkin2</groupId>
<artifactId>zipkin-collector-parent</artifactId>
<version>3.4.4-SNAPSHOT</version>
<version>3.5.0-SNAPSHOT</version>
</parent>

<artifactId>zipkin-collector</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion zipkin-collector/kafka/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>io.zipkin.zipkin2</groupId>
<artifactId>zipkin-collector-parent</artifactId>
<version>3.4.4-SNAPSHOT</version>
<version>3.5.0-SNAPSHOT</version>
</parent>

<artifactId>zipkin-collector-kafka</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion zipkin-collector/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>io.zipkin</groupId>
<artifactId>zipkin-parent</artifactId>
<version>3.4.4-SNAPSHOT</version>
<version>3.5.0-SNAPSHOT</version>
</parent>

<groupId>io.zipkin.zipkin2</groupId>
Expand Down
2 changes: 1 addition & 1 deletion zipkin-collector/rabbitmq/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>io.zipkin.zipkin2</groupId>
<artifactId>zipkin-collector-parent</artifactId>
<version>3.4.4-SNAPSHOT</version>
<version>3.5.0-SNAPSHOT</version>
</parent>

<artifactId>zipkin-collector-rabbitmq</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion zipkin-collector/scribe/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>io.zipkin.zipkin2</groupId>
<artifactId>zipkin-collector-parent</artifactId>
<version>3.4.4-SNAPSHOT</version>
<version>3.5.0-SNAPSHOT</version>
</parent>

<artifactId>zipkin-collector-scribe</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion zipkin-junit5/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>io.zipkin</groupId>
<artifactId>zipkin-parent</artifactId>
<version>3.4.4-SNAPSHOT</version>
<version>3.5.0-SNAPSHOT</version>
</parent>

<groupId>io.zipkin.zipkin2</groupId>
Expand Down
2 changes: 1 addition & 1 deletion zipkin-lens/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>io.zipkin</groupId>
<artifactId>zipkin-parent</artifactId>
<version>3.4.4-SNAPSHOT</version>
<version>3.5.0-SNAPSHOT</version>
</parent>

<artifactId>zipkin-lens</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions zipkin-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>io.zipkin</groupId>
<artifactId>zipkin-parent</artifactId>
<version>3.4.4-SNAPSHOT</version>
<version>3.5.0-SNAPSHOT</version>
</parent>

<artifactId>zipkin-server</artifactId>
Expand All @@ -27,7 +27,7 @@

<!-- Sometimes we need to override Armeria's Brave version -->
<brave.version>6.0.3</brave.version>
<zipkin-reporter.version>3.4.0</zipkin-reporter.version>
<zipkin-reporter.version>3.4.3</zipkin-reporter.version>
<log4j.version>2.23.1</log4j.version>
<proto.generatedSourceDirectory>${project.build.directory}/generated-test-sources/wire</proto.generatedSourceDirectory>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion zipkin-storage/cassandra/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>io.zipkin.zipkin2</groupId>
<artifactId>zipkin-storage-parent</artifactId>
<version>3.4.4-SNAPSHOT</version>
<version>3.5.0-SNAPSHOT</version>
</parent>

<artifactId>zipkin-storage-cassandra</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion zipkin-storage/elasticsearch/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>io.zipkin.zipkin2</groupId>
<artifactId>zipkin-storage-parent</artifactId>
<version>3.4.4-SNAPSHOT</version>
<version>3.5.0-SNAPSHOT</version>
</parent>

<artifactId>zipkin-storage-elasticsearch</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion zipkin-storage/mysql-v1/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>io.zipkin.zipkin2</groupId>
<artifactId>zipkin-storage-parent</artifactId>
<version>3.4.4-SNAPSHOT</version>
<version>3.5.0-SNAPSHOT</version>
</parent>

<artifactId>zipkin-storage-mysql-v1</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion zipkin-storage/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>io.zipkin</groupId>
<artifactId>zipkin-parent</artifactId>
<version>3.4.4-SNAPSHOT</version>
<version>3.5.0-SNAPSHOT</version>
</parent>

<groupId>io.zipkin.zipkin2</groupId>
Expand Down
2 changes: 1 addition & 1 deletion zipkin-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>io.zipkin</groupId>
<artifactId>zipkin-parent</artifactId>
<version>3.4.4-SNAPSHOT</version>
<version>3.5.0-SNAPSHOT</version>
</parent>

<groupId>io.zipkin.zipkin2</groupId>
Expand Down
2 changes: 1 addition & 1 deletion zipkin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>io.zipkin</groupId>
<artifactId>zipkin-parent</artifactId>
<version>3.4.4-SNAPSHOT</version>
<version>3.5.0-SNAPSHOT</version>
</parent>

<groupId>io.zipkin.zipkin2</groupId>
Expand Down
Loading