External dependencies upgrade - Spring Boot 3.2.4 and Spring Cloud 20…

…23.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]>
Azure · Mar 25, 2024 · 26ed5db · 26ed5db
1 parent 1a41290
commit 26ed5db
Show file tree

Hide file tree

Showing 117 changed files with 959 additions and 942 deletions.
diff --git a/.vscode/cspell.json b/.vscode/cspell.json
@@ -925,6 +925,7 @@
         "brotli",
         "bson",
         "cbor",
+        "chromadb",
         "cockroachdb",
         "codehaus",
         "collectd",
@@ -994,6 +995,7 @@
         "ldif",
         "leveldb",
         "liquibase",
+        "milvus",
         "minio",
         "mockmvc",
         "moshi",
@@ -1009,6 +1011,8 @@
         "ojdbc",
         "okcurl",
         "okio",
+        "ollama",
+        "openfga",
         "openmldb",
         "opentsdb",
         "orai",
@@ -1019,6 +1023,7 @@
         "otlp",
         "pcollections",
         "proxool",
+        "qdrant",
         "qpack",
         "questdb",
         "quic",
@@ -1058,6 +1063,7 @@
         "vertx",
         "vibur",
         "wadl",
+        "weaviate",
         "webmvc",
         "xerial",
         "xmpp",

diff --git a/common/perf-test-core/pom.xml b/common/perf-test-core/pom.xml
@@ -51,7 +51,7 @@
                 <!-- Special allowance for performance libraries as they aren't shipped. -->
                 <include>com.beust:jcommander:[1.78]</include> <!-- {x-include-update;com.beust:jcommander;external_dependency} -->
 
-                <include>io.projectreactor:reactor-core:[3.6.3]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
+                <include>io.projectreactor:reactor-core:[3.6.4]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
                 <include>io.vertx:vertx-codegen:[4.5.4]</include> <!-- {x-include-update;io.vertx:vertx-codegen;external_dependency} -->
               </includes>
             </bannedDependencies>

diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt
@@ -1,6 +1,6 @@
 # To avoid dependency conflicts between SDK and Spring, when modifying or adding dependencies,
-# make sure the version is same to sdk/spring/scripts/spring_boot_3.2.3_managed_external_dependencies.txt
-# If your version is different from sdk/spring/scripts/spring_boot_3.2.3_managed_external_dependencies.txt,
+# make sure the version is same to sdk/spring/scripts/spring_boot_3.2.4_managed_external_dependencies.txt
+# If your version is different from sdk/spring/scripts/spring_boot_3.2.4_managed_external_dependencies.txt,
 # please discuss with Spring Integration team members:
 # @chenrujun (rujche), @saragluna (xiada), @yiliuTo (yiliu6), @backwind1233 (zhihaoguo).
 # Thanks.
@@ -54,9 +54,9 @@ commons-net:commons-net;3.9.0
 io.cloudevents:cloudevents-api;2.2.0
 io.cloudevents:cloudevents-core;2.2.0
 io.fabric8:kubernetes-client;6.9.2
-io.micrometer:micrometer-core;1.12.3
-io.micrometer:micrometer-registry-azure-monitor;1.12.3
-io.micrometer:micrometer-registry-graphite;1.12.3
+io.micrometer:micrometer-core;1.12.4
+io.micrometer:micrometer-registry-azure-monitor;1.12.4
+io.micrometer:micrometer-registry-graphite;1.12.4
 io.netty:netty-buffer;4.1.107.Final
 io.netty:netty-common;4.1.107.Final
 io.netty:netty-codec;4.1.107.Final
@@ -70,9 +70,9 @@ io.netty:netty-tcnative-boringssl-static;2.0.62.Final
 io.netty:netty-transport-native-epoll;4.1.107.Final
 io.netty:netty-transport-native-unix-common;4.1.107.Final
 io.netty:netty-transport-native-kqueue;4.1.107.Final
