Merge Spring Cloud Azure 7 to main

.vscode/cspell.json

@@ -1093,6 +1093,7 @@
         "itest",
         "itests",
         "jaas",
+        "jandex",
         "janino",
         "jaspi",
         "jaxb",
@@ -1112,6 +1113,7 @@
         "jooq",
         "jpamodelgen",
         "jspc",
+        "jspecify",
         "jstl",
         "jtds",
         "jvnet",
@@ -1193,15 +1195,19 @@
         "uberjar",
         "ultraq",
         "unboundid",
+        "uring",
         "vavr",
         "vertx",
         "vibur",
         "wadl",
         "weaviate",
+        "webauthn",
         "webmvc",
         "xerial",
+        "xmlparserv",
         "xmpp",
         "xsom",
+        "xtend",
         "yasson",
         "yugabytedb",
         "zaxxer",

eng/lintingconfigs/revapi/track2/revapi.json

@@ -340,6 +340,36 @@
           "old" : "interface com.azure.spring.cloud.autoconfigure.jms.ServiceBusJmsConnectionFactoryCustomizer",
           "justification" : "Remove deprecated method"
         },
+        {
+          "code" : "java.method.parameterTypeChanged",
+          "old" : "parameter void com.azure.spring.data.cosmos.core.mapping.BasicCosmosPersistentEntity<T>::<init>(===org.springframework.data.util.TypeInformation<T>===)",
+          "new" : "parameter void com.azure.spring.data.cosmos.core.mapping.BasicCosmosPersistentEntity<T>::<init>(===org.springframework.data.core.TypeInformation<T>===)",
+          "justification" : "Replace deprecated parameterType"
+        },
+        {
+          "code" : "java.method.parameterTypeChanged",
+          "old" : "parameter <T> com.azure.spring.data.cosmos.core.mapping.BasicCosmosPersistentEntity<T> com.azure.spring.data.cosmos.core.mapping.CosmosMappingContext::createPersistentEntity(===org.springframework.data.util.TypeInformation<T>===)",
+          "new" : "parameter <T> com.azure.spring.data.cosmos.core.mapping.BasicCosmosPersistentEntity<T> com.azure.spring.data.cosmos.core.mapping.CosmosMappingContext::createPersistentEntity(===org.springframework.data.core.TypeInformation<T>===)",
+          "justification" : "Replace deprecated parameterType"
+        },
+        {
+          "code" : "java.method.parameterTypeChanged",
+          "old" : "parameter java.util.Optional<org.springframework.data.repository.query.QueryLookupStrategy> com.azure.spring.data.cosmos.repository.support.CosmosRepositoryFactory::getQueryLookupStrategy(org.springframework.data.repository.query.QueryLookupStrategy.Key, ===org.springframework.data.repository.query.QueryMethodEvaluationContextProvider===)",
+          "new" : "parameter java.util.Optional<org.springframework.data.repository.query.QueryLookupStrategy> com.azure.spring.data.cosmos.repository.support.CosmosRepositoryFactory::getQueryLookupStrategy(org.springframework.data.repository.query.QueryLookupStrategy.Key, ===org.springframework.data.repository.query.ValueExpressionDelegate===)",
+          "justification" : "Replace deprecated parameterType"
+        },
+        {
+          "code" : "java.method.parameterTypeChanged",
+          "old" : "parameter java.util.Optional<org.springframework.data.repository.query.QueryLookupStrategy> com.azure.spring.data.cosmos.repository.support.ReactiveCosmosRepositoryFactory::getQueryLookupStrategy(org.springframework.data.repository.query.QueryLookupStrategy.Key, ===org.springframework.data.repository.query.QueryMethodEvaluationContextProvider===)",
+          "new" : "parameter java.util.Optional<org.springframework.data.repository.query.QueryLookupStrategy> com.azure.spring.data.cosmos.repository.support.ReactiveCosmosRepositoryFactory::getQueryLookupStrategy(org.springframework.data.repository.query.QueryLookupStrategy.Key, ===org.springframework.data.repository.query.ValueExpressionDelegate===)",
+          "justification" : "Replace deprecated parameterType"
+        },
+        {
+          "code" : "java.method.parameterTypeChanged",
+          "old" : "parameter void com.azure.spring.integration.core.handler.DefaultMessageHandler::setSendCallback(===org.springframework.util.concurrent.ListenableFutureCallback<java.lang.Void>===)",
+          "new" : "parameter void com.azure.spring.integration.core.handler.DefaultMessageHandler::setSendCallback(===java.util.function.BiConsumer<java.lang.Void, java.lang.Throwable>===)",
+          "justification" : "Replace deprecated parameterType"
+        },
         {
           "code": "java.method.numberOfParametersChanged",
           "old": {

eng/versioning/external_dependencies.txt

@@ -301,101 +301,101 @@ resourcemanager_com.jcraft:jsch;0.1.55
 storage_com.microsoft.azure:azure-storage;8.6.6
 
 # sdk\spring\pom.xml modules
-springboot3_com.diffplug.spotless:spotless-maven-plugin;2.30.0
-springboot3_com.fasterxml.jackson.core:jackson-annotations;2.19.4
-springboot3_com.fasterxml.jackson.core:jackson-core;2.19.4
-springboot3_com.fasterxml.jackson.core:jackson-databind;2.19.4
-springboot3_com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.19.4
-springboot3_com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.19.4
-springboot3_com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.19.4
-springboot3_com.fasterxml.jackson.module:jackson-module-afterburner;2.19.4
-springboot3_com.fasterxml.jackson.module:jackson-module-parameter-names;2.19.4
-springboot3_com.github.spotbugs:spotbugs-maven-plugin;4.8.2.0
-springboot3_com.google.code.findbugs:jsr305;3.0.2
-springboot3_com.mysql:mysql-connector-j;9.5.0
-springboot3_com.nimbusds:nimbus-jose-jwt;9.37.3
-springboot3_io.lettuce:lettuce-core;6.6.0.RELEASE
-springboot3_io.micrometer:micrometer-core;1.15.7
-springboot3_io.netty:netty-buffer;4.1.130.Final
-springboot3_io.netty:netty-codec-http;4.1.130.Final
-springboot3_io.netty:netty-common;4.1.130.Final
-springboot3_io.netty:netty-handler;4.1.130.Final
-springboot3_io.netty:netty-transport-native-epoll;4.1.130.Final
-springboot3_io.netty:netty-transport-native-kqueue;4.1.130.Final
-springboot3_io.netty:netty-transport;4.1.130.Final
-springboot3_io.projectreactor.netty:reactor-netty;1.2.13
-springboot3_io.projectreactor:reactor-test;3.7.14
-springboot3_jakarta.servlet:jakarta.servlet-api;6.0.0
-springboot3_jakarta.validation:jakarta.validation-api;3.0.2
-springboot3_javax.annotation:javax.annotation-api;1.3.2
-springboot3_net.bytebuddy:byte-buddy-agent;1.17.8
-springboot3_net.bytebuddy:byte-buddy;1.17.8
-springboot3_org.apache.commons:commons-lang3;3.17.0
-springboot3_org.apache.kafka:kafka-clients;3.9.1
-springboot3_org.apache.maven.plugins:maven-antrun-plugin;3.1.0
-springboot3_org.apache.maven.plugins:maven-compiler-plugin;3.14.1
-springboot3_org.apache.maven.plugins:maven-enforcer-plugin;3.5.0
-springboot3_org.apache.maven.plugins:maven-failsafe-plugin;3.5.4
-springboot3_org.apache.maven.plugins:maven-jar-plugin;3.4.2
-springboot3_org.apache.maven.plugins:maven-javadoc-plugin;3.11.3
-springboot3_org.apache.maven.plugins:maven-surefire-plugin;3.5.4
-springboot3_org.assertj:assertj-core;3.27.6
-springboot3_org.hibernate.validator:hibernate-validator;8.0.3.Final
-springboot3_org.javatuples:javatuples;1.2
-springboot3_org.junit.jupiter:junit-jupiter;5.12.2
-springboot3_org.messaginghub:pooled-jms;3.1.8
-springboot3_org.mockito:mockito-core;5.17.0
-springboot3_org.postgresql:postgresql;42.7.8
-springboot3_org.revapi:revapi-maven-plugin;0.14.6
-springboot3_org.slf4j:slf4j-api;2.0.17
-springboot3_org.slf4j:slf4j-simple;2.0.17
-springboot3_org.springframework.boot:spring-boot-actuator-autoconfigure;3.5.9
-springboot3_org.springframework.boot:spring-boot-actuator;3.5.9
-springboot3_org.springframework.boot:spring-boot-autoconfigure;3.5.9
-springboot3_org.springframework.boot:spring-boot-configuration-metadata;3.5.9
-springboot3_org.springframework.boot:spring-boot-configuration-processor;3.5.9
-springboot3_org.springframework.boot:spring-boot-docker-compose;3.5.9
-springboot3_org.springframework.boot:spring-boot-starter-actuator;3.5.9
-springboot3_org.springframework.boot:spring-boot-starter-data-jdbc;3.5.9
-springboot3_org.springframework.boot:spring-boot-starter-integration;3.5.9
-springboot3_org.springframework.boot:spring-boot-starter-parent;3.5.9
-springboot3_org.springframework.boot:spring-boot-starter-test;3.5.9
-springboot3_org.springframework.boot:spring-boot-starter-web;3.5.9
-springboot3_org.springframework.boot:spring-boot-starter;3.5.9
-springboot3_org.springframework.boot:spring-boot-test;3.5.9
-springboot3_org.springframework.boot:spring-boot-testcontainers;3.5.9
-springboot3_org.springframework.cloud:spring-cloud-bus;4.3.1
-springboot3_org.springframework.cloud:spring-cloud-context;4.3.1
-springboot3_org.springframework.cloud:spring-cloud-starter-stream-kafka;4.3.1
-springboot3_org.springframework.cloud:spring-cloud-stream-test-binder;4.3.1
-springboot3_org.springframework.cloud:spring-cloud-stream;4.3.1
-springboot3_org.springframework.data:spring-data-commons;3.5.7
-springboot3_org.springframework.data:spring-data-redis;3.5.7
-springboot3_org.springframework.integration:spring-integration-core;6.5.5
-springboot3_org.springframework.kafka:spring-kafka;3.3.11
-springboot3_org.springframework.retry:spring-retry;2.0.12
-springboot3_org.springframework.security:spring-security-config;6.5.7
-springboot3_org.springframework.security:spring-security-oauth2-client;6.5.7
-springboot3_org.springframework.security:spring-security-oauth2-jose;6.5.7
-springboot3_org.springframework.security:spring-security-oauth2-resource-server;6.5.7
-springboot3_org.springframework.security:spring-security-web;6.5.7
-springboot3_org.springframework:spring-beans;6.2.15
-springboot3_org.springframework:spring-context-support;6.2.15
-springboot3_org.springframework:spring-context;6.2.15
-springboot3_org.springframework:spring-core-test;6.2.15
-springboot3_org.springframework:spring-core;6.2.15
-springboot3_org.springframework:spring-expression;6.2.15
-springboot3_org.springframework:spring-jdbc;6.2.15
-springboot3_org.springframework:spring-jms;6.2.15
-springboot3_org.springframework:spring-messaging;6.2.15
-springboot3_org.springframework:spring-test;6.2.15
-springboot3_org.springframework:spring-tx;6.2.15
-springboot3_org.springframework:spring-web;6.2.15
-springboot3_org.springframework:spring-webmvc;6.2.15
-springboot3_org.testcontainers:junit-jupiter;1.21.4
-springboot3_org.testcontainers:azure;1.21.4
-springboot3_jakarta.annotation:jakarta.annotation-api;3.0.0
-springboot3_ch.qos.logback:logback-classic;1.5.22
+springboot4_com.diffplug.spotless:spotless-maven-plugin;2.30.0
+springboot4_com.fasterxml.jackson.core:jackson-annotations;2.20
+springboot4_com.fasterxml.jackson.core:jackson-databind;2.20.1
+springboot4_com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.20.1
+springboot4_com.fasterxml.jackson.module:jackson-module-parameter-names;2.20.1
+springboot4_com.github.spotbugs:spotbugs-maven-plugin;4.8.2.0
+springboot4_com.google.code.findbugs:jsr305;3.0.2
+springboot4_com.mysql:mysql-connector-j;9.5.0
+springboot4_com.nimbusds:nimbus-jose-jwt;9.37.3
+springboot4_io.lettuce:lettuce-core;6.8.1.RELEASE
+springboot4_io.micrometer:micrometer-core;1.16.0
+springboot4_io.netty:netty-buffer;4.2.7.Final
+springboot4_io.netty:netty-codec-http;4.2.7.Final
+springboot4_io.netty:netty-common;4.2.7.Final
+springboot4_io.netty:netty-handler;4.2.7.Final
+springboot4_io.netty:netty-transport-native-epoll;4.2.7.Final
+springboot4_io.netty:netty-transport-native-kqueue;4.2.7.Final
+springboot4_io.netty:netty-transport;4.2.7.Final
+springboot4_io.projectreactor.netty:reactor-netty;1.3.0
+springboot4_io.projectreactor:reactor-test;3.8.0
+springboot4_jakarta.servlet:jakarta.servlet-api;6.1.0
+springboot4_jakarta.validation:jakarta.validation-api;3.1.1
+springboot4_javax.annotation:javax.annotation-api;1.3.2
+springboot4_net.bytebuddy:byte-buddy-agent;1.17.8
+springboot4_net.bytebuddy:byte-buddy;1.17.8
+springboot4_org.apache.commons:commons-lang3;3.19.0
+springboot4_org.apache.kafka:kafka-clients;4.1.1
+springboot4_org.apache.maven.plugins:maven-antrun-plugin;3.2.0
+springboot4_org.apache.maven.plugins:maven-compiler-plugin;3.14.1
+springboot4_org.apache.maven.plugins:maven-enforcer-plugin;3.6.2
+springboot4_org.apache.maven.plugins:maven-failsafe-plugin;3.5.4
+springboot4_org.apache.maven.plugins:maven-jar-plugin;3.4.2
+springboot4_org.apache.maven.plugins:maven-javadoc-plugin;3.12.0
+springboot4_org.apache.maven.plugins:maven-surefire-plugin;3.5.4
+springboot4_org.assertj:assertj-core;3.27.6
+springboot4_org.hibernate.validator:hibernate-validator;9.0.1.Final
+springboot4_org.javatuples:javatuples;1.2
+springboot4_org.junit.jupiter:junit-jupiter;6.0.1
+springboot4_org.messaginghub:pooled-jms;3.1.7
+springboot4_org.mockito:mockito-core;5.20.0
+springboot4_org.postgresql:postgresql;42.7.8
+springboot4_org.revapi:revapi-maven-plugin;0.14.6
+springboot4_org.slf4j:slf4j-api;2.0.17
+springboot4_org.slf4j:slf4j-simple;2.0.17
+springboot4_org.springframework.boot:spring-boot-actuator-autoconfigure;4.0.0
+springboot4_org.springframework.boot:spring-boot-actuator;4.0.0
+springboot4_org.springframework.boot:spring-boot-autoconfigure;4.0.0
+springboot4_org.springframework.boot:spring-boot-configuration-metadata;4.0.0
+springboot4_org.springframework.boot:spring-boot-configuration-processor;4.0.0
+springboot4_org.springframework.boot:spring-boot-data-redis;4.0.0
+springboot4_org.springframework.boot:spring-boot-docker-compose;4.0.0
+springboot4_org.springframework.boot:spring-boot-health;4.0.0
+springboot4_org.springframework.boot:spring-boot-http-converter;4.0.0
+springboot4_org.springframework.boot:spring-boot-jackson2;4.0.0
+springboot4_org.springframework.boot:spring-boot-jdbc;4.0.0
+springboot4_org.springframework.boot:spring-boot-jms;4.0.0
+springboot4_org.springframework.boot:spring-boot-kafka;4.0.0
+springboot4_org.springframework.boot:spring-boot-persistence;4.0.0
+springboot4_org.springframework.boot:spring-boot-restclient;4.0.0
+springboot4_org.springframework.boot:spring-boot-resttestclient;4.0.0
+springboot4_org.springframework.boot:spring-boot-security;4.0.0
+springboot4_org.springframework.boot:spring-boot-security-oauth2-client;4.0.0
+springboot4_org.springframework.boot:spring-boot-security-oauth2-resource-server;4.0.0
+springboot4_org.springframework.boot:spring-boot-starter-actuator;4.0.0
+springboot4_org.springframework.boot:spring-boot-starter-data-jdbc;4.0.0
+springboot4_org.springframework.boot:spring-boot-starter-integration;4.0.0
+springboot4_org.springframework.boot:spring-boot-starter-parent;4.0.0
+springboot4_org.springframework.boot:spring-boot-starter-test;4.0.0
+springboot4_org.springframework.boot:spring-boot-starter-webmvc;4.0.0
+springboot4_org.springframework.boot:spring-boot-starter;4.0.0
+springboot4_org.springframework.boot:spring-boot-test;4.0.0
+springboot4_org.springframework.boot:spring-boot-testcontainers;4.0.0
+springboot4_org.springframework.cloud:spring-cloud-bus;5.0.0
+springboot4_org.springframework.cloud:spring-cloud-context;5.0.0
+springboot4_org.springframework.cloud:spring-cloud-starter-stream-kafka;5.0.0
+springboot4_org.springframework.cloud:spring-cloud-stream-test-binder;5.0.0
+springboot4_org.springframework.cloud:spring-cloud-stream;5.0.0
+springboot4_org.springframework.data:spring-data-commons;4.0.0
+springboot4_org.springframework.integration:spring-integration-core;7.0.0
+springboot4_org.springframework.retry:spring-retry;2.0.12
+springboot4_org.springframework:spring-beans;7.0.1
+springboot4_org.springframework:spring-context-support;7.0.1
+springboot4_org.springframework:spring-context;7.0.1
+springboot4_org.springframework:spring-core-test;7.0.1
+springboot4_org.springframework:spring-core;7.0.1
+springboot4_org.springframework:spring-expression;7.0.1
+springboot4_org.springframework:spring-messaging;7.0.1
+springboot4_org.springframework:spring-test;7.0.1
+springboot4_org.springframework:spring-tx;7.0.1
+springboot4_org.springframework:spring-web;7.0.1
+springboot4_org.springframework:spring-webmvc;7.0.1
+springboot4_org.testcontainers:junit-jupiter;1.21.3
+springboot4_org.testcontainers:azure;1.21.3
+springboot4_jakarta.annotation:jakarta.annotation-api;3.0.0
+springboot4_ch.qos.logback:logback-classic;1.5.21
 # Used for Spring version updates
-springboot3_org.springframework.boot:spring-boot-dependencies;3.5.9
-springboot3_org.springframework.cloud:spring-cloud-dependencies;2025.0.1
+springboot4_org.springframework.boot:spring-boot-dependencies;4.0.0
+springboot4_org.springframework.cloud:spring-cloud-dependencies;2025.1.0

eng/versioning/find_unused_dependencies.py

@@ -9,8 +9,8 @@
 from utils import load_version_map_from_file
 from utils import version_update_marker
 
-IGNORED_DEPENDENCIES = {'springboot3_org.springframework.boot:spring-boot-dependencies',
-                        'springboot3_org.springframework.cloud:spring-cloud-dependencies'}
+IGNORED_DEPENDENCIES = {'springboot4_org.springframework.boot:spring-boot-dependencies',
+                        'springboot4_org.springframework.cloud:spring-cloud-dependencies'}
 
 def fixup_version_map(version_file, version_map):
     # uses the util function to load the version map from the file, then adds a bool to each entry to track if it is visisted
@@ -64,4 +64,4 @@ def main():
         exit(1)
 
 if __name__ == "__main__":
-    main()
+    main()