From d49932c6df145f16a55e206a50bab253c43ef302 Mon Sep 17 00:00:00 2001 From: Andriy Redko Date: Sun, 5 Jan 2025 12:20:44 -0500 Subject: [PATCH 1/2] Update Spring Boot to 3.4.1 and other dependency updates Signed-off-by: Andriy Redko --- benchmarks/pom.xml | 2 +- docker/test-images/zipkin-eureka/pom.xml | 4 ++-- pom.xml | 24 ++++++++++++------------ zipkin-collector/activemq/pom.xml | 2 +- zipkin-collector/core/pom.xml | 2 +- zipkin-collector/kafka/pom.xml | 2 +- zipkin-collector/pom.xml | 2 +- zipkin-collector/rabbitmq/pom.xml | 2 +- zipkin-collector/scribe/pom.xml | 2 +- zipkin-junit5/pom.xml | 2 +- zipkin-lens/pom.xml | 2 +- zipkin-server/pom.xml | 4 ++-- zipkin-storage/cassandra/pom.xml | 2 +- zipkin-storage/elasticsearch/pom.xml | 2 +- zipkin-storage/mysql-v1/pom.xml | 2 +- zipkin-storage/pom.xml | 2 +- zipkin-tests/pom.xml | 2 +- zipkin/pom.xml | 2 +- 18 files changed, 31 insertions(+), 31 deletions(-) diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index 4402f8dc59..5ce94b5d95 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -11,7 +11,7 @@ io.zipkin zipkin-parent - 3.4.4-SNAPSHOT + 3.5.0-SNAPSHOT benchmarks diff --git a/docker/test-images/zipkin-eureka/pom.xml b/docker/test-images/zipkin-eureka/pom.xml index 3a744313e3..6bbeb6bf8c 100644 --- a/docker/test-images/zipkin-eureka/pom.xml +++ b/docker/test-images/zipkin-eureka/pom.xml @@ -29,7 +29,7 @@ org.springframework.boot spring-boot-dependencies - 3.3.6 + 3.4.1 pom import @@ -56,7 +56,7 @@ org.springframework.cloud spring-cloud-starter-netflix-eureka-server - 4.1.3 + 4.2.0 diff --git a/pom.xml b/pom.xml index 3c9976f413..1a043d8e6c 100755 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ io.zipkin zipkin-parent - 3.4.4-SNAPSHOT + 3.5.0-SNAPSHOT pom @@ -47,42 +47,42 @@ 1.0.0 com.linecorp.armeria - 1.31.0 + 1.31.3 - 4.1.115.Final + 4.1.116.Final - 2.17.2 + 2.18.2 4.18.1 - 1.13.4 + 1.14.2 1.3.2 - 3.3.6 - 6.1.15 + 3.4.1 + 6.2.1 - 3.4.1 + 3.5.1 5.1.0 2.0.16 1.11.0 4.9.10 - 5.11.2 - 5.14.1 - 3.26.3 + 5.11.4 + 5.15.2 + 3.27.2 4.2.2 1.20.2 4.12.0 - 5.6.1 + 5.6.2 5.1.0 2.11.0 diff --git a/zipkin-collector/activemq/pom.xml b/zipkin-collector/activemq/pom.xml index 21eac4b117..78374ea323 100644 --- a/zipkin-collector/activemq/pom.xml +++ b/zipkin-collector/activemq/pom.xml @@ -11,7 +11,7 @@ io.zipkin.zipkin2 zipkin-collector-parent - 3.4.4-SNAPSHOT + 3.5.0-SNAPSHOT zipkin-collector-activemq diff --git a/zipkin-collector/core/pom.xml b/zipkin-collector/core/pom.xml index 6e0e4253bd..83226d2346 100644 --- a/zipkin-collector/core/pom.xml +++ b/zipkin-collector/core/pom.xml @@ -11,7 +11,7 @@ io.zipkin.zipkin2 zipkin-collector-parent - 3.4.4-SNAPSHOT + 3.5.0-SNAPSHOT zipkin-collector diff --git a/zipkin-collector/kafka/pom.xml b/zipkin-collector/kafka/pom.xml index 86972dd58f..ea72be2d25 100644 --- a/zipkin-collector/kafka/pom.xml +++ b/zipkin-collector/kafka/pom.xml @@ -11,7 +11,7 @@ io.zipkin.zipkin2 zipkin-collector-parent - 3.4.4-SNAPSHOT + 3.5.0-SNAPSHOT zipkin-collector-kafka diff --git a/zipkin-collector/pom.xml b/zipkin-collector/pom.xml index 1be6240c1a..1e347cc803 100644 --- a/zipkin-collector/pom.xml +++ b/zipkin-collector/pom.xml @@ -11,7 +11,7 @@ io.zipkin zipkin-parent - 3.4.4-SNAPSHOT + 3.5.0-SNAPSHOT io.zipkin.zipkin2 diff --git a/zipkin-collector/rabbitmq/pom.xml b/zipkin-collector/rabbitmq/pom.xml index 2aa7290929..160dfe1c64 100644 --- a/zipkin-collector/rabbitmq/pom.xml +++ b/zipkin-collector/rabbitmq/pom.xml @@ -11,7 +11,7 @@ io.zipkin.zipkin2 zipkin-collector-parent - 3.4.4-SNAPSHOT + 3.5.0-SNAPSHOT zipkin-collector-rabbitmq diff --git a/zipkin-collector/scribe/pom.xml b/zipkin-collector/scribe/pom.xml index 7063da7ef7..e4a0081874 100644 --- a/zipkin-collector/scribe/pom.xml +++ b/zipkin-collector/scribe/pom.xml @@ -11,7 +11,7 @@ io.zipkin.zipkin2 zipkin-collector-parent - 3.4.4-SNAPSHOT + 3.5.0-SNAPSHOT zipkin-collector-scribe diff --git a/zipkin-junit5/pom.xml b/zipkin-junit5/pom.xml index b7c78b87ee..8bee8c63b5 100644 --- a/zipkin-junit5/pom.xml +++ b/zipkin-junit5/pom.xml @@ -11,7 +11,7 @@ io.zipkin zipkin-parent - 3.4.4-SNAPSHOT + 3.5.0-SNAPSHOT io.zipkin.zipkin2 diff --git a/zipkin-lens/pom.xml b/zipkin-lens/pom.xml index e84b0df126..362ed74abd 100644 --- a/zipkin-lens/pom.xml +++ b/zipkin-lens/pom.xml @@ -11,7 +11,7 @@ io.zipkin zipkin-parent - 3.4.4-SNAPSHOT + 3.5.0-SNAPSHOT zipkin-lens diff --git a/zipkin-server/pom.xml b/zipkin-server/pom.xml index 4a9810f8fc..29379094f3 100644 --- a/zipkin-server/pom.xml +++ b/zipkin-server/pom.xml @@ -11,7 +11,7 @@ io.zipkin zipkin-parent - 3.4.4-SNAPSHOT + 3.5.0-SNAPSHOT zipkin-server @@ -27,7 +27,7 @@ 6.0.3 - 3.4.0 + 3.4.3 2.23.1 ${project.build.directory}/generated-test-sources/wire diff --git a/zipkin-storage/cassandra/pom.xml b/zipkin-storage/cassandra/pom.xml index c515983573..a74fc0297d 100644 --- a/zipkin-storage/cassandra/pom.xml +++ b/zipkin-storage/cassandra/pom.xml @@ -11,7 +11,7 @@ io.zipkin.zipkin2 zipkin-storage-parent - 3.4.4-SNAPSHOT + 3.5.0-SNAPSHOT zipkin-storage-cassandra diff --git a/zipkin-storage/elasticsearch/pom.xml b/zipkin-storage/elasticsearch/pom.xml index 7ac0de608a..e992a6322d 100644 --- a/zipkin-storage/elasticsearch/pom.xml +++ b/zipkin-storage/elasticsearch/pom.xml @@ -11,7 +11,7 @@ io.zipkin.zipkin2 zipkin-storage-parent - 3.4.4-SNAPSHOT + 3.5.0-SNAPSHOT zipkin-storage-elasticsearch diff --git a/zipkin-storage/mysql-v1/pom.xml b/zipkin-storage/mysql-v1/pom.xml index be0c821857..7b53cad54d 100644 --- a/zipkin-storage/mysql-v1/pom.xml +++ b/zipkin-storage/mysql-v1/pom.xml @@ -11,7 +11,7 @@ io.zipkin.zipkin2 zipkin-storage-parent - 3.4.4-SNAPSHOT + 3.5.0-SNAPSHOT zipkin-storage-mysql-v1 diff --git a/zipkin-storage/pom.xml b/zipkin-storage/pom.xml index 8d21d40726..55b3c17728 100644 --- a/zipkin-storage/pom.xml +++ b/zipkin-storage/pom.xml @@ -11,7 +11,7 @@ io.zipkin zipkin-parent - 3.4.4-SNAPSHOT + 3.5.0-SNAPSHOT io.zipkin.zipkin2 diff --git a/zipkin-tests/pom.xml b/zipkin-tests/pom.xml index 44ae7e73f0..5c4a1e47c6 100644 --- a/zipkin-tests/pom.xml +++ b/zipkin-tests/pom.xml @@ -11,7 +11,7 @@ io.zipkin zipkin-parent - 3.4.4-SNAPSHOT + 3.5.0-SNAPSHOT io.zipkin.zipkin2 diff --git a/zipkin/pom.xml b/zipkin/pom.xml index 7b1e470a05..25a50e7806 100644 --- a/zipkin/pom.xml +++ b/zipkin/pom.xml @@ -11,7 +11,7 @@ io.zipkin zipkin-parent - 3.4.4-SNAPSHOT + 3.5.0-SNAPSHOT io.zipkin.zipkin2 From adf6dd5d1daf24ab130eb18fddda6c032a09ea31 Mon Sep 17 00:00:00 2001 From: Andriy Redko Date: Sun, 5 Jan 2025 19:57:18 -0500 Subject: [PATCH 2/2] Address code review comments Signed-off-by: Andriy Redko --- benchmarks/pom.xml | 2 +- pom.xml | 2 +- zipkin-collector/activemq/pom.xml | 2 +- zipkin-collector/core/pom.xml | 2 +- zipkin-collector/kafka/pom.xml | 2 +- zipkin-collector/pom.xml | 2 +- zipkin-collector/rabbitmq/pom.xml | 2 +- zipkin-collector/scribe/pom.xml | 2 +- zipkin-junit5/pom.xml | 2 +- zipkin-lens/pom.xml | 2 +- zipkin-server/pom.xml | 2 +- zipkin-storage/cassandra/pom.xml | 2 +- zipkin-storage/elasticsearch/pom.xml | 2 +- zipkin-storage/mysql-v1/pom.xml | 2 +- zipkin-storage/pom.xml | 2 +- zipkin-tests/pom.xml | 2 +- zipkin/pom.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index 5ce94b5d95..4402f8dc59 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -11,7 +11,7 @@ io.zipkin zipkin-parent - 3.5.0-SNAPSHOT + 3.4.4-SNAPSHOT benchmarks diff --git a/pom.xml b/pom.xml index 1a043d8e6c..c8b76a5cc5 100755 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ io.zipkin zipkin-parent - 3.5.0-SNAPSHOT + 3.4.4-SNAPSHOT pom diff --git a/zipkin-collector/activemq/pom.xml b/zipkin-collector/activemq/pom.xml index 78374ea323..21eac4b117 100644 --- a/zipkin-collector/activemq/pom.xml +++ b/zipkin-collector/activemq/pom.xml @@ -11,7 +11,7 @@ io.zipkin.zipkin2 zipkin-collector-parent - 3.5.0-SNAPSHOT + 3.4.4-SNAPSHOT zipkin-collector-activemq diff --git a/zipkin-collector/core/pom.xml b/zipkin-collector/core/pom.xml index 83226d2346..6e0e4253bd 100644 --- a/zipkin-collector/core/pom.xml +++ b/zipkin-collector/core/pom.xml @@ -11,7 +11,7 @@ io.zipkin.zipkin2 zipkin-collector-parent - 3.5.0-SNAPSHOT + 3.4.4-SNAPSHOT zipkin-collector diff --git a/zipkin-collector/kafka/pom.xml b/zipkin-collector/kafka/pom.xml index ea72be2d25..86972dd58f 100644 --- a/zipkin-collector/kafka/pom.xml +++ b/zipkin-collector/kafka/pom.xml @@ -11,7 +11,7 @@ io.zipkin.zipkin2 zipkin-collector-parent - 3.5.0-SNAPSHOT + 3.4.4-SNAPSHOT zipkin-collector-kafka diff --git a/zipkin-collector/pom.xml b/zipkin-collector/pom.xml index 1e347cc803..1be6240c1a 100644 --- a/zipkin-collector/pom.xml +++ b/zipkin-collector/pom.xml @@ -11,7 +11,7 @@ io.zipkin zipkin-parent - 3.5.0-SNAPSHOT + 3.4.4-SNAPSHOT io.zipkin.zipkin2 diff --git a/zipkin-collector/rabbitmq/pom.xml b/zipkin-collector/rabbitmq/pom.xml index 160dfe1c64..2aa7290929 100644 --- a/zipkin-collector/rabbitmq/pom.xml +++ b/zipkin-collector/rabbitmq/pom.xml @@ -11,7 +11,7 @@ io.zipkin.zipkin2 zipkin-collector-parent - 3.5.0-SNAPSHOT + 3.4.4-SNAPSHOT zipkin-collector-rabbitmq diff --git a/zipkin-collector/scribe/pom.xml b/zipkin-collector/scribe/pom.xml index e4a0081874..7063da7ef7 100644 --- a/zipkin-collector/scribe/pom.xml +++ b/zipkin-collector/scribe/pom.xml @@ -11,7 +11,7 @@ io.zipkin.zipkin2 zipkin-collector-parent - 3.5.0-SNAPSHOT + 3.4.4-SNAPSHOT zipkin-collector-scribe diff --git a/zipkin-junit5/pom.xml b/zipkin-junit5/pom.xml index 8bee8c63b5..b7c78b87ee 100644 --- a/zipkin-junit5/pom.xml +++ b/zipkin-junit5/pom.xml @@ -11,7 +11,7 @@ io.zipkin zipkin-parent - 3.5.0-SNAPSHOT + 3.4.4-SNAPSHOT io.zipkin.zipkin2 diff --git a/zipkin-lens/pom.xml b/zipkin-lens/pom.xml index 362ed74abd..e84b0df126 100644 --- a/zipkin-lens/pom.xml +++ b/zipkin-lens/pom.xml @@ -11,7 +11,7 @@ io.zipkin zipkin-parent - 3.5.0-SNAPSHOT + 3.4.4-SNAPSHOT zipkin-lens diff --git a/zipkin-server/pom.xml b/zipkin-server/pom.xml index 29379094f3..e1ffff3fa6 100644 --- a/zipkin-server/pom.xml +++ b/zipkin-server/pom.xml @@ -11,7 +11,7 @@ io.zipkin zipkin-parent - 3.5.0-SNAPSHOT + 3.4.4-SNAPSHOT zipkin-server diff --git a/zipkin-storage/cassandra/pom.xml b/zipkin-storage/cassandra/pom.xml index a74fc0297d..c515983573 100644 --- a/zipkin-storage/cassandra/pom.xml +++ b/zipkin-storage/cassandra/pom.xml @@ -11,7 +11,7 @@ io.zipkin.zipkin2 zipkin-storage-parent - 3.5.0-SNAPSHOT + 3.4.4-SNAPSHOT zipkin-storage-cassandra diff --git a/zipkin-storage/elasticsearch/pom.xml b/zipkin-storage/elasticsearch/pom.xml index e992a6322d..7ac0de608a 100644 --- a/zipkin-storage/elasticsearch/pom.xml +++ b/zipkin-storage/elasticsearch/pom.xml @@ -11,7 +11,7 @@ io.zipkin.zipkin2 zipkin-storage-parent - 3.5.0-SNAPSHOT + 3.4.4-SNAPSHOT zipkin-storage-elasticsearch diff --git a/zipkin-storage/mysql-v1/pom.xml b/zipkin-storage/mysql-v1/pom.xml index 7b53cad54d..be0c821857 100644 --- a/zipkin-storage/mysql-v1/pom.xml +++ b/zipkin-storage/mysql-v1/pom.xml @@ -11,7 +11,7 @@ io.zipkin.zipkin2 zipkin-storage-parent - 3.5.0-SNAPSHOT + 3.4.4-SNAPSHOT zipkin-storage-mysql-v1 diff --git a/zipkin-storage/pom.xml b/zipkin-storage/pom.xml index 55b3c17728..8d21d40726 100644 --- a/zipkin-storage/pom.xml +++ b/zipkin-storage/pom.xml @@ -11,7 +11,7 @@ io.zipkin zipkin-parent - 3.5.0-SNAPSHOT + 3.4.4-SNAPSHOT io.zipkin.zipkin2 diff --git a/zipkin-tests/pom.xml b/zipkin-tests/pom.xml index 5c4a1e47c6..44ae7e73f0 100644 --- a/zipkin-tests/pom.xml +++ b/zipkin-tests/pom.xml @@ -11,7 +11,7 @@ io.zipkin zipkin-parent - 3.5.0-SNAPSHOT + 3.4.4-SNAPSHOT io.zipkin.zipkin2 diff --git a/zipkin/pom.xml b/zipkin/pom.xml index 25a50e7806..7b1e470a05 100644 --- a/zipkin/pom.xml +++ b/zipkin/pom.xml @@ -11,7 +11,7 @@ io.zipkin zipkin-parent - 3.5.0-SNAPSHOT + 3.4.4-SNAPSHOT io.zipkin.zipkin2