External dependencies upgrade - Spring Boot 2.7.18 and Spring Cloud 2…

…021.0.8 (#37885) * update to 2.7.18
Azure · Dec 8, 2023 · e339e1e · e339e1e
1 parent 07e6915
commit e339e1e
Show file tree

Hide file tree

Showing 43 changed files with 513 additions and 512 deletions.
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_2.7.17_managed_external_dependencies.txt
-# If your version is different from sdk/spring/scripts/spring_boot_2.7.17_managed_external_dependencies.txt,
+# make sure the version is same to sdk/spring/scripts/spring_boot_2.7.18_managed_external_dependencies.txt
+# If your version is different from sdk/spring/scripts/spring_boot_2.7.18_managed_external_dependencies.txt,
 # please discuss with Spring Integration team members:
 # @chenrujun (rujche), @saragluna (xiada), @yiliuTo (yiliu6), @backwind1233 (zhihaoguo).
 # Thanks.
@@ -51,9 +51,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;5.12.3
-io.micrometer:micrometer-core;1.9.16
-io.micrometer:micrometer-registry-azure-monitor;1.9.16
-io.micrometer:micrometer-registry-graphite;1.9.16
+io.micrometer:micrometer-core;1.9.17
+io.micrometer:micrometer-registry-azure-monitor;1.9.17
+io.micrometer:micrometer-registry-graphite;1.9.17
 io.netty:netty-buffer;4.1.101.Final
 io.netty:netty-common;4.1.101.Final
 io.netty:netty-codec;4.1.101.Final
@@ -106,7 +106,7 @@ org.graalvm.buildtools:junit-platform-native;0.9.19
 org.graalvm.buildtools:native-maven-plugin;0.9.19
 org.graalvm.sdk:graal-sdk;22.0.0.2
 org.graalvm.nativeimage:svm;22.0.0.2
-org.messaginghub:pooled-jms;1.2.5
+org.messaginghub:pooled-jms;1.2.6
 org.postgresql:postgresql;42.3.8
 org.slf4j:slf4j-api;1.7.36
 org.slf4j:slf4j-nop;1.7.36
@@ -119,33 +119,33 @@ 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;2.7.17
-org.springframework.boot:spring-boot-actuator;2.7.17
-org.springframework.boot:spring-boot-actuator-autoconfigure;2.7.17
-org.springframework.boot:spring-boot-autoconfigure-processor;2.7.17
-org.springframework.boot:spring-boot-autoconfigure;2.7.17
-org.springframework.boot:spring-boot-configuration-metadata;2.7.17
-org.springframework.boot:spring-boot-configuration-processor;2.7.17
-org.springframework.boot:spring-boot-maven-plugin;2.7.17
-org.springframework.boot:spring-boot-starter-actuator;2.7.17
-org.springframework.boot:spring-boot-starter-aop;2.7.17
-org.springframework.boot:spring-boot-starter-cache;2.7.17
-org.springframework.boot:spring-boot-starter-data-redis;2.7.17
-org.springframework.boot:spring-boot-starter-data-jdbc;2.7.17
-org.springframework.boot:spring-boot-starter-integration;2.7.17
-org.springframework.boot:spring-boot-starter-logging;2.7.17
-org.springframework.boot:spring-boot-starter-test;2.7.17
-org.springframework.boot:spring-boot-starter-validation;2.7.17
-org.springframework.boot:spring-boot-starter-web;2.7.17
-org.springframework.boot:spring-boot-starter;2.7.17
-org.springframework.boot:spring-boot-test;2.7.17
-org.springframework.boot:spring-boot;2.7.17
-org.springframework.data:spring-data-commons;2.7.17
-org.springframework.data:spring-data-mongodb;3.4.17
-org.springframework.data:spring-data-redis;2.7.17
+org.springframework.boot:spring-boot-dependencies;2.7.18
+org.springframework.boot:spring-boot-actuator;2.7.18
+org.springframework.boot:spring-boot-actuator-autoconfigure;2.7.18
+org.springframework.boot:spring-boot-autoconfigure-processor;2.7.18
+org.springframework.boot:spring-boot-autoconfigure;2.7.18
+org.springframework.boot:spring-boot-configuration-metadata;2.7.18
+org.springframework.boot:spring-boot-configuration-processor;2.7.18
+org.springframework.boot:spring-boot-maven-plugin;2.7.18
+org.springframework.boot:spring-boot-starter-actuator;2.7.18
+org.springframework.boot:spring-boot-starter-aop;2.7.18
+org.springframework.boot:spring-boot-starter-cache;2.7.18
+org.springframework.boot:spring-boot-starter-data-redis;2.7.18
+org.springframework.boot:spring-boot-starter-data-jdbc;2.7.18
+org.springframework.boot:spring-boot-starter-integration;2.7.18
+org.springframework.boot:spring-boot-starter-logging;2.7.18
+org.springframework.boot:spring-boot-starter-test;2.7.18
+org.springframework.boot:spring-boot-starter-validation;2.7.18
+org.springframework.boot:spring-boot-starter-web;2.7.18
+org.springframework.boot:spring-boot-starter;2.7.18
+org.springframework.boot:spring-boot-test;2.7.18
+org.springframework.boot:spring-boot;2.7.18
+org.springframework.data:spring-data-commons;2.7.18
+org.springframework.data:spring-data-mongodb;3.4.18
+org.springframework.data:spring-data-redis;2.7.18
 org.springframework.experimental:spring-aot;0.11.4
 org.springframework.experimental:spring-aot-maven-plugin;0.11.4
-org.springframework.integration:spring-integration-core;5.5.19
+org.springframework.integration:spring-integration-core;5.5.20
 org.springframework.kafka:spring-kafka;2.9.11
 org.springframework.security:spring-security-config;5.7.11
 org.springframework.security:spring-security-core;5.7.11
@@ -154,20 +154,20 @@ org.springframework.security:spring-security-oauth2-resource-server;5.7.11
 org.springframework.security:spring-security-oauth2-core;5.7.11
 org.springframework.security:spring-security-oauth2-jose;5.7.11
 org.springframework.security:spring-security-web;5.7.11
-org.springframework:spring-beans;5.3.30
-org.springframework:spring-context-support;5.3.30
-org.springframework:spring-context;5.3.30
-org.springframework:spring-core;5.3.30
-org.springframework:spring-expression;5.3.30
-org.springframework:spring-jdbc;5.3.30
-org.springframework:spring-jms;5.3.30
-org.springframework:spring-messaging;5.3.30
-org.springframework:spring-tx;5.3.30
-org.springframework:spring-web;5.3.30
-org.springframework:spring-webmvc;5.3.30
-org.springframework:spring-test;5.3.30
+org.springframework:spring-beans;5.3.31
+org.springframework:spring-context-support;5.3.31
+org.springframework:spring-context;5.3.31
+org.springframework:spring-core;5.3.31
+org.springframework:spring-expression;5.3.31
+org.springframework:spring-jdbc;5.3.31
+org.springframework:spring-jms;5.3.31
+org.springframework:spring-messaging;5.3.31
+org.springframework:spring-tx;5.3.31
+org.springframework:spring-web;5.3.31
+org.springframework:spring-webmvc;5.3.31
+org.springframework:spring-test;5.3.31
 org.springframework.retry:spring-retry;1.3.4
-org.springframework.boot:spring-boot-starter-parent;2.7.17
+org.springframework.boot:spring-boot-starter-parent;2.7.18
 
 ## Spring cloud dependency versions
 org.springframework.cloud:spring-cloud-dependencies;2021.0.8
@@ -269,9 +269,9 @@ com.puppycrawl.tools:checkstyle;9.3
 com.toasttab.android:gummy-bears-api-26;0.5.1
 commons-io:commons-io;2.11.0
 commons-validator:commons-validator;1.6
-io.dropwizard.metrics:metrics-core;4.2.21
-io.dropwizard.metrics:metrics-graphite;4.2.21
-io.dropwizard.metrics:metrics-jvm;4.2.21
+io.dropwizard.metrics:metrics-core;4.2.22
+io.dropwizard.metrics:metrics-graphite;4.2.22
+io.dropwizard.metrics:metrics-jvm;4.2.22
 io.reactivex.rxjava2:rxjava;2.2.21
 net.java.dev.jna:jna-platform;5.6.0
 net.oneandone.reflections8:reflections8;0.11.7

diff --git a/sdk/cosmos/azure-cosmos-benchmark/pom.xml b/sdk/cosmos/azure-cosmos-benchmark/pom.xml
@@ -109,13 +109,13 @@ Licensed under the MIT License.
     <dependency>
       <groupId>io.micrometer</groupId>
       <artifactId>micrometer-registry-azure-monitor</artifactId>
-      <version>1.9.16</version> <!-- {x-version-update;io.micrometer:micrometer-registry-azure-monitor;external_dependency} -->
+      <version>1.9.17</version> <!-- {x-version-update;io.micrometer:micrometer-registry-azure-monitor;external_dependency} -->
     </dependency>
 
     <dependency>
       <groupId>io.micrometer</groupId>
       <artifactId>micrometer-registry-graphite</artifactId>
-      <version>1.9.16</version> <!-- {x-version-update;io.micrometer:micrometer-registry-graphite;external_dependency} -->
+      <version>1.9.17</version> <!-- {x-version-update;io.micrometer:micrometer-registry-graphite;external_dependency} -->
     </dependency>
 
     <dependency>
@@ -266,8 +266,8 @@ Licensed under the MIT License.
                 <include>com.google.guava:guava:[32.0.1-jre]</include> <!-- {x-include-update;cosmos_com.google.guava:guava;external_dependency} -->
                 <include>io.dropwizard.metrics:metrics-graphite:[4.1.0]</include> <!-- {x-include-update;cosmos_io.dropwizard.metrics:metrics-graphite;external_dependency} -->
                 <include>io.dropwizard.metrics:metrics-jvm:[4.1.0]</include> <!-- {x-include-update;cosmos_io.dropwizard.metrics:metrics-jvm;external_dependency} -->
-                <include>io.micrometer:micrometer-registry-azure-monitor:[1.9.16]</include> <!-- {x-include-update;io.micrometer:micrometer-registry-azure-monitor;external_dependency} -->
-                <include>io.micrometer:micrometer-registry-graphite:[1.9.16]</include> <!-- {x-include-update;io.micrometer:micrometer-registry-graphite;external_dependency} -->
+                <include>io.micrometer:micrometer-registry-azure-monitor:[1.9.17]</include> <!-- {x-include-update;io.micrometer:micrometer-registry-azure-monitor;external_dependency} -->
+                <include>io.micrometer:micrometer-registry-graphite:[1.9.17]</include> <!-- {x-include-update;io.micrometer:micrometer-registry-graphite;external_dependency} -->
                 <include>org.apache.commons:commons-lang3:[3.12.0]</include> <!-- {x-include-update;org.apache.commons:commons-lang3;external_dependency} -->
                 <include>org.apache.logging.log4j:log4j-api:[2.17.2]</include> <!-- {x-include-update;org.apache.logging.log4j:log4j-api;external_dependency} -->
                 <include>org.apache.logging.log4j:log4j-core:[2.17.2]</include> <!-- {x-include-update;org.apache.logging.log4j:log4j-core;external_dependency} -->

diff --git a/sdk/cosmos/azure-cosmos-dotnet-benchmark/pom.xml b/sdk/cosmos/azure-cosmos-dotnet-benchmark/pom.xml
@@ -190,8 +190,8 @@ Licensed under the MIT License.
                 <include>org.slf4j:slf4j-api:[1.7.36]</include> <!-- {x-include-update;org.slf4j:slf4j-api;external_dependency} -->
                 <include>io.dropwizard.metrics:metrics-graphite:[4.1.0]</include> <!-- {x-include-update;cosmos_io.dropwizard.metrics:metrics-graphite;external_dependency} -->
                 <include>io.dropwizard.metrics:metrics-jvm:[4.1.0]</include> <!-- {x-include-update;cosmos_io.dropwizard.metrics:metrics-jvm;external_dependency} -->
-                <include>io.micrometer:micrometer-registry-azure-monitor:[1.9.16]</include> <!-- {x-include-update;io.micrometer:micrometer-registry-azure-monitor;external_dependency} -->
-                <include>io.micrometer:micrometer-registry-graphite:[1.9.16]</include> <!-- {x-include-update;io.micrometer:micrometer-registry-graphite;external_dependency} -->
+                <include>io.micrometer:micrometer-registry-azure-monitor:[1.9.17]</include> <!-- {x-include-update;io.micrometer:micrometer-registry-azure-monitor;external_dependency} -->
+                <include>io.micrometer:micrometer-registry-graphite:[1.9.17]</include> <!-- {x-include-update;io.micrometer:micrometer-registry-graphite;external_dependency} -->
                 <include>org.apache.commons:commons-lang3:[3.12.0]</include> <!-- {x-include-update;org.apache.commons:commons-lang3;external_dependency} -->
                 <include>org.apache.logging.log4j:log4j-api:[2.17.2]</include> <!-- {x-include-update;org.apache.logging.log4j:log4j-api;external_dependency} -->
                 <include>org.apache.logging.log4j:log4j-core:[2.17.2]</include> <!-- {x-include-update;org.apache.logging.log4j:log4j-core;external_dependency} -->

diff --git a/sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml b/sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml
@@ -180,7 +180,7 @@
     <dependency>
       <groupId>io.micrometer</groupId>
       <artifactId>micrometer-registry-azure-monitor</artifactId>
-      <version>1.9.16</version> <!-- {x-version-update;io.micrometer:micrometer-registry-azure-monitor;external_dependency} -->
+      <version>1.9.17</version> <!-- {x-version-update;io.micrometer:micrometer-registry-azure-monitor;external_dependency} -->
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -230,7 +230,7 @@
                 <include>com.fasterxml.jackson.core:jackson-databind:[2.13.5]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
                 <include>com.fasterxml.jackson.module:jackson-module-scala_2.12:[2.13.5]</include> <!-- {x-include-update;com.fasterxml.jackson.module:jackson-module-scala_2.12;external_dependency} -->
                 <include>com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.13.5]</include> <!-- {x-include-update;com.fasterxml.jackson.datatype:jackson-datatype-jsr310;external_dependency} -->