-io.projectreactor.netty:reactor-netty;1.1.16
-io.projectreactor.netty:reactor-netty-http;1.1.16
-io.projectreactor:reactor-core;3.6.3
+io.projectreactor.netty:reactor-netty;1.1.17
+io.projectreactor.netty:reactor-netty-http;1.1.17
+io.projectreactor:reactor-core;3.6.4
 io.vertx:vertx-codegen;4.5.4
 io.vertx:vertx-core;4.5.4
 io.vertx:vertx-reactive-streams;4.5.4
@@ -85,7 +85,7 @@ org.apache.commons:commons-compress;1.26.0
 org.apache.avro:avro;1.11.3
 org.apache.avro:avro-maven-plugin;1.11.3
 org.apache.commons:commons-lang3;3.13.0
-org.apache.groovy:groovy;4.0.18
+org.apache.groovy:groovy;4.0.20
 org.apache.httpcomponents:httpclient;4.5.14
 org.apache.kafka:kafka-clients;3.6.1
 org.apache.logging.log4j:log4j-api;2.21.1
@@ -113,68 +113,68 @@ org.graalvm.buildtools:native-maven-plugin;0.9.28
 org.graalvm.sdk:graal-sdk;22.0.0.2
 org.graalvm.nativeimage:svm;22.0.0.2
 org.messaginghub:pooled-jms;3.1.5
-org.postgresql:postgresql;42.6.1
+org.postgresql:postgresql;42.6.2
 org.slf4j:slf4j-api;2.0.12
 org.slf4j:slf4j-nop;2.0.12
 org.slf4j:slf4j-simple;2.0.12
 redis.clients:jedis;5.1.0
-io.lettuce:lettuce-core;6.3.1.RELEASE
+io.lettuce:lettuce-core;6.3.2.RELEASE
 org.redisson:redisson;3.27.0
 net.bytebuddy:byte-buddy;1.14.12
 net.bytebuddy:byte-buddy-agent;1.14.12
 testdep_net.bytebuddy:byte-buddy;1.14.8
 testdep_net.bytebuddy:byte-buddy-agent;1.14.8
 
 ## Spring boot dependency versions
-org.springframework.boot:spring-boot-dependencies;3.2.3
-org.springframework.boot:spring-boot-actuator;3.2.3
-org.springframework.boot:spring-boot-actuator-autoconfigure;3.2.3
-org.springframework.boot:spring-boot-autoconfigure-processor;3.2.3
-org.springframework.boot:spring-boot-autoconfigure;3.2.3
-org.springframework.boot:spring-boot-configuration-metadata;3.2.3
-org.springframework.boot:spring-boot-configuration-processor;3.2.3
-org.springframework.boot:spring-boot-maven-plugin;3.2.3
-org.springframework.boot:spring-boot-starter-actuator;3.2.3
-org.springframework.boot:spring-boot-starter-aop;3.2.3
-org.springframework.boot:spring-boot-starter-cache;3.2.3
-org.springframework.boot:spring-boot-starter-data-redis;3.2.3
-org.springframework.boot:spring-boot-starter-data-jdbc;3.2.3
-org.springframework.boot:spring-boot-starter-integration;3.2.3
-org.springframework.boot:spring-boot-starter-logging;3.2.3
-org.springframework.boot:spring-boot-starter-test;3.2.3
-org.springframework.boot:spring-boot-starter-validation;3.2.3
-org.springframework.boot:spring-boot-starter-web;3.2.3
-org.springframework.boot:spring-boot-starter;3.2.3
-org.springframework.boot:spring-boot-test;3.2.3
-org.springframework.boot:spring-boot;3.2.3
-org.springframework.data:spring-data-commons;3.2.3
-org.springframework.data:spring-data-mongodb;4.2.3
-org.springframework.data:spring-data-redis;3.2.3
+org.springframework.boot:spring-boot-dependencies;3.2.4
+org.springframework.boot:spring-boot-actuator;3.2.4
+org.springframework.boot:spring-boot-actuator-autoconfigure;3.2.4
+org.springframework.boot:spring-boot-autoconfigure-processor;3.2.4
+org.springframework.boot:spring-boot-autoconfigure;3.2.4
+org.springframework.boot:spring-boot-configuration-metadata;3.2.4
+org.springframework.boot:spring-boot-configuration-processor;3.2.4
+org.springframework.boot:spring-boot-maven-plugin;3.2.4
+org.springframework.boot:spring-boot-starter-actuator;3.2.4
+org.springframework.boot:spring-boot-starter-aop;3.2.4
+org.springframework.boot:spring-boot-starter-cache;3.2.4
+org.springframework.boot:spring-boot-starter-data-redis;3.2.4
+org.springframework.boot:spring-boot-starter-data-jdbc;3.2.4
+org.springframework.boot:spring-boot-starter-integration;3.2.4
+org.springframework.boot:spring-boot-starter-logging;3.2.4
+org.springframework.boot:spring-boot-starter-test;3.2.4
+org.springframework.boot:spring-boot-starter-validation;3.2.4
+org.springframework.boot:spring-boot-starter-web;3.2.4
+org.springframework.boot:spring-boot-starter;3.2.4
+org.springframework.boot:spring-boot-test;3.2.4
+org.springframework.boot:spring-boot;3.2.4
+org.springframework.data:spring-data-commons;3.2.4
+org.springframework.data:spring-data-mongodb;4.2.4
+org.springframework.data:spring-data-redis;3.2.4
 org.springframework.experimental:spring-aot;0.11.4
 org.springframework.experimental:spring-aot-maven-plugin;0.11.4
