Skip to content

Commit 26ed5db

Browse files
Netyyyygithub-actions
andauthored
External dependencies upgrade - Spring Boot 3.2.4 and Spring Cloud 2023.0.0 (#39355)
* Upgrade external dependencies to align with Spring Boot 3.2.4 * fix cspell * make jetty below 10 --------- Co-authored-by: github-actions <[email protected]>
1 parent 1a41290 commit 26ed5db

File tree

117 files changed

+959
-942
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+959
-942
lines changed

.vscode/cspell.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -925,6 +925,7 @@
925925
"brotli",
926926
"bson",
927927
"cbor",
928+
"chromadb",
928929
"cockroachdb",
929930
"codehaus",
930931
"collectd",
@@ -994,6 +995,7 @@
994995
"ldif",
995996
"leveldb",
996997
"liquibase",
998+
"milvus",
997999
"minio",
9981000
"mockmvc",
9991001
"moshi",
@@ -1009,6 +1011,8 @@
10091011
"ojdbc",
10101012
"okcurl",
10111013
"okio",
1014+
"ollama",
1015+
"openfga",
10121016
"openmldb",
10131017
"opentsdb",
10141018
"orai",
@@ -1019,6 +1023,7 @@
10191023
"otlp",
10201024
"pcollections",
10211025
"proxool",
1026+
"qdrant",
10221027
"qpack",
10231028
"questdb",
10241029
"quic",
@@ -1058,6 +1063,7 @@
10581063
"vertx",
10591064
"vibur",
10601065
"wadl",
1066+
"weaviate",
10611067
"webmvc",
10621068
"xerial",
10631069
"xmpp",

common/perf-test-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<!-- Special allowance for performance libraries as they aren't shipped. -->
5252
<include>com.beust:jcommander:[1.78]</include> <!-- {x-include-update;com.beust:jcommander;external_dependency} -->
5353

54-
<include>io.projectreactor:reactor-core:[3.6.3]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
54+
<include>io.projectreactor:reactor-core:[3.6.4]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
5555
<include>io.vertx:vertx-codegen:[4.5.4]</include> <!-- {x-include-update;io.vertx:vertx-codegen;external_dependency} -->
5656
</includes>
5757
</bannedDependencies>

eng/versioning/external_dependencies.txt

Lines changed: 63 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# To avoid dependency conflicts between SDK and Spring, when modifying or adding dependencies,
2-
# make sure the version is same to sdk/spring/scripts/spring_boot_3.2.3_managed_external_dependencies.txt
3-
# If your version is different from sdk/spring/scripts/spring_boot_3.2.3_managed_external_dependencies.txt,
2+
# make sure the version is same to sdk/spring/scripts/spring_boot_3.2.4_managed_external_dependencies.txt
3+
# If your version is different from sdk/spring/scripts/spring_boot_3.2.4_managed_external_dependencies.txt,
44
# please discuss with Spring Integration team members:
55
# @chenrujun (rujche), @saragluna (xiada), @yiliuTo (yiliu6), @backwind1233 (zhihaoguo).
66
# Thanks.
@@ -54,9 +54,9 @@ commons-net:commons-net;3.9.0
5454
io.cloudevents:cloudevents-api;2.2.0
5555
io.cloudevents:cloudevents-core;2.2.0
5656
io.fabric8:kubernetes-client;6.9.2
57-
io.micrometer:micrometer-core;1.12.3
58-
io.micrometer:micrometer-registry-azure-monitor;1.12.3
59-
io.micrometer:micrometer-registry-graphite;1.12.3
57+
io.micrometer:micrometer-core;1.12.4
58+
io.micrometer:micrometer-registry-azure-monitor;1.12.4
59+
io.micrometer:micrometer-registry-graphite;1.12.4
6060
io.netty:netty-buffer;4.1.107.Final
6161
io.netty:netty-common;4.1.107.Final
6262
io.netty:netty-codec;4.1.107.Final
@@ -70,9 +70,9 @@ io.netty:netty-tcnative-boringssl-static;2.0.62.Final
7070
io.netty:netty-transport-native-epoll;4.1.107.Final
7171
io.netty:netty-transport-native-unix-common;4.1.107.Final
7272
io.netty:netty-transport-native-kqueue;4.1.107.Final
73-
io.projectreactor.netty:reactor-netty;1.1.16
74-
io.projectreactor.netty:reactor-netty-http;1.1.16
75-
io.projectreactor:reactor-core;3.6.3
73+
io.projectreactor.netty:reactor-netty;1.1.17
74+
io.projectreactor.netty:reactor-netty-http;1.1.17
75+
io.projectreactor:reactor-core;3.6.4
7676
io.vertx:vertx-codegen;4.5.4
7777
io.vertx:vertx-core;4.5.4
7878
io.vertx:vertx-reactive-streams;4.5.4
@@ -85,7 +85,7 @@ org.apache.commons:commons-compress;1.26.0
8585
org.apache.avro:avro;1.11.3
8686
org.apache.avro:avro-maven-plugin;1.11.3
8787
org.apache.commons:commons-lang3;3.13.0
88-
org.apache.groovy:groovy;4.0.18
88+
org.apache.groovy:groovy;4.0.20
8989
org.apache.httpcomponents:httpclient;4.5.14
9090
org.apache.kafka:kafka-clients;3.6.1
9191
org.apache.logging.log4j:log4j-api;2.21.1
@@ -113,68 +113,68 @@ org.graalvm.buildtools:native-maven-plugin;0.9.28
113113
org.graalvm.sdk:graal-sdk;22.0.0.2
114114
org.graalvm.nativeimage:svm;22.0.0.2
115115
org.messaginghub:pooled-jms;3.1.5
116-
org.postgresql:postgresql;42.6.1
116+
org.postgresql:postgresql;42.6.2
117117
org.slf4j:slf4j-api;2.0.12
118118
org.slf4j:slf4j-nop;2.0.12
119119
org.slf4j:slf4j-simple;2.0.12
120120
redis.clients:jedis;5.1.0
121-
io.lettuce:lettuce-core;6.3.1.RELEASE
121+
io.lettuce:lettuce-core;6.3.2.RELEASE
122122
org.redisson:redisson;3.27.0
123123
net.bytebuddy:byte-buddy;1.14.12
124124
net.bytebuddy:byte-buddy-agent;1.14.12
125125
testdep_net.bytebuddy:byte-buddy;1.14.8
126126
testdep_net.bytebuddy:byte-buddy-agent;1.14.8
127127

128128
## Spring boot dependency versions
129-
org.springframework.boot:spring-boot-dependencies;3.2.3
130-
org.springframework.boot:spring-boot-actuator;3.2.3
131-
org.springframework.boot:spring-boot-actuator-autoconfigure;3.2.3
132-
org.springframework.boot:spring-boot-autoconfigure-processor;3.2.3
133-
org.springframework.boot:spring-boot-autoconfigure;3.2.3
134-
org.springframework.boot:spring-boot-configuration-metadata;3.2.3
135-
org.springframework.boot:spring-boot-configuration-processor;3.2.3
136-
org.springframework.boot:spring-boot-maven-plugin;3.2.3
137-
org.springframework.boot:spring-boot-starter-actuator;3.2.3
138-
org.springframework.boot:spring-boot-starter-aop;3.2.3
139-
org.springframework.boot:spring-boot-starter-cache;3.2.3
140-
org.springframework.boot:spring-boot-starter-data-redis;3.2.3
141-
org.springframework.boot:spring-boot-starter-data-jdbc;3.2.3
142-
org.springframework.boot:spring-boot-starter-integration;3.2.3
143-
org.springframework.boot:spring-boot-starter-logging;3.2.3
144-
org.springframework.boot:spring-boot-starter-test;3.2.3
145-
org.springframework.boot:spring-boot-starter-validation;3.2.3
146-
org.springframework.boot:spring-boot-starter-web;3.2.3
147-
org.springframework.boot:spring-boot-starter;3.2.3
148-
org.springframework.boot:spring-boot-test;3.2.3
149-
org.springframework.boot:spring-boot;3.2.3
150-
org.springframework.data:spring-data-commons;3.2.3
151-
org.springframework.data:spring-data-mongodb;4.2.3
152-
org.springframework.data:spring-data-redis;3.2.3
129+
org.springframework.boot:spring-boot-dependencies;3.2.4
130+
org.springframework.boot:spring-boot-actuator;3.2.4
131+
org.springframework.boot:spring-boot-actuator-autoconfigure;3.2.4
132+
org.springframework.boot:spring-boot-autoconfigure-processor;3.2.4
133+
org.springframework.boot:spring-boot-autoconfigure;3.2.4
134+
org.springframework.boot:spring-boot-configuration-metadata;3.2.4
135+
org.springframework.boot:spring-boot-configuration-processor;3.2.4
136+
org.springframework.boot:spring-boot-maven-plugin;3.2.4
137+
org.springframework.boot:spring-boot-starter-actuator;3.2.4
138+
org.springframework.boot:spring-boot-starter-aop;3.2.4
139+
org.springframework.boot:spring-boot-starter-cache;3.2.4
140+
org.springframework.boot:spring-boot-starter-data-redis;3.2.4
141+
org.springframework.boot:spring-boot-starter-data-jdbc;3.2.4
142+
org.springframework.boot:spring-boot-starter-integration;3.2.4
143+
org.springframework.boot:spring-boot-starter-logging;3.2.4
144+
org.springframework.boot:spring-boot-starter-test;3.2.4
145+
org.springframework.boot:spring-boot-starter-validation;3.2.4
146+
org.springframework.boot:spring-boot-starter-web;3.2.4
147+
org.springframework.boot:spring-boot-starter;3.2.4
148+
org.springframework.boot:spring-boot-test;3.2.4
149+
org.springframework.boot:spring-boot;3.2.4
150+
org.springframework.data:spring-data-commons;3.2.4
151+
org.springframework.data:spring-data-mongodb;4.2.4
152+
org.springframework.data:spring-data-redis;3.2.4
153153
org.springframework.experimental:spring-aot;0.11.4
154154
org.springframework.experimental:spring-aot-maven-plugin;0.11.4
155-
org.springframework.integration:spring-integration-core;6.2.2
156-
org.springframework.kafka:spring-kafka;3.1.2
157-
org.springframework.security:spring-security-config;6.2.2
158-
org.springframework.security:spring-security-core;6.2.2
159-
org.springframework.security:spring-security-oauth2-client;6.2.2
160-
org.springframework.security:spring-security-oauth2-resource-server;6.2.2
161-
org.springframework.security:spring-security-oauth2-core;6.2.2
162-
org.springframework.security:spring-security-oauth2-jose;6.2.2
163-
org.springframework.security:spring-security-web;6.2.2
164-
org.springframework:spring-beans;6.1.4
165-
org.springframework:spring-context-support;6.1.4
166-
org.springframework:spring-context;6.1.4
167-
org.springframework:spring-core;6.1.4
168-
org.springframework:spring-expression;6.1.4
169-
org.springframework:spring-jdbc;6.1.4
170-
org.springframework:spring-jms;6.1.4
171-
org.springframework:spring-messaging;6.1.4
172-
org.springframework:spring-tx;6.1.4
173-
org.springframework:spring-web;6.1.4
174-
org.springframework:spring-webmvc;6.1.4
175-
org.springframework:spring-test;6.1.4
155+
org.springframework.integration:spring-integration-core;6.2.3
156+
org.springframework.kafka:spring-kafka;3.1.3
157+
org.springframework.security:spring-security-config;6.2.3
158+
org.springframework.security:spring-security-core;6.2.3
159+
org.springframework.security:spring-security-oauth2-client;6.2.3
160+
org.springframework.security:spring-security-oauth2-resource-server;6.2.3
161+
org.springframework.security:spring-security-oauth2-core;6.2.3
162+
org.springframework.security:spring-security-oauth2-jose;6.2.3
163+
org.springframework.security:spring-security-web;6.2.3
164+
org.springframework:spring-beans;6.1.5
165+
org.springframework:spring-context-support;6.1.5
166+
org.springframework:spring-context;6.1.5
167+
org.springframework:spring-core;6.1.5
168+
org.springframework:spring-expression;6.1.5
169+
org.springframework:spring-jdbc;6.1.5
170+
org.springframework:spring-jms;6.1.5
171+
org.springframework:spring-messaging;6.1.5
172+
org.springframework:spring-tx;6.1.5
173+
org.springframework:spring-web;6.1.5
174+
org.springframework:spring-webmvc;6.1.5
175+
org.springframework:spring-test;6.1.5
176176
org.springframework.retry:spring-retry;2.0.5
177-
org.springframework.boot:spring-boot-starter-parent;3.2.3
177+
org.springframework.boot:spring-boot-starter-parent;3.2.4
178178

179179
## Spring cloud dependency versions
180180
org.springframework.cloud:spring-cloud-dependencies;2023.0.0
@@ -222,7 +222,7 @@ io.opentelemetry.instrumentation:opentelemetry-spring-boot-starter;2.1.0-alpha
222222
io.opentelemetry.instrumentation:opentelemetry-jdbc;2.1.0-alpha
223223
io.opentelemetry.instrumentation:opentelemetry-logback-appender-1.0;2.1.0-alpha
224224

225-
io.projectreactor:reactor-test;3.6.3
225+
io.projectreactor:reactor-test;3.6.4
226226
io.github.hakky54:logcaptor;2.9.0
227227
com.squareup.okio:okio;3.6.0
228228
com.squareup.okio:okio-jvm;3.6.0
@@ -334,8 +334,8 @@ org.revapi:revapi-java-spi;0.23.6
334334
org.revapi:revapi-reporter-json;0.4.5
335335
org.revapi:revapi-maven-plugin;0.14.6
336336
org.sonatype.plugins:nexus-staging-maven-plugin;1.6.8
337-
org.testcontainers:testcontainers;1.19.5
338-
org.testcontainers:junit-jupiter;1.19.5
337+
org.testcontainers:testcontainers;1.19.7
338+
org.testcontainers:junit-jupiter;1.19.7
339339

340340
# External Dependency Exceptions
341341
# This section is for external dependencies whose versions were different than
@@ -443,7 +443,7 @@ spring_redis.clients:jedis;3.8.0
443443

444444
# Spring Boot 3 dependency versions
445445
jakarta.servlet:jakarta.servlet-api;6.0.0
446-
jakarta.xml.bind:jakarta.xml.bind-api;4.0.1
447-
org.springframework.boot:spring-boot-starter-log4j2;3.2.3
446+
jakarta.xml.bind:jakarta.xml.bind-api;4.0.2
447+
org.springframework.boot:spring-boot-starter-log4j2;3.2.4
448448
org.springframework.cloud:spring-cloud-stream-test-binder;4.1.0
449-
org.springframework:spring-core-test;6.1.4
449+
org.springframework:spring-core-test;6.1.5

sdk/appconfiguration/azure-data-appconfiguration/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
<dependency>
110110
<groupId>io.projectreactor</groupId>
111111
<artifactId>reactor-test</artifactId>
112-
<version>3.6.3</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
112+
<version>3.6.4</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
113113
<scope>test</scope>
114114
</dependency>
115115
<dependency>

sdk/communication/azure-communication-callautomation/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
<dependency>
114114
<groupId>io.projectreactor</groupId>
115115
<artifactId>reactor-test</artifactId>
116-
<version>3.6.3</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
116+
<version>3.6.4</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
117117
<scope>test</scope>
118118
</dependency>
119119
<dependency>

sdk/communication/azure-communication-callingserver/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
<dependency>
127127
<groupId>io.projectreactor</groupId>
128128
<artifactId>reactor-test</artifactId>
129-
<version>3.6.3</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
129+
<version>3.6.4</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
130130
<scope>test</scope>
131131
</dependency>
132132
<dependency>

sdk/communication/azure-communication-common/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
<dependency>
8282
<groupId>io.projectreactor</groupId>
8383
<artifactId>reactor-test</artifactId>
84-
<version>3.6.3</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
84+
<version>3.6.4</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
8585
<scope>test</scope>
8686
</dependency>
8787
</dependencies>

sdk/communication/azure-communication-identity/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
<dependency>
9292
<groupId>io.projectreactor</groupId>
9393
<artifactId>reactor-test</artifactId>
94-
<version>3.6.3</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
94+
<version>3.6.4</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
9595
<scope>test</scope>
9696
</dependency>
9797
<dependency>

sdk/communication/azure-communication-jobrouter/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<dependency>
6262
<groupId>io.projectreactor</groupId>
6363
<artifactId>reactor-test</artifactId>
64-
<version>3.6.3</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
64+
<version>3.6.4</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
6565
<scope>test</scope>
6666
</dependency>
6767
<dependency>

sdk/communication/azure-communication-messages/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
<dependency>
103103
<groupId>io.projectreactor</groupId>
104104
<artifactId>reactor-test</artifactId>
105-
<version>3.6.3</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
105+
<version>3.6.4</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
106106
<scope>test</scope>
107107
</dependency>
108108
<dependency>

0 commit comments

Comments
 (0)