-                <include>io.micrometer:micrometer-registry-azure-monitor:[1.9.16]</include> <!-- {x-include-update;io.micrometer:micrometer-registry-azure-monitor;external_dependency} -->
+                <include>io.micrometer:micrometer-registry-azure-monitor:[1.9.17]</include> <!-- {x-include-update;io.micrometer:micrometer-registry-azure-monitor;external_dependency} -->
                 <include>com.microsoft.azure:applicationinsights-core:[2.6.4]</include> <!-- {x-include-update;cosmos_com.microsoft.azure:applicationinsights-core;external_dependency} -->
                 <include>com.globalmentor:hadoop-bare-naked-local-fs:[0.1.0]</include> <!-- {x-include-update;cosmos_com.globalmentor:hadoop-bare-naked-local-fs;external_dependency} -->
               </includes>

diff --git a/sdk/cosmos/azure-cosmos/pom.xml b/sdk/cosmos/azure-cosmos/pom.xml
@@ -122,7 +122,7 @@ Licensed under the MIT License.
     <dependency>
       <groupId>io.micrometer</groupId>
       <artifactId>micrometer-core</artifactId>
-      <version>1.9.16</version> <!-- {x-version-update;io.micrometer:micrometer-core;external_dependency} -->
+      <version>1.9.17</version> <!-- {x-version-update;io.micrometer:micrometer-core;external_dependency} -->
     </dependency>
   </dependencies>
 