-org.springframework.integration:spring-integration-core;6.2.2
-org.springframework.kafka:spring-kafka;3.1.2
-org.springframework.security:spring-security-config;6.2.2
-org.springframework.security:spring-security-core;6.2.2
-org.springframework.security:spring-security-oauth2-client;6.2.2
-org.springframework.security:spring-security-oauth2-resource-server;6.2.2
-org.springframework.security:spring-security-oauth2-core;6.2.2
-org.springframework.security:spring-security-oauth2-jose;6.2.2
-org.springframework.security:spring-security-web;6.2.2
-org.springframework:spring-beans;6.1.4
-org.springframework:spring-context-support;6.1.4
-org.springframework:spring-context;6.1.4
-org.springframework:spring-core;6.1.4
-org.springframework:spring-expression;6.1.4
-org.springframework:spring-jdbc;6.1.4
-org.springframework:spring-jms;6.1.4
-org.springframework:spring-messaging;6.1.4
-org.springframework:spring-tx;6.1.4
-org.springframework:spring-web;6.1.4
-org.springframework:spring-webmvc;6.1.4
-org.springframework:spring-test;6.1.4
+org.springframework.integration:spring-integration-core;6.2.3
+org.springframework.kafka:spring-kafka;3.1.3
+org.springframework.security:spring-security-config;6.2.3
+org.springframework.security:spring-security-core;6.2.3
+org.springframework.security:spring-security-oauth2-client;6.2.3
+org.springframework.security:spring-security-oauth2-resource-server;6.2.3
+org.springframework.security:spring-security-oauth2-core;6.2.3
+org.springframework.security:spring-security-oauth2-jose;6.2.3
+org.springframework.security:spring-security-web;6.2.3
+org.springframework:spring-beans;6.1.5
+org.springframework:spring-context-support;6.1.5
+org.springframework:spring-context;6.1.5
+org.springframework:spring-core;6.1.5
+org.springframework:spring-expression;6.1.5
+org.springframework:spring-jdbc;6.1.5
+org.springframework:spring-jms;6.1.5
+org.springframework:spring-messaging;6.1.5
+org.springframework:spring-tx;6.1.5
+org.springframework:spring-web;6.1.5
+org.springframework:spring-webmvc;6.1.5
+org.springframework:spring-test;6.1.5
 org.springframework.retry:spring-retry;2.0.5