@@ -156,7 +156,7 @@ Licensed under the MIT License.
               <includes>
                 <include>com.fasterxml.jackson.module:jackson-module-afterburner:[2.13.5]</include> <!-- {x-include-update;cosmos_com.fasterxml.jackson.module:jackson-module-afterburner;external_dependency} -->
                 <include>io.dropwizard.metrics:metrics-core:[4.1.0]</include> <!-- {x-include-update;cosmos_io.dropwizard.metrics:metrics-core;external_dependency} -->
-                <include>io.micrometer:micrometer-core:[1.9.16]</include> <!-- {x-include-update;io.micrometer:micrometer-core;external_dependency} -->
+                <include>io.micrometer:micrometer-core:[1.9.17]</include> <!-- {x-include-update;io.micrometer:micrometer-core;external_dependency} -->
                 <include>org.slf4j:slf4j-api:[1.7.36]</include> <!-- {x-include-update;org.slf4j:slf4j-api;external_dependency} -->
                 <include>org.hdrhistogram:HdrHistogram:[2.1.12]</include> <!-- {x-include-update;cosmos_org.hdrhistogram:HdrHistogram;external_dependency} -->
               </includes>

diff --git a/sdk/eventhubs/azure-messaging-eventhubs-stress/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs-stress/pom.xml
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter</artifactId>
-      <version>2.7.17</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter;external_dependency} -->
+      <version>2.7.18</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter;external_dependency} -->
     </dependency>
 
     <dependency>