-org.springframework.boot:spring-boot-starter-parent;3.2.3
+org.springframework.boot:spring-boot-starter-parent;3.2.4
 
 ## Spring cloud dependency versions
 org.springframework.cloud:spring-cloud-dependencies;2023.0.0
@@ -222,7 +222,7 @@ io.opentelemetry.instrumentation:opentelemetry-spring-boot-starter;2.1.0-alpha
 io.opentelemetry.instrumentation:opentelemetry-jdbc;2.1.0-alpha
 io.opentelemetry.instrumentation:opentelemetry-logback-appender-1.0;2.1.0-alpha
 
-io.projectreactor:reactor-test;3.6.3
+io.projectreactor:reactor-test;3.6.4
 io.github.hakky54:logcaptor;2.9.0
 com.squareup.okio:okio;3.6.0
 com.squareup.okio:okio-jvm;3.6.0
@@ -334,8 +334,8 @@ org.revapi:revapi-java-spi;0.23.6
 org.revapi:revapi-reporter-json;0.4.5
 org.revapi:revapi-maven-plugin;0.14.6
 org.sonatype.plugins:nexus-staging-maven-plugin;1.6.8
-org.testcontainers:testcontainers;1.19.5
-org.testcontainers:junit-jupiter;1.19.5
+org.testcontainers:testcontainers;1.19.7
+org.testcontainers:junit-jupiter;1.19.7
 
 # External Dependency Exceptions
 # This section is for external dependencies whose versions were different than
@@ -443,7 +443,7 @@ spring_redis.clients:jedis;3.8.0
 
 # Spring Boot 3 dependency versions
 jakarta.servlet:jakarta.servlet-api;6.0.0
-jakarta.xml.bind:jakarta.xml.bind-api;4.0.1
-org.springframework.boot:spring-boot-starter-log4j2;3.2.3
+jakarta.xml.bind:jakarta.xml.bind-api;4.0.2
+org.springframework.boot:spring-boot-starter-log4j2;3.2.4
 org.springframework.cloud:spring-cloud-stream-test-binder;4.1.0
-org.springframework:spring-core-test;6.1.4
+org.springframework:spring-core-test;6.1.5
diff --git a/sdk/appconfiguration/azure-data-appconfiguration/pom.xml b/sdk/appconfiguration/azure-data-appconfiguration/pom.xml
@@ -109,7 +109,7 @@
     <dependency>
       <groupId>io.projectreactor</groupId>
       <artifactId>reactor-test</artifactId>
-      <version>3.6.3</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
+      <version>3.6.4</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/sdk/communication/azure-communication-callautomation/pom.xml b/sdk/communication/azure-communication-callautomation/pom.xml
@@ -113,7 +113,7 @@
     <dependency>
       <groupId>io.projectreactor</groupId>
       <artifactId>reactor-test</artifactId>
-      <version>3.6.3</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
+      <version>3.6.4</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/sdk/communication/azure-communication-callingserver/pom.xml b/sdk/communication/azure-communication-callingserver/pom.xml
@@ -126,7 +126,7 @@
     <dependency>
       <groupId>io.projectreactor</groupId>
       <artifactId>reactor-test</artifactId>
-      <version>3.6.3</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
+      <version>3.6.4</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/sdk/communication/azure-communication-common/pom.xml b/sdk/communication/azure-communication-common/pom.xml
@@ -81,7 +81,7 @@
     <dependency>
       <groupId>io.projectreactor</groupId>
       <artifactId>reactor-test</artifactId>
-      <version>3.6.3</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
+      <version>3.6.4</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/sdk/communication/azure-communication-identity/pom.xml b/sdk/communication/azure-communication-identity/pom.xml
@@ -91,7 +91,7 @@
     <dependency>
       <groupId>io.projectreactor</groupId>
       <artifactId>reactor-test</artifactId>
-      <version>3.6.3</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
+      <version>3.6.4</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/sdk/communication/azure-communication-jobrouter/pom.xml b/sdk/communication/azure-communication-jobrouter/pom.xml
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>io.projectreactor</groupId>
       <artifactId>reactor-test</artifactId>
-      <version>3.6.3</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
+      <version>3.6.4</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/sdk/communication/azure-communication-messages/pom.xml b/sdk/communication/azure-communication-messages/pom.xml
@@ -102,7 +102,7 @@
     <dependency>
       <groupId>io.projectreactor</groupId>
       <artifactId>reactor-test</artifactId>
-      <version>3.6.3</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
+      <version>3.6.4</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/sdk/communication/azure-communication-networktraversal/pom.xml b/sdk/communication/azure-communication-networktraversal/pom.xml
@@ -89,7 +89,7 @@
     <dependency>
       <groupId>io.projectreactor</groupId>
       <artifactId>reactor-test</artifactId>
-      <version>3.6.3</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
+      <version>3.6.4</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/sdk/communication/azure-communication-phonenumbers/pom.xml b/sdk/communication/azure-communication-phonenumbers/pom.xml
@@ -91,7 +91,7 @@
     <dependency>
       <groupId>io.projectreactor</groupId>
       <artifactId>reactor-test</artifactId>
-      <version>3.6.3</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
+      <version>3.6.4</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/sdk/communication/azure-communication-rooms/pom.xml b/sdk/communication/azure-communication-rooms/pom.xml
@@ -99,7 +99,7 @@
     <dependency>
       <groupId>io.projectreactor</groupId>
       <artifactId>reactor-test</artifactId>
-      <version>3.6.3</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
+      <version>3.6.4</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/sdk/communication/azure-communication-sms/pom.xml b/sdk/communication/azure-communication-sms/pom.xml
@@ -95,7 +95,7 @@
     <dependency>
       <groupId>io.projectreactor</groupId>
       <artifactId>reactor-test</artifactId>
-      <version>3.6.3</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
+      <version>3.6.4</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/sdk/containerregistry/azure-containers-containerregistry/pom.xml b/sdk/containerregistry/azure-containers-containerregistry/pom.xml
@@ -99,7 +99,7 @@
     <dependency>
       <groupId>io.projectreactor</groupId>
       <artifactId>reactor-test</artifactId>
-      <version>3.6.3</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
+      <version>3.6.4</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/sdk/core/azure-core-amqp-experimental/pom.xml b/sdk/core/azure-core-amqp-experimental/pom.xml
@@ -90,7 +90,7 @@
     <dependency>
       <groupId>io.projectreactor</groupId>
       <artifactId>reactor-test</artifactId>
-      <version>3.6.3</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
+      <version>3.6.4</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/sdk/core/azure-core-amqp/pom.xml b/sdk/core/azure-core-amqp/pom.xml
@@ -93,7 +93,7 @@
     <dependency>
       <groupId>io.projectreactor</groupId>
       <artifactId>reactor-test</artifactId>
-      <version>3.6.3</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
+      <version>3.6.4</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
       <scope>test</scope>
     </dependency>
 

diff --git a/sdk/core/azure-core-experimental/pom.xml b/sdk/core/azure-core-experimental/pom.xml
@@ -122,7 +122,7 @@
     <dependency>
       <groupId>io.projectreactor</groupId>
       <artifactId>reactor-test</artifactId>
-      <version>3.6.3</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
+      <version>3.6.4</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/sdk/core/azure-core-http-jdk-httpclient/pom.xml b/sdk/core/azure-core-http-jdk-httpclient/pom.xml
@@ -105,7 +105,7 @@
     <dependency>
       <groupId>io.projectreactor</groupId>
       <artifactId>reactor-test</artifactId>
-      <version>3.6.3</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
+      <version>3.6.4</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
       <scope>test</scope>
     </dependency>