@@ -73,7 +73,7 @@
       <plugin>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
-        <version>2.7.17</version> <!-- {x-version-update;org.springframework.boot:spring-boot-maven-plugin;external_dependency} -->
+        <version>2.7.18</version> <!-- {x-version-update;org.springframework.boot:spring-boot-maven-plugin;external_dependency} -->
         <executions>
           <execution>
             <goals>
@@ -91,7 +91,7 @@
             <bannedDependencies>
               <includes>
                 <include>com.microsoft.azure:applicationinsights-core:[3.4.1]</include> <!-- {x-include-update;com.microsoft.azure:applicationinsights-core;external_dependency} -->
-                <include>org.springframework.boot:spring-boot-starter:[2.7.17]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter;external_dependency} -->
+                <include>org.springframework.boot:spring-boot-starter:[2.7.18]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter;external_dependency} -->
                 <include>org.codehaus.janino:janino:[3.1.10]</include> <!-- {x-include-update;org.codehaus.janino:janino;external_dependency} -->
               </includes>
             </bannedDependencies>

diff --git a/sdk/keyvault/azure-security-test-keyvault-jca/pom.xml b/sdk/keyvault/azure-security-test-keyvault-jca/pom.xml
@@ -76,7 +76,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      <version>5.3.30</version> <!-- {x-version-update;org.springframework:spring-core;external_dependency} -->
+      <version>5.3.31</version> <!-- {x-version-update;org.springframework:spring-core;external_dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/sdk/servicebus/azure-messaging-servicebus-stress/pom.xml b/sdk/servicebus/azure-messaging-servicebus-stress/pom.xml
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter</artifactId>
-      <version>2.7.17</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter;external_dependency} -->
+      <version>2.7.18</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter;external_dependency} -->
     </dependency>
 
     <dependency>
@@ -62,7 +62,7 @@
       <plugin>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
-        <version>2.7.17</version> <!-- {x-version-update;org.springframework.boot:spring-boot-maven-plugin;external_dependency} -->
+        <version>2.7.18</version> <!-- {x-version-update;org.springframework.boot:spring-boot-maven-plugin;external_dependency} -->
         <executions>
           <execution>
             <goals>
@@ -79,7 +79,7 @@
           <rules>
             <bannedDependencies>
               <includes>
-                <include>org.springframework.boot:spring-boot-starter:[2.7.17]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter;external_dependency} -->
+                <include>org.springframework.boot:spring-boot-starter:[2.7.18]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter;external_dependency} -->
                 <include>org.codehaus.janino:janino:[3.1.10]</include> <!-- {x-include-update;org.codehaus.janino:janino;external_dependency} -->
               </includes>
             </bannedDependencies>

diff --git a/sdk/spring/CHANGELOG.md b/sdk/spring/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Release History
 
 ## 4.14.0-beta.1 (Unreleased)
+Upgrade Spring Boot dependencies version to 2.7.18 and Spring Cloud dependencies version to 2021.0.8
 
 ### Spring Cloud Azure Autoconfigure
 This section includes changes in `spring-cloud-azure-autoconfigure` module.