diff --git a/.vscode/cspell.json b/.vscode/cspell.json index b692e840c4cc..bd85726cce1c 100644 --- a/.vscode/cspell.json +++ b/.vscode/cspell.json @@ -1091,6 +1091,7 @@ "itest", "itests", "jaas", + "jandex", "janino", "jaspi", "jaxb", @@ -1110,6 +1111,7 @@ "jooq", "jpamodelgen", "jspc", + "jspecify", "jstl", "jtds", "jvnet", @@ -1191,15 +1193,19 @@ "uberjar", "ultraq", "unboundid", + "uring", "vavr", "vertx", "vibur", "wadl", "weaviate", + "webauthn", "webmvc", "xerial", + "xmlparserv", "xmpp", "xsom", + "xtend", "yasson", "yugabytedb", "zaxxer", diff --git a/eng/lintingconfigs/revapi/track2/revapi.json b/eng/lintingconfigs/revapi/track2/revapi.json index 88da8835cc34..a384e9a0f00b 100644 --- a/eng/lintingconfigs/revapi/track2/revapi.json +++ b/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::(===org.springframework.data.util.TypeInformation===)", + "new" : "parameter void com.azure.spring.data.cosmos.core.mapping.BasicCosmosPersistentEntity::(===org.springframework.data.core.TypeInformation===)", + "justification" : "Replace deprecated parameterType" + }, + { + "code" : "java.method.parameterTypeChanged", + "old" : "parameter com.azure.spring.data.cosmos.core.mapping.BasicCosmosPersistentEntity com.azure.spring.data.cosmos.core.mapping.CosmosMappingContext::createPersistentEntity(===org.springframework.data.util.TypeInformation===)", + "new" : "parameter com.azure.spring.data.cosmos.core.mapping.BasicCosmosPersistentEntity com.azure.spring.data.cosmos.core.mapping.CosmosMappingContext::createPersistentEntity(===org.springframework.data.core.TypeInformation===)", + "justification" : "Replace deprecated parameterType" + }, + { + "code" : "java.method.parameterTypeChanged", + "old" : "parameter java.util.Optional 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 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 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 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===)", + "new" : "parameter void com.azure.spring.integration.core.handler.DefaultMessageHandler::setSendCallback(===java.util.function.BiConsumer===)", + "justification" : "Replace deprecated parameterType" + }, { "code": "java.method.numberOfParametersChanged", "old": { diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index ee3006837816..25f48a5f5071 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -298,104 +298,104 @@ 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.2 -springboot3_com.fasterxml.jackson.core:jackson-core;2.19.2 -springboot3_com.fasterxml.jackson.core:jackson-databind;2.19.2 -springboot3_com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.19.2 -springboot3_com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.19.2 -springboot3_com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.19.2 -springboot3_com.fasterxml.jackson.module:jackson-module-afterburner;2.19.2 -springboot3_com.fasterxml.jackson.module:jackson-module-parameter-names;2.19.2 -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.4.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.3 -springboot3_io.netty:netty-buffer;4.1.124.Final -springboot3_io.netty:netty-codec-http;4.1.124.Final -springboot3_io.netty:netty-common;4.1.124.Final -springboot3_io.netty:netty-handler;4.1.124.Final -springboot3_io.netty:netty-transport-native-epoll;4.1.124.Final -springboot3_io.netty:netty-transport-native-kqueue;4.1.124.Final -springboot3_io.netty:netty-transport;4.1.124.Final -springboot3_io.projectreactor.netty:reactor-netty;1.2.9 -springboot3_io.projectreactor:reactor-test;3.7.9 -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.7 -springboot3_net.bytebuddy:byte-buddy;1.17.7 -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.0 -springboot3_org.apache.maven.plugins:maven-enforcer-plugin;3.5.0 -springboot3_org.apache.maven.plugins:maven-failsafe-plugin;3.5.3 -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.3 -springboot3_org.assertj:assertj-core;3.27.4 -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.7 -springboot3_org.mockito:mockito-core;5.17.0 -springboot3_org.postgresql:postgresql;42.7.7 -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.5 -springboot3_org.springframework.boot:spring-boot-actuator;3.5.5 -springboot3_org.springframework.boot:spring-boot-autoconfigure;3.5.5 -springboot3_org.springframework.boot:spring-boot-configuration-metadata;3.5.5 -springboot3_org.springframework.boot:spring-boot-configuration-processor;3.5.5 -springboot3_org.springframework.boot:spring-boot-docker-compose;3.5.5 -springboot3_org.springframework.boot:spring-boot-starter-actuator;3.5.5 -springboot3_org.springframework.boot:spring-boot-starter-data-jdbc;3.5.5 -springboot3_org.springframework.boot:spring-boot-starter-integration;3.5.5 -springboot3_org.springframework.boot:spring-boot-starter-parent;3.5.5 -springboot3_org.springframework.boot:spring-boot-starter-test;3.5.5 -springboot3_org.springframework.boot:spring-boot-starter-web;3.5.5 -springboot3_org.springframework.boot:spring-boot-starter;3.5.5 -springboot3_org.springframework.boot:spring-boot-test;3.5.5 -springboot3_org.springframework.boot:spring-boot-testcontainers;3.5.5 -springboot3_org.springframework.cloud:spring-cloud-bus;4.3.0 -springboot3_org.springframework.cloud:spring-cloud-context;4.3.0 -springboot3_org.springframework.cloud:spring-cloud-starter-stream-kafka;4.3.0 -springboot3_org.springframework.cloud:spring-cloud-stream-test-binder;4.3.0 -springboot3_org.springframework.cloud:spring-cloud-stream;4.3.0 -springboot3_org.springframework.data:spring-data-commons;3.5.3 -springboot3_org.springframework.data:spring-data-redis;3.5.3 -springboot3_org.springframework.integration:spring-integration-core;6.5.1 -springboot3_org.springframework.kafka:spring-kafka;3.3.9 -springboot3_org.springframework.retry:spring-retry;2.0.12 -springboot3_org.springframework.security:spring-security-config;6.5.3 -springboot3_org.springframework.security:spring-security-oauth2-client;6.5.3 -springboot3_org.springframework.security:spring-security-oauth2-jose;6.5.3 -springboot3_org.springframework.security:spring-security-oauth2-resource-server;6.5.3 -springboot3_org.springframework.security:spring-security-web;6.5.3 -springboot3_org.springframework:spring-beans;6.2.10 -springboot3_org.springframework:spring-context-support;6.2.10 -springboot3_org.springframework:spring-context;6.2.10 -springboot3_org.springframework:spring-core-test;6.2.10 -springboot3_org.springframework:spring-core;6.2.10 -springboot3_org.springframework:spring-expression;6.2.10 -springboot3_org.springframework:spring-jdbc;6.2.10 -springboot3_org.springframework:spring-jms;6.2.10 -springboot3_org.springframework:spring-messaging;6.2.10 -springboot3_org.springframework:spring-test;6.2.10 -springboot3_org.springframework:spring-tx;6.2.10 -springboot3_org.springframework:spring-web;6.2.10 -springboot3_org.springframework:spring-webmvc;6.2.10 -springboot3_org.testcontainers:junit-jupiter;1.21.3 -springboot3_org.testcontainers:azure;1.21.3 -springboot3_jakarta.annotation:jakarta.annotation-api;3.0.0 -springboot3_ch.qos.logback:logback-classic;1.5.18 +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.5 -springboot3_org.springframework.cloud:spring-cloud-dependencies;2025.0.0 +springboot4_org.springframework.boot:spring-boot-dependencies;4.0.0 +springboot4_org.springframework.cloud:spring-cloud-dependencies;2025.1.0 # Java 7 support diff --git a/eng/versioning/find_unused_dependencies.py b/eng/versioning/find_unused_dependencies.py index e5dae738b3c8..bf08c4d18610 100644 --- a/eng/versioning/find_unused_dependencies.py +++ b/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() \ No newline at end of file + main() diff --git a/sdk/spring/CHANGELOG.md b/sdk/spring/CHANGELOG.md index 3a65e0f34f4d..ab05fb96b338 100644 --- a/sdk/spring/CHANGELOG.md +++ b/sdk/spring/CHANGELOG.md @@ -1,4 +1,6 @@ # Release History +# (Unreleased) +Upgrade Spring Boot dependencies version to 4.0.0 and Spring Cloud dependencies version to 2025.1.0 ## 6.1.0 (2025-12-16) - This release is compatible with Spring Boot 3.5.0-3.5.8. (Note: 3.5.x (x>8) should be supported, but they aren't tested with this release.) diff --git a/sdk/spring/README.md b/sdk/spring/README.md index 972b196c52be..354a92e412f1 100644 --- a/sdk/spring/README.md +++ b/sdk/spring/README.md @@ -1,9 +1,9 @@ > [!WARNING] -> [Spring Cloud Azure 4.19.0](https://github.com/Azure/azure-sdk-for-java/tree/spring-cloud-azure_4.19.0) is the final release in the 4.x series. We will continue to provide support for this version until June 2025. After June 2025 we will stop all support for Spring Cloud Azure 4.x +> [Spring Cloud Azure 4.20.0](https://github.com/Azure/azure-sdk-for-java/tree/spring-cloud-azure_4.20.0) is the final release in the 4.x series. We will continue to provide support for this version until June 2025. After June 2025 we will stop all support for Spring Cloud Azure 4.x > [!NOTE] -> Spring Cloud Azure 5.x now fully supports Spring Boot 3.3.0 and later versions, we strongly encourage you to upgrade. For more information, please refer to [Which Version of Spring Cloud Azure Should I Use](https://github.com/Azure/azure-sdk-for-java/wiki/Spring-Versions-Mapping#which-version-of-spring-cloud-azure-should-i-use). +> Spring Cloud Azure 5.x is fully aligned with Spring Boot 3.x, version 6.x supports Spring Boot 3.5.x, and version 7.x is designed for Spring Boot 4. To take advantage of the latest features, performance improvements, and security updates, we strongly recommend upgrading. For more information, please refer to [Which Version of Spring Cloud Azure Should I Use](https://github.com/Azure/azure-sdk-for-java/wiki/Spring-Versions-Mapping#which-version-of-spring-cloud-azure-should-i-use). # Spring Cloud Azure @@ -72,7 +72,7 @@ This module contains the auto-configuration code for Azure services. ### spring-cloud-azure-starters -Spring Cloud Azure Starters are a set of convenient dependency descriptors to include in your application. It boosts your Spring Boot application developement with Azure services. For example, if you want to get started using Spring and Azure Cosmos DB for data persistence, include the `spring-cloud-azure-starter-cosmos` dependency in your project. +Spring Cloud Azure Starters are a set of convenient dependency descriptors to include in your application. It boosts your Spring Boot application development with Azure services. For example, if you want to get started using Spring and Azure Cosmos DB for data persistence, include the `spring-cloud-azure-starter-cosmos` dependency in your project. The following application starters are provided by Spring Cloud Azure under the `com.azure.spring` group: @@ -120,7 +120,7 @@ This provides auto-configuration for actuator endpoints based on the content of Spring Integration Extension for Azure provides Spring Integration adapters for the various services provided by the [Azure SDK for Java](https://github.com/Azure/azure-sdk-for-java/). Below is a list of supported adapters: -- spring-integration-azure-eventhbus +- spring-integration-azure-eventhubs - spring-integration-azure-servicebus - spring-integration-azure-storage-queue @@ -226,6 +226,10 @@ You have to create a `custom.security file` in `src/main/resources` with the fol jdk.jar.disabledAlgorithms=MD2, MD5, RSA, DSA ``` +## Spring Boot 4 Support + +The source code of Spring Cloud Azure for Spring Boot 4.x can be found on the [feature/springcloudazure-7.x](https://github.com/Azure/azure-sdk-for-java/tree/feature/springcloudazure-7.x) branch. + ## Contributing This project welcomes contributions and suggestions. Most contributions require you to agree to a Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us the rights to use your contribution. For details, visit https://cla.microsoft.com. diff --git a/sdk/spring/azure-spring-data-cosmos/README.md b/sdk/spring/azure-spring-data-cosmos/README.md index bffdf144499d..0c658925b287 100644 --- a/sdk/spring/azure-spring-data-cosmos/README.md +++ b/sdk/spring/azure-spring-data-cosmos/README.md @@ -131,6 +131,7 @@ Set `pointOperationLatencyThresholdInMS`, `nonPointOperationLatencyThresholdInMS ```java readme-sample-AppConfiguration @Configuration @EnableCosmosRepositories +@SuppressWarnings("deprecation") public class AppConfiguration extends AbstractCosmosConfiguration { private static final Logger LOGGER = LoggerFactory.getLogger(AppConfiguration.class); @@ -280,8 +281,8 @@ java -javaagent:"" -jar #### Using database provisioned throughput -Cosmos supports both [container](https://learn.microsoft.com/azure/cosmos-db/sql/how-to-provision-container-throughput) -and [database](https://learn.microsoft.com/azure/cosmos-db/sql/how-to-provision-database-throughput) provisioned +Cosmos supports both [container](https://learn.microsoft.com/azure/cosmos-db/how-to-provision-container-throughput) +and [database](https://learn.microsoft.com/azure/cosmos-db/how-to-provision-database-throughput) provisioned throughput. By default, spring-data-cosmos will provision throughput for each container created. If you prefer to share throughput between containers, you can enable database provisioned throughput via CosmosConfig. @@ -608,7 +609,7 @@ public class MyItem { String _etag; } ``` -- Read more about Optimistic Locking [here](https://learn.microsoft.com/azure/cosmos-db/sql/database-transactions-optimistic-concurrency#optimistic-concurrency-control) +- Read more about Optimistic Locking [here](https://learn.microsoft.com/azure/cosmos-db/database-transactions-optimistic-concurrency#optimistic-concurrency-control) ### Spring Data custom query, pageable and sorting - Azure-spring-data-cosmos supports [spring data custom queries][spring_data_custom_query] diff --git a/sdk/spring/azure-spring-data-cosmos/pom.xml b/sdk/spring/azure-spring-data-cosmos/pom.xml index 0b061eff639a..4814f597316b 100644 --- a/sdk/spring/azure-spring-data-cosmos/pom.xml +++ b/sdk/spring/azure-spring-data-cosmos/pom.xml @@ -53,38 +53,32 @@ org.springframework spring-core - 6.2.10 - - - commons-logging - commons-logging - - + 7.0.1 org.springframework spring-web - 6.2.10 + 7.0.1 org.springframework spring-beans - 6.2.10 + 7.0.1 org.springframework spring-context - 6.2.10 + 7.0.1 org.springframework spring-tx - 6.2.10 + 7.0.1 org.springframework.data spring-data-commons - 3.5.3 + 4.0.0 org.slf4j @@ -95,7 +89,12 @@ org.springframework spring-expression - 6.2.10 + 7.0.1 + + + org.springframework.boot + spring-boot-persistence + 4.0.0 com.azure @@ -105,39 +104,39 @@ com.fasterxml.jackson.module jackson-module-parameter-names - 2.19.2 + 2.20.1 com.fasterxml.jackson.datatype jackson-datatype-jdk8 - 2.19.2 + 2.20.1 com.fasterxml.jackson.core jackson-annotations - 2.19.2 + 2.20 org.javatuples javatuples - 1.2 + 1.2 javax.annotation javax.annotation-api - 1.3.2 + 1.3.2 org.apache.commons commons-lang3 - 3.17.0 + 3.19.0 org.mockito mockito-core - 5.17.0 + 5.20.0 test @@ -145,19 +144,19 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test org.springframework.boot spring-boot-starter-test - 3.5.5 + 4.0.0 test @@ -169,13 +168,13 @@ io.projectreactor reactor-test - 3.7.9 + 3.8.0 test org.slf4j slf4j-simple - 2.0.17 + 2.0.17 test + 3.0.2 provided org.slf4j slf4j-api - 2.0.17 + 2.0.17 @@ -203,7 +202,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -250,25 +249,26 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.2 - org.springframework:spring-beans:[6.2.10] - org.springframework:spring-web:[6.2.10] - org.springframework:spring-tx:[6.2.10] - org.springframework:spring-expression:[6.2.10] - org.springframework:spring-core:[6.2.10] - org.springframework:spring-context:[6.2.10] - org.springframework.data:spring-data-commons:[3.5.3] - org.javatuples:javatuples:[1.2] - com.fasterxml.jackson.core:jackson-annotations:[2.19.2] - com.fasterxml.jackson.datatype:jackson-datatype-jdk8:[2.19.2] - com.fasterxml.jackson.module:jackson-module-parameter-names:[2.19.2] - javax.annotation:javax.annotation-api:[1.3.2] - org.apache.commons:commons-lang3:[3.17.0] - org.slf4j:slf4j-api:[2.0.17] + org.springframework:spring-beans:[7.0.1] + org.springframework:spring-web:[7.0.1] + org.springframework:spring-tx:[7.0.1] + org.springframework:spring-expression:[7.0.1] + org.springframework:spring-core:[7.0.1] + org.springframework:spring-context:[7.0.1] + org.springframework.boot:spring-boot-persistence:[4.0.0] + org.springframework.data:spring-data-commons:[4.0.0] + org.javatuples:javatuples:[1.2] + com.fasterxml.jackson.core:jackson-annotations:[2.20] + com.fasterxml.jackson.datatype:jackson-datatype-jdk8:[2.20.1] + com.fasterxml.jackson.module:jackson-module-parameter-names:[2.20.1] + javax.annotation:javax.annotation-api:[1.3.2] + org.apache.commons:commons-lang3:[3.19.0] + org.slf4j:slf4j-api:[2.0.17] @@ -278,7 +278,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.11.3 + 3.12.0 com/azure/spring/data/cosmos/core/mapping/BasicCosmosPersistentProperty.java @@ -296,7 +296,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.5.3 + 3.5.4 src/test/resources/application.properties ${skip.integration.tests} @@ -330,7 +330,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.3 + 3.5.4 @@ -351,7 +351,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.3 + 3.5.4 @@ -371,7 +371,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.5.3 + 3.5.4 diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/common/MacAddress.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/common/MacAddress.java index 41ff8997e186..4c8ce721f0a4 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/common/MacAddress.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/common/MacAddress.java @@ -29,6 +29,7 @@ /** * Mac address class to transfer mac address to hash mac address. */ +@SuppressWarnings("deprecation") public final class MacAddress { private static final String UNKNOWN_MAC_ADDRESS = "Unknown-Mac-Address"; diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/common/PropertyLoader.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/common/PropertyLoader.java index 57265332dc44..8d8761445c93 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/common/PropertyLoader.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/common/PropertyLoader.java @@ -11,6 +11,7 @@ /** * Load properties from files */ +@SuppressWarnings("deprecation") public final class PropertyLoader { private static final String PROJECT_PROPERTY_FILE = "/azure-spring-data-cosmos.properties"; diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/CosmosTemplate.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/CosmosTemplate.java index 9bea4d7322a0..357ba09107d9 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/CosmosTemplate.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/CosmosTemplate.java @@ -82,6 +82,7 @@ /** * Template class for cosmos db */ +@SuppressWarnings("deprecation") public class CosmosTemplate implements CosmosOperations, ApplicationContextAware { private static final Logger LOGGER = LoggerFactory.getLogger(CosmosTemplate.class); diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplate.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplate.java index da0b587cf076..0ef821d8c42d 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplate.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplate.java @@ -69,7 +69,7 @@ /** * Template class of reactive cosmos */ -@SuppressWarnings("unchecked") +@SuppressWarnings({"unchecked", "deprecation"}) public class ReactiveCosmosTemplate implements ReactiveCosmosOperations, ApplicationContextAware { private static final Logger LOGGER = LoggerFactory.getLogger(ReactiveCosmosTemplate.class); diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/ResponseDiagnosticsProcessor.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/ResponseDiagnosticsProcessor.java index 15e2c09e7543..4c0bd6a8f04b 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/ResponseDiagnosticsProcessor.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/ResponseDiagnosticsProcessor.java @@ -8,6 +8,7 @@ /** * Interface for processing cosmosDB response */ +@SuppressWarnings("deprecation") public interface ResponseDiagnosticsProcessor { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/generator/AbstractQueryGenerator.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/generator/AbstractQueryGenerator.java index 0f67e77cf890..ab634521548e 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/generator/AbstractQueryGenerator.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/generator/AbstractQueryGenerator.java @@ -26,6 +26,7 @@ /** * Base class for generating sql query */ +@SuppressWarnings("deprecation") public abstract class AbstractQueryGenerator { private static String tableName = ""; diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/BasicCosmosPersistentEntity.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/BasicCosmosPersistentEntity.java index 7655f85d1b96..1ba5ad75d8ec 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/BasicCosmosPersistentEntity.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/BasicCosmosPersistentEntity.java @@ -9,7 +9,7 @@ import org.springframework.context.expression.BeanFactoryAccessor; import org.springframework.context.expression.BeanFactoryResolver; import org.springframework.data.mapping.model.BasicPersistentEntity; -import org.springframework.data.util.TypeInformation; +import org.springframework.data.core.TypeInformation; import org.springframework.expression.spel.support.StandardEvaluationContext; /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/CosmosMappingContext.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/CosmosMappingContext.java index 37ff147eaff1..4370def19cf5 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/CosmosMappingContext.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/CosmosMappingContext.java @@ -7,7 +7,7 @@ import org.springframework.data.mapping.context.AbstractMappingContext; import org.springframework.data.mapping.model.Property; import org.springframework.data.mapping.model.SimpleTypeHolder; -import org.springframework.data.util.TypeInformation; +import org.springframework.data.core.TypeInformation; /** * Class to build mapping metadata and thus create instances of {@link BasicCosmosPersistentEntity} and diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/event/CosmosMappingEvent.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/event/CosmosMappingEvent.java index f60b8ba62eb7..cf9186fbf674 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/event/CosmosMappingEvent.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/event/CosmosMappingEvent.java @@ -14,6 +14,7 @@ * * @param the type of the event. */ +@SuppressWarnings("deprecation") public class CosmosMappingEvent extends ApplicationEvent { private static final long serialVersionUID = 1L; diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/query/CosmosQuery.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/query/CosmosQuery.java index 24412c33559a..2d0e51a6c7fc 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/query/CosmosQuery.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/query/CosmosQuery.java @@ -17,6 +17,7 @@ /** * Class for cosmos query */ +@SuppressWarnings("deprecation") public class CosmosQuery { private final Criteria criteria; diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/query/Criteria.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/query/Criteria.java index d95ad67a4130..a822de941d23 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/query/Criteria.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/query/Criteria.java @@ -11,6 +11,7 @@ /** * Class of criteria */ +@SuppressWarnings("deprecation") public final class Criteria { private String subject; diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/query/CriteriaType.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/query/CriteriaType.java index 50e2354b9171..6a36ec2ab70b 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/query/CriteriaType.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/query/CriteriaType.java @@ -13,6 +13,7 @@ /** * Enum of criteria type */ +@SuppressWarnings("deprecation") public enum CriteriaType { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosAccessException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosAccessException.java index a7f96013e0c3..44e4de6d766c 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosAccessException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosAccessException.java @@ -17,6 +17,7 @@ * rely on innerException for any retriable logic, or for more details on the failure of * the operation. */ +@SuppressWarnings("deprecation") public class CosmosAccessException extends DataAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosBadRequestException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosBadRequestException.java index ca3e5d87969e..f72ab0ba0dfb 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosBadRequestException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosBadRequestException.java @@ -7,6 +7,7 @@ /** * Exception for Cosmos Bad Request Exception. */ +@SuppressWarnings("deprecation") public final class CosmosBadRequestException extends CosmosAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosConflictException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosConflictException.java index fb89ba633791..a95a64d4edc5 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosConflictException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosConflictException.java @@ -7,6 +7,7 @@ /** * Exception for Cosmos Conflict Exception. */ +@SuppressWarnings("deprecation") public final class CosmosConflictException extends CosmosAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosExceptionUtils.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosExceptionUtils.java index d0f1fa090de3..56a439e23482 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosExceptionUtils.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosExceptionUtils.java @@ -13,6 +13,7 @@ /** * To handle and throw a cosmos db exception when access the database */ +@SuppressWarnings("deprecation") public class CosmosExceptionUtils { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosForbiddenException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosForbiddenException.java index bb132d43a388..860bc15b2506 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosForbiddenException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosForbiddenException.java @@ -7,6 +7,7 @@ /** * Exception for Cosmos Forbidden Exception. */ +@SuppressWarnings("deprecation") public final class CosmosForbiddenException extends CosmosAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosGoneException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosGoneException.java index 993dd709a927..9cfe2f4f93d2 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosGoneException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosGoneException.java @@ -7,6 +7,7 @@ /** * Exception for Cosmos Gone Exception. */ +@SuppressWarnings("deprecation") public final class CosmosGoneException extends CosmosAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosInternalServerErrorException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosInternalServerErrorException.java index d85631e06c51..a28d95b9e768 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosInternalServerErrorException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosInternalServerErrorException.java @@ -7,6 +7,7 @@ /** * Exception for Cosmos Internal Server Error Exception. */ +@SuppressWarnings("deprecation") public final class CosmosInternalServerErrorException extends CosmosAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosInvalidPartitionException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosInvalidPartitionException.java index eb3151ad92c7..16449c709a4c 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosInvalidPartitionException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosInvalidPartitionException.java @@ -7,6 +7,7 @@ /** * Exception for Cosmos Invalid Partition Exception. */ +@SuppressWarnings("deprecation") public final class CosmosInvalidPartitionException extends CosmosAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosMethodNotAllowedException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosMethodNotAllowedException.java index 1f2d7c03f41c..99088d151120 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosMethodNotAllowedException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosMethodNotAllowedException.java @@ -7,6 +7,7 @@ /** * Exception for Cosmos Method Not Allowed Exception. */ +@SuppressWarnings("deprecation") public final class CosmosMethodNotAllowedException extends CosmosAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosNotFoundException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosNotFoundException.java index 6ea9f396d8f9..791fa295c174 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosNotFoundException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosNotFoundException.java @@ -7,6 +7,7 @@ /** * Exception for Cosmos Not Found Exception. */ +@SuppressWarnings("deprecation") public final class CosmosNotFoundException extends CosmosAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosOperationCancelledException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosOperationCancelledException.java index 797dea283db8..c6ed3560a504 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosOperationCancelledException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosOperationCancelledException.java @@ -7,6 +7,7 @@ /** * Exception for Cosmos Operation Cancelled Exception. */ +@SuppressWarnings("deprecation") public final class CosmosOperationCancelledException extends CosmosAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosPartitionIsMigratingException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosPartitionIsMigratingException.java index eb088b7e2949..5aaa462e8d1c 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosPartitionIsMigratingException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosPartitionIsMigratingException.java @@ -7,6 +7,7 @@ /** * Exception for Cosmos Partition Is Migrating Exception. */ +@SuppressWarnings("deprecation") public final class CosmosPartitionIsMigratingException extends CosmosAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosPartitionKeyRangeGoneException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosPartitionKeyRangeGoneException.java index 0e72035b115a..baec7789b0d5 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosPartitionKeyRangeGoneException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosPartitionKeyRangeGoneException.java @@ -7,6 +7,7 @@ /** * Exception for Cosmos Partition Key Range Gone Exception. */ +@SuppressWarnings("deprecation") public final class CosmosPartitionKeyRangeGoneException extends CosmosAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosPartitionKeyRangeIsSplittingException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosPartitionKeyRangeIsSplittingException.java index a20e039f7db8..045b77d884d3 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosPartitionKeyRangeIsSplittingException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosPartitionKeyRangeIsSplittingException.java @@ -7,6 +7,7 @@ /** * Exception for Cosmos Key Range Is Splitting Exception. */ +@SuppressWarnings("deprecation") public final class CosmosPartitionKeyRangeIsSplittingException extends CosmosAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosPreconditionFailedException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosPreconditionFailedException.java index 03da7ea593e8..e77ac33eeb24 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosPreconditionFailedException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosPreconditionFailedException.java @@ -7,6 +7,7 @@ /** * Exception for Cosmos Precondition Failed Exception. */ +@SuppressWarnings("deprecation") public final class CosmosPreconditionFailedException extends CosmosAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosRequestEntityTooLargeException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosRequestEntityTooLargeException.java index 68272e00c35e..ef37e7411e16 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosRequestEntityTooLargeException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosRequestEntityTooLargeException.java @@ -7,6 +7,7 @@ /** * Exception for Cosmos Request Entity Too Large Exception. */ +@SuppressWarnings("deprecation") public final class CosmosRequestEntityTooLargeException extends CosmosAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosRequestRateTooLargeException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosRequestRateTooLargeException.java index 1685a38aa0fa..bc8e2e7657db 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosRequestRateTooLargeException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosRequestRateTooLargeException.java @@ -7,6 +7,7 @@ /** * Exception for Cosmos Request Rate Too Large Exception. */ +@SuppressWarnings("deprecation") public final class CosmosRequestRateTooLargeException extends CosmosAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosRequestTimeoutException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosRequestTimeoutException.java index de9b987005e5..ff0ee33ae262 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosRequestTimeoutException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosRequestTimeoutException.java @@ -7,6 +7,7 @@ /** * Exception for Cosmos Request Timeout Exception. */ +@SuppressWarnings("deprecation") public final class CosmosRequestTimeoutException extends CosmosAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosRetryWithException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosRetryWithException.java index 196b03ab7974..29f2f7dab7da 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosRetryWithException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosRetryWithException.java @@ -7,6 +7,7 @@ /** * Exception for Cosmos Retry With Exception. */ +@SuppressWarnings("deprecation") public final class CosmosRetryWithException extends CosmosAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosServiceUnavailableException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosServiceUnavailableException.java index 8599a95fc6a2..45ade5d204b1 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosServiceUnavailableException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosServiceUnavailableException.java @@ -7,6 +7,7 @@ /** * Exception for Cosmos Service Unavailable Exception. */ +@SuppressWarnings("deprecation") public final class CosmosServiceUnavailableException extends CosmosAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosUnauthorizedException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosUnauthorizedException.java index 23af773683ef..876a3fc678fe 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosUnauthorizedException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosUnauthorizedException.java @@ -7,6 +7,7 @@ /** * Exception for Cosmos Unauthorized Exception. */ +@SuppressWarnings("deprecation") public final class CosmosUnauthorizedException extends CosmosAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/DatabaseCreationException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/DatabaseCreationException.java index 6b42de838600..b6f4702fe49f 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/DatabaseCreationException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/DatabaseCreationException.java @@ -8,6 +8,7 @@ /** * General exception for illegal creation of cosmos db */ +@SuppressWarnings("deprecation") public class DatabaseCreationException extends DataAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/IllegalCollectionException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/IllegalCollectionException.java index 991338998643..e732a847377d 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/IllegalCollectionException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/IllegalCollectionException.java @@ -8,6 +8,7 @@ /** * General exception for illegal collection of cosmos db */ +@SuppressWarnings("deprecation") public class IllegalCollectionException extends DataAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/IllegalQueryException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/IllegalQueryException.java index e1027f879cc3..6c6bc271c227 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/IllegalQueryException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/IllegalQueryException.java @@ -8,6 +8,7 @@ /** * General exception for illegal query of cosmos db */ +@SuppressWarnings("deprecation") public class IllegalQueryException extends DataAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosParameter.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosParameter.java index 5bbc3ca93ed5..52fbc0f05794 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosParameter.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosParameter.java @@ -4,7 +4,7 @@ import org.springframework.core.MethodParameter; import org.springframework.data.repository.query.Parameter; -import org.springframework.data.util.TypeInformation; +import org.springframework.data.core.TypeInformation; /** * A single cosmos parameter of a query method. diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosParameters.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosParameters.java index a489c30d77b2..015ebe6dc2f0 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosParameters.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosParameters.java @@ -3,6 +3,7 @@ package com.azure.spring.data.cosmos.repository.query; import org.springframework.data.repository.query.Parameters; +import org.springframework.data.repository.query.ParametersSource; import java.lang.reflect.Method; import java.util.List; @@ -17,9 +18,8 @@ public class CosmosParameters extends Parameters parameters) { diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosQueryCreator.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosQueryCreator.java index 65c3f25f0cb8..02aa35b05b0c 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosQueryCreator.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosQueryCreator.java @@ -25,6 +25,7 @@ * How to bind values to the query. if CosmosDb already has binding capability, if not we would have to do it here in * some creative way.query creator are associated with part tree queries, */ +@SuppressWarnings("deprecation") public class CosmosQueryCreator extends AbstractQueryCreator { private final MappingContext mappingContext; diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosQueryMethod.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosQueryMethod.java index 3ab770dd8509..d6cfdc0e0f21 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosQueryMethod.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosQueryMethod.java @@ -64,6 +64,7 @@ public boolean hasAnnotatedQuery() { * * @return the query string or null */ + @SuppressWarnings("deprecation") @Nullable public String getQueryAnnotation() { return annotatedQueryValue; diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/ReactiveCosmosQueryCreator.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/ReactiveCosmosQueryCreator.java index a7c6cd5bc9f5..d2495e9c6eab 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/ReactiveCosmosQueryCreator.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/ReactiveCosmosQueryCreator.java @@ -23,6 +23,7 @@ /** * Class for reactive cosmos query creators that create criteria based queries from a {@link PartTree}. */ +@SuppressWarnings("deprecation") public class ReactiveCosmosQueryCreator extends AbstractQueryCreator { private final MappingContext mappingContext; diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/ReactiveCosmosQueryMethod.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/ReactiveCosmosQueryMethod.java index 7b9c5b5dc839..191688725481 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/ReactiveCosmosQueryMethod.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/ReactiveCosmosQueryMethod.java @@ -77,6 +77,7 @@ public boolean hasAnnotatedQuery() { * Gets the annotated query or returns null * @return the annotated query String or null */ + @SuppressWarnings("deprecation") @Nullable public String getQueryAnnotation() { return annotatedQueryValue; diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/CosmosEntityInformation.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/CosmosEntityInformation.java index 7d462a7c5ceb..dd1c02c62272 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/CosmosEntityInformation.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/CosmosEntityInformation.java @@ -49,6 +49,7 @@ * @param domain type. * @param id type. */ +@SuppressWarnings("deprecation") public class CosmosEntityInformation extends AbstractEntityInformation { private static final Function, CosmosEntityInformation> ENTITY_INFORMATION_CREATOR = diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/CosmosRepositoryFactory.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/CosmosRepositoryFactory.java index 214fe3bff377..66b4193fecab 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/CosmosRepositoryFactory.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/CosmosRepositoryFactory.java @@ -14,6 +14,7 @@ import org.springframework.data.repository.core.support.RepositoryFactorySupport; import org.springframework.data.repository.query.QueryLookupStrategy; import org.springframework.data.repository.query.RepositoryQuery; +import org.springframework.data.repository.query.ValueExpressionDelegate; import org.springframework.util.Assert; import java.io.Serializable; @@ -48,23 +49,21 @@ protected Object getTargetRepository(RepositoryInformation information) { } @Override + @SuppressWarnings("deprecation") public EntityInformation getEntityInformation(Class domainType) { return new CosmosEntityInformation<>(domainType); } @Override - @SuppressWarnings({"deprecation", "removal"}) protected Optional getQueryLookupStrategy(QueryLookupStrategy.Key key, - org.springframework.data.repository.query.QueryMethodEvaluationContextProvider evaluationContextProvider) { - return Optional.of(new CosmosDbQueryLookupStrategy(cosmosOperations, evaluationContextProvider)); + ValueExpressionDelegate valueExpressionDelegate) { + return Optional.of(new CosmosDbQueryLookupStrategy(cosmosOperations, valueExpressionDelegate)); } - @SuppressWarnings({"deprecation", "removal"}) private static class CosmosDbQueryLookupStrategy implements QueryLookupStrategy { private final CosmosOperations dbOperations; - CosmosDbQueryLookupStrategy(CosmosOperations operations, - org.springframework.data.repository.query.QueryMethodEvaluationContextProvider provider) { + CosmosDbQueryLookupStrategy(CosmosOperations operations, ValueExpressionDelegate delegate) { this.dbOperations = operations; } diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/ReactiveCosmosRepositoryFactory.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/ReactiveCosmosRepositoryFactory.java index fea259c60194..7cacb7d39c4a 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/ReactiveCosmosRepositoryFactory.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/ReactiveCosmosRepositoryFactory.java @@ -13,6 +13,7 @@ import org.springframework.data.repository.core.support.ReactiveRepositoryFactorySupport; import org.springframework.data.repository.query.QueryLookupStrategy; import org.springframework.data.repository.query.RepositoryQuery; +import org.springframework.data.repository.query.ValueExpressionDelegate; import org.springframework.util.Assert; import java.io.Serializable; @@ -36,6 +37,7 @@ public ReactiveCosmosRepositoryFactory(ReactiveCosmosOperations cosmosOperations } @Override + @SuppressWarnings("deprecation") public EntityInformation getEntityInformation(Class domainType) { return new CosmosEntityInformation<>(domainType); } @@ -53,19 +55,16 @@ protected Class getRepositoryBaseClass(RepositoryMetadata metadata) { } @Override - @SuppressWarnings({"deprecation", "removal"}) protected Optional getQueryLookupStrategy(QueryLookupStrategy.Key key, - org.springframework.data.repository.query.QueryMethodEvaluationContextProvider evaluationContextProvider) { + ValueExpressionDelegate valueExpressionDelegate) { return Optional.of(new ReactiveCosmosQueryLookupStrategy(cosmosOperations, - evaluationContextProvider)); + valueExpressionDelegate)); } - @SuppressWarnings({"deprecation", "removal"}) private static class ReactiveCosmosQueryLookupStrategy implements QueryLookupStrategy { private final ReactiveCosmosOperations cosmosOperations; - ReactiveCosmosQueryLookupStrategy(ReactiveCosmosOperations operations, - org.springframework.data.repository.query.QueryMethodEvaluationContextProvider provider) { + ReactiveCosmosQueryLookupStrategy(ReactiveCosmosOperations operations, ValueExpressionDelegate delegate) { this.cosmosOperations = operations; } diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/SimpleCosmosRepository.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/SimpleCosmosRepository.java index 43c8aa4f143d..4f95ec668832 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/SimpleCosmosRepository.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/SimpleCosmosRepository.java @@ -34,6 +34,7 @@ * @param domain type. * @param id type. */ +@SuppressWarnings("deprecation") public class SimpleCosmosRepository implements CosmosRepository { private final CosmosOperations operation; diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/SimpleReactiveCosmosRepository.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/SimpleReactiveCosmosRepository.java index d1a1caab659b..e5b2b6760ffe 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/SimpleReactiveCosmosRepository.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/SimpleReactiveCosmosRepository.java @@ -30,6 +30,7 @@ * @param the type of the domain class managed by this repository. * @param the type of the id of the domain class managed by this repository. */ +@SuppressWarnings("deprecation") public class SimpleReactiveCosmosRepository implements ReactiveCosmosRepository { private final CosmosEntityInformation entityInformation; diff --git a/sdk/spring/azure-spring-data-cosmos/src/samples/java/com/azure/spring/data/cosmos/AppConfiguration.java b/sdk/spring/azure-spring-data-cosmos/src/samples/java/com/azure/spring/data/cosmos/AppConfiguration.java index 8cd043070c01..cc8886325c6f 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/samples/java/com/azure/spring/data/cosmos/AppConfiguration.java +++ b/sdk/spring/azure-spring-data-cosmos/src/samples/java/com/azure/spring/data/cosmos/AppConfiguration.java @@ -26,6 +26,7 @@ // BEGIN: readme-sample-AppConfiguration @Configuration @EnableCosmosRepositories +@SuppressWarnings("deprecation") public class AppConfiguration extends AbstractCosmosConfiguration { private static final Logger LOGGER = LoggerFactory.getLogger(AppConfiguration.class); diff --git a/sdk/spring/azure-spring-data-cosmos/src/samples/java/com/azure/spring/data/cosmos/AppConfigurationCodeSnippet.java b/sdk/spring/azure-spring-data-cosmos/src/samples/java/com/azure/spring/data/cosmos/AppConfigurationCodeSnippet.java index b6bf291860fe..701bad9d457d 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/samples/java/com/azure/spring/data/cosmos/AppConfigurationCodeSnippet.java +++ b/sdk/spring/azure-spring-data-cosmos/src/samples/java/com/azure/spring/data/cosmos/AppConfigurationCodeSnippet.java @@ -24,6 +24,7 @@ @Configuration @EnableCosmosRepositories +@SuppressWarnings("deprecation") public class AppConfigurationCodeSnippet extends AbstractCosmosConfiguration { private static final Logger LOGGER = LoggerFactory.getLogger(AppConfigurationCodeSnippet.class); diff --git a/sdk/spring/azure-spring-data-cosmos/src/samples/java/com/azure/spring/data/cosmos/UserRepositoryConfiguration.java b/sdk/spring/azure-spring-data-cosmos/src/samples/java/com/azure/spring/data/cosmos/UserRepositoryConfiguration.java index 0faf6a673960..096896168471 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/samples/java/com/azure/spring/data/cosmos/UserRepositoryConfiguration.java +++ b/sdk/spring/azure-spring-data-cosmos/src/samples/java/com/azure/spring/data/cosmos/UserRepositoryConfiguration.java @@ -27,6 +27,7 @@ @EnableConfigurationProperties(CosmosProperties.class) @EnableReactiveCosmosRepositories @PropertySource("classpath:application.properties") +@SuppressWarnings("deprecation") public class UserRepositoryConfiguration extends AbstractCosmosConfiguration { private static final Logger LOGGER = LoggerFactory.getLogger(UserRepositoryConfiguration.class); diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIT.java index 9daa3a398ba4..c4273aef6f3a 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIT.java @@ -51,7 +51,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.domain.EntityScanner; +import org.springframework.boot.persistence.autoconfigure.EntityScanner; import org.springframework.context.ApplicationContext; import org.springframework.data.annotation.Persistent; import org.springframework.data.auditing.IsNewAwareAuditingHandler; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplatePartitionIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplatePartitionIT.java index 62beed86c8d1..4f069d418b45 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplatePartitionIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplatePartitionIT.java @@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.domain.EntityScanner; +import org.springframework.boot.persistence.autoconfigure.EntityScanner; import org.springframework.context.ApplicationContext; import org.springframework.data.annotation.Persistent; import org.springframework.data.domain.Page; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantContainerCosmosFactoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantContainerCosmosFactoryIT.java index f087dd4888d0..4ba492852b2c 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantContainerCosmosFactoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantContainerCosmosFactoryIT.java @@ -22,7 +22,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.domain.EntityScanner; +import org.springframework.boot.persistence.autoconfigure.EntityScanner; import org.springframework.context.ApplicationContext; import org.springframework.data.annotation.Persistent; import org.springframework.test.context.ContextConfiguration; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantDBCosmosFactoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantDBCosmosFactoryIT.java index 0de37438ecea..01ad4c86a795 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantDBCosmosFactoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantDBCosmosFactoryIT.java @@ -22,7 +22,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.domain.EntityScanner; +import org.springframework.boot.persistence.autoconfigure.EntityScanner; import org.springframework.context.ApplicationContext; import org.springframework.data.annotation.Persistent; import org.springframework.test.context.ContextConfiguration; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplateIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplateIT.java index 407187e1c35e..9a40db71b592 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplateIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplateIT.java @@ -53,7 +53,7 @@ import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.autoconfigure.domain.EntityScanner; +import org.springframework.boot.persistence.autoconfigure.EntityScanner; import org.springframework.context.ApplicationContext; import org.springframework.data.annotation.Persistent; import org.springframework.data.auditing.IsNewAwareAuditingHandler; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplatePartitionIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplatePartitionIT.java index ffbfe5068841..1e5852078ca1 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplatePartitionIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplatePartitionIT.java @@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.domain.EntityScanner; +import org.springframework.boot.persistence.autoconfigure.EntityScanner; import org.springframework.context.ApplicationContext; import org.springframework.data.annotation.Persistent; import org.springframework.data.repository.query.parser.Part; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantContainerCosmosFactoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantContainerCosmosFactoryIT.java index 77eef43b221b..81970d39fc50 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantContainerCosmosFactoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantContainerCosmosFactoryIT.java @@ -22,7 +22,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.domain.EntityScanner; +import org.springframework.boot.persistence.autoconfigure.EntityScanner; import org.springframework.context.ApplicationContext; import org.springframework.data.annotation.Persistent; import org.springframework.test.context.ContextConfiguration; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantDBCosmosFactoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantDBCosmosFactoryIT.java index 56bc2acd0499..d05f905f4f1f 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantDBCosmosFactoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantDBCosmosFactoryIT.java @@ -22,7 +22,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.domain.EntityScanner; +import org.springframework.boot.persistence.autoconfigure.EntityScanner; import org.springframework.context.ApplicationContext; import org.springframework.data.annotation.Persistent; import org.springframework.test.context.ContextConfiguration; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/BasicCosmosPersistentEntityUnitTest.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/BasicCosmosPersistentEntityUnitTest.java index 345457579818..ac0f86f67c98 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/BasicCosmosPersistentEntityUnitTest.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/BasicCosmosPersistentEntityUnitTest.java @@ -5,25 +5,23 @@ import com.azure.spring.data.cosmos.domain.Person; import org.junit.jupiter.api.Test; -import org.springframework.data.util.ClassTypeInformation; +import org.springframework.data.core.TypeInformation; import static org.assertj.core.api.Assertions.assertThat; public class BasicCosmosPersistentEntityUnitTest { - @SuppressWarnings({"deprecation", "removal"}) @Test public void testGetCollection() { final BasicCosmosPersistentEntity entity = new BasicCosmosPersistentEntity( - ClassTypeInformation.from(Person.class)); + TypeInformation.of(Person.class)); assertThat(entity.getContainer()).isEqualTo(""); } - @SuppressWarnings({"deprecation", "removal"}) @Test public void testGetLanguage() { final BasicCosmosPersistentEntity entity = new BasicCosmosPersistentEntity( - ClassTypeInformation.from(Person.class)); + TypeInformation.of(Person.class)); assertThat(entity.getLanguage()).isEqualTo(""); } diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/exception/CosmosExceptionUtilsTest.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/exception/CosmosExceptionUtilsTest.java index f1c892d00ef5..917f93b74faf 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/exception/CosmosExceptionUtilsTest.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/exception/CosmosExceptionUtilsTest.java @@ -133,6 +133,7 @@ public void testPreconditionFailedException() { } @Test + @SuppressWarnings("deprecation") public void testRequestEntityTooLargeException() { CosmosException cosmosException = BridgeInternal.createCosmosException(HttpStatus.PAYLOAD_TOO_LARGE.value(), "Request Entity Too Large Exception"); assertThrows(CosmosRequestEntityTooLargeException.class, () -> { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/CustomerRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/CustomerRepositoryIT.java index 90a6ed88b5ce..5cd89414c62f 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/CustomerRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/CustomerRepositoryIT.java @@ -26,6 +26,7 @@ @ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) +@SuppressWarnings("deprecation") public class CustomerRepositoryIT { private static final String USER_NAME_0 = "username-0"; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ProjectRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ProjectRepositoryIT.java index a4acb6f0c4d8..401ec213799b 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ProjectRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ProjectRepositoryIT.java @@ -31,6 +31,7 @@ @ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) +@SuppressWarnings("deprecation") public class ProjectRepositoryIT { private static final String ID_0 = "id-0"; diff --git a/sdk/spring/ci.yml b/sdk/spring/ci.yml index b91fedb2a87a..dd7d87e691fe 100644 --- a/sdk/spring/ci.yml +++ b/sdk/spring/ci.yml @@ -244,10 +244,11 @@ parameters: displayName: 'spring-cloud-azure-starter-appconfiguration-config' type: boolean default: true -- name: release_springcloudazurestartermonitor - displayName: 'spring-cloud-azure-starter-monitor' - type: boolean - default: true +# todo: add back when monitor support Spring Boot 4 +#- name: release_springcloudazurestartermonitor +# displayName: 'spring-cloud-azure-starter-monitor' +# type: boolean +# default: true extends: @@ -603,12 +604,13 @@ extends: skipPublishDocMs: true skipVerifyChangeLog: true releaseInBatch: ${{ parameters.release_springcloudazurestarterappconfigurationconfig }} - - name: spring-cloud-azure-starter-monitor - groupId: com.azure.spring - safeName: springcloudazurestartermonitor - skipPublishDocGithubIo: true - skipPublishDocMs: true - skipVerifyChangeLog: true - releaseInBatch: ${{ parameters.release_springcloudazurestartermonitor }} +# todo: add back when monitor support Spring Boot 4 +# - name: spring-cloud-azure-starter-monitor +# groupId: com.azure.spring +# safeName: springcloudazurestartermonitor +# skipPublishDocGithubIo: true +# skipPublishDocMs: true +# skipVerifyChangelog: true +# releaseInBatch: ${{ parameters.release_springcloudazurestartermonitor }} MatrixFilters: - JavaTestVersion=^(?!1.8|1.11).* diff --git a/sdk/spring/pipeline/spring-cloud-azure-supported-spring.json b/sdk/spring/pipeline/spring-cloud-azure-supported-spring.json index 8187f1bacf61..a0299c5f0401 100644 --- a/sdk/spring/pipeline/spring-cloud-azure-supported-spring.json +++ b/sdk/spring/pipeline/spring-cloud-azure-supported-spring.json @@ -27,12 +27,12 @@ "current" : false, "releaseStatus" : "GENERAL_AVAILABILITY", "snapshot" : false, - "supportStatus" : "END_OF_LIFE", - "spring-boot-version" : "3.5.8", - "spring-cloud-version" : "2025.0.0" + "supportStatus" : "SUPPORTED", + "spring-boot-version" : "4.0.0", + "spring-cloud-version" : "2025.1.0" }, { - "current" : false, + "current" : true, "releaseStatus" : "GENERAL_AVAILABILITY", "snapshot" : false, "supportStatus" : "END_OF_LIFE", diff --git a/sdk/spring/pom.xml b/sdk/spring/pom.xml index 005b5bc5c160..b21a8cac2f43 100644 --- a/sdk/spring/pom.xml +++ b/sdk/spring/pom.xml @@ -70,8 +70,8 @@ spring-cloud-azure-feature-management-web spring-cloud-azure-starter-appconfiguration-config azure-spring-data-cosmos - spring-cloud-azure-starter-monitor - spring-cloud-azure-starter-monitor-test + + diff --git a/sdk/spring/scripts/_constants.py b/sdk/spring/scripts/_constants.py index c54f0ec5f9bf..bff58806cb2f 100644 --- a/sdk/spring/scripts/_constants.py +++ b/sdk/spring/scripts/_constants.py @@ -3,14 +3,19 @@ SPRING_BOOT_MAJOR_2_VERSION_TAG_PREFIX = '' SPRING_BOOT_MAJOR_3_VERSION_NAME = '3' SPRING_BOOT_MAJOR_3_VERSION_TAG_PREFIX = 'springboot3_' +SPRING_BOOT_MAJOR_4_VERSION_NAME = '4' +SPRING_BOOT_MAJOR_4_VERSION_TAG_PREFIX = 'springboot4_' SPRING_BOOT_MAJOR_VERSION_PREFIX_DICT = { SPRING_BOOT_MAJOR_2_VERSION_NAME: SPRING_BOOT_MAJOR_2_VERSION_TAG_PREFIX, - SPRING_BOOT_MAJOR_3_VERSION_NAME: SPRING_BOOT_MAJOR_3_VERSION_TAG_PREFIX + SPRING_BOOT_MAJOR_3_VERSION_NAME: SPRING_BOOT_MAJOR_3_VERSION_TAG_PREFIX, + SPRING_BOOT_MAJOR_4_VERSION_NAME: SPRING_BOOT_MAJOR_4_VERSION_TAG_PREFIX } def get_spring_boot_version_tag_prefix(spring_boot_version): - if spring_boot_version.startswith('3.') or spring_boot_version == SPRING_BOOT_MAJOR_3_VERSION_NAME: + if spring_boot_version.startswith('4.') or spring_boot_version == SPRING_BOOT_MAJOR_4_VERSION_NAME: + return SPRING_BOOT_MAJOR_VERSION_PREFIX_DICT[SPRING_BOOT_MAJOR_4_VERSION_NAME] + elif spring_boot_version.startswith('3.') or spring_boot_version == SPRING_BOOT_MAJOR_3_VERSION_NAME: return SPRING_BOOT_MAJOR_VERSION_PREFIX_DICT[SPRING_BOOT_MAJOR_3_VERSION_NAME] elif spring_boot_version.startswith('2.') or spring_boot_version == SPRING_BOOT_MAJOR_2_VERSION_NAME: return SPRING_BOOT_MAJOR_VERSION_PREFIX_DICT[SPRING_BOOT_MAJOR_2_VERSION_NAME] @@ -21,8 +26,8 @@ def get_spring_boot_version_tag_prefix(spring_boot_version): # Since Spring Cloud Azure uses multiple versions of external dependencies managed by Spring Boot, # the modules that still use Spring Boot 2 to manage dependencies will be skipped. SKIP_ADDING_DEPENDENCY_MANAGEMENT_ARTIFACTS = [ - 'spring-cloud-azure-starter-monitor-test', - 'spring-cloud-azure-starter-monitor' +# 'spring-cloud-azure-starter-monitor-test', +# 'spring-cloud-azure-starter-monitor' ] # Since some features are based on a higher Spring Boot version, it is sufficient to let the modules # corresponding to these special Spring Boot versions use the latest Spring Boot version. diff --git a/sdk/spring/scripts/compatibility_update_supported_version_matrix_json.py b/sdk/spring/scripts/compatibility_update_supported_version_matrix_json.py index 10db8da158c5..5cd577479ff0 100644 --- a/sdk/spring/scripts/compatibility_update_supported_version_matrix_json.py +++ b/sdk/spring/scripts/compatibility_update_supported_version_matrix_json.py @@ -15,7 +15,7 @@ import argparse from compatibility_get_spring_cloud_version import get_spring_cloud_version -from _constants import SPRING_BOOT_MAJOR_2_VERSION_NAME, SPRING_BOOT_MAJOR_3_VERSION_NAME +from _constants import SPRING_BOOT_MAJOR_2_VERSION_NAME, SPRING_BOOT_MAJOR_3_VERSION_NAME, SPRING_BOOT_MAJOR_4_VERSION_NAME def get_args(): @@ -26,9 +26,9 @@ def get_args(): '-sbmvn', '--spring-boot-major-version-number', type=str, - choices=[SPRING_BOOT_MAJOR_2_VERSION_NAME, SPRING_BOOT_MAJOR_3_VERSION_NAME], - default=SPRING_BOOT_MAJOR_3_VERSION_NAME, - help='Which major version of Spring Boot to use. The default is ' + SPRING_BOOT_MAJOR_3_VERSION_NAME + '.' + choices=[SPRING_BOOT_MAJOR_2_VERSION_NAME, SPRING_BOOT_MAJOR_3_VERSION_NAME, SPRING_BOOT_MAJOR_4_VERSION_NAME], + default=SPRING_BOOT_MAJOR_4_VERSION_NAME, + help='Which major version of Spring Boot to use. The default is ' + SPRING_BOOT_MAJOR_4_VERSION_NAME + '.' ) parser.add_argument('-mcp', '--matrix-config-path', type=str, default='sdk/spring/pipeline/supported-version-matrix.json') parser.add_argument( diff --git a/sdk/spring/scripts/spring_boot_3.5.5_managed_external_dependencies.txt b/sdk/spring/scripts/spring_boot_3.5.5_managed_external_dependencies.txt deleted file mode 100644 index 4ba839f64a4a..000000000000 --- a/sdk/spring/scripts/spring_boot_3.5.5_managed_external_dependencies.txt +++ /dev/null @@ -1,1889 +0,0 @@ -ch.qos.logback:logback-classic;1.5.18 -ch.qos.logback:logback-core;1.5.18 -co.elastic.clients:elasticsearch-java;8.18.5 -com.couchbase.client:java-client;3.8.3 -com.datastax.oss:native-protocol;1.5.1 -com.ecwid.consul:consul-api;1.4.5 -com.fasterxml.jackson.core:jackson-annotations;2.19.2 -com.fasterxml.jackson.core:jackson-core;2.19.2 -com.fasterxml.jackson.core:jackson-databind;2.19.2 -com.fasterxml.jackson.dataformat:jackson-dataformat-avro;2.19.2 -com.fasterxml.jackson.dataformat:jackson-dataformat-cbor;2.19.2 -com.fasterxml.jackson.dataformat:jackson-dataformat-csv;2.19.2 -com.fasterxml.jackson.dataformat:jackson-dataformat-ion;2.19.2 -com.fasterxml.jackson.dataformat:jackson-dataformat-properties;2.19.2 -com.fasterxml.jackson.dataformat:jackson-dataformat-protobuf;2.19.2 -com.fasterxml.jackson.dataformat:jackson-dataformat-smile;2.19.2 -com.fasterxml.jackson.dataformat:jackson-dataformat-toml;2.19.2 -com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.19.2 -com.fasterxml.jackson.dataformat:jackson-dataformat-yaml;2.19.2 -com.fasterxml.jackson.datatype:jackson-datatype-eclipse-collections;2.19.2 -com.fasterxml.jackson.datatype:jackson-datatype-guava;2.19.2 -com.fasterxml.jackson.datatype:jackson-datatype-hibernate4;2.19.2 -com.fasterxml.jackson.datatype:jackson-datatype-hibernate5;2.19.2 -com.fasterxml.jackson.datatype:jackson-datatype-hibernate5-jakarta;2.19.2 -com.fasterxml.jackson.datatype:jackson-datatype-hibernate6;2.19.2 -com.fasterxml.jackson.datatype:jackson-datatype-hppc;2.19.2 -com.fasterxml.jackson.datatype:jackson-datatype-jakarta-jsonp;2.19.2 -com.fasterxml.jackson.datatype:jackson-datatype-javax-money;2.19.2 -com.fasterxml.jackson.datatype:jackson-datatype-jaxrs;2.19.2 -com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.19.2 -com.fasterxml.jackson.datatype:jackson-datatype-joda;2.19.2 -com.fasterxml.jackson.datatype:jackson-datatype-joda-money;2.19.2 -com.fasterxml.jackson.datatype:jackson-datatype-json-org;2.19.2 -com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.19.2 -com.fasterxml.jackson.datatype:jackson-datatype-jsr353;2.19.2 -com.fasterxml.jackson.datatype:jackson-datatype-moneta;2.19.2 -com.fasterxml.jackson.datatype:jackson-datatype-pcollections;2.19.2 -com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-base;2.19.2 -com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-cbor-provider;2.19.2 -com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-json-provider;2.19.2 -com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-smile-provider;2.19.2 -com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-xml-provider;2.19.2 -com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-yaml-provider;2.19.2 -com.fasterxml.jackson.jaxrs:jackson-jaxrs-base;2.19.2 -com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider;2.19.2 -com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider;2.19.2 -com.fasterxml.jackson.jaxrs:jackson-jaxrs-smile-provider;2.19.2 -com.fasterxml.jackson.jaxrs:jackson-jaxrs-xml-provider;2.19.2 -com.fasterxml.jackson.jaxrs:jackson-jaxrs-yaml-provider;2.19.2 -com.fasterxml.jackson.jr:jackson-jr-all;2.19.2 -com.fasterxml.jackson.jr:jackson-jr-annotation-support;2.19.2 -com.fasterxml.jackson.jr:jackson-jr-extension-javatime;2.19.2 -com.fasterxml.jackson.jr:jackson-jr-objects;2.19.2 -com.fasterxml.jackson.jr:jackson-jr-retrofit2;2.19.2 -com.fasterxml.jackson.jr:jackson-jr-stree;2.19.2 -com.fasterxml.jackson.module:jackson-module-afterburner;2.19.2 -com.fasterxml.jackson.module:jackson-module-android-record;2.19.2 -com.fasterxml.jackson.module:jackson-module-blackbird;2.19.2 -com.fasterxml.jackson.module:jackson-module-guice;2.19.2 -com.fasterxml.jackson.module:jackson-module-guice7;2.19.2 -com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations;2.19.2 -com.fasterxml.jackson.module:jackson-module-jaxb-annotations;2.19.2 -com.fasterxml.jackson.module:jackson-module-jsonSchema;2.19.2 -com.fasterxml.jackson.module:jackson-module-jsonSchema-jakarta;2.19.2 -com.fasterxml.jackson.module:jackson-module-kotlin;2.19.2 -com.fasterxml.jackson.module:jackson-module-mrbean;2.19.2 -com.fasterxml.jackson.module:jackson-module-no-ctor-deser;2.19.2 -com.fasterxml.jackson.module:jackson-module-osgi;2.19.2 -com.fasterxml.jackson.module:jackson-module-parameter-names;2.19.2 -com.fasterxml.jackson.module:jackson-module-paranamer;2.19.2 -com.fasterxml.jackson.module:jackson-module-scala_2.11;2.19.2 -com.fasterxml.jackson.module:jackson-module-scala_2.12;2.19.2 -com.fasterxml.jackson.module:jackson-module-scala_2.13;2.19.2 -com.fasterxml.jackson.module:jackson-module-scala_3;2.19.2 -com.fasterxml.jackson:jackson-bom;2.19.2 -com.fasterxml:classmate;1.7.0 -com.github.ben-manes.caffeine:caffeine;3.2.2 -com.github.ben-manes.caffeine:guava;3.2.2 -com.github.ben-manes.caffeine:jcache;3.2.2 -com.github.ben-manes.caffeine:simulator;3.2.2 -com.github.mxab.thymeleaf.extras:thymeleaf-extras-data-attribute;2.0.1 -com.github.tomakehurst:wiremock-jre8-standalone;2.35.1 -com.google.code.gson:gson;2.13.1 -com.graphql-java:graphql-java;24.1 -com.h2database:h2;2.3.232 -com.hazelcast:hazelcast;5.5.0 -com.hazelcast:hazelcast-spring;5.5.0 -com.ibm.db2:jcc;12.1.2.0 -com.jayway.jsonpath:json-path;2.9.0 -com.jayway.jsonpath:json-path-assert;2.9.0 -com.microsoft.sqlserver:mssql-jdbc;12.10.1.jre11 -com.mysql:mysql-connector-j;9.4.0 -com.netflix.eureka:eureka-client;2.0.4 -com.netflix.eureka:eureka-client-jersey3;2.0.4 -com.netflix.eureka:eureka-core;2.0.4 -com.netflix.eureka:eureka-core-jersey3;2.0.4 -com.oracle.database.ha:ons;23.7.0.25.01 -com.oracle.database.ha:simplefan;23.7.0.25.01 -com.oracle.database.jdbc:ojdbc11;23.7.0.25.01 -com.oracle.database.jdbc:ojdbc11-production;23.7.0.25.01 -com.oracle.database.jdbc:ojdbc17;23.7.0.25.01 -com.oracle.database.jdbc:ojdbc17-production;23.7.0.25.01 -com.oracle.database.jdbc:ojdbc8;23.7.0.25.01 -com.oracle.database.jdbc:ojdbc8-production;23.7.0.25.01 -com.oracle.database.jdbc:rsi;23.7.0.25.01 -com.oracle.database.jdbc:ucp;23.7.0.25.01 -com.oracle.database.jdbc:ucp11;23.7.0.25.01 -com.oracle.database.jdbc:ucp17;23.7.0.25.01 -com.oracle.database.nls:orai18n;23.7.0.25.01 -com.oracle.database.r2dbc:oracle-r2dbc;1.3.0 -com.oracle.database.security:oraclepki;23.7.0.25.01 -com.oracle.database.xml:xdb;23.7.0.25.01 -com.oracle.database.xml:xmlparserv2;23.7.0.25.01 -com.querydsl:codegen-utils;5.1.0 -com.querydsl:querydsl-apt;5.1.0 -com.querydsl:querydsl-bom;5.1.0 -com.querydsl:querydsl-codegen;5.1.0 -com.querydsl:querydsl-collections;5.1.0 -com.querydsl:querydsl-core;5.1.0 -com.querydsl:querydsl-guava;5.1.0 -com.querydsl:querydsl-hibernate-search;5.1.0 -com.querydsl:querydsl-jdo;5.1.0 -com.querydsl:querydsl-jpa;5.1.0 -com.querydsl:querydsl-jpa-codegen;5.1.0 -com.querydsl:querydsl-kotlin;5.1.0 -com.querydsl:querydsl-kotlin-codegen;5.1.0 -com.querydsl:querydsl-lucene3;5.1.0 -com.querydsl:querydsl-lucene4;5.1.0 -com.querydsl:querydsl-lucene5;5.1.0 -com.querydsl:querydsl-mongodb;5.1.0 -com.querydsl:querydsl-scala;5.1.0 -com.querydsl:querydsl-spatial;5.1.0 -com.querydsl:querydsl-sql;5.1.0 -com.querydsl:querydsl-sql-codegen;5.1.0 -com.querydsl:querydsl-sql-spatial;5.1.0 -com.querydsl:querydsl-sql-spring;5.1.0 -com.rabbitmq:amqp-client;5.25.0 -com.rabbitmq:stream-client;0.23.0 -com.redis:testcontainers-redis;2.2.4 -com.samskivert:jmustache;1.16 -com.sendgrid:sendgrid-java;4.10.3 -com.squareup.okhttp3:logging-interceptor;4.12.0 -com.squareup.okhttp3:mockwebserver;4.12.0 -com.squareup.okhttp3:okcurl;4.12.0 -com.squareup.okhttp3:okhttp;4.12.0 -com.squareup.okhttp3:okhttp-bom;4.12.0 -com.squareup.okhttp3:okhttp-brotli;4.12.0 -com.squareup.okhttp3:okhttp-dnsoverhttps;4.12.0 -com.squareup.okhttp3:okhttp-sse;4.12.0 -com.squareup.okhttp3:okhttp-tls;4.12.0 -com.squareup.okhttp3:okhttp-urlconnection;4.12.0 -com.sun.istack:istack-commons-runtime;4.1.2 -com.sun.xml.bind:jaxb-core;4.0.5 -com.sun.xml.bind:jaxb-impl;4.0.5 -com.sun.xml.bind:jaxb-jxc;4.0.5 -com.sun.xml.bind:jaxb-osgi;4.0.5 -com.sun.xml.bind:jaxb-xjc;4.0.5 -com.sun.xml.fastinfoset:FastInfoset;2.1.1 -com.sun.xml.messaging.saaj:saaj-impl;3.0.4 -com.toomuchcoding.jsonassert:jsonassert;0.8.0 -com.toomuchcoding.jsonassert:jsonassert-shade;0.8.0 -com.unboundid:unboundid-ldapsdk;7.0.3 -com.zaxxer:HikariCP;6.3.2 -commons-codec:commons-codec;1.18.0 -commons-pool:commons-pool;1.6 -io.asyncer:r2dbc-mysql;1.4.1 -io.fabric8.java-generator:io.fabric8.java-generator.gradle.plugin;7.3.1 -io.fabric8.kubernetes:kubernetes-karaf;7.3.1 -io.fabric8:certmanager-client;7.3.1 -io.fabric8:certmanager-model;7.3.1 -io.fabric8:chaosmesh-client;7.3.1 -io.fabric8:chaosmesh-model;7.3.1 -io.fabric8:crd-generator-api;7.3.1 -io.fabric8:crd-generator-api-v2;7.3.1 -io.fabric8:crd-generator-apt;7.3.1 -io.fabric8:crd-generator-cli;7.3.1 -io.fabric8:crd-generator-collector;7.3.1 -io.fabric8:crd-generator-maven-plugin;7.3.1 -io.fabric8:generator-annotations;7.3.1 -io.fabric8:istio-client;7.3.1 -io.fabric8:istio-model;7.3.1 -io.fabric8:java-generator-benchmark;7.3.1 -io.fabric8:java-generator-cli;7.3.1 -io.fabric8:java-generator-core;7.3.1 -io.fabric8:java-generator-maven-plugin;7.3.1 -io.fabric8:knative-client;7.3.1 -io.fabric8:knative-model;7.3.1 -io.fabric8:kube-api-test;7.3.1 -io.fabric8:kube-api-test-client-inject;7.3.1 -io.fabric8:kubernetes-client;7.3.1 -io.fabric8:kubernetes-client-api;7.3.1 -io.fabric8:kubernetes-client-bom;7.3.1 -io.fabric8:kubernetes-client-init-bc-fips;7.3.1 -io.fabric8:kubernetes-httpclient-jdk;7.3.1 -io.fabric8:kubernetes-httpclient-jetty;7.3.1 -io.fabric8:kubernetes-httpclient-okhttp;7.3.1 -io.fabric8:kubernetes-httpclient-vertx;7.3.1 -io.fabric8:kubernetes-junit-jupiter;7.3.1 -io.fabric8:kubernetes-junit-jupiter-autodetected;7.3.1 -io.fabric8:kubernetes-log4j;7.3.1 -io.fabric8:kubernetes-model-admissionregistration;7.3.1 -io.fabric8:kubernetes-model-apiextensions;7.3.1 -io.fabric8:kubernetes-model-apps;7.3.1 -io.fabric8:kubernetes-model-autoscaling;7.3.1 -io.fabric8:kubernetes-model-batch;7.3.1 -io.fabric8:kubernetes-model-certificates;7.3.1 -io.fabric8:kubernetes-model-common;7.3.1 -io.fabric8:kubernetes-model-coordination;7.3.1 -io.fabric8:kubernetes-model-core;7.3.1 -io.fabric8:kubernetes-model-discovery;7.3.1 -io.fabric8:kubernetes-model-events;7.3.1 -io.fabric8:kubernetes-model-extensions;7.3.1 -io.fabric8:kubernetes-model-flowcontrol;7.3.1 -io.fabric8:kubernetes-model-gatewayapi;7.3.1 -io.fabric8:kubernetes-model-kustomize;7.3.1 -io.fabric8:kubernetes-model-metrics;7.3.1 -io.fabric8:kubernetes-model-networking;7.3.1 -io.fabric8:kubernetes-model-node;7.3.1 -io.fabric8:kubernetes-model-policy;7.3.1 -io.fabric8:kubernetes-model-rbac;7.3.1 -io.fabric8:kubernetes-model-resource;7.3.1 -io.fabric8:kubernetes-model-scheduling;7.3.1 -io.fabric8:kubernetes-model-storageclass;7.3.1 -io.fabric8:kubernetes-model-validator;7.3.1 -io.fabric8:kubernetes-openshift-uberjar;7.3.1 -io.fabric8:kubernetes-server-mock;7.3.1 -io.fabric8:mockwebserver;7.3.1 -io.fabric8:open-cluster-management-client;7.3.1 -io.fabric8:open-cluster-management-model;7.3.1 -io.fabric8:openapi-model-generator-maven-plugin;7.3.1 -io.fabric8:openshift-client;7.3.1 -io.fabric8:openshift-client-api;7.3.1 -io.fabric8:openshift-model;7.3.1 -io.fabric8:openshift-model-autoscaling;7.3.1 -io.fabric8:openshift-model-config;7.3.1 -io.fabric8:openshift-model-console;7.3.1 -io.fabric8:openshift-model-hive;7.3.1 -io.fabric8:openshift-model-installer;7.3.1 -io.fabric8:openshift-model-machine;7.3.1 -io.fabric8:openshift-model-machineconfiguration;7.3.1 -io.fabric8:openshift-model-miscellaneous;7.3.1 -io.fabric8:openshift-model-monitoring;7.3.1 -io.fabric8:openshift-model-operator;7.3.1 -io.fabric8:openshift-model-operatorhub;7.3.1 -io.fabric8:openshift-model-storageversionmigrator;7.3.1 -io.fabric8:openshift-model-tuned;7.3.1 -io.fabric8:openshift-model-whereabouts;7.3.1 -io.fabric8:ovn-client;7.3.1 -io.fabric8:ovn-model;7.3.1 -io.fabric8:tekton-client;7.3.1 -io.fabric8:tekton-model;7.3.1 -io.fabric8:verticalpodautoscaler-client;7.3.1 -io.fabric8:verticalpodautoscaler-model;7.3.1 -io.fabric8:volcano-client;7.3.1 -io.fabric8:volcano-model;7.3.1 -io.fabric8:volumesnapshot-client;7.3.1 -io.fabric8:volumesnapshot-model;7.3.1 -io.fabric8:zjsonpatch;7.3.1 -io.github.git-commit-id:git-commit-id-maven-plugin;9.0.2 -io.github.openfeign:feign-annotation-error-decoder;13.6 -io.github.openfeign:feign-bom;13.6 -io.github.openfeign:feign-core;13.6 -io.github.openfeign:feign-dropwizard-metrics4;13.6 -io.github.openfeign:feign-dropwizard-metrics5;13.6 -io.github.openfeign:feign-fastjson2;13.6 -io.github.openfeign:feign-form;13.6 -io.github.openfeign:feign-form-spring;13.6 -io.github.openfeign:feign-googlehttpclient;13.6 -io.github.openfeign:feign-gson;13.6 -io.github.openfeign:feign-hc5;13.6 -io.github.openfeign:feign-httpclient;13.6 -io.github.openfeign:feign-hystrix;13.6 -io.github.openfeign:feign-jackson;13.6 -io.github.openfeign:feign-jackson-jaxb;13.6 -io.github.openfeign:feign-jackson-jr;13.6 -io.github.openfeign:feign-jakarta;13.6 -io.github.openfeign:feign-java11;13.6 -io.github.openfeign:feign-jaxb;13.6 -io.github.openfeign:feign-jaxb-jakarta;13.6 -io.github.openfeign:feign-jaxrs;13.6 -io.github.openfeign:feign-jaxrs2;13.6 -io.github.openfeign:feign-jaxrs3;13.6 -io.github.openfeign:feign-jaxrs4;13.6 -io.github.openfeign:feign-json;13.6 -io.github.openfeign:feign-kotlin;13.6 -io.github.openfeign:feign-micrometer;13.6 -io.github.openfeign:feign-mock;13.6 -io.github.openfeign:feign-moshi;13.6 -io.github.openfeign:feign-okhttp;13.6 -io.github.openfeign:feign-reactive-wrappers;13.6 -io.github.openfeign:feign-ribbon;13.6 -io.github.openfeign:feign-sax;13.6 -io.github.openfeign:feign-slf4j;13.6 -io.github.openfeign:feign-soap;13.6 -io.github.openfeign:feign-soap-jakarta;13.6 -io.github.openfeign:feign-spring;13.6 -io.github.openfeign:feign-vertx;13.6 -io.github.openfeign:feign-vertx4-test;13.6 -io.github.openfeign:feign-vertx5-test;13.6 -io.github.resilience4j:resilience4j-all;2.2.0 -io.github.resilience4j:resilience4j-annotations;2.2.0 -io.github.resilience4j:resilience4j-bom;2.2.0 -io.github.resilience4j:resilience4j-bulkhead;2.2.0 -io.github.resilience4j:resilience4j-cache;2.2.0 -io.github.resilience4j:resilience4j-circuitbreaker;2.2.0 -io.github.resilience4j:resilience4j-circularbuffer;2.2.0 -io.github.resilience4j:resilience4j-consumer;2.2.0 -io.github.resilience4j:resilience4j-core;2.2.0 -io.github.resilience4j:resilience4j-feign;2.2.0 -io.github.resilience4j:resilience4j-kotlin;2.2.0 -io.github.resilience4j:resilience4j-metrics;2.2.0 -io.github.resilience4j:resilience4j-micrometer;2.2.0 -io.github.resilience4j:resilience4j-ratelimiter;2.2.0 -io.github.resilience4j:resilience4j-reactor;2.2.0 -io.github.resilience4j:resilience4j-retry;2.2.0 -io.github.resilience4j:resilience4j-rxjava2;2.2.0 -io.github.resilience4j:resilience4j-rxjava3;2.2.0 -io.github.resilience4j:resilience4j-spring;2.2.0 -io.github.resilience4j:resilience4j-spring-boot2;2.2.0 -io.github.resilience4j:resilience4j-spring-boot3;2.2.0 -io.github.resilience4j:resilience4j-spring-cloud2;2.2.0 -io.github.resilience4j:resilience4j-spring6;2.2.0 -io.github.resilience4j:resilience4j-timelimiter;2.2.0 -io.github.resilience4j:resilience4j-vavr;2.2.0 -io.kubernetes:client-java;19.0.2 -io.kubernetes:client-java-extended;19.0.2 -io.kubernetes:client-java-spring-integration;19.0.2 -io.lettuce:lettuce-core;6.6.0.RELEASE -io.micrometer:context-propagation;1.1.3 -io.micrometer:docs;1.5.3 -io.micrometer:micrometer-bom;1.15.3 -io.micrometer:micrometer-commons;1.15.3 -io.micrometer:micrometer-core;1.15.3 -io.micrometer:micrometer-jakarta9;1.15.3 -io.micrometer:micrometer-java11;1.15.3 -io.micrometer:micrometer-java21;1.15.3 -io.micrometer:micrometer-jetty11;1.15.3 -io.micrometer:micrometer-jetty12;1.15.3 -io.micrometer:micrometer-observation;1.15.3 -io.micrometer:micrometer-observation-test;1.15.3 -io.micrometer:micrometer-registry-appoptics;1.15.3 -io.micrometer:micrometer-registry-atlas;1.15.3 -io.micrometer:micrometer-registry-azure-monitor;1.15.3 -io.micrometer:micrometer-registry-cloudwatch2;1.15.3 -io.micrometer:micrometer-registry-datadog;1.15.3 -io.micrometer:micrometer-registry-dynatrace;1.15.3 -io.micrometer:micrometer-registry-elastic;1.15.3 -io.micrometer:micrometer-registry-ganglia;1.15.3 -io.micrometer:micrometer-registry-graphite;1.15.3 -io.micrometer:micrometer-registry-health;1.15.3 -io.micrometer:micrometer-registry-humio;1.15.3 -io.micrometer:micrometer-registry-influx;1.15.3 -io.micrometer:micrometer-registry-jmx;1.15.3 -io.micrometer:micrometer-registry-kairos;1.15.3 -io.micrometer:micrometer-registry-new-relic;1.15.3 -io.micrometer:micrometer-registry-opentsdb;1.15.3 -io.micrometer:micrometer-registry-otlp;1.15.3 -io.micrometer:micrometer-registry-prometheus;1.15.3 -io.micrometer:micrometer-registry-prometheus-simpleclient;1.15.3 -io.micrometer:micrometer-registry-signalfx;1.15.3 -io.micrometer:micrometer-registry-stackdriver;1.15.3 -io.micrometer:micrometer-registry-statsd;1.15.3 -io.micrometer:micrometer-registry-wavefront;1.15.3 -io.micrometer:micrometer-test;1.15.3 -io.micrometer:micrometer-tracing;1.5.3 -io.micrometer:micrometer-tracing-bom;1.5.3 -io.micrometer:micrometer-tracing-bridge-brave;1.5.3 -io.micrometer:micrometer-tracing-bridge-otel;1.5.3 -io.micrometer:micrometer-tracing-integration-test;1.5.3 -io.micrometer:micrometer-tracing-reporter-wavefront;1.5.3 -io.micrometer:micrometer-tracing-test;1.5.3 -io.netty:netty-all;4.1.124.Final -io.netty:netty-bom;4.1.124.Final -io.netty:netty-buffer;4.1.124.Final -io.netty:netty-codec;4.1.124.Final -io.netty:netty-codec-dns;4.1.124.Final -io.netty:netty-codec-haproxy;4.1.124.Final -io.netty:netty-codec-http;4.1.124.Final -io.netty:netty-codec-http2;4.1.124.Final -io.netty:netty-codec-memcache;4.1.124.Final -io.netty:netty-codec-mqtt;4.1.124.Final -io.netty:netty-codec-redis;4.1.124.Final -io.netty:netty-codec-smtp;4.1.124.Final -io.netty:netty-codec-socks;4.1.124.Final -io.netty:netty-codec-stomp;4.1.124.Final -io.netty:netty-codec-xml;4.1.124.Final -io.netty:netty-common;4.1.124.Final -io.netty:netty-dev-tools;4.1.124.Final -io.netty:netty-handler;4.1.124.Final -io.netty:netty-handler-proxy;4.1.124.Final -io.netty:netty-handler-ssl-ocsp;4.1.124.Final -io.netty:netty-resolver;4.1.124.Final -io.netty:netty-resolver-dns;4.1.124.Final -io.netty:netty-resolver-dns-classes-macos;4.1.124.Final -io.netty:netty-resolver-dns-native-macos;4.1.124.Final -io.netty:netty-tcnative;2.0.72.Final -io.netty:netty-tcnative-boringssl-static;2.0.72.Final -io.netty:netty-tcnative-classes;2.0.72.Final -io.netty:netty-transport;4.1.124.Final -io.netty:netty-transport-classes-epoll;4.1.124.Final -io.netty:netty-transport-classes-kqueue;4.1.124.Final -io.netty:netty-transport-native-epoll;4.1.124.Final -io.netty:netty-transport-native-kqueue;4.1.124.Final -io.netty:netty-transport-native-unix-common;4.1.124.Final -io.netty:netty-transport-rxtx;4.1.124.Final -io.netty:netty-transport-sctp;4.1.124.Final -io.netty:netty-transport-udt;4.1.124.Final -io.opentelemetry:opentelemetry-api;1.49.0 -io.opentelemetry:opentelemetry-bom;1.49.0 -io.opentelemetry:opentelemetry-context;1.49.0 -io.opentelemetry:opentelemetry-exporter-common;1.49.0 -io.opentelemetry:opentelemetry-exporter-logging;1.49.0 -io.opentelemetry:opentelemetry-exporter-logging-otlp;1.49.0 -io.opentelemetry:opentelemetry-exporter-otlp;1.49.0 -io.opentelemetry:opentelemetry-exporter-otlp-common;1.49.0 -io.opentelemetry:opentelemetry-exporter-sender-grpc-managed-channel;1.49.0 -io.opentelemetry:opentelemetry-exporter-sender-jdk;1.49.0 -io.opentelemetry:opentelemetry-exporter-sender-okhttp;1.49.0 -io.opentelemetry:opentelemetry-exporter-zipkin;1.49.0 -io.opentelemetry:opentelemetry-extension-kotlin;1.49.0 -io.opentelemetry:opentelemetry-extension-trace-propagators;1.49.0 -io.opentelemetry:opentelemetry-opentracing-shim;1.49.0 -io.opentelemetry:opentelemetry-sdk;1.49.0 -io.opentelemetry:opentelemetry-sdk-common;1.49.0 -io.opentelemetry:opentelemetry-sdk-extension-autoconfigure;1.49.0 -io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi;1.49.0 -io.opentelemetry:opentelemetry-sdk-extension-jaeger-remote-sampler;1.49.0 -io.opentelemetry:opentelemetry-sdk-logs;1.49.0 -io.opentelemetry:opentelemetry-sdk-metrics;1.49.0 -io.opentelemetry:opentelemetry-sdk-testing;1.49.0 -io.opentelemetry:opentelemetry-sdk-trace;1.49.0 -io.projectreactor.addons:reactor-adapter;3.5.2 -io.projectreactor.addons:reactor-extra;3.5.2 -io.projectreactor.addons:reactor-pool;1.1.3 -io.projectreactor.addons:reactor-pool-micrometer;0.2.3 -io.projectreactor.kafka:reactor-kafka;1.3.23 -io.projectreactor.kotlin:reactor-kotlin-extensions;1.2.3 -io.projectreactor.netty:reactor-netty;1.2.9 -io.projectreactor.netty:reactor-netty-core;1.2.9 -io.projectreactor.netty:reactor-netty-http;1.2.9 -io.projectreactor.netty:reactor-netty-http-brave;1.2.9 -io.projectreactor:reactor-bom;2024.0.9 -io.projectreactor:reactor-core;3.7.9 -io.projectreactor:reactor-core-micrometer;1.2.9 -io.projectreactor:reactor-test;3.7.9 -io.projectreactor:reactor-tools;3.7.9 -io.prometheus:prometheus-metrics-bom;1.3.10 -io.prometheus:prometheus-metrics-config;1.3.10 -io.prometheus:prometheus-metrics-core;1.3.10 -io.prometheus:prometheus-metrics-exporter-common;1.3.10 -io.prometheus:prometheus-metrics-exporter-httpserver;1.3.10 -io.prometheus:prometheus-metrics-exporter-opentelemetry;1.3.10 -io.prometheus:prometheus-metrics-exporter-opentelemetry-no-otel;1.3.10 -io.prometheus:prometheus-metrics-exporter-opentelemetry-otel-agent-resources;1.3.10 -io.prometheus:prometheus-metrics-exporter-pushgateway;1.3.10 -io.prometheus:prometheus-metrics-exporter-servlet-jakarta;1.3.10 -io.prometheus:prometheus-metrics-exporter-servlet-javax;1.3.10 -io.prometheus:prometheus-metrics-exposition-formats;1.3.10 -io.prometheus:prometheus-metrics-exposition-formats-no-protobuf;1.3.10 -io.prometheus:prometheus-metrics-exposition-textformats;1.3.10 -io.prometheus:prometheus-metrics-instrumentation-caffeine;1.3.10 -io.prometheus:prometheus-metrics-instrumentation-dropwizard;1.3.10 -io.prometheus:prometheus-metrics-instrumentation-dropwizard5;1.3.10 -io.prometheus:prometheus-metrics-instrumentation-guava;1.3.10 -io.prometheus:prometheus-metrics-instrumentation-jvm;1.3.10 -io.prometheus:prometheus-metrics-model;1.3.10 -io.prometheus:prometheus-metrics-simpleclient-bridge;1.3.10 -io.prometheus:prometheus-metrics-tracer;1.3.10 -io.prometheus:prometheus-metrics-tracer-common;1.3.10 -io.prometheus:prometheus-metrics-tracer-initializer;1.3.10 -io.prometheus:prometheus-metrics-tracer-otel;1.3.10 -io.prometheus:prometheus-metrics-tracer-otel-agent;1.3.10 -io.prometheus:simpleclient;0.16.0 -io.prometheus:simpleclient_bom;0.16.0 -io.prometheus:simpleclient_caffeine;0.16.0 -io.prometheus:simpleclient_common;0.16.0 -io.prometheus:simpleclient_dropwizard;0.16.0 -io.prometheus:simpleclient_graphite_bridge;0.16.0 -io.prometheus:simpleclient_guava;0.16.0 -io.prometheus:simpleclient_hibernate;0.16.0 -io.prometheus:simpleclient_hotspot;0.16.0 -io.prometheus:simpleclient_httpserver;0.16.0 -io.prometheus:simpleclient_jetty;0.16.0 -io.prometheus:simpleclient_jetty_jdk8;0.16.0 -io.prometheus:simpleclient_log4j;0.16.0 -io.prometheus:simpleclient_log4j2;0.16.0 -io.prometheus:simpleclient_logback;0.16.0 -io.prometheus:simpleclient_pushgateway;0.16.0 -io.prometheus:simpleclient_servlet;0.16.0 -io.prometheus:simpleclient_servlet_jakarta;0.16.0 -io.prometheus:simpleclient_spring_boot;0.16.0 -io.prometheus:simpleclient_spring_web;0.16.0 -io.prometheus:simpleclient_tracer_common;0.16.0 -io.prometheus:simpleclient_tracer_otel;0.16.0 -io.prometheus:simpleclient_tracer_otel_agent;0.16.0 -io.prometheus:simpleclient_vertx;0.16.0 -io.r2dbc:r2dbc-h2;1.0.0.RELEASE -io.r2dbc:r2dbc-mssql;1.0.2.RELEASE -io.r2dbc:r2dbc-pool;1.0.2.RELEASE -io.r2dbc:r2dbc-proxy;1.1.6.RELEASE -io.r2dbc:r2dbc-spi;1.0.0.RELEASE -io.reactivex.rxjava3:rxjava;3.1.11 -io.rest-assured:json-path;5.5.6 -io.rest-assured:json-schema-validator;5.5.6 -io.rest-assured:kotlin-extensions;5.5.6 -io.rest-assured:rest-assured;5.5.6 -io.rest-assured:rest-assured-all;5.5.6 -io.rest-assured:rest-assured-bom;5.5.6 -io.rest-assured:rest-assured-common;5.5.6 -io.rest-assured:scala-extensions;5.5.6 -io.rest-assured:scala-support;5.5.6 -io.rest-assured:spring-commons;5.5.6 -io.rest-assured:spring-mock-mvc;5.5.6 -io.rest-assured:spring-mock-mvc-kotlin-extensions;5.5.6 -io.rest-assured:spring-web-test-client;5.5.6 -io.rest-assured:spring-web-test-client-kotlin-extensions;5.5.6 -io.rest-assured:xml-path;5.5.6 -io.rsocket:rsocket-bom;1.1.5 -io.rsocket:rsocket-core;1.1.5 -io.rsocket:rsocket-load-balancer;1.1.5 -io.rsocket:rsocket-micrometer;1.1.5 -io.rsocket:rsocket-test;1.1.5 -io.rsocket:rsocket-transport-local;1.1.5 -io.rsocket:rsocket-transport-netty;1.1.5 -io.spring.gradle:dependency-management-plugin;1.1.7 -io.undertow:undertow-core;2.3.18.Final -io.undertow:undertow-servlet;2.3.18.Final -io.undertow:undertow-websockets-jsr;2.3.18.Final -io.zipkin.brave:brave;6.1.0 -io.zipkin.brave:brave-bom;6.1.0 -io.zipkin.brave:brave-context-jfr;6.1.0 -io.zipkin.brave:brave-context-log4j12;6.1.0 -io.zipkin.brave:brave-context-log4j2;6.1.0 -io.zipkin.brave:brave-context-slf4j;6.1.0 -io.zipkin.brave:brave-instrumentation-dubbo;6.1.0 -io.zipkin.brave:brave-instrumentation-grpc;6.1.0 -io.zipkin.brave:brave-instrumentation-http;6.1.0 -io.zipkin.brave:brave-instrumentation-http-tests;6.1.0 -io.zipkin.brave:brave-instrumentation-http-tests-jakarta;6.1.0 -io.zipkin.brave:brave-instrumentation-httpasyncclient;6.1.0 -io.zipkin.brave:brave-instrumentation-httpclient;6.1.0 -io.zipkin.brave:brave-instrumentation-httpclient5;6.1.0 -io.zipkin.brave:brave-instrumentation-jakarta-jms;6.1.0 -io.zipkin.brave:brave-instrumentation-jaxrs2;6.1.0 -io.zipkin.brave:brave-instrumentation-jersey-server;6.1.0 -io.zipkin.brave:brave-instrumentation-jms;6.1.0 -io.zipkin.brave:brave-instrumentation-jms-jakarta;6.1.0 -io.zipkin.brave:brave-instrumentation-kafka-clients;6.1.0 -io.zipkin.brave:brave-instrumentation-kafka-streams;6.1.0 -io.zipkin.brave:brave-instrumentation-messaging;6.1.0 -io.zipkin.brave:brave-instrumentation-mongodb;6.1.0 -io.zipkin.brave:brave-instrumentation-mysql;6.1.0 -io.zipkin.brave:brave-instrumentation-mysql6;6.1.0 -io.zipkin.brave:brave-instrumentation-mysql8;6.1.0 -io.zipkin.brave:brave-instrumentation-netty-codec-http;6.1.0 -io.zipkin.brave:brave-instrumentation-okhttp3;6.1.0 -io.zipkin.brave:brave-instrumentation-rocketmq-client;6.1.0 -io.zipkin.brave:brave-instrumentation-rpc;6.1.0 -io.zipkin.brave:brave-instrumentation-servlet;6.1.0 -io.zipkin.brave:brave-instrumentation-servlet-jakarta;6.1.0 -io.zipkin.brave:brave-instrumentation-spring-rabbit;6.1.0 -io.zipkin.brave:brave-instrumentation-spring-web;6.1.0 -io.zipkin.brave:brave-instrumentation-spring-webmvc;6.1.0 -io.zipkin.brave:brave-instrumentation-vertx-web;6.1.0 -io.zipkin.brave:brave-spring-beans;6.1.0 -io.zipkin.brave:brave-tests;6.1.0 -io.zipkin.reporter2:zipkin-reporter;3.5.1 -io.zipkin.reporter2:zipkin-reporter-bom;3.5.1 -io.zipkin.reporter2:zipkin-reporter-brave;3.5.1 -io.zipkin.reporter2:zipkin-reporter-metrics-micrometer;3.5.1 -io.zipkin.reporter2:zipkin-reporter-spring-beans;3.5.1 -io.zipkin.reporter2:zipkin-sender-activemq-client;3.5.1 -io.zipkin.reporter2:zipkin-sender-amqp-client;3.5.1 -io.zipkin.reporter2:zipkin-sender-kafka;3.5.1 -io.zipkin.reporter2:zipkin-sender-libthrift;3.5.1 -io.zipkin.reporter2:zipkin-sender-okhttp3;3.5.1 -io.zipkin.reporter2:zipkin-sender-pulsar-client;3.5.1 -io.zipkin.reporter2:zipkin-sender-urlconnection;3.5.1 -jakarta.activation:jakarta.activation-api;2.1.3 -jakarta.annotation:jakarta.annotation-api;2.1.1 -jakarta.inject:jakarta.inject-api;2.0.1 -jakarta.jms:jakarta.jms-api;3.1.0 -jakarta.json.bind:jakarta.json.bind-api;3.0.1 -jakarta.json:jakarta.json-api;2.1.3 -jakarta.mail:jakarta.mail-api;2.1.3 -jakarta.management.j2ee:jakarta.management.j2ee-api;1.1.4 -jakarta.persistence:jakarta.persistence-api;3.1.0 -jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api;3.0.2 -jakarta.servlet:jakarta.servlet-api;6.0.0 -jakarta.transaction:jakarta.transaction-api;2.0.1 -jakarta.validation:jakarta.validation-api;3.0.2 -jakarta.websocket:jakarta.websocket-api;2.1.1 -jakarta.websocket:jakarta.websocket-client-api;2.1.1 -jakarta.ws.rs:jakarta.ws.rs-api;3.1.0 -jakarta.xml.bind:jakarta.xml.bind-api;4.0.2 -jakarta.xml.soap:jakarta.xml.soap-api;3.0.2 -jakarta.xml.ws:jakarta.xml.ws-api;4.0.2 -javax.cache:cache-api;1.1.1 -javax.money:money-api;1.1 -jaxen:jaxen;2.0.0 -junit:junit;4.13.2 -net.bytebuddy:byte-buddy;1.17.7 -net.bytebuddy:byte-buddy-agent;1.17.7 -net.minidev:json-smart;2.5.2 -net.sourceforge.jtds:jtds;1.3.1 -net.sourceforge.nekohtml:nekohtml;1.9.22 -nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect;3.4.0 -org.apache.activemq:activemq-all;6.1.7 -org.apache.activemq:activemq-amqp;6.1.7 -org.apache.activemq:activemq-blueprint;6.1.7 -org.apache.activemq:activemq-bom;6.1.7 -org.apache.activemq:activemq-branding;2.40.0 -org.apache.activemq:activemq-broker;6.1.7 -org.apache.activemq:activemq-client;6.1.7 -org.apache.activemq:activemq-console;6.1.7 -org.apache.activemq:activemq-http;6.1.7 -org.apache.activemq:activemq-jaas;6.1.7 -org.apache.activemq:activemq-jdbc-store;6.1.7 -org.apache.activemq:activemq-jms-pool;6.1.7 -org.apache.activemq:activemq-kahadb-store;6.1.7 -org.apache.activemq:activemq-karaf;6.1.7 -org.apache.activemq:activemq-log4j-appender;6.1.7 -org.apache.activemq:activemq-mqtt;6.1.7 -org.apache.activemq:activemq-openwire-generator;6.1.7 -org.apache.activemq:activemq-openwire-legacy;6.1.7 -org.apache.activemq:activemq-osgi;6.1.7 -org.apache.activemq:activemq-pool;6.1.7 -org.apache.activemq:activemq-ra;6.1.7 -org.apache.activemq:activemq-rar;6.1.7 -org.apache.activemq:activemq-run;6.1.7 -org.apache.activemq:activemq-runtime-config;6.1.7 -org.apache.activemq:activemq-shiro;6.1.7 -org.apache.activemq:activemq-spring;6.1.7 -org.apache.activemq:activemq-stomp;6.1.7 -org.apache.activemq:activemq-web;6.1.7 -org.apache.activemq:activemq-web-console;6.1.7 -org.apache.activemq:activemq-web-demo;6.1.7 -org.apache.activemq:artemis-amqp-protocol;2.40.0 -org.apache.activemq:artemis-bom;2.40.0 -org.apache.activemq:artemis-boot;2.40.0 -org.apache.activemq:artemis-cdi-client;2.40.0 -org.apache.activemq:artemis-cli;2.40.0 -org.apache.activemq:artemis-commons;2.40.0 -org.apache.activemq:artemis-console;2.40.0 -org.apache.activemq:artemis-core-client;2.40.0 -org.apache.activemq:artemis-core-client-all;2.40.0 -org.apache.activemq:artemis-core-client-osgi;2.40.0 -org.apache.activemq:artemis-dto;2.40.0 -org.apache.activemq:artemis-features;2.40.0 -org.apache.activemq:artemis-hornetq-protocol;2.40.0 -org.apache.activemq:artemis-hqclient-protocol;2.40.0 -org.apache.activemq:artemis-jakarta-cdi-client;2.40.0 -org.apache.activemq:artemis-jakarta-client;2.40.0 -org.apache.activemq:artemis-jakarta-client-all;2.40.0 -org.apache.activemq:artemis-jakarta-openwire-protocol;2.40.0 -org.apache.activemq:artemis-jakarta-ra;2.40.0 -org.apache.activemq:artemis-jakarta-server;2.40.0 -org.apache.activemq:artemis-jakarta-service-extensions;2.40.0 -org.apache.activemq:artemis-jdbc-store;2.40.0 -org.apache.activemq:artemis-jms-client;2.40.0 -org.apache.activemq:artemis-jms-client-all;2.40.0 -org.apache.activemq:artemis-jms-client-osgi;2.40.0 -org.apache.activemq:artemis-jms-server;2.40.0 -org.apache.activemq:artemis-journal;2.40.0 -org.apache.activemq:artemis-lockmanager-api;2.40.0 -org.apache.activemq:artemis-lockmanager-ri;2.40.0 -org.apache.activemq:artemis-mqtt-protocol;2.40.0 -org.apache.activemq:artemis-openwire-protocol;2.40.0 -org.apache.activemq:artemis-ra;2.40.0 -org.apache.activemq:artemis-selector;2.40.0 -org.apache.activemq:artemis-server;2.40.0 -org.apache.activemq:artemis-server-osgi;2.40.0 -org.apache.activemq:artemis-service-extensions;2.40.0 -org.apache.activemq:artemis-stomp-protocol;2.40.0 -org.apache.activemq:artemis-web;2.40.0 -org.apache.activemq:artemis-website;2.40.0 -org.apache.cassandra:java-driver-bom;4.19.0 -org.apache.cassandra:java-driver-core;4.19.0 -org.apache.cassandra:java-driver-core-shaded;4.19.0 -org.apache.cassandra:java-driver-guava-shaded;4.19.0 -org.apache.cassandra:java-driver-mapper-processor;4.19.0 -org.apache.cassandra:java-driver-mapper-runtime;4.19.0 -org.apache.cassandra:java-driver-metrics-micrometer;4.19.0 -org.apache.cassandra:java-driver-metrics-microprofile;4.19.0 -org.apache.cassandra:java-driver-query-builder;4.19.0 -org.apache.cassandra:java-driver-test-infra;4.19.0 -org.apache.commons:commons-dbcp2;2.13.0 -org.apache.commons:commons-lang3;3.17.0 -org.apache.commons:commons-pool2;2.12.1 -org.apache.curator:curator-framework;5.8.0 -org.apache.curator:curator-recipes;5.8.0 -org.apache.curator:curator-test;5.8.0 -org.apache.curator:curator-x-discovery;5.8.0 -org.apache.derby:derby;10.16.1.1 -org.apache.derby:derbyclient;10.16.1.1 -org.apache.derby:derbynet;10.16.1.1 -org.apache.derby:derbyoptionaltools;10.16.1.1 -org.apache.derby:derbyshared;10.16.1.1 -org.apache.derby:derbytools;10.16.1.1 -org.apache.groovy:groovy;4.0.28 -org.apache.groovy:groovy-ant;4.0.28 -org.apache.groovy:groovy-astbuilder;4.0.28 -org.apache.groovy:groovy-bom;4.0.28 -org.apache.groovy:groovy-cli-commons;4.0.28 -org.apache.groovy:groovy-cli-picocli;4.0.28 -org.apache.groovy:groovy-console;4.0.28 -org.apache.groovy:groovy-contracts;4.0.28 -org.apache.groovy:groovy-datetime;4.0.28 -org.apache.groovy:groovy-dateutil;4.0.28 -org.apache.groovy:groovy-docgenerator;4.0.28 -org.apache.groovy:groovy-ginq;4.0.28 -org.apache.groovy:groovy-groovydoc;4.0.28 -org.apache.groovy:groovy-groovysh;4.0.28 -org.apache.groovy:groovy-jmx;4.0.28 -org.apache.groovy:groovy-json;4.0.28 -org.apache.groovy:groovy-jsr223;4.0.28 -org.apache.groovy:groovy-macro;4.0.28 -org.apache.groovy:groovy-macro-library;4.0.28 -org.apache.groovy:groovy-nio;4.0.28 -org.apache.groovy:groovy-servlet;4.0.28 -org.apache.groovy:groovy-sql;4.0.28 -org.apache.groovy:groovy-swing;4.0.28 -org.apache.groovy:groovy-templates;4.0.28 -org.apache.groovy:groovy-test;4.0.28 -org.apache.groovy:groovy-test-junit5;4.0.28 -org.apache.groovy:groovy-testng;4.0.28 -org.apache.groovy:groovy-toml;4.0.28 -org.apache.groovy:groovy-typecheckers;4.0.28 -org.apache.groovy:groovy-xml;4.0.28 -org.apache.groovy:groovy-yaml;4.0.28 -org.apache.httpcomponents.client5:httpclient5;5.5 -org.apache.httpcomponents.client5:httpclient5-cache;5.5 -org.apache.httpcomponents.client5:httpclient5-fluent;5.5 -org.apache.httpcomponents.core5:httpcore5;5.3.4 -org.apache.httpcomponents.core5:httpcore5-h2;5.3.4 -org.apache.httpcomponents.core5:httpcore5-reactive;5.3.4 -org.apache.httpcomponents:httpasyncclient;4.1.5 -org.apache.httpcomponents:httpcore;4.4.16 -org.apache.httpcomponents:httpcore-nio;4.4.16 -org.apache.kafka:connect;3.9.1 -org.apache.kafka:connect-api;3.9.1 -org.apache.kafka:connect-basic-auth-extension;3.9.1 -org.apache.kafka:connect-file;3.9.1 -org.apache.kafka:connect-json;3.9.1 -org.apache.kafka:connect-mirror;3.9.1 -org.apache.kafka:connect-mirror-client;3.9.1 -org.apache.kafka:connect-runtime;3.9.1 -org.apache.kafka:connect-transforms;3.9.1 -org.apache.kafka:generator;3.9.1 -org.apache.kafka:kafka-clients;3.9.1 -org.apache.kafka:kafka-log4j-appender;3.9.1 -org.apache.kafka:kafka-metadata;3.9.1 -org.apache.kafka:kafka-raft;3.9.1 -org.apache.kafka:kafka-server;3.9.1 -org.apache.kafka:kafka-server-common;3.9.1 -org.apache.kafka:kafka-shell;3.9.1 -org.apache.kafka:kafka-storage;3.9.1 -org.apache.kafka:kafka-storage-api;3.9.1 -org.apache.kafka:kafka-streams;3.9.1 -org.apache.kafka:kafka-streams-scala_2.12;3.9.1 -org.apache.kafka:kafka-streams-scala_2.13;3.9.1 -org.apache.kafka:kafka-streams-test-utils;3.9.1 -org.apache.kafka:kafka-tools;3.9.1 -org.apache.kafka:kafka_2.12;3.9.1 -org.apache.kafka:kafka_2.13;3.9.1 -org.apache.kafka:trogdor;3.9.1 -org.apache.logging.log4j:log4j-1.2-api;2.24.3 -org.apache.logging.log4j:log4j-api;2.24.3 -org.apache.logging.log4j:log4j-api-test;2.24.3 -org.apache.logging.log4j:log4j-appserver;2.24.3 -org.apache.logging.log4j:log4j-bom;2.24.3 -org.apache.logging.log4j:log4j-cassandra;2.24.3 -org.apache.logging.log4j:log4j-core;2.24.3 -org.apache.logging.log4j:log4j-core-test;2.24.3 -org.apache.logging.log4j:log4j-couchdb;2.24.3 -org.apache.logging.log4j:log4j-docker;2.24.3 -org.apache.logging.log4j:log4j-flume-ng;2.23.1 -org.apache.logging.log4j:log4j-iostreams;2.24.3 -org.apache.logging.log4j:log4j-jakarta-smtp;2.24.3 -org.apache.logging.log4j:log4j-jakarta-web;2.24.3 -org.apache.logging.log4j:log4j-jcl;2.24.3 -org.apache.logging.log4j:log4j-jpa;2.24.3 -org.apache.logging.log4j:log4j-jpl;2.24.3 -org.apache.logging.log4j:log4j-jul;2.24.3 -org.apache.logging.log4j:log4j-layout-template-json;2.24.3 -org.apache.logging.log4j:log4j-mongodb;2.24.3 -org.apache.logging.log4j:log4j-mongodb4;2.24.3 -org.apache.logging.log4j:log4j-slf4j-impl;2.24.3 -org.apache.logging.log4j:log4j-slf4j2-impl;2.24.3 -org.apache.logging.log4j:log4j-spring-boot;2.24.3 -org.apache.logging.log4j:log4j-spring-cloud-config-client;2.24.3 -org.apache.logging.log4j:log4j-taglib;2.24.3 -org.apache.logging.log4j:log4j-to-jul;2.24.3 -org.apache.logging.log4j:log4j-to-slf4j;2.24.3 -org.apache.logging.log4j:log4j-web;2.24.3 -org.apache.maven.plugins:maven-antrun-plugin;3.1.0 -org.apache.maven.plugins:maven-assembly-plugin;3.7.1 -org.apache.maven.plugins:maven-clean-plugin;3.4.1 -org.apache.maven.plugins:maven-compiler-plugin;3.14.0 -org.apache.maven.plugins:maven-dependency-plugin;3.8.1 -org.apache.maven.plugins:maven-deploy-plugin;3.1.4 -org.apache.maven.plugins:maven-enforcer-plugin;3.5.0 -org.apache.maven.plugins:maven-failsafe-plugin;3.5.3 -org.apache.maven.plugins:maven-gpg-plugin;3.1.0 -org.apache.maven.plugins:maven-help-plugin;3.5.1 -org.apache.maven.plugins:maven-install-plugin;3.1.4 -org.apache.maven.plugins:maven-invoker-plugin;3.9.1 -org.apache.maven.plugins:maven-jar-plugin;3.4.2 -org.apache.maven.plugins:maven-javadoc-plugin;3.11.3 -org.apache.maven.plugins:maven-release-plugin;2.5.3 -org.apache.maven.plugins:maven-resources-plugin;3.3.1 -org.apache.maven.plugins:maven-shade-plugin;3.6.0 -org.apache.maven.plugins:maven-source-plugin;3.3.1 -org.apache.maven.plugins:maven-surefire-plugin;3.5.3 -org.apache.maven.plugins:maven-war-plugin;3.4.0 -org.apache.pulsar:bouncy-castle-bc;4.0.6 -org.apache.pulsar:bouncy-castle-bcfips;4.0.6 -org.apache.pulsar:bouncy-castle-parent;4.0.6 -org.apache.pulsar:buildtools;4.0.6 -org.apache.pulsar:distribution;4.0.6 -org.apache.pulsar:docker-images;4.0.6 -org.apache.pulsar:jclouds-shaded;4.0.6 -org.apache.pulsar:managed-ledger;4.0.6 -org.apache.pulsar:pulsar;4.0.6 -org.apache.pulsar:pulsar-all-docker-image;4.0.6 -org.apache.pulsar:pulsar-bom;4.0.6 -org.apache.pulsar:pulsar-broker;4.0.6 -org.apache.pulsar:pulsar-broker-auth-athenz;4.0.6 -org.apache.pulsar:pulsar-broker-auth-oidc;4.0.6 -org.apache.pulsar:pulsar-broker-auth-sasl;4.0.6 -org.apache.pulsar:pulsar-broker-common;4.0.6 -org.apache.pulsar:pulsar-cli-utils;4.0.6 -org.apache.pulsar:pulsar-client;4.0.6 -org.apache.pulsar:pulsar-client-admin;4.0.6 -org.apache.pulsar:pulsar-client-admin-api;4.0.6 -org.apache.pulsar:pulsar-client-admin-original;4.0.6 -org.apache.pulsar:pulsar-client-all;4.0.6 -org.apache.pulsar:pulsar-client-api;4.0.6 -org.apache.pulsar:pulsar-client-auth-athenz;4.0.6 -org.apache.pulsar:pulsar-client-auth-sasl;4.0.6 -org.apache.pulsar:pulsar-client-messagecrypto-bc;4.0.6 -org.apache.pulsar:pulsar-client-original;4.0.6 -org.apache.pulsar:pulsar-client-reactive-adapter;0.6.0 -org.apache.pulsar:pulsar-client-reactive-api;0.6.0 -org.apache.pulsar:pulsar-client-reactive-bom;0.6.0 -org.apache.pulsar:pulsar-client-reactive-jackson;0.6.0 -org.apache.pulsar:pulsar-client-reactive-producer-cache-caffeine;0.6.0 -org.apache.pulsar:pulsar-client-reactive-producer-cache-caffeine-shaded;0.6.0 -org.apache.pulsar:pulsar-client-tools;4.0.6 -org.apache.pulsar:pulsar-client-tools-api;4.0.6 -org.apache.pulsar:pulsar-common;4.0.6 -org.apache.pulsar:pulsar-config-validation;4.0.6 -org.apache.pulsar:pulsar-docker-image;4.0.6 -org.apache.pulsar:pulsar-docs-tools;4.0.6 -org.apache.pulsar:pulsar-functions;4.0.6 -org.apache.pulsar:pulsar-functions-api;4.0.6 -org.apache.pulsar:pulsar-functions-api-examples;4.0.6 -org.apache.pulsar:pulsar-functions-api-examples-builtin;4.0.6 -org.apache.pulsar:pulsar-functions-instance;4.0.6 -org.apache.pulsar:pulsar-functions-local-runner;4.0.6 -org.apache.pulsar:pulsar-functions-local-runner-original;4.0.6 -org.apache.pulsar:pulsar-functions-proto;4.0.6 -org.apache.pulsar:pulsar-functions-runtime;4.0.6 -org.apache.pulsar:pulsar-functions-runtime-all;4.0.6 -org.apache.pulsar:pulsar-functions-secrets;4.0.6 -org.apache.pulsar:pulsar-functions-utils;4.0.6 -org.apache.pulsar:pulsar-functions-worker;4.0.6 -org.apache.pulsar:pulsar-io;4.0.6 -org.apache.pulsar:pulsar-io-aerospike;4.0.6 -org.apache.pulsar:pulsar-io-alluxio;4.0.6 -org.apache.pulsar:pulsar-io-aws;4.0.6 -org.apache.pulsar:pulsar-io-batch-data-generator;4.0.6 -org.apache.pulsar:pulsar-io-batch-discovery-triggerers;4.0.6 -org.apache.pulsar:pulsar-io-canal;4.0.6 -org.apache.pulsar:pulsar-io-cassandra;4.0.6 -org.apache.pulsar:pulsar-io-common;4.0.6 -org.apache.pulsar:pulsar-io-core;4.0.6 -org.apache.pulsar:pulsar-io-data-generator;4.0.6 -org.apache.pulsar:pulsar-io-debezium;4.0.6 -org.apache.pulsar:pulsar-io-debezium-core;4.0.6 -org.apache.pulsar:pulsar-io-debezium-mongodb;4.0.6 -org.apache.pulsar:pulsar-io-debezium-mssql;4.0.6 -org.apache.pulsar:pulsar-io-debezium-mysql;4.0.6 -org.apache.pulsar:pulsar-io-debezium-oracle;4.0.6 -org.apache.pulsar:pulsar-io-debezium-postgres;4.0.6 -org.apache.pulsar:pulsar-io-distribution;4.0.6 -org.apache.pulsar:pulsar-io-docs;4.0.6 -org.apache.pulsar:pulsar-io-dynamodb;4.0.6 -org.apache.pulsar:pulsar-io-elastic-search;4.0.6 -org.apache.pulsar:pulsar-io-file;4.0.6 -org.apache.pulsar:pulsar-io-flume;4.0.6 -org.apache.pulsar:pulsar-io-hbase;4.0.6 -org.apache.pulsar:pulsar-io-hdfs3;4.0.6 -org.apache.pulsar:pulsar-io-http;4.0.6 -org.apache.pulsar:pulsar-io-influxdb;4.0.6 -org.apache.pulsar:pulsar-io-jdbc;4.0.6 -org.apache.pulsar:pulsar-io-jdbc-clickhouse;4.0.6 -org.apache.pulsar:pulsar-io-jdbc-core;4.0.6 -org.apache.pulsar:pulsar-io-jdbc-mariadb;4.0.6 -org.apache.pulsar:pulsar-io-jdbc-openmldb;4.0.6 -org.apache.pulsar:pulsar-io-jdbc-postgres;4.0.6 -org.apache.pulsar:pulsar-io-jdbc-sqlite;4.0.6 -org.apache.pulsar:pulsar-io-kafka;4.0.6 -org.apache.pulsar:pulsar-io-kafka-connect-adaptor;4.0.6 -org.apache.pulsar:pulsar-io-kafka-connect-adaptor-nar;4.0.6 -org.apache.pulsar:pulsar-io-kinesis;4.0.6 -org.apache.pulsar:pulsar-io-mongo;4.0.6 -org.apache.pulsar:pulsar-io-netty;4.0.6 -org.apache.pulsar:pulsar-io-nsq;4.0.6 -org.apache.pulsar:pulsar-io-rabbitmq;4.0.6 -org.apache.pulsar:pulsar-io-redis;4.0.6 -org.apache.pulsar:pulsar-io-solr;4.0.6 -org.apache.pulsar:pulsar-io-twitter;4.0.6 -org.apache.pulsar:pulsar-metadata;4.0.6 -org.apache.pulsar:pulsar-offloader-distribution;4.0.6 -org.apache.pulsar:pulsar-package-bookkeeper-storage;4.0.6 -org.apache.pulsar:pulsar-package-core;4.0.6 -org.apache.pulsar:pulsar-package-filesystem-storage;4.0.6 -org.apache.pulsar:pulsar-package-management;4.0.6 -org.apache.pulsar:pulsar-proxy;4.0.6 -org.apache.pulsar:pulsar-server-distribution;4.0.6 -org.apache.pulsar:pulsar-shell-distribution;4.0.6 -org.apache.pulsar:pulsar-testclient;4.0.6 -org.apache.pulsar:pulsar-transaction-common;4.0.6 -org.apache.pulsar:pulsar-transaction-coordinator;4.0.6 -org.apache.pulsar:pulsar-transaction-parent;4.0.6 -org.apache.pulsar:pulsar-websocket;4.0.6 -org.apache.pulsar:structured-event-log;4.0.6 -org.apache.pulsar:testmocks;4.0.6 -org.apache.pulsar:tiered-storage-file-system;4.0.6 -org.apache.pulsar:tiered-storage-jcloud;4.0.6 -org.apache.pulsar:tiered-storage-parent;4.0.6 -org.apache.tomcat.embed:tomcat-embed-core;10.1.44 -org.apache.tomcat.embed:tomcat-embed-el;10.1.44 -org.apache.tomcat.embed:tomcat-embed-jasper;10.1.44 -org.apache.tomcat.embed:tomcat-embed-websocket;10.1.44 -org.apache.tomcat:tomcat-annotations-api;10.1.44 -org.apache.tomcat:tomcat-jdbc;10.1.44 -org.apache.tomcat:tomcat-jsp-api;10.1.44 -org.aspectj:aspectjrt;1.9.24 -org.aspectj:aspectjtools;1.9.24 -org.aspectj:aspectjweaver;1.9.24 -org.assertj:assertj-bom;3.27.4 -org.assertj:assertj-core;3.27.4 -org.assertj:assertj-guava;3.27.4 -org.awaitility:awaitility;4.2.2 -org.awaitility:awaitility-groovy;4.2.2 -org.awaitility:awaitility-kotlin;4.2.2 -org.awaitility:awaitility-scala;4.2.2 -org.cache2k:cache2k-api;2.6.1.Final -org.cache2k:cache2k-config;2.6.1.Final -org.cache2k:cache2k-core;2.6.1.Final -org.cache2k:cache2k-jcache;2.6.1.Final -org.cache2k:cache2k-micrometer;2.6.1.Final -org.cache2k:cache2k-spring;2.6.1.Final -org.codehaus.janino:commons-compiler;3.1.12 -org.codehaus.janino:commons-compiler-jdk;3.1.12 -org.codehaus.janino:janino;3.1.12 -org.codehaus.mojo:build-helper-maven-plugin;3.6.1 -org.codehaus.mojo:versions-maven-plugin;2.18.0 -org.codehaus.mojo:xml-maven-plugin;1.1.0 -org.crac:crac;1.5.0 -org.cyclonedx:cyclonedx-maven-plugin;2.9.1 -org.eclipse.angus:angus-activation;2.0.2 -org.eclipse.angus:angus-core;2.0.4 -org.eclipse.angus:angus-mail;2.0.4 -org.eclipse.angus:dsn;2.0.4 -org.eclipse.angus:gimap;2.0.4 -org.eclipse.angus:imap;2.0.4 -org.eclipse.angus:jakarta.mail;2.0.4 -org.eclipse.angus:logging-mailhandler;2.0.4 -org.eclipse.angus:pop3;2.0.4 -org.eclipse.angus:smtp;2.0.4 -org.eclipse.jetty.demos:jetty-demo-handler;12.0.25 -org.eclipse.jetty.ee10.osgi:jetty-ee10-osgi-alpn;12.0.25 -org.eclipse.jetty.ee10.osgi:jetty-ee10-osgi-boot;12.0.25 -org.eclipse.jetty.ee10.osgi:jetty-ee10-osgi-boot-jsp;12.0.25 -org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-client;12.0.25 -org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-client-webapp;12.0.25 -org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-common;12.0.25 -org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-server;12.0.25 -org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jetty-client-webapp;12.0.25 -org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jetty-server;12.0.25 -org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-servlet;12.0.25 -org.eclipse.jetty.ee10:jetty-ee10-annotations;12.0.25 -org.eclipse.jetty.ee10:jetty-ee10-apache-jsp;12.0.25 -org.eclipse.jetty.ee10:jetty-ee10-bom;12.0.25 -org.eclipse.jetty.ee10:jetty-ee10-cdi;12.0.25 -org.eclipse.jetty.ee10:jetty-ee10-fcgi-proxy;12.0.25 -org.eclipse.jetty.ee10:jetty-ee10-glassfish-jstl;12.0.25 -org.eclipse.jetty.ee10:jetty-ee10-jaspi;12.0.25 -org.eclipse.jetty.ee10:jetty-ee10-jndi;12.0.25 -org.eclipse.jetty.ee10:jetty-ee10-jspc-maven-plugin;12.0.25 -org.eclipse.jetty.ee10:jetty-ee10-maven-plugin;12.0.25 -org.eclipse.jetty.ee10:jetty-ee10-plus;12.0.25 -org.eclipse.jetty.ee10:jetty-ee10-proxy;12.0.25 -org.eclipse.jetty.ee10:jetty-ee10-quickstart;12.0.25 -org.eclipse.jetty.ee10:jetty-ee10-runner;12.0.25 -org.eclipse.jetty.ee10:jetty-ee10-servlet;12.0.25 -org.eclipse.jetty.ee10:jetty-ee10-servlets;12.0.25 -org.eclipse.jetty.ee10:jetty-ee10-webapp;12.0.25 -org.eclipse.jetty.fcgi:jetty-fcgi-client;12.0.25 -org.eclipse.jetty.fcgi:jetty-fcgi-proxy;12.0.25 -org.eclipse.jetty.fcgi:jetty-fcgi-server;12.0.25 -org.eclipse.jetty.http2:jetty-http2-client;12.0.25 -org.eclipse.jetty.http2:jetty-http2-client-transport;12.0.25 -org.eclipse.jetty.http2:jetty-http2-common;12.0.25 -org.eclipse.jetty.http2:jetty-http2-hpack;12.0.25 -org.eclipse.jetty.http2:jetty-http2-server;12.0.25 -org.eclipse.jetty.http3:jetty-http3-client;12.0.25 -org.eclipse.jetty.http3:jetty-http3-client-transport;12.0.25 -org.eclipse.jetty.http3:jetty-http3-common;12.0.25 -org.eclipse.jetty.http3:jetty-http3-qpack;12.0.25 -org.eclipse.jetty.http3:jetty-http3-server;12.0.25 -org.eclipse.jetty.quic:jetty-quic-client;12.0.25 -org.eclipse.jetty.quic:jetty-quic-common;12.0.25 -org.eclipse.jetty.quic:jetty-quic-quiche-common;12.0.25 -org.eclipse.jetty.quic:jetty-quic-quiche-foreign;12.0.25 -org.eclipse.jetty.quic:jetty-quic-quiche-jna;12.0.25 -org.eclipse.jetty.quic:jetty-quic-server;12.0.25 -org.eclipse.jetty.websocket:jetty-websocket-core-client;12.0.25 -org.eclipse.jetty.websocket:jetty-websocket-core-common;12.0.25 -org.eclipse.jetty.websocket:jetty-websocket-core-server;12.0.25 -org.eclipse.jetty.websocket:jetty-websocket-jetty-api;12.0.25 -org.eclipse.jetty.websocket:jetty-websocket-jetty-client;12.0.25 -org.eclipse.jetty.websocket:jetty-websocket-jetty-common;12.0.25 -org.eclipse.jetty.websocket:jetty-websocket-jetty-server;12.0.25 -org.eclipse.jetty:jetty-alpn-client;12.0.25 -org.eclipse.jetty:jetty-alpn-conscrypt-client;12.0.25 -org.eclipse.jetty:jetty-alpn-conscrypt-server;12.0.25 -org.eclipse.jetty:jetty-alpn-java-client;12.0.25 -org.eclipse.jetty:jetty-alpn-java-server;12.0.25 -org.eclipse.jetty:jetty-alpn-server;12.0.25 -org.eclipse.jetty:jetty-bom;12.0.25 -org.eclipse.jetty:jetty-client;12.0.25 -org.eclipse.jetty:jetty-deploy;12.0.25 -org.eclipse.jetty:jetty-ee;12.0.25 -org.eclipse.jetty:jetty-http;12.0.25 -org.eclipse.jetty:jetty-http-spi;12.0.25 -org.eclipse.jetty:jetty-http-tools;12.0.25 -org.eclipse.jetty:jetty-io;12.0.25 -org.eclipse.jetty:jetty-jmx;12.0.25 -org.eclipse.jetty:jetty-jndi;12.0.25 -org.eclipse.jetty:jetty-keystore;12.0.25 -org.eclipse.jetty:jetty-openid;12.0.25 -org.eclipse.jetty:jetty-osgi;12.0.25 -org.eclipse.jetty:jetty-plus;12.0.25 -org.eclipse.jetty:jetty-proxy;12.0.25 -org.eclipse.jetty:jetty-reactive-httpclient;4.0.11 -org.eclipse.jetty:jetty-rewrite;12.0.25 -org.eclipse.jetty:jetty-security;12.0.25 -org.eclipse.jetty:jetty-server;12.0.25 -org.eclipse.jetty:jetty-session;12.0.25 -org.eclipse.jetty:jetty-slf4j-impl;12.0.25 -org.eclipse.jetty:jetty-start;12.0.25 -org.eclipse.jetty:jetty-unixdomain-server;12.0.25 -org.eclipse.jetty:jetty-util;12.0.25 -org.eclipse.jetty:jetty-util-ajax;12.0.25 -org.eclipse.jetty:jetty-xml;12.0.25 -org.eclipse.jgit:org.eclipse.jgit;6.10.1.202505221210-r -org.eclipse.jgit:org.eclipse.jgit.http.apache;6.10.1.202505221210-r -org.eclipse.jgit:org.eclipse.jgit.junit.http;6.10.1.202505221210-r -org.eclipse.jgit:org.eclipse.jgit.ssh.apache;6.10.1.202505221210-r -org.eclipse:yasson;3.0.4 -org.ehcache:ehcache;3.10.8 -org.ehcache:ehcache-clustered;3.10.8 -org.ehcache:ehcache-transactions;3.10.8 -org.elasticsearch.client:elasticsearch-rest-client;8.18.5 -org.elasticsearch.client:elasticsearch-rest-client-sniffer;8.18.5 -org.firebirdsql.jdbc:jaybird;6.0.2 -org.flywaydb:flyway-commandline;11.7.2 -org.flywaydb:flyway-core;11.7.2 -org.flywaydb:flyway-database-cassandra;11.7.2 -org.flywaydb:flyway-database-db2;11.7.2 -org.flywaydb:flyway-database-derby;11.7.2 -org.flywaydb:flyway-database-hsqldb;11.7.2 -org.flywaydb:flyway-database-informix;11.7.2 -org.flywaydb:flyway-database-mongodb;11.7.2 -org.flywaydb:flyway-database-oracle;11.7.2 -org.flywaydb:flyway-database-postgresql;11.7.2 -org.flywaydb:flyway-database-redshift;11.7.2 -org.flywaydb:flyway-database-saphana;11.7.2 -org.flywaydb:flyway-database-snowflake;11.7.2 -org.flywaydb:flyway-database-sybasease;11.7.2 -org.flywaydb:flyway-firebird;11.7.2 -org.flywaydb:flyway-gcp-bigquery;11.7.2 -org.flywaydb:flyway-gcp-spanner;11.7.2 -org.flywaydb:flyway-maven-plugin;11.7.2 -org.flywaydb:flyway-mysql;11.7.2 -org.flywaydb:flyway-singlestore;11.7.2 -org.flywaydb:flyway-sqlserver;11.7.2 -org.freemarker:freemarker;2.3.34 -org.glassfish.jaxb:codemodel;4.0.5 -org.glassfish.jaxb:jaxb-bom;4.0.5 -org.glassfish.jaxb:jaxb-core;4.0.5 -org.glassfish.jaxb:jaxb-jxc;4.0.5 -org.glassfish.jaxb:jaxb-runtime;4.0.5 -org.glassfish.jaxb:jaxb-xjc;4.0.5 -org.glassfish.jaxb:txw2;4.0.5 -org.glassfish.jaxb:xsom;4.0.5 -org.glassfish.jersey.bundles:jaxrs-ri;3.1.11 -org.glassfish.jersey.connectors:jersey-apache-connector;3.1.11 -org.glassfish.jersey.connectors:jersey-apache5-connector;3.1.11 -org.glassfish.jersey.connectors:jersey-grizzly-connector;3.1.11 -org.glassfish.jersey.connectors:jersey-helidon-connector;3.1.11 -org.glassfish.jersey.connectors:jersey-jdk-connector;3.1.11 -org.glassfish.jersey.connectors:jersey-jetty-connector;3.1.11 -org.glassfish.jersey.connectors:jersey-jetty-http2-connector;3.1.11 -org.glassfish.jersey.connectors:jersey-jetty11-connector;3.1.11 -org.glassfish.jersey.connectors:jersey-jnh-connector;3.1.11 -org.glassfish.jersey.connectors:jersey-netty-connector;3.1.11 -org.glassfish.jersey.containers.glassfish:jersey-gf-ejb;3.1.11 -org.glassfish.jersey.containers:jersey-container-grizzly2-http;3.1.11 -org.glassfish.jersey.containers:jersey-container-grizzly2-servlet;3.1.11 -org.glassfish.jersey.containers:jersey-container-jdk-http;3.1.11 -org.glassfish.jersey.containers:jersey-container-jetty-http;3.1.11 -org.glassfish.jersey.containers:jersey-container-jetty-http2;3.1.11 -org.glassfish.jersey.containers:jersey-container-jetty-servlet;3.1.11 -org.glassfish.jersey.containers:jersey-container-jetty11-http;3.1.11 -org.glassfish.jersey.containers:jersey-container-netty-http;3.1.11 -org.glassfish.jersey.containers:jersey-container-servlet;3.1.11 -org.glassfish.jersey.containers:jersey-container-servlet-core;3.1.11 -org.glassfish.jersey.containers:jersey-container-simple-http;3.1.11 -org.glassfish.jersey.core:jersey-client;3.1.11 -org.glassfish.jersey.core:jersey-common;3.1.11 -org.glassfish.jersey.core:jersey-server;3.1.11 -org.glassfish.jersey.ext.cdi:jersey-cdi-rs-inject;3.1.11 -org.glassfish.jersey.ext.cdi:jersey-cdi1x;3.1.11 -org.glassfish.jersey.ext.cdi:jersey-cdi1x-ban-custom-hk2-binding;3.1.11 -org.glassfish.jersey.ext.cdi:jersey-cdi1x-servlet;3.1.11 -org.glassfish.jersey.ext.cdi:jersey-cdi1x-transaction;3.1.11 -org.glassfish.jersey.ext.cdi:jersey-cdi1x-validation;3.1.11 -org.glassfish.jersey.ext.cdi:jersey-weld2-se;3.1.11 -org.glassfish.jersey.ext.microprofile:jersey-mp-config;3.1.11 -org.glassfish.jersey.ext.microprofile:jersey-mp-rest-client;3.1.11 -org.glassfish.jersey.ext.rx:jersey-rx-client-guava;3.1.11 -org.glassfish.jersey.ext.rx:jersey-rx-client-rxjava;3.1.11 -org.glassfish.jersey.ext.rx:jersey-rx-client-rxjava2;3.1.11 -org.glassfish.jersey.ext:jersey-bean-validation;3.1.11 -org.glassfish.jersey.ext:jersey-declarative-linking;3.1.11 -org.glassfish.jersey.ext:jersey-entity-filtering;3.1.11 -org.glassfish.jersey.ext:jersey-metainf-services;3.1.11 -org.glassfish.jersey.ext:jersey-micrometer;3.1.11 -org.glassfish.jersey.ext:jersey-mvc;3.1.11 -org.glassfish.jersey.ext:jersey-mvc-bean-validation;3.1.11 -org.glassfish.jersey.ext:jersey-mvc-freemarker;3.1.11 -org.glassfish.jersey.ext:jersey-mvc-jsp;3.1.11 -org.glassfish.jersey.ext:jersey-mvc-mustache;3.1.11 -org.glassfish.jersey.ext:jersey-proxy-client;3.1.11 -org.glassfish.jersey.ext:jersey-spring6;3.1.11 -org.glassfish.jersey.ext:jersey-wadl-doclet;3.1.11 -org.glassfish.jersey.inject:jersey-cdi2-se;3.1.11 -org.glassfish.jersey.inject:jersey-hk2;3.1.11 -org.glassfish.jersey.media:jersey-media-jaxb;3.1.11 -org.glassfish.jersey.media:jersey-media-json-binding;3.1.11 -org.glassfish.jersey.media:jersey-media-json-gson;3.1.11 -org.glassfish.jersey.media:jersey-media-json-jackson;3.1.11 -org.glassfish.jersey.media:jersey-media-json-jettison;3.1.11 -org.glassfish.jersey.media:jersey-media-json-processing;3.1.11 -org.glassfish.jersey.media:jersey-media-kryo;3.1.11 -org.glassfish.jersey.media:jersey-media-moxy;3.1.11 -org.glassfish.jersey.media:jersey-media-multipart;3.1.11 -org.glassfish.jersey.media:jersey-media-sse;3.1.11 -org.glassfish.jersey.security:oauth1-client;3.1.11 -org.glassfish.jersey.security:oauth1-server;3.1.11 -org.glassfish.jersey.security:oauth1-signature;3.1.11 -org.glassfish.jersey.security:oauth2-client;3.1.11 -org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-bundle;3.1.11 -org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-external;3.1.11 -org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2;3.1.11 -org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-inmemory;3.1.11 -org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jdk-http;3.1.11 -org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jetty;3.1.11 -org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jetty-http2;3.1.11 -org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-netty;3.1.11 -org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-simple;3.1.11 -org.glassfish.jersey.test-framework:jersey-test-framework-core;3.1.11 -org.glassfish.jersey.test-framework:jersey-test-framework-util;3.1.11 -org.glassfish.jersey:jersey-bom;3.1.11 -org.glassfish.web:jakarta.servlet.jsp.jstl;3.0.1 -org.graalvm.buildtools:native-maven-plugin;0.10.6 -org.hamcrest:hamcrest;3.0 -org.hamcrest:hamcrest-core;3.0 -org.hamcrest:hamcrest-library;3.0 -org.hibernate.orm:hibernate-agroal;6.6.26.Final -org.hibernate.orm:hibernate-ant;6.6.26.Final -org.hibernate.orm:hibernate-c3p0;6.6.26.Final -org.hibernate.orm:hibernate-community-dialects;6.6.26.Final -org.hibernate.orm:hibernate-core;6.6.26.Final -org.hibernate.orm:hibernate-envers;6.6.26.Final -org.hibernate.orm:hibernate-graalvm;6.6.26.Final -org.hibernate.orm:hibernate-hikaricp;6.6.26.Final -org.hibernate.orm:hibernate-jcache;6.6.26.Final -org.hibernate.orm:hibernate-jpamodelgen;6.6.26.Final -org.hibernate.orm:hibernate-micrometer;6.6.26.Final -org.hibernate.orm:hibernate-proxool;6.6.26.Final -org.hibernate.orm:hibernate-spatial;6.6.26.Final -org.hibernate.orm:hibernate-testing;6.6.26.Final -org.hibernate.orm:hibernate-vibur;6.6.26.Final -org.hibernate.validator:hibernate-validator;8.0.3.Final -org.hibernate.validator:hibernate-validator-annotation-processor;8.0.3.Final -org.hsqldb:hsqldb;2.7.3 -org.htmlunit:htmlunit;4.11.1 -org.infinispan.protostream:protostream;5.0.13.Final -org.infinispan.protostream:protostream-processor;5.0.13.Final -org.infinispan.protostream:protostream-types;5.0.13.Final -org.infinispan:infinispan-anchored-keys;15.2.5.Final -org.infinispan:infinispan-api;15.2.5.Final -org.infinispan:infinispan-bom;15.2.5.Final -org.infinispan:infinispan-cachestore-jdbc;15.2.5.Final -org.infinispan:infinispan-cachestore-jdbc-common;15.2.5.Final -org.infinispan:infinispan-cachestore-remote;15.2.5.Final -org.infinispan:infinispan-cachestore-rocksdb;15.2.5.Final -org.infinispan:infinispan-cachestore-sql;15.2.5.Final -org.infinispan:infinispan-cdi-common;15.2.5.Final -org.infinispan:infinispan-cdi-embedded;15.2.5.Final -org.infinispan:infinispan-cdi-remote;15.2.5.Final -org.infinispan:infinispan-checkstyle;15.2.5.Final -org.infinispan:infinispan-cli-client;15.2.5.Final -org.infinispan:infinispan-client-hotrod;15.2.5.Final -org.infinispan:infinispan-client-hotrod-legacy;15.2.5.Final -org.infinispan:infinispan-client-rest;15.2.5.Final -org.infinispan:infinispan-clustered-counter;15.2.5.Final -org.infinispan:infinispan-clustered-lock;15.2.5.Final -org.infinispan:infinispan-commons;15.2.5.Final -org.infinispan:infinispan-commons-graalvm;15.2.5.Final -org.infinispan:infinispan-commons-spi;15.2.5.Final -org.infinispan:infinispan-commons-test;15.2.5.Final -org.infinispan:infinispan-component-annotations;15.2.5.Final -org.infinispan:infinispan-component-processor;15.2.5.Final -org.infinispan:infinispan-console;15.2.1.Final -org.infinispan:infinispan-core;15.2.5.Final -org.infinispan:infinispan-core-graalvm;15.2.5.Final -org.infinispan:infinispan-counter-api;15.2.5.Final -org.infinispan:infinispan-hibernate-cache-commons;15.2.5.Final -org.infinispan:infinispan-hibernate-cache-spi;15.2.5.Final -org.infinispan:infinispan-hibernate-cache-v62;15.2.5.Final -org.infinispan:infinispan-jboss-marshalling;15.2.5.Final -org.infinispan:infinispan-jcache;15.2.5.Final -org.infinispan:infinispan-jcache-commons;15.2.5.Final -org.infinispan:infinispan-jcache-remote;15.2.5.Final -org.infinispan:infinispan-key-value-store-client;15.2.5.Final -org.infinispan:infinispan-logging-annotations;15.2.5.Final -org.infinispan:infinispan-logging-processor;15.2.5.Final -org.infinispan:infinispan-multimap;15.2.5.Final -org.infinispan:infinispan-objectfilter;15.2.5.Final -org.infinispan:infinispan-query;15.2.5.Final -org.infinispan:infinispan-query-core;15.2.5.Final -org.infinispan:infinispan-query-dsl;15.2.5.Final -org.infinispan:infinispan-remote-query-client;15.2.5.Final -org.infinispan:infinispan-remote-query-server;15.2.5.Final -org.infinispan:infinispan-scripting;15.2.5.Final -org.infinispan:infinispan-server-core;15.2.5.Final -org.infinispan:infinispan-server-hotrod;15.2.5.Final -org.infinispan:infinispan-server-memcached;15.2.5.Final -org.infinispan:infinispan-server-resp;15.2.5.Final -org.infinispan:infinispan-server-rest;15.2.5.Final -org.infinispan:infinispan-server-router;15.2.5.Final -org.infinispan:infinispan-server-runtime;15.2.5.Final -org.infinispan:infinispan-server-testdriver-core;15.2.5.Final -org.infinispan:infinispan-server-testdriver-junit4;15.2.5.Final -org.infinispan:infinispan-server-testdriver-junit5;15.2.5.Final -org.infinispan:infinispan-spring-boot3-starter-embedded;15.2.5.Final -org.infinispan:infinispan-spring-boot3-starter-remote;15.2.5.Final -org.infinispan:infinispan-spring6-common;15.2.5.Final -org.infinispan:infinispan-spring6-embedded;15.2.5.Final -org.infinispan:infinispan-spring6-remote;15.2.5.Final -org.infinispan:infinispan-tasks;15.2.5.Final -org.infinispan:infinispan-tasks-api;15.2.5.Final -org.infinispan:infinispan-tools;15.2.5.Final -org.influxdb:influxdb-java;2.25 -org.jboss.logging:jboss-logging;3.6.1.Final -org.jdom:jdom2;2.0.6.1 -org.jetbrains.kotlin:kotlin-bom;1.9.25 -org.jetbrains.kotlin:kotlin-compiler;1.9.25 -org.jetbrains.kotlin:kotlin-compiler-embeddable;1.9.25 -org.jetbrains.kotlin:kotlin-daemon-client;1.9.25 -org.jetbrains.kotlin:kotlin-main-kts;1.9.25 -org.jetbrains.kotlin:kotlin-maven-plugin;1.9.25 -org.jetbrains.kotlin:kotlin-osgi-bundle;1.9.25 -org.jetbrains.kotlin:kotlin-reflect;1.9.25 -org.jetbrains.kotlin:kotlin-script-runtime;1.9.25 -org.jetbrains.kotlin:kotlin-scripting-common;1.9.25 -org.jetbrains.kotlin:kotlin-scripting-ide-services;1.9.25 -org.jetbrains.kotlin:kotlin-scripting-jvm;1.9.25 -org.jetbrains.kotlin:kotlin-scripting-jvm-host;1.9.25 -org.jetbrains.kotlin:kotlin-stdlib;1.9.25 -org.jetbrains.kotlin:kotlin-stdlib-common;1.9.25 -org.jetbrains.kotlin:kotlin-stdlib-jdk7;1.9.25 -org.jetbrains.kotlin:kotlin-stdlib-jdk8;1.9.25 -org.jetbrains.kotlin:kotlin-stdlib-js;1.9.25 -org.jetbrains.kotlin:kotlin-test;1.9.25 -org.jetbrains.kotlin:kotlin-test-annotations-common;1.9.25 -org.jetbrains.kotlin:kotlin-test-common;1.9.25 -org.jetbrains.kotlin:kotlin-test-js;1.9.25 -org.jetbrains.kotlin:kotlin-test-junit;1.9.25 -org.jetbrains.kotlin:kotlin-test-junit5;1.9.25 -org.jetbrains.kotlin:kotlin-test-testng;1.9.25 -org.jetbrains.kotlinx:kotlinx-coroutines-android;1.8.1 -org.jetbrains.kotlinx:kotlinx-coroutines-bom;1.8.1 -org.jetbrains.kotlinx:kotlinx-coroutines-core;1.8.1 -org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm;1.8.1 -org.jetbrains.kotlinx:kotlinx-coroutines-debug;1.8.1 -org.jetbrains.kotlinx:kotlinx-coroutines-guava;1.8.1 -org.jetbrains.kotlinx:kotlinx-coroutines-javafx;1.8.1 -org.jetbrains.kotlinx:kotlinx-coroutines-jdk8;1.8.1 -org.jetbrains.kotlinx:kotlinx-coroutines-jdk9;1.8.1 -org.jetbrains.kotlinx:kotlinx-coroutines-play-services;1.8.1 -org.jetbrains.kotlinx:kotlinx-coroutines-reactive;1.8.1 -org.jetbrains.kotlinx:kotlinx-coroutines-reactor;1.8.1 -org.jetbrains.kotlinx:kotlinx-coroutines-rx2;1.8.1 -org.jetbrains.kotlinx:kotlinx-coroutines-rx3;1.8.1 -org.jetbrains.kotlinx:kotlinx-coroutines-slf4j;1.8.1 -org.jetbrains.kotlinx:kotlinx-coroutines-swing;1.8.1 -org.jetbrains.kotlinx:kotlinx-coroutines-test;1.8.1 -org.jetbrains.kotlinx:kotlinx-coroutines-test-jvm;1.8.1 -org.jetbrains.kotlinx:kotlinx-serialization-bom;1.6.3 -org.jetbrains.kotlinx:kotlinx-serialization-cbor;1.6.3 -org.jetbrains.kotlinx:kotlinx-serialization-cbor-jvm;1.6.3 -org.jetbrains.kotlinx:kotlinx-serialization-core;1.6.3 -org.jetbrains.kotlinx:kotlinx-serialization-core-jvm;1.6.3 -org.jetbrains.kotlinx:kotlinx-serialization-hocon;1.6.3 -org.jetbrains.kotlinx:kotlinx-serialization-json;1.6.3 -org.jetbrains.kotlinx:kotlinx-serialization-json-jvm;1.6.3 -org.jetbrains.kotlinx:kotlinx-serialization-json-okio;1.6.3 -org.jetbrains.kotlinx:kotlinx-serialization-json-okio-jvm;1.6.3 -org.jetbrains.kotlinx:kotlinx-serialization-properties;1.6.3 -org.jetbrains.kotlinx:kotlinx-serialization-properties-jvm;1.6.3 -org.jetbrains.kotlinx:kotlinx-serialization-protobuf;1.6.3 -org.jetbrains.kotlinx:kotlinx-serialization-protobuf-jvm;1.6.3 -org.jooq:jooq;3.19.25 -org.jooq:jooq-codegen;3.19.25 -org.jooq:jooq-codegen-maven;3.19.25 -org.jooq:jooq-kotlin;3.19.25 -org.jooq:jooq-meta;3.19.25 -org.junit.jupiter:junit-jupiter;5.12.2 -org.junit.jupiter:junit-jupiter-api;5.12.2 -org.junit.jupiter:junit-jupiter-engine;5.12.2 -org.junit.jupiter:junit-jupiter-migrationsupport;5.12.2 -org.junit.jupiter:junit-jupiter-params;5.12.2 -org.junit.platform:junit-platform-commons;1.12.2 -org.junit.platform:junit-platform-console;1.12.2 -org.junit.platform:junit-platform-engine;1.12.2 -org.junit.platform:junit-platform-jfr;1.12.2 -org.junit.platform:junit-platform-launcher;1.12.2 -org.junit.platform:junit-platform-reporting;1.12.2 -org.junit.platform:junit-platform-runner;1.12.2 -org.junit.platform:junit-platform-suite;1.12.2 -org.junit.platform:junit-platform-suite-api;1.12.2 -org.junit.platform:junit-platform-suite-commons;1.12.2 -org.junit.platform:junit-platform-suite-engine;1.12.2 -org.junit.platform:junit-platform-testkit;1.12.2 -org.junit.vintage:junit-vintage-engine;5.12.2 -org.junit:junit-bom;5.12.2 -org.jvnet.staxex:stax-ex;2.1.0 -org.liquibase:liquibase-cdi;4.31.1 -org.liquibase:liquibase-core;4.31.1 -org.liquibase:liquibase-maven-plugin;4.31.1 -org.mariadb.jdbc:mariadb-java-client;3.5.5 -org.mariadb:r2dbc-mariadb;1.3.0 -org.messaginghub:pooled-jms;3.1.7 -org.mockito:mockito-android;5.17.0 -org.mockito:mockito-bom;5.17.0 -org.mockito:mockito-core;5.17.0 -org.mockito:mockito-errorprone;5.17.0 -org.mockito:mockito-junit-jupiter;5.17.0 -org.mockito:mockito-proxy;5.17.0 -org.mockito:mockito-subclass;5.17.0 -org.mongodb.scala:mongo-scala-bson_2.11;5.5.1 -org.mongodb.scala:mongo-scala-bson_2.12;5.5.1 -org.mongodb.scala:mongo-scala-bson_2.13;5.5.1 -org.mongodb.scala:mongo-scala-driver_2.11;5.5.1 -org.mongodb.scala:mongo-scala-driver_2.12;5.5.1 -org.mongodb.scala:mongo-scala-driver_2.13;5.5.1 -org.mongodb:bson;5.5.1 -org.mongodb:bson-kotlin;5.5.1 -org.mongodb:bson-kotlinx;5.5.1 -org.mongodb:bson-record-codec;5.5.1 -org.mongodb:mongodb-crypt;5.5.1 -org.mongodb:mongodb-driver-bom;5.5.1 -org.mongodb:mongodb-driver-core;5.5.1 -org.mongodb:mongodb-driver-kotlin-coroutine;5.5.1 -org.mongodb:mongodb-driver-kotlin-extensions;5.5.1 -org.mongodb:mongodb-driver-kotlin-sync;5.5.1 -org.mongodb:mongodb-driver-reactivestreams;5.5.1 -org.mongodb:mongodb-driver-sync;5.5.1 -org.neo4j.driver:neo4j-java-driver;5.28.9 -org.postgresql:postgresql;42.7.7 -org.postgresql:r2dbc-postgresql;1.0.7.RELEASE -org.projectlombok:lombok;1.18.38 -org.quartz-scheduler:quartz;2.5.0 -org.quartz-scheduler:quartz-jobs;2.5.0 -org.reactivestreams:reactive-streams;1.0.4 -org.seleniumhq.selenium:htmlunit3-driver;4.30.0 -org.seleniumhq.selenium:selenium-api;4.31.0 -org.seleniumhq.selenium:selenium-bom;4.31.0 -org.seleniumhq.selenium:selenium-chrome-driver;4.31.0 -org.seleniumhq.selenium:selenium-chromium-driver;4.31.0 -org.seleniumhq.selenium:selenium-devtools-v133;4.31.0 -org.seleniumhq.selenium:selenium-devtools-v134;4.31.0 -org.seleniumhq.selenium:selenium-devtools-v135;4.31.0 -org.seleniumhq.selenium:selenium-edge-driver;4.31.0 -org.seleniumhq.selenium:selenium-firefox-driver;4.31.0 -org.seleniumhq.selenium:selenium-grid;4.31.0 -org.seleniumhq.selenium:selenium-http;4.31.0 -org.seleniumhq.selenium:selenium-ie-driver;4.31.0 -org.seleniumhq.selenium:selenium-java;4.31.0 -org.seleniumhq.selenium:selenium-json;4.31.0 -org.seleniumhq.selenium:selenium-manager;4.31.0 -org.seleniumhq.selenium:selenium-remote-driver;4.31.0 -org.seleniumhq.selenium:selenium-safari-driver;4.31.0 -org.seleniumhq.selenium:selenium-session-map-jdbc;4.31.0 -org.seleniumhq.selenium:selenium-session-map-redis;4.31.0 -org.seleniumhq.selenium:selenium-support;4.31.0 -org.skyscreamer:jsonassert;1.5.3 -org.slf4j:jcl-over-slf4j;2.0.17 -org.slf4j:jul-to-slf4j;2.0.17 -org.slf4j:log4j-over-slf4j;2.0.17 -org.slf4j:slf4j-api;2.0.17 -org.slf4j:slf4j-ext;2.0.17 -org.slf4j:slf4j-jdk-platform-logging;2.0.17 -org.slf4j:slf4j-jdk14;2.0.17 -org.slf4j:slf4j-log4j12;2.0.17 -org.slf4j:slf4j-nop;2.0.17 -org.slf4j:slf4j-reload4j;2.0.17 -org.slf4j:slf4j-simple;2.0.17 -org.sonatype.central:central-publishing-maven-plugin;0.7.0 -org.sonatype.plugins:nexus-staging-maven-plugin;1.7.0 -org.springframework.amqp:spring-amqp;3.2.6 -org.springframework.amqp:spring-amqp-bom;3.2.6 -org.springframework.amqp:spring-rabbit;3.2.6 -org.springframework.amqp:spring-rabbit-junit;3.2.6 -org.springframework.amqp:spring-rabbit-stream;3.2.6 -org.springframework.amqp:spring-rabbit-test;3.2.6 -org.springframework.batch:spring-batch-bom;5.2.2 -org.springframework.batch:spring-batch-core;5.2.2 -org.springframework.batch:spring-batch-infrastructure;5.2.2 -org.springframework.batch:spring-batch-integration;5.2.2 -org.springframework.batch:spring-batch-test;5.2.2 -org.springframework.boot:spring-boot;3.5.5 -org.springframework.boot:spring-boot-actuator;3.5.5 -org.springframework.boot:spring-boot-actuator-autoconfigure;3.5.5 -org.springframework.boot:spring-boot-autoconfigure;3.5.5 -org.springframework.boot:spring-boot-autoconfigure-processor;3.5.5 -org.springframework.boot:spring-boot-buildpack-platform;3.5.5 -org.springframework.boot:spring-boot-configuration-metadata;3.5.5 -org.springframework.boot:spring-boot-configuration-processor;3.5.5 -org.springframework.boot:spring-boot-dependencies;3.5.5 -org.springframework.boot:spring-boot-devtools;3.5.5 -org.springframework.boot:spring-boot-docker-compose;3.5.5 -org.springframework.boot:spring-boot-jarmode-tools;3.5.5 -org.springframework.boot:spring-boot-loader;3.5.5 -org.springframework.boot:spring-boot-loader-classic;3.5.5 -org.springframework.boot:spring-boot-loader-tools;3.5.5 -org.springframework.boot:spring-boot-maven-plugin;3.5.5 -org.springframework.boot:spring-boot-properties-migrator;3.5.5 -org.springframework.boot:spring-boot-starter;3.5.5 -org.springframework.boot:spring-boot-starter-activemq;3.5.5 -org.springframework.boot:spring-boot-starter-actuator;3.5.5 -org.springframework.boot:spring-boot-starter-amqp;3.5.5 -org.springframework.boot:spring-boot-starter-aop;3.5.5 -org.springframework.boot:spring-boot-starter-artemis;3.5.5 -org.springframework.boot:spring-boot-starter-batch;3.5.5 -org.springframework.boot:spring-boot-starter-cache;3.5.5 -org.springframework.boot:spring-boot-starter-data-cassandra;3.5.5 -org.springframework.boot:spring-boot-starter-data-cassandra-reactive;3.5.5 -org.springframework.boot:spring-boot-starter-data-couchbase;3.5.5 -org.springframework.boot:spring-boot-starter-data-couchbase-reactive;3.5.5 -org.springframework.boot:spring-boot-starter-data-elasticsearch;3.5.5 -org.springframework.boot:spring-boot-starter-data-jdbc;3.5.5 -org.springframework.boot:spring-boot-starter-data-jpa;3.5.5 -org.springframework.boot:spring-boot-starter-data-ldap;3.5.5 -org.springframework.boot:spring-boot-starter-data-mongodb;3.5.5 -org.springframework.boot:spring-boot-starter-data-mongodb-reactive;3.5.5 -org.springframework.boot:spring-boot-starter-data-neo4j;3.5.5 -org.springframework.boot:spring-boot-starter-data-r2dbc;3.5.5 -org.springframework.boot:spring-boot-starter-data-redis;3.5.5 -org.springframework.boot:spring-boot-starter-data-redis-reactive;3.5.5 -org.springframework.boot:spring-boot-starter-data-rest;3.5.5 -org.springframework.boot:spring-boot-starter-freemarker;3.5.5 -org.springframework.boot:spring-boot-starter-graphql;3.5.5 -org.springframework.boot:spring-boot-starter-groovy-templates;3.5.5 -org.springframework.boot:spring-boot-starter-hateoas;3.5.5 -org.springframework.boot:spring-boot-starter-integration;3.5.5 -org.springframework.boot:spring-boot-starter-jdbc;3.5.5 -org.springframework.boot:spring-boot-starter-jersey;3.5.5 -org.springframework.boot:spring-boot-starter-jetty;3.5.5 -org.springframework.boot:spring-boot-starter-jooq;3.5.5 -org.springframework.boot:spring-boot-starter-json;3.5.5 -org.springframework.boot:spring-boot-starter-log4j2;3.5.5 -org.springframework.boot:spring-boot-starter-logging;3.5.5 -org.springframework.boot:spring-boot-starter-mail;3.5.5 -org.springframework.boot:spring-boot-starter-mustache;3.5.5 -org.springframework.boot:spring-boot-starter-oauth2-authorization-server;3.5.5 -org.springframework.boot:spring-boot-starter-oauth2-client;3.5.5 -org.springframework.boot:spring-boot-starter-oauth2-resource-server;3.5.5 -org.springframework.boot:spring-boot-starter-parent;3.5.5 -org.springframework.boot:spring-boot-starter-pulsar;3.5.5 -org.springframework.boot:spring-boot-starter-pulsar-reactive;3.5.5 -org.springframework.boot:spring-boot-starter-quartz;3.5.5 -org.springframework.boot:spring-boot-starter-reactor-netty;3.5.5 -org.springframework.boot:spring-boot-starter-rsocket;3.5.5 -org.springframework.boot:spring-boot-starter-security;3.5.5 -org.springframework.boot:spring-boot-starter-test;3.5.5 -org.springframework.boot:spring-boot-starter-thymeleaf;3.5.5 -org.springframework.boot:spring-boot-starter-tomcat;3.5.5 -org.springframework.boot:spring-boot-starter-undertow;3.5.5 -org.springframework.boot:spring-boot-starter-validation;3.5.5 -org.springframework.boot:spring-boot-starter-web;3.5.5 -org.springframework.boot:spring-boot-starter-web-services;3.5.5 -org.springframework.boot:spring-boot-starter-webflux;3.5.5 -org.springframework.boot:spring-boot-starter-websocket;3.5.5 -org.springframework.boot:spring-boot-test;3.5.5 -org.springframework.boot:spring-boot-test-autoconfigure;3.5.5 -org.springframework.boot:spring-boot-testcontainers;3.5.5 -org.springframework.cloud:spring-cloud-bus;4.3.0 -org.springframework.cloud:spring-cloud-bus-dependencies;4.3.0 -org.springframework.cloud:spring-cloud-bus-rsocket;4.3.0 -org.springframework.cloud:spring-cloud-circuitbreaker-dependencies;3.3.0 -org.springframework.cloud:spring-cloud-circuitbreaker-resilience4j;3.3.0 -org.springframework.cloud:spring-cloud-circuitbreaker-spring-retry;3.3.0 -org.springframework.cloud:spring-cloud-commons;4.3.0 -org.springframework.cloud:spring-cloud-commons-dependencies;4.3.0 -org.springframework.cloud:spring-cloud-config-client;4.3.0 -org.springframework.cloud:spring-cloud-config-dependencies;4.3.0 -org.springframework.cloud:spring-cloud-config-monitor;4.3.0 -org.springframework.cloud:spring-cloud-config-server;4.3.0 -org.springframework.cloud:spring-cloud-consul-binder;4.3.0 -org.springframework.cloud:spring-cloud-consul-config;4.3.0 -org.springframework.cloud:spring-cloud-consul-core;4.3.0 -org.springframework.cloud:spring-cloud-consul-dependencies;4.3.0 -org.springframework.cloud:spring-cloud-consul-discovery;4.3.0 -org.springframework.cloud:spring-cloud-context;4.3.0 -org.springframework.cloud:spring-cloud-contract-converters;4.3.0 -org.springframework.cloud:spring-cloud-contract-dependencies;4.3.0 -org.springframework.cloud:spring-cloud-contract-gradle-plugin;4.3.0 -org.springframework.cloud:spring-cloud-contract-maven-plugin;4.3.0 -org.springframework.cloud:spring-cloud-contract-shade;4.3.0 -org.springframework.cloud:spring-cloud-contract-spec;4.3.0 -org.springframework.cloud:spring-cloud-contract-spec-groovy;4.3.0 -org.springframework.cloud:spring-cloud-contract-spec-java;4.3.0 -org.springframework.cloud:spring-cloud-contract-spec-kotlin;4.3.0 -org.springframework.cloud:spring-cloud-contract-stub-runner;4.3.0 -org.springframework.cloud:spring-cloud-contract-stub-runner-boot;4.3.0 -org.springframework.cloud:spring-cloud-contract-verifier;4.3.0 -org.springframework.cloud:spring-cloud-contract-wiremock;4.3.0 -org.springframework.cloud:spring-cloud-dependencies;2025.0.0 -org.springframework.cloud:spring-cloud-function-adapter-aws;4.3.0 -org.springframework.cloud:spring-cloud-function-adapter-azure;4.3.0 -org.springframework.cloud:spring-cloud-function-adapter-azure-web;4.3.0 -org.springframework.cloud:spring-cloud-function-adapter-gcp;4.3.0 -org.springframework.cloud:spring-cloud-function-context;4.3.0 -org.springframework.cloud:spring-cloud-function-core;4.3.0 -org.springframework.cloud:spring-cloud-function-dependencies;4.3.0 -org.springframework.cloud:spring-cloud-function-deployer;4.3.0 -org.springframework.cloud:spring-cloud-function-grpc;4.3.0 -org.springframework.cloud:spring-cloud-function-grpc-cloudevent-ext;4.3.0 -org.springframework.cloud:spring-cloud-function-integration;4.3.0 -org.springframework.cloud:spring-cloud-function-kotlin;4.3.0 -org.springframework.cloud:spring-cloud-function-rsocket;4.3.0 -org.springframework.cloud:spring-cloud-function-serverless-web;4.3.0 -org.springframework.cloud:spring-cloud-function-web;4.3.0 -org.springframework.cloud:spring-cloud-gateway-dependencies;4.3.0 -org.springframework.cloud:spring-cloud-gateway-mvc;4.3.0 -org.springframework.cloud:spring-cloud-gateway-proxyexchange-webflux;4.3.0 -org.springframework.cloud:spring-cloud-gateway-proxyexchange-webmvc;4.3.0 -org.springframework.cloud:spring-cloud-gateway-server;4.3.0 -org.springframework.cloud:spring-cloud-gateway-server-mvc;4.3.0 -org.springframework.cloud:spring-cloud-gateway-server-webflux;4.3.0 -org.springframework.cloud:spring-cloud-gateway-server-webmvc;4.3.0 -org.springframework.cloud:spring-cloud-gateway-webflux;4.3.0 -org.springframework.cloud:spring-cloud-kubernetes-client-autoconfig;3.3.0 -org.springframework.cloud:spring-cloud-kubernetes-client-config;3.3.0 -org.springframework.cloud:spring-cloud-kubernetes-client-discovery;3.3.0 -org.springframework.cloud:spring-cloud-kubernetes-client-loadbalancer;3.3.0 -org.springframework.cloud:spring-cloud-kubernetes-commons;3.3.0 -org.springframework.cloud:spring-cloud-kubernetes-dependencies;3.3.0 -org.springframework.cloud:spring-cloud-kubernetes-discovery;3.3.0 -org.springframework.cloud:spring-cloud-kubernetes-fabric8-autoconfig;3.3.0 -org.springframework.cloud:spring-cloud-kubernetes-fabric8-config;3.3.0 -org.springframework.cloud:spring-cloud-kubernetes-fabric8-discovery;3.3.0 -org.springframework.cloud:spring-cloud-kubernetes-fabric8-istio;3.3.0 -org.springframework.cloud:spring-cloud-kubernetes-fabric8-leader;3.3.0 -org.springframework.cloud:spring-cloud-kubernetes-fabric8-loadbalancer;3.3.0 -org.springframework.cloud:spring-cloud-kubernetes-test-support;3.3.0 -org.springframework.cloud:spring-cloud-loadbalancer;4.3.0 -org.springframework.cloud:spring-cloud-netflix-dependencies;4.3.0 -org.springframework.cloud:spring-cloud-netflix-eureka-client;4.3.0 -org.springframework.cloud:spring-cloud-netflix-eureka-server;4.3.0 -org.springframework.cloud:spring-cloud-openfeign-core;4.3.0 -org.springframework.cloud:spring-cloud-openfeign-dependencies;4.3.0 -org.springframework.cloud:spring-cloud-starter;4.3.0 -org.springframework.cloud:spring-cloud-starter-bootstrap;4.3.0 -org.springframework.cloud:spring-cloud-starter-bus-amqp;4.3.0 -org.springframework.cloud:spring-cloud-starter-bus-kafka;4.3.0 -org.springframework.cloud:spring-cloud-starter-bus-stream;4.3.0 -org.springframework.cloud:spring-cloud-starter-circuitbreaker-reactor-resilience4j;3.3.0 -org.springframework.cloud:spring-cloud-starter-circuitbreaker-resilience4j;3.3.0 -org.springframework.cloud:spring-cloud-starter-circuitbreaker-spring-retry;3.3.0 -org.springframework.cloud:spring-cloud-starter-config;4.3.0 -org.springframework.cloud:spring-cloud-starter-consul;4.3.0 -org.springframework.cloud:spring-cloud-starter-consul-all;4.3.0 -org.springframework.cloud:spring-cloud-starter-consul-bus;4.3.0 -org.springframework.cloud:spring-cloud-starter-consul-config;4.3.0 -org.springframework.cloud:spring-cloud-starter-consul-discovery;4.3.0 -org.springframework.cloud:spring-cloud-starter-contract-stub-runner;4.3.0 -org.springframework.cloud:spring-cloud-starter-contract-stub-runner-jetty;4.3.0 -org.springframework.cloud:spring-cloud-starter-contract-verifier;4.3.0 -org.springframework.cloud:spring-cloud-starter-function-web;4.3.0 -org.springframework.cloud:spring-cloud-starter-function-webflux;4.3.0 -org.springframework.cloud:spring-cloud-starter-gateway;4.3.0 -org.springframework.cloud:spring-cloud-starter-gateway-mvc;4.3.0 -org.springframework.cloud:spring-cloud-starter-gateway-server-webflux;4.3.0 -org.springframework.cloud:spring-cloud-starter-gateway-server-webmvc;4.3.0 -org.springframework.cloud:spring-cloud-starter-kubernetes-client;3.3.0 -org.springframework.cloud:spring-cloud-starter-kubernetes-client-all;3.3.0 -org.springframework.cloud:spring-cloud-starter-kubernetes-client-config;3.3.0 -org.springframework.cloud:spring-cloud-starter-kubernetes-client-loadbalancer;3.3.0 -org.springframework.cloud:spring-cloud-starter-kubernetes-discoveryclient;3.3.0 -org.springframework.cloud:spring-cloud-starter-kubernetes-fabric8;3.3.0 -org.springframework.cloud:spring-cloud-starter-kubernetes-fabric8-all;3.3.0 -org.springframework.cloud:spring-cloud-starter-kubernetes-fabric8-config;3.3.0 -org.springframework.cloud:spring-cloud-starter-kubernetes-fabric8-loadbalancer;3.3.0 -org.springframework.cloud:spring-cloud-starter-loadbalancer;4.3.0 -org.springframework.cloud:spring-cloud-starter-netflix-eureka-client;4.3.0 -org.springframework.cloud:spring-cloud-starter-netflix-eureka-server;4.3.0 -org.springframework.cloud:spring-cloud-starter-openfeign;4.3.0 -org.springframework.cloud:spring-cloud-starter-stream-kafka;4.3.0 -org.springframework.cloud:spring-cloud-starter-stream-rabbit;4.3.0 -org.springframework.cloud:spring-cloud-starter-task;3.3.0 -org.springframework.cloud:spring-cloud-starter-vault-config;4.3.0 -org.springframework.cloud:spring-cloud-starter-zookeeper;4.3.0 -org.springframework.cloud:spring-cloud-starter-zookeeper-all;4.3.0 -org.springframework.cloud:spring-cloud-starter-zookeeper-config;4.3.0 -org.springframework.cloud:spring-cloud-starter-zookeeper-discovery;4.3.0 -org.springframework.cloud:spring-cloud-stream;4.3.0 -org.springframework.cloud:spring-cloud-stream-binder-kafka;4.3.0 -org.springframework.cloud:spring-cloud-stream-binder-kafka-core;4.3.0 -org.springframework.cloud:spring-cloud-stream-binder-kafka-reactive;4.3.0 -org.springframework.cloud:spring-cloud-stream-binder-kafka-streams;4.3.0 -org.springframework.cloud:spring-cloud-stream-binder-pulsar;4.3.0 -org.springframework.cloud:spring-cloud-stream-binder-rabbit;4.3.0 -org.springframework.cloud:spring-cloud-stream-binder-rabbit-core;4.3.0 -org.springframework.cloud:spring-cloud-stream-binder-rabbit-test-support;4.3.0 -org.springframework.cloud:spring-cloud-stream-dependencies;4.3.0 -org.springframework.cloud:spring-cloud-stream-schema-registry-client;4.3.0 -org.springframework.cloud:spring-cloud-stream-schema-registry-core;4.3.0 -org.springframework.cloud:spring-cloud-stream-schema-registry-server;4.3.0 -org.springframework.cloud:spring-cloud-stream-test-binder;4.3.0 -org.springframework.cloud:spring-cloud-stream-test-support;4.3.0 -org.springframework.cloud:spring-cloud-task-batch;3.3.0 -org.springframework.cloud:spring-cloud-task-core;3.3.0 -org.springframework.cloud:spring-cloud-task-dependencies;3.3.0 -org.springframework.cloud:spring-cloud-task-stream;3.3.0 -org.springframework.cloud:spring-cloud-test-support;4.3.0 -org.springframework.cloud:spring-cloud-vault-config;4.3.0 -org.springframework.cloud:spring-cloud-vault-config-aws;4.3.0 -org.springframework.cloud:spring-cloud-vault-config-consul;4.3.0 -org.springframework.cloud:spring-cloud-vault-config-databases;4.3.0 -org.springframework.cloud:spring-cloud-vault-config-rabbitmq;4.3.0 -org.springframework.cloud:spring-cloud-vault-dependencies;4.3.0 -org.springframework.cloud:spring-cloud-zookeeper-config;4.3.0 -org.springframework.cloud:spring-cloud-zookeeper-core;4.3.0 -org.springframework.cloud:spring-cloud-zookeeper-dependencies;4.3.0 -org.springframework.cloud:spring-cloud-zookeeper-discovery;4.3.0 -org.springframework.credhub:spring-credhub-core;2.1.1.RELEASE -org.springframework.data:spring-data-bom;2025.0.3 -org.springframework.data:spring-data-cassandra;4.5.3 -org.springframework.data:spring-data-commons;3.5.3 -org.springframework.data:spring-data-couchbase;5.5.3 -org.springframework.data:spring-data-elasticsearch;5.5.3 -org.springframework.data:spring-data-envers;3.5.3 -org.springframework.data:spring-data-jdbc;3.5.3 -org.springframework.data:spring-data-jpa;3.5.3 -org.springframework.data:spring-data-keyvalue;3.5.3 -org.springframework.data:spring-data-ldap;3.5.3 -org.springframework.data:spring-data-mongodb;4.5.3 -org.springframework.data:spring-data-neo4j;7.5.3 -org.springframework.data:spring-data-r2dbc;3.5.3 -org.springframework.data:spring-data-redis;3.5.3 -org.springframework.data:spring-data-relational;3.5.3 -org.springframework.data:spring-data-rest-core;4.5.3 -org.springframework.data:spring-data-rest-hal-explorer;4.5.3 -org.springframework.data:spring-data-rest-webmvc;4.5.3 -org.springframework.graphql:spring-graphql;1.4.1 -org.springframework.graphql:spring-graphql-test;1.4.1 -org.springframework.hateoas:spring-hateoas;2.5.1 -org.springframework.integration:spring-integration-amqp;6.5.1 -org.springframework.integration:spring-integration-bom;6.5.1 -org.springframework.integration:spring-integration-camel;6.5.1 -org.springframework.integration:spring-integration-cassandra;6.5.1 -org.springframework.integration:spring-integration-core;6.5.1 -org.springframework.integration:spring-integration-debezium;6.5.1 -org.springframework.integration:spring-integration-event;6.5.1 -org.springframework.integration:spring-integration-feed;6.5.1 -org.springframework.integration:spring-integration-file;6.5.1 -org.springframework.integration:spring-integration-ftp;6.5.1 -org.springframework.integration:spring-integration-graphql;6.5.1 -org.springframework.integration:spring-integration-groovy;6.5.1 -org.springframework.integration:spring-integration-hazelcast;6.5.1 -org.springframework.integration:spring-integration-http;6.5.1 -org.springframework.integration:spring-integration-ip;6.5.1 -org.springframework.integration:spring-integration-jdbc;6.5.1 -org.springframework.integration:spring-integration-jms;6.5.1 -org.springframework.integration:spring-integration-jmx;6.5.1 -org.springframework.integration:spring-integration-jpa;6.5.1 -org.springframework.integration:spring-integration-kafka;6.5.1 -org.springframework.integration:spring-integration-mail;6.5.1 -org.springframework.integration:spring-integration-mongodb;6.5.1 -org.springframework.integration:spring-integration-mqtt;6.5.1 -org.springframework.integration:spring-integration-r2dbc;6.5.1 -org.springframework.integration:spring-integration-redis;6.5.1 -org.springframework.integration:spring-integration-rsocket;6.5.1 -org.springframework.integration:spring-integration-scripting;6.5.1 -org.springframework.integration:spring-integration-sftp;6.5.1 -org.springframework.integration:spring-integration-smb;6.5.1 -org.springframework.integration:spring-integration-stomp;6.5.1 -org.springframework.integration:spring-integration-stream;6.5.1 -org.springframework.integration:spring-integration-syslog;6.5.1 -org.springframework.integration:spring-integration-test;6.5.1 -org.springframework.integration:spring-integration-test-support;6.5.1 -org.springframework.integration:spring-integration-webflux;6.5.1 -org.springframework.integration:spring-integration-websocket;6.5.1 -org.springframework.integration:spring-integration-ws;6.5.1 -org.springframework.integration:spring-integration-xml;6.5.1 -org.springframework.integration:spring-integration-xmpp;6.5.1 -org.springframework.integration:spring-integration-zeromq;6.5.1 -org.springframework.integration:spring-integration-zip;6.5.1 -org.springframework.integration:spring-integration-zookeeper;6.5.1 -org.springframework.kafka:spring-kafka;3.3.9 -org.springframework.kafka:spring-kafka-test;3.3.9 -org.springframework.ldap:spring-ldap-core;3.3.3 -org.springframework.ldap:spring-ldap-ldif-core;3.3.3 -org.springframework.ldap:spring-ldap-odm;3.3.3 -org.springframework.ldap:spring-ldap-test;3.3.3 -org.springframework.pulsar:spring-pulsar;1.2.9 -org.springframework.pulsar:spring-pulsar-bom;1.2.9 -org.springframework.pulsar:spring-pulsar-cache-provider;1.2.9 -org.springframework.pulsar:spring-pulsar-cache-provider-caffeine;1.2.9 -org.springframework.pulsar:spring-pulsar-reactive;1.2.9 -org.springframework.pulsar:spring-pulsar-test;1.2.9 -org.springframework.restdocs:spring-restdocs-asciidoctor;3.0.5 -org.springframework.restdocs:spring-restdocs-bom;3.0.5 -org.springframework.restdocs:spring-restdocs-core;3.0.5 -org.springframework.restdocs:spring-restdocs-mockmvc;3.0.5 -org.springframework.restdocs:spring-restdocs-restassured;3.0.5 -org.springframework.restdocs:spring-restdocs-webtestclient;3.0.5 -org.springframework.retry:spring-retry;2.0.12 -org.springframework.security:spring-security-acl;6.5.3 -org.springframework.security:spring-security-aspects;6.5.3 -org.springframework.security:spring-security-bom;6.5.3 -org.springframework.security:spring-security-cas;6.5.3 -org.springframework.security:spring-security-config;6.5.3 -org.springframework.security:spring-security-core;6.5.3 -org.springframework.security:spring-security-crypto;6.5.3 -org.springframework.security:spring-security-data;6.5.3 -org.springframework.security:spring-security-ldap;6.5.3 -org.springframework.security:spring-security-messaging;6.5.3 -org.springframework.security:spring-security-oauth2-authorization-server;1.5.2 -org.springframework.security:spring-security-oauth2-client;6.5.3 -org.springframework.security:spring-security-oauth2-core;6.5.3 -org.springframework.security:spring-security-oauth2-jose;6.5.3 -org.springframework.security:spring-security-oauth2-resource-server;6.5.3 -org.springframework.security:spring-security-rsocket;6.5.3 -org.springframework.security:spring-security-saml2-service-provider;6.5.3 -org.springframework.security:spring-security-taglibs;6.5.3 -org.springframework.security:spring-security-test;6.5.3 -org.springframework.security:spring-security-web;6.5.3 -org.springframework.session:spring-session-bom;3.5.2 -org.springframework.session:spring-session-core;3.5.2 -org.springframework.session:spring-session-data-mongodb;3.5.2 -org.springframework.session:spring-session-data-redis;3.5.2 -org.springframework.session:spring-session-hazelcast;3.5.2 -org.springframework.session:spring-session-jdbc;3.5.2 -org.springframework.vault:spring-vault-core;3.2.0 -org.springframework.ws:spring-ws-bom;4.1.1 -org.springframework.ws:spring-ws-core;4.1.1 -org.springframework.ws:spring-ws-security;4.1.1 -org.springframework.ws:spring-ws-support;4.1.1 -org.springframework.ws:spring-ws-test;4.1.1 -org.springframework.ws:spring-xml;4.1.1 -org.springframework:spring-aop;6.2.10 -org.springframework:spring-aspects;6.2.10 -org.springframework:spring-beans;6.2.10 -org.springframework:spring-context;6.2.10 -org.springframework:spring-context-indexer;6.2.10 -org.springframework:spring-context-support;6.2.10 -org.springframework:spring-core;6.2.10 -org.springframework:spring-core-test;6.2.10 -org.springframework:spring-expression;6.2.10 -org.springframework:spring-framework-bom;6.2.10 -org.springframework:spring-instrument;6.2.10 -org.springframework:spring-jcl;6.2.10 -org.springframework:spring-jdbc;6.2.10 -org.springframework:spring-jms;6.2.10 -org.springframework:spring-messaging;6.2.10 -org.springframework:spring-orm;6.2.10 -org.springframework:spring-oxm;6.2.10 -org.springframework:spring-r2dbc;6.2.10 -org.springframework:spring-test;6.2.10 -org.springframework:spring-tx;6.2.10 -org.springframework:spring-web;6.2.10 -org.springframework:spring-webflux;6.2.10 -org.springframework:spring-webmvc;6.2.10 -org.springframework:spring-websocket;6.2.10 -org.testcontainers:activemq;1.21.3 -org.testcontainers:azure;1.21.3 -org.testcontainers:cassandra;1.21.3 -org.testcontainers:chromadb;1.21.3 -org.testcontainers:clickhouse;1.21.3 -org.testcontainers:cockroachdb;1.21.3 -org.testcontainers:consul;1.21.3 -org.testcontainers:couchbase;1.21.3 -org.testcontainers:cratedb;1.21.3 -org.testcontainers:database-commons;1.21.3 -org.testcontainers:databend;1.21.3 -org.testcontainers:db2;1.21.3 -org.testcontainers:dynalite;1.21.3 -org.testcontainers:elasticsearch;1.21.3 -org.testcontainers:gcloud;1.21.3 -org.testcontainers:grafana;1.21.3 -org.testcontainers:hivemq;1.21.3 -org.testcontainers:influxdb;1.21.3 -org.testcontainers:jdbc;1.21.3 -org.testcontainers:junit-jupiter;1.21.3 -org.testcontainers:k3s;1.21.3 -org.testcontainers:k6;1.21.3 -org.testcontainers:kafka;1.21.3 -org.testcontainers:ldap;1.21.3 -org.testcontainers:localstack;1.21.3 -org.testcontainers:mariadb;1.21.3 -org.testcontainers:milvus;1.21.3 -org.testcontainers:minio;1.21.3 -org.testcontainers:mockserver;1.21.3 -org.testcontainers:mongodb;1.21.3 -org.testcontainers:mssqlserver;1.21.3 -org.testcontainers:mysql;1.21.3 -org.testcontainers:neo4j;1.21.3 -org.testcontainers:nginx;1.21.3 -org.testcontainers:oceanbase;1.21.3 -org.testcontainers:ollama;1.21.3 -org.testcontainers:openfga;1.21.3 -org.testcontainers:oracle-free;1.21.3 -org.testcontainers:oracle-xe;1.21.3 -org.testcontainers:orientdb;1.21.3 -org.testcontainers:pinecone;1.21.3 -org.testcontainers:postgresql;1.21.3 -org.testcontainers:presto;1.21.3 -org.testcontainers:pulsar;1.21.3 -org.testcontainers:qdrant;1.21.3 -org.testcontainers:questdb;1.21.3 -org.testcontainers:r2dbc;1.21.3 -org.testcontainers:rabbitmq;1.21.3 -org.testcontainers:redpanda;1.21.3 -org.testcontainers:scylladb;1.21.3 -org.testcontainers:selenium;1.21.3 -org.testcontainers:solace;1.21.3 -org.testcontainers:solr;1.21.3 -org.testcontainers:spock;1.21.3 -org.testcontainers:testcontainers;1.21.3 -org.testcontainers:testcontainers-bom;1.21.3 -org.testcontainers:tidb;1.21.3 -org.testcontainers:timeplus;1.21.3 -org.testcontainers:toxiproxy;1.21.3 -org.testcontainers:trino;1.21.3 -org.testcontainers:typesense;1.21.3 -org.testcontainers:vault;1.21.3 -org.testcontainers:weaviate;1.21.3 -org.testcontainers:yugabytedb;1.21.3 -org.thymeleaf.extras:thymeleaf-extras-springsecurity6;3.1.3.RELEASE -org.thymeleaf:thymeleaf;3.1.3.RELEASE -org.thymeleaf:thymeleaf-spring6;3.1.3.RELEASE -org.tmatesoft.svnkit:svnkit;1.10.11 -org.vibur:vibur-dbcp;26.0 -org.vibur:vibur-object-pool;26.0 -org.webjars:webjars-locator-core;0.59 -org.webjars:webjars-locator-lite;1.1.0 -org.wiremock:wiremock-standalone;3.9.2 -org.xerial:sqlite-jdbc;3.49.1.0 -org.xmlunit:xmlunit-assertj;2.10.3 -org.xmlunit:xmlunit-assertj3;2.10.3 -org.xmlunit:xmlunit-core;2.10.3 -org.xmlunit:xmlunit-jakarta-jaxb-impl;2.10.3 -org.xmlunit:xmlunit-legacy;2.10.3 -org.xmlunit:xmlunit-matchers;2.10.3 -org.xmlunit:xmlunit-placeholders;2.10.3 -org.yaml:snakeyaml;2.4 -redis.clients:jedis;6.0.0 -wsdl4j:wsdl4j;1.6.3 diff --git a/sdk/spring/scripts/spring_boot_4.0.0_managed_external_dependencies.txt b/sdk/spring/scripts/spring_boot_4.0.0_managed_external_dependencies.txt new file mode 100644 index 000000000000..a1cfbf3baaa3 --- /dev/null +++ b/sdk/spring/scripts/spring_boot_4.0.0_managed_external_dependencies.txt @@ -0,0 +1,2176 @@ +ch.qos.logback:logback-classic;1.5.21 +ch.qos.logback:logback-core;1.5.21 +co.elastic.clients:elasticsearch-java;9.2.1 +co.elastic.clients:elasticsearch-rest5-client;9.2.1 +com.couchbase.client:java-client;3.9.2 +com.datastax.oss:native-protocol;1.5.2 +com.ecwid.consul:consul-api;1.4.5 +com.fasterxml.jackson.core:jackson-annotations;2.20 +com.fasterxml.jackson.core:jackson-core;2.20.1 +com.fasterxml.jackson.core:jackson-databind;2.20.1 +com.fasterxml.jackson.dataformat:jackson-dataformat-avro;2.20.1 +com.fasterxml.jackson.dataformat:jackson-dataformat-cbor;2.20.1 +com.fasterxml.jackson.dataformat:jackson-dataformat-csv;2.20.1 +com.fasterxml.jackson.dataformat:jackson-dataformat-ion;2.20.1 +com.fasterxml.jackson.dataformat:jackson-dataformat-properties;2.20.1 +com.fasterxml.jackson.dataformat:jackson-dataformat-protobuf;2.20.1 +com.fasterxml.jackson.dataformat:jackson-dataformat-smile;2.20.1 +com.fasterxml.jackson.dataformat:jackson-dataformat-toml;2.20.1 +com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.20.1 +com.fasterxml.jackson.dataformat:jackson-dataformat-yaml;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-eclipse-collections;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-guava;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-hibernate4;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-hibernate5;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-hibernate5-jakarta;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-hibernate6;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-hibernate7;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-hppc;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-jakarta-jsonp;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-javax-money;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-jaxrs;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-joda;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-joda-money;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-json-org;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-jsr353;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-moneta;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-pcollections;2.20.1 +com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-base;2.20.1 +com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-cbor-provider;2.20.1 +com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-json-provider;2.20.1 +com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-smile-provider;2.20.1 +com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-xml-provider;2.20.1 +com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-yaml-provider;2.20.1 +com.fasterxml.jackson.jaxrs:jackson-jaxrs-base;2.20.1 +com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider;2.20.1 +com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider;2.20.1 +com.fasterxml.jackson.jaxrs:jackson-jaxrs-smile-provider;2.20.1 +com.fasterxml.jackson.jaxrs:jackson-jaxrs-xml-provider;2.20.1 +com.fasterxml.jackson.jaxrs:jackson-jaxrs-yaml-provider;2.20.1 +com.fasterxml.jackson.jr:jackson-jr-all;2.20.1 +com.fasterxml.jackson.jr:jackson-jr-annotation-support;2.20.1 +com.fasterxml.jackson.jr:jackson-jr-extension-javatime;2.20.1 +com.fasterxml.jackson.jr:jackson-jr-objects;2.20.1 +com.fasterxml.jackson.jr:jackson-jr-retrofit2;2.20.1 +com.fasterxml.jackson.jr:jackson-jr-stree;2.20.1 +com.fasterxml.jackson.module:jackson-module-afterburner;2.20.1 +com.fasterxml.jackson.module:jackson-module-android-record;2.20.1 +com.fasterxml.jackson.module:jackson-module-blackbird;2.20.1 +com.fasterxml.jackson.module:jackson-module-guice;2.20.1 +com.fasterxml.jackson.module:jackson-module-guice7;2.20.1 +com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations;2.20.1 +com.fasterxml.jackson.module:jackson-module-jaxb-annotations;2.20.1 +com.fasterxml.jackson.module:jackson-module-jsonSchema;2.20.1 +com.fasterxml.jackson.module:jackson-module-jsonSchema-jakarta;2.20.1 +com.fasterxml.jackson.module:jackson-module-kotlin;2.20.1 +com.fasterxml.jackson.module:jackson-module-mrbean;2.20.1 +com.fasterxml.jackson.module:jackson-module-no-ctor-deser;2.20.1 +com.fasterxml.jackson.module:jackson-module-osgi;2.20.1 +com.fasterxml.jackson.module:jackson-module-parameter-names;2.20.1 +com.fasterxml.jackson.module:jackson-module-paranamer;2.20.1 +com.fasterxml.jackson.module:jackson-module-scala_2.11;2.20.1 +com.fasterxml.jackson.module:jackson-module-scala_2.12;2.20.1 +com.fasterxml.jackson.module:jackson-module-scala_2.13;2.20.1 +com.fasterxml.jackson.module:jackson-module-scala_3;2.20.1 +com.fasterxml.jackson:jackson-bom;2.20.1 +com.fasterxml:classmate;1.7.1 +com.github.ben-manes.caffeine:caffeine;3.2.3 +com.github.ben-manes.caffeine:guava;3.2.3 +com.github.ben-manes.caffeine:jcache;3.2.3 +com.github.ben-manes.caffeine:simulator;3.2.3 +com.github.mxab.thymeleaf.extras:thymeleaf-extras-data-attribute;2.0.1 +com.google.code.gson:gson;2.13.2 +com.graphql-java:graphql-java;25.0 +com.h2database:h2;2.4.240 +com.hazelcast:hazelcast;5.5.0 +com.hazelcast:hazelcast-spring;5.5.0 +com.ibm.db2:jcc;12.1.3.0 +com.jayway.jsonpath:json-path;2.9.0 +com.jayway.jsonpath:json-path-assert;2.9.0 +com.microsoft.sqlserver:mssql-jdbc;13.2.1.jre11 +com.mysql:mysql-connector-j;9.5.0 +com.netflix.eureka:eureka-client;2.0.5 +com.netflix.eureka:eureka-client-jersey3;2.0.5 +com.netflix.eureka:eureka-core;2.0.5 +com.netflix.eureka:eureka-core-jersey3;2.0.5 +com.oracle.database.ha:ons;23.9.0.25.07 +com.oracle.database.ha:simplefan;23.9.0.25.07 +com.oracle.database.jdbc:ojdbc11;23.9.0.25.07 +com.oracle.database.jdbc:ojdbc11-production;23.9.0.25.07 +com.oracle.database.jdbc:ojdbc17;23.9.0.25.07 +com.oracle.database.jdbc:ojdbc17-production;23.9.0.25.07 +com.oracle.database.jdbc:ojdbc8;23.9.0.25.07 +com.oracle.database.jdbc:ojdbc8-production;23.9.0.25.07 +com.oracle.database.jdbc:rsi;23.9.0.25.07 +com.oracle.database.jdbc:ucp;23.9.0.25.07 +com.oracle.database.jdbc:ucp11;23.9.0.25.07 +com.oracle.database.jdbc:ucp17;23.9.0.25.07 +com.oracle.database.nls:orai18n;23.9.0.25.07 +com.oracle.database.r2dbc:oracle-r2dbc;1.3.0 +com.oracle.database.security:oraclepki;23.9.0.25.07 +com.oracle.database.xml:xdb;23.9.0.25.07 +com.oracle.database.xml:xmlparserv2;23.9.0.25.07 +com.querydsl:codegen-utils;5.1.0 +com.querydsl:querydsl-apt;5.1.0 +com.querydsl:querydsl-bom;5.1.0 +com.querydsl:querydsl-codegen;5.1.0 +com.querydsl:querydsl-collections;5.1.0 +com.querydsl:querydsl-core;5.1.0 +com.querydsl:querydsl-guava;5.1.0 +com.querydsl:querydsl-hibernate-search;5.1.0 +com.querydsl:querydsl-jdo;5.1.0 +com.querydsl:querydsl-jpa;5.1.0 +com.querydsl:querydsl-jpa-codegen;5.1.0 +com.querydsl:querydsl-kotlin;5.1.0 +com.querydsl:querydsl-kotlin-codegen;5.1.0 +com.querydsl:querydsl-lucene3;5.1.0 +com.querydsl:querydsl-lucene4;5.1.0 +com.querydsl:querydsl-lucene5;5.1.0 +com.querydsl:querydsl-mongodb;5.1.0 +com.querydsl:querydsl-scala;5.1.0 +com.querydsl:querydsl-spatial;5.1.0 +com.querydsl:querydsl-sql;5.1.0 +com.querydsl:querydsl-sql-codegen;5.1.0 +com.querydsl:querydsl-sql-spatial;5.1.0 +com.querydsl:querydsl-sql-spring;5.1.0 +com.rabbitmq:amqp-client;5.27.1 +com.rabbitmq:stream-client;0.23.0 +com.redis:testcontainers-redis;2.2.4 +com.samskivert:jmustache;1.16 +com.sendgrid:sendgrid-java;4.10.3 +com.squareup.okhttp3:logging-interceptor;4.12.0 +com.squareup.okhttp3:mockwebserver;4.12.0 +com.squareup.okhttp3:okcurl;4.12.0 +com.squareup.okhttp3:okhttp;4.12.0 +com.squareup.okhttp3:okhttp-bom;4.12.0 +com.squareup.okhttp3:okhttp-brotli;4.12.0 +com.squareup.okhttp3:okhttp-dnsoverhttps;4.12.0 +com.squareup.okhttp3:okhttp-sse;4.12.0 +com.squareup.okhttp3:okhttp-tls;4.12.0 +com.squareup.okhttp3:okhttp-urlconnection;4.12.0 +com.sun.xml.bind:jaxb-core;4.0.6 +com.sun.xml.bind:jaxb-impl;4.0.6 +com.sun.xml.bind:jaxb-jxc;4.0.6 +com.sun.xml.bind:jaxb-osgi;4.0.6 +com.sun.xml.bind:jaxb-xjc;4.0.6 +com.sun.xml.messaging.saaj:saaj-impl;3.0.4 +com.toomuchcoding.jsonassert:jsonassert;0.8.0 +com.toomuchcoding.jsonassert:jsonassert-shade;0.8.0 +com.unboundid:unboundid-ldapsdk;7.0.3 +com.zaxxer:HikariCP;7.0.2 +commons-codec:commons-codec;1.19.0 +commons-logging:commons-logging;1.3.5 +commons-pool:commons-pool;1.6 +io.asyncer:r2dbc-mysql;1.4.1 +io.fabric8.java-generator:io.fabric8.java-generator.gradle.plugin;7.4.0 +io.fabric8.kubernetes:kubernetes-karaf;7.4.0 +io.fabric8:certmanager-client;7.4.0 +io.fabric8:certmanager-model;7.4.0 +io.fabric8:chaosmesh-client;7.4.0 +io.fabric8:chaosmesh-model;7.4.0 +io.fabric8:crd-generator-api;7.4.0 +io.fabric8:crd-generator-api-v2;7.4.0 +io.fabric8:crd-generator-apt;7.4.0 +io.fabric8:crd-generator-cli;7.4.0 +io.fabric8:crd-generator-collector;7.4.0 +io.fabric8:crd-generator-maven-plugin;7.4.0 +io.fabric8:generator-annotations;7.4.0 +io.fabric8:istio-client;7.4.0 +io.fabric8:istio-model;7.4.0 +io.fabric8:java-generator-benchmark;7.4.0 +io.fabric8:java-generator-cli;7.4.0 +io.fabric8:java-generator-core;7.4.0 +io.fabric8:java-generator-maven-plugin;7.4.0 +io.fabric8:knative-client;7.4.0 +io.fabric8:knative-model;7.4.0 +io.fabric8:kube-api-test;7.4.0 +io.fabric8:kube-api-test-client-inject;7.4.0 +io.fabric8:kubernetes-client;7.4.0 +io.fabric8:kubernetes-client-api;7.4.0 +io.fabric8:kubernetes-client-bom;7.4.0 +io.fabric8:kubernetes-client-init-bc-fips;7.4.0 +io.fabric8:kubernetes-httpclient-jdk;7.4.0 +io.fabric8:kubernetes-httpclient-jetty;7.4.0 +io.fabric8:kubernetes-httpclient-okhttp;7.4.0 +io.fabric8:kubernetes-httpclient-vertx;7.4.0 +io.fabric8:kubernetes-junit-jupiter;7.4.0 +io.fabric8:kubernetes-junit-jupiter-autodetected;7.4.0 +io.fabric8:kubernetes-log4j;7.4.0 +io.fabric8:kubernetes-model-admissionregistration;7.4.0 +io.fabric8:kubernetes-model-apiextensions;7.4.0 +io.fabric8:kubernetes-model-apps;7.4.0 +io.fabric8:kubernetes-model-autoscaling;7.4.0 +io.fabric8:kubernetes-model-batch;7.4.0 +io.fabric8:kubernetes-model-certificates;7.4.0 +io.fabric8:kubernetes-model-common;7.4.0 +io.fabric8:kubernetes-model-coordination;7.4.0 +io.fabric8:kubernetes-model-core;7.4.0 +io.fabric8:kubernetes-model-discovery;7.4.0 +io.fabric8:kubernetes-model-events;7.4.0 +io.fabric8:kubernetes-model-extensions;7.4.0 +io.fabric8:kubernetes-model-flowcontrol;7.4.0 +io.fabric8:kubernetes-model-gatewayapi;7.4.0 +io.fabric8:kubernetes-model-kustomize;7.4.0 +io.fabric8:kubernetes-model-metrics;7.4.0 +io.fabric8:kubernetes-model-networking;7.4.0 +io.fabric8:kubernetes-model-node;7.4.0 +io.fabric8:kubernetes-model-policy;7.4.0 +io.fabric8:kubernetes-model-rbac;7.4.0 +io.fabric8:kubernetes-model-resource;7.4.0 +io.fabric8:kubernetes-model-scheduling;7.4.0 +io.fabric8:kubernetes-model-storageclass;7.4.0 +io.fabric8:kubernetes-model-validator;7.4.0 +io.fabric8:kubernetes-openshift-uberjar;7.4.0 +io.fabric8:kubernetes-server-mock;7.4.0 +io.fabric8:mockwebserver;7.4.0 +io.fabric8:open-cluster-management-client;7.4.0 +io.fabric8:open-cluster-management-model;7.4.0 +io.fabric8:openapi-model-generator-maven-plugin;7.4.0 +io.fabric8:openshift-client;7.4.0 +io.fabric8:openshift-client-api;7.4.0 +io.fabric8:openshift-model;7.4.0 +io.fabric8:openshift-model-autoscaling;7.4.0 +io.fabric8:openshift-model-config;7.4.0 +io.fabric8:openshift-model-console;7.4.0 +io.fabric8:openshift-model-hive;7.4.0 +io.fabric8:openshift-model-installer;7.4.0 +io.fabric8:openshift-model-machine;7.4.0 +io.fabric8:openshift-model-machineconfiguration;7.4.0 +io.fabric8:openshift-model-miscellaneous;7.4.0 +io.fabric8:openshift-model-monitoring;7.4.0 +io.fabric8:openshift-model-operator;7.4.0 +io.fabric8:openshift-model-operatorhub;7.4.0 +io.fabric8:openshift-model-storageversionmigrator;7.4.0 +io.fabric8:openshift-model-tuned;7.4.0 +io.fabric8:openshift-model-whereabouts;7.4.0 +io.fabric8:ovn-client;7.4.0 +io.fabric8:ovn-model;7.4.0 +io.fabric8:tekton-client;7.4.0 +io.fabric8:tekton-model;7.4.0 +io.fabric8:verticalpodautoscaler-client;7.4.0 +io.fabric8:verticalpodautoscaler-model;7.4.0 +io.fabric8:volcano-client;7.4.0 +io.fabric8:volcano-model;7.4.0 +io.fabric8:volumesnapshot-client;7.4.0 +io.fabric8:volumesnapshot-model;7.4.0 +io.fabric8:zjsonpatch;7.4.0 +io.github.git-commit-id:git-commit-id-maven-plugin;9.0.2 +io.github.openfeign:feign-annotation-error-decoder;13.6 +io.github.openfeign:feign-bom;13.6 +io.github.openfeign:feign-core;13.6 +io.github.openfeign:feign-dropwizard-metrics4;13.6 +io.github.openfeign:feign-dropwizard-metrics5;13.6 +io.github.openfeign:feign-fastjson2;13.6 +io.github.openfeign:feign-form;13.6 +io.github.openfeign:feign-form-spring;13.6 +io.github.openfeign:feign-googlehttpclient;13.6 +io.github.openfeign:feign-gson;13.6 +io.github.openfeign:feign-hc5;13.6 +io.github.openfeign:feign-httpclient;13.6 +io.github.openfeign:feign-hystrix;13.6 +io.github.openfeign:feign-jackson;13.6 +io.github.openfeign:feign-jackson-jaxb;13.6 +io.github.openfeign:feign-jackson-jr;13.6 +io.github.openfeign:feign-jakarta;13.6 +io.github.openfeign:feign-java11;13.6 +io.github.openfeign:feign-jaxb;13.6 +io.github.openfeign:feign-jaxb-jakarta;13.6 +io.github.openfeign:feign-jaxrs;13.6 +io.github.openfeign:feign-jaxrs2;13.6 +io.github.openfeign:feign-jaxrs3;13.6 +io.github.openfeign:feign-jaxrs4;13.6 +io.github.openfeign:feign-json;13.6 +io.github.openfeign:feign-kotlin;13.6 +io.github.openfeign:feign-micrometer;13.6 +io.github.openfeign:feign-mock;13.6 +io.github.openfeign:feign-moshi;13.6 +io.github.openfeign:feign-okhttp;13.6 +io.github.openfeign:feign-reactive-wrappers;13.6 +io.github.openfeign:feign-ribbon;13.6 +io.github.openfeign:feign-sax;13.6 +io.github.openfeign:feign-slf4j;13.6 +io.github.openfeign:feign-soap;13.6 +io.github.openfeign:feign-soap-jakarta;13.6 +io.github.openfeign:feign-spring;13.6 +io.github.openfeign:feign-vertx;13.6 +io.github.openfeign:feign-vertx4-test;13.6 +io.github.openfeign:feign-vertx5-test;13.6 +io.github.resilience4j:resilience4j-all;2.3.0 +io.github.resilience4j:resilience4j-annotations;2.3.0 +io.github.resilience4j:resilience4j-bom;2.3.0 +io.github.resilience4j:resilience4j-bulkhead;2.3.0 +io.github.resilience4j:resilience4j-cache;2.3.0 +io.github.resilience4j:resilience4j-circuitbreaker;2.3.0 +io.github.resilience4j:resilience4j-circularbuffer;2.3.0 +io.github.resilience4j:resilience4j-consumer;2.3.0 +io.github.resilience4j:resilience4j-core;2.3.0 +io.github.resilience4j:resilience4j-feign;2.3.0 +io.github.resilience4j:resilience4j-kotlin;2.3.0 +io.github.resilience4j:resilience4j-metrics;2.3.0 +io.github.resilience4j:resilience4j-micrometer;2.3.0 +io.github.resilience4j:resilience4j-ratelimiter;2.3.0 +io.github.resilience4j:resilience4j-reactor;2.3.0 +io.github.resilience4j:resilience4j-retry;2.3.0 +io.github.resilience4j:resilience4j-rxjava2;2.3.0 +io.github.resilience4j:resilience4j-rxjava3;2.3.0 +io.github.resilience4j:resilience4j-spring;2.3.0 +io.github.resilience4j:resilience4j-spring-boot2;2.3.0 +io.github.resilience4j:resilience4j-spring-boot3;2.3.0 +io.github.resilience4j:resilience4j-spring-cloud2;2.3.0 +io.github.resilience4j:resilience4j-spring6;2.3.0 +io.github.resilience4j:resilience4j-timelimiter;2.3.0 +io.github.resilience4j:resilience4j-vavr;2.3.0 +io.kubernetes:client-java;24.0.0 +io.kubernetes:client-java-extended;24.0.0 +io.kubernetes:client-java-spring-integration;24.0.0 +io.lettuce:lettuce-core;6.8.1.RELEASE +io.micrometer:context-propagation;1.2.0 +io.micrometer:docs;1.6.0 +io.micrometer:micrometer-bom;1.16.0 +io.micrometer:micrometer-commons;1.16.0 +io.micrometer:micrometer-core;1.16.0 +io.micrometer:micrometer-jakarta9;1.16.0 +io.micrometer:micrometer-java11;1.16.0 +io.micrometer:micrometer-java21;1.16.0 +io.micrometer:micrometer-jetty11;1.16.0 +io.micrometer:micrometer-jetty12;1.16.0 +io.micrometer:micrometer-observation;1.16.0 +io.micrometer:micrometer-observation-test;1.16.0 +io.micrometer:micrometer-registry-appoptics;1.16.0 +io.micrometer:micrometer-registry-atlas;1.16.0 +io.micrometer:micrometer-registry-azure-monitor;1.16.0 +io.micrometer:micrometer-registry-cloudwatch2;1.16.0 +io.micrometer:micrometer-registry-datadog;1.16.0 +io.micrometer:micrometer-registry-dynatrace;1.16.0 +io.micrometer:micrometer-registry-elastic;1.16.0 +io.micrometer:micrometer-registry-ganglia;1.16.0 +io.micrometer:micrometer-registry-graphite;1.16.0 +io.micrometer:micrometer-registry-health;1.16.0 +io.micrometer:micrometer-registry-humio;1.16.0 +io.micrometer:micrometer-registry-influx;1.16.0 +io.micrometer:micrometer-registry-jmx;1.16.0 +io.micrometer:micrometer-registry-kairos;1.16.0 +io.micrometer:micrometer-registry-new-relic;1.16.0 +io.micrometer:micrometer-registry-opentsdb;1.16.0 +io.micrometer:micrometer-registry-otlp;1.16.0 +io.micrometer:micrometer-registry-prometheus;1.16.0 +io.micrometer:micrometer-registry-prometheus-simpleclient;1.16.0 +io.micrometer:micrometer-registry-signalfx;1.16.0 +io.micrometer:micrometer-registry-stackdriver;1.16.0 +io.micrometer:micrometer-registry-statsd;1.16.0 +io.micrometer:micrometer-registry-wavefront;1.16.0 +io.micrometer:micrometer-test;1.16.0 +io.micrometer:micrometer-tracing;1.6.0 +io.micrometer:micrometer-tracing-bom;1.6.0 +io.micrometer:micrometer-tracing-bridge-brave;1.6.0 +io.micrometer:micrometer-tracing-bridge-otel;1.6.0 +io.micrometer:micrometer-tracing-integration-test;1.6.0 +io.micrometer:micrometer-tracing-reporter-wavefront;1.6.0 +io.micrometer:micrometer-tracing-test;1.6.0 +io.netty:netty-all;4.2.7.Final +io.netty:netty-bom;4.2.7.Final +io.netty:netty-buffer;4.2.7.Final +io.netty:netty-codec;4.2.7.Final +io.netty:netty-codec-base;4.2.7.Final +io.netty:netty-codec-classes-quic;4.2.7.Final +io.netty:netty-codec-compression;4.2.7.Final +io.netty:netty-codec-dns;4.2.7.Final +io.netty:netty-codec-haproxy;4.2.7.Final +io.netty:netty-codec-http;4.2.7.Final +io.netty:netty-codec-http2;4.2.7.Final +io.netty:netty-codec-http3;4.2.7.Final +io.netty:netty-codec-marshalling;4.2.7.Final +io.netty:netty-codec-memcache;4.2.7.Final +io.netty:netty-codec-mqtt;4.2.7.Final +io.netty:netty-codec-native-quic;4.2.7.Final +io.netty:netty-codec-protobuf;4.2.7.Final +io.netty:netty-codec-redis;4.2.7.Final +io.netty:netty-codec-smtp;4.2.7.Final +io.netty:netty-codec-socks;4.2.7.Final +io.netty:netty-codec-stomp;4.2.7.Final +io.netty:netty-codec-xml;4.2.7.Final +io.netty:netty-common;4.2.7.Final +io.netty:netty-dev-tools;4.2.7.Final +io.netty:netty-handler;4.2.7.Final +io.netty:netty-handler-proxy;4.2.7.Final +io.netty:netty-handler-ssl-ocsp;4.2.7.Final +io.netty:netty-pkitesting;4.2.7.Final +io.netty:netty-resolver;4.2.7.Final +io.netty:netty-resolver-dns;4.2.7.Final +io.netty:netty-resolver-dns-classes-macos;4.2.7.Final +io.netty:netty-resolver-dns-native-macos;4.2.7.Final +io.netty:netty-tcnative;2.0.74.Final +io.netty:netty-tcnative-boringssl-static;2.0.74.Final +io.netty:netty-tcnative-classes;2.0.74.Final +io.netty:netty-transport;4.2.7.Final +io.netty:netty-transport-classes-epoll;4.2.7.Final +io.netty:netty-transport-classes-io_uring;4.2.7.Final +io.netty:netty-transport-classes-kqueue;4.2.7.Final +io.netty:netty-transport-native-epoll;4.2.7.Final +io.netty:netty-transport-native-io_uring;4.2.7.Final +io.netty:netty-transport-native-kqueue;4.2.7.Final +io.netty:netty-transport-native-unix-common;4.2.7.Final +io.netty:netty-transport-rxtx;4.2.7.Final +io.netty:netty-transport-sctp;4.2.7.Final +io.netty:netty-transport-udt;4.2.7.Final +io.opentelemetry:opentelemetry-api;1.55.0 +io.opentelemetry:opentelemetry-bom;1.55.0 +io.opentelemetry:opentelemetry-common;1.55.0 +io.opentelemetry:opentelemetry-context;1.55.0 +io.opentelemetry:opentelemetry-exporter-common;1.55.0 +io.opentelemetry:opentelemetry-exporter-logging;1.55.0 +io.opentelemetry:opentelemetry-exporter-logging-otlp;1.55.0 +io.opentelemetry:opentelemetry-exporter-otlp;1.55.0 +io.opentelemetry:opentelemetry-exporter-otlp-common;1.55.0 +io.opentelemetry:opentelemetry-exporter-sender-grpc-managed-channel;1.55.0 +io.opentelemetry:opentelemetry-exporter-sender-jdk;1.55.0 +io.opentelemetry:opentelemetry-exporter-sender-okhttp;1.55.0 +io.opentelemetry:opentelemetry-exporter-zipkin;1.55.0 +io.opentelemetry:opentelemetry-extension-kotlin;1.55.0 +io.opentelemetry:opentelemetry-extension-trace-propagators;1.55.0 +io.opentelemetry:opentelemetry-opentracing-shim;1.55.0 +io.opentelemetry:opentelemetry-sdk;1.55.0 +io.opentelemetry:opentelemetry-sdk-common;1.55.0 +io.opentelemetry:opentelemetry-sdk-extension-autoconfigure;1.55.0 +io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi;1.55.0 +io.opentelemetry:opentelemetry-sdk-extension-jaeger-remote-sampler;1.55.0 +io.opentelemetry:opentelemetry-sdk-logs;1.55.0 +io.opentelemetry:opentelemetry-sdk-metrics;1.55.0 +io.opentelemetry:opentelemetry-sdk-testing;1.55.0 +io.opentelemetry:opentelemetry-sdk-trace;1.55.0 +io.projectreactor.addons:reactor-adapter;3.6.0 +io.projectreactor.addons:reactor-extra;3.6.0 +io.projectreactor.addons:reactor-pool;1.2.0 +io.projectreactor.addons:reactor-pool-micrometer;1.2.0 +io.projectreactor.kotlin:reactor-kotlin-extensions;1.3.0 +io.projectreactor.netty:reactor-netty;1.3.0 +io.projectreactor.netty:reactor-netty-core;1.3.0 +io.projectreactor.netty:reactor-netty-http;1.3.0 +io.projectreactor.netty:reactor-netty-http-brave;1.3.0 +io.projectreactor.netty:reactor-netty-quic;1.3.0 +io.projectreactor:reactor-bom;2025.0.0 +io.projectreactor:reactor-core;3.8.0 +io.projectreactor:reactor-core-micrometer;3.8.0 +io.projectreactor:reactor-test;3.8.0 +io.projectreactor:reactor-tools;3.8.0 +io.prometheus:prometheus-metrics-bom;1.4.3 +io.prometheus:prometheus-metrics-config;1.4.3 +io.prometheus:prometheus-metrics-core;1.4.3 +io.prometheus:prometheus-metrics-exporter-common;1.4.3 +io.prometheus:prometheus-metrics-exporter-httpserver;1.4.3 +io.prometheus:prometheus-metrics-exporter-opentelemetry;1.4.3 +io.prometheus:prometheus-metrics-exporter-opentelemetry-no-otel;1.4.3 +io.prometheus:prometheus-metrics-exporter-opentelemetry-otel-agent-resources;1.4.3 +io.prometheus:prometheus-metrics-exporter-pushgateway;1.4.3 +io.prometheus:prometheus-metrics-exporter-servlet-jakarta;1.4.3 +io.prometheus:prometheus-metrics-exporter-servlet-javax;1.4.3 +io.prometheus:prometheus-metrics-exposition-formats;1.4.3 +io.prometheus:prometheus-metrics-exposition-formats-no-protobuf;1.4.3 +io.prometheus:prometheus-metrics-exposition-textformats;1.4.3 +io.prometheus:prometheus-metrics-instrumentation-caffeine;1.4.3 +io.prometheus:prometheus-metrics-instrumentation-dropwizard;1.4.3 +io.prometheus:prometheus-metrics-instrumentation-dropwizard5;1.4.3 +io.prometheus:prometheus-metrics-instrumentation-guava;1.4.3 +io.prometheus:prometheus-metrics-instrumentation-jvm;1.4.3 +io.prometheus:prometheus-metrics-model;1.4.3 +io.prometheus:prometheus-metrics-simpleclient-bridge;1.4.3 +io.prometheus:prometheus-metrics-tracer;1.4.3 +io.prometheus:prometheus-metrics-tracer-common;1.4.3 +io.prometheus:prometheus-metrics-tracer-initializer;1.4.3 +io.prometheus:prometheus-metrics-tracer-otel;1.4.3 +io.prometheus:prometheus-metrics-tracer-otel-agent;1.4.3 +io.prometheus:simpleclient;0.16.0 +io.prometheus:simpleclient_bom;0.16.0 +io.prometheus:simpleclient_caffeine;0.16.0 +io.prometheus:simpleclient_common;0.16.0 +io.prometheus:simpleclient_dropwizard;0.16.0 +io.prometheus:simpleclient_graphite_bridge;0.16.0 +io.prometheus:simpleclient_guava;0.16.0 +io.prometheus:simpleclient_hibernate;0.16.0 +io.prometheus:simpleclient_hotspot;0.16.0 +io.prometheus:simpleclient_httpserver;0.16.0 +io.prometheus:simpleclient_jetty;0.16.0 +io.prometheus:simpleclient_jetty_jdk8;0.16.0 +io.prometheus:simpleclient_log4j;0.16.0 +io.prometheus:simpleclient_log4j2;0.16.0 +io.prometheus:simpleclient_logback;0.16.0 +io.prometheus:simpleclient_pushgateway;0.16.0 +io.prometheus:simpleclient_servlet;0.16.0 +io.prometheus:simpleclient_servlet_jakarta;0.16.0 +io.prometheus:simpleclient_spring_boot;0.16.0 +io.prometheus:simpleclient_spring_web;0.16.0 +io.prometheus:simpleclient_tracer_common;0.16.0 +io.prometheus:simpleclient_tracer_otel;0.16.0 +io.prometheus:simpleclient_tracer_otel_agent;0.16.0 +io.prometheus:simpleclient_vertx;0.16.0 +io.r2dbc:r2dbc-h2;1.1.0.RELEASE +io.r2dbc:r2dbc-mssql;1.0.3.RELEASE +io.r2dbc:r2dbc-pool;1.0.2.RELEASE +io.r2dbc:r2dbc-proxy;1.1.6.RELEASE +io.r2dbc:r2dbc-spi;1.0.0.RELEASE +io.reactivex.rxjava3:rxjava;3.1.12 +io.rsocket:rsocket-bom;1.1.5 +io.rsocket:rsocket-core;1.1.5 +io.rsocket:rsocket-load-balancer;1.1.5 +io.rsocket:rsocket-micrometer;1.1.5 +io.rsocket:rsocket-test;1.1.5 +io.rsocket:rsocket-transport-local;1.1.5 +io.rsocket:rsocket-transport-netty;1.1.5 +io.spring.gradle:dependency-management-plugin;1.1.7 +io.zipkin.brave:brave;6.3.0 +io.zipkin.brave:brave-bom;6.3.0 +io.zipkin.brave:brave-context-jfr;6.3.0 +io.zipkin.brave:brave-context-log4j12;6.3.0 +io.zipkin.brave:brave-context-log4j2;6.3.0 +io.zipkin.brave:brave-context-slf4j;6.3.0 +io.zipkin.brave:brave-instrumentation-dubbo;6.3.0 +io.zipkin.brave:brave-instrumentation-grpc;6.3.0 +io.zipkin.brave:brave-instrumentation-http;6.3.0 +io.zipkin.brave:brave-instrumentation-http-tests;6.3.0 +io.zipkin.brave:brave-instrumentation-http-tests-jakarta;6.3.0 +io.zipkin.brave:brave-instrumentation-httpasyncclient;6.3.0 +io.zipkin.brave:brave-instrumentation-httpclient;6.3.0 +io.zipkin.brave:brave-instrumentation-httpclient5;6.3.0 +io.zipkin.brave:brave-instrumentation-jakarta-jms;6.3.0 +io.zipkin.brave:brave-instrumentation-jaxrs2;6.3.0 +io.zipkin.brave:brave-instrumentation-jdbi3;6.3.0 +io.zipkin.brave:brave-instrumentation-jersey-server;6.3.0 +io.zipkin.brave:brave-instrumentation-jersey-server-jakarta;6.3.0 +io.zipkin.brave:brave-instrumentation-jms;6.3.0 +io.zipkin.brave:brave-instrumentation-jms-jakarta;6.3.0 +io.zipkin.brave:brave-instrumentation-kafka-clients;6.3.0 +io.zipkin.brave:brave-instrumentation-kafka-streams;6.3.0 +io.zipkin.brave:brave-instrumentation-messaging;6.3.0 +io.zipkin.brave:brave-instrumentation-mongodb;6.3.0 +io.zipkin.brave:brave-instrumentation-mysql;6.3.0 +io.zipkin.brave:brave-instrumentation-mysql6;6.3.0 +io.zipkin.brave:brave-instrumentation-mysql8;6.3.0 +io.zipkin.brave:brave-instrumentation-netty-codec-http;6.3.0 +io.zipkin.brave:brave-instrumentation-okhttp3;6.3.0 +io.zipkin.brave:brave-instrumentation-rocketmq-client;6.3.0 +io.zipkin.brave:brave-instrumentation-rpc;6.3.0 +io.zipkin.brave:brave-instrumentation-servlet;6.3.0 +io.zipkin.brave:brave-instrumentation-servlet-jakarta;6.3.0 +io.zipkin.brave:brave-instrumentation-spring-rabbit;6.3.0 +io.zipkin.brave:brave-instrumentation-spring-web;6.3.0 +io.zipkin.brave:brave-instrumentation-spring-webmvc;6.3.0 +io.zipkin.brave:brave-instrumentation-vertx-web;6.3.0 +io.zipkin.brave:brave-spring-beans;6.3.0 +io.zipkin.brave:brave-tests;6.3.0 +io.zipkin.reporter2:zipkin-reporter;3.5.1 +io.zipkin.reporter2:zipkin-reporter-bom;3.5.1 +io.zipkin.reporter2:zipkin-reporter-brave;3.5.1 +io.zipkin.reporter2:zipkin-reporter-metrics-micrometer;3.5.1 +io.zipkin.reporter2:zipkin-reporter-spring-beans;3.5.1 +io.zipkin.reporter2:zipkin-sender-activemq-client;3.5.1 +io.zipkin.reporter2:zipkin-sender-amqp-client;3.5.1 +io.zipkin.reporter2:zipkin-sender-kafka;3.5.1 +io.zipkin.reporter2:zipkin-sender-libthrift;3.5.1 +io.zipkin.reporter2:zipkin-sender-okhttp3;3.5.1 +io.zipkin.reporter2:zipkin-sender-pulsar-client;3.5.1 +io.zipkin.reporter2:zipkin-sender-urlconnection;3.5.1 +jakarta.activation:jakarta.activation-api;2.1.4 +jakarta.annotation:jakarta.annotation-api;3.0.0 +jakarta.inject:jakarta.inject-api;2.0.1 +jakarta.jms:jakarta.jms-api;3.1.0 +jakarta.json.bind:jakarta.json.bind-api;3.0.1 +jakarta.json:jakarta.json-api;2.1.3 +jakarta.mail:jakarta.mail-api;2.1.5 +jakarta.management.j2ee:jakarta.management.j2ee-api;1.1.4 +jakarta.persistence:jakarta.persistence-api;3.2.0 +jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api;3.0.2 +jakarta.servlet:jakarta.servlet-api;6.1.0 +jakarta.transaction:jakarta.transaction-api;2.0.1 +jakarta.validation:jakarta.validation-api;3.1.1 +jakarta.websocket:jakarta.websocket-api;2.2.0 +jakarta.websocket:jakarta.websocket-client-api;2.2.0 +jakarta.ws.rs:jakarta.ws.rs-api;4.0.0 +jakarta.xml.bind:jakarta.xml.bind-api;4.0.4 +jakarta.xml.soap:jakarta.xml.soap-api;3.0.2 +jakarta.xml.ws:jakarta.xml.ws-api;4.0.2 +javax.cache:cache-api;1.1.1 +javax.money:money-api;1.1 +jaxen:jaxen;2.0.0 +junit:junit;4.13.2 +net.bytebuddy:byte-buddy;1.17.8 +net.bytebuddy:byte-buddy-agent;1.17.8 +net.minidev:json-smart;2.6.0 +net.sourceforge.jtds:jtds;1.3.1 +net.sourceforge.nekohtml:nekohtml;1.9.22 +nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect;3.4.0 +org.apache.activemq:activemq-all;6.1.8 +org.apache.activemq:activemq-amqp;6.1.8 +org.apache.activemq:activemq-blueprint;6.1.8 +org.apache.activemq:activemq-bom;6.1.8 +org.apache.activemq:activemq-broker;6.1.8 +org.apache.activemq:activemq-client;6.1.8 +org.apache.activemq:activemq-console;6.1.8 +org.apache.activemq:activemq-http;6.1.8 +org.apache.activemq:activemq-jaas;6.1.8 +org.apache.activemq:activemq-jdbc-store;6.1.8 +org.apache.activemq:activemq-jms-pool;6.1.8 +org.apache.activemq:activemq-kahadb-store;6.1.8 +org.apache.activemq:activemq-karaf;6.1.8 +org.apache.activemq:activemq-log4j-appender;6.1.8 +org.apache.activemq:activemq-mqtt;6.1.8 +org.apache.activemq:activemq-openwire-generator;6.1.8 +org.apache.activemq:activemq-openwire-legacy;6.1.8 +org.apache.activemq:activemq-osgi;6.1.8 +org.apache.activemq:activemq-pool;6.1.8 +org.apache.activemq:activemq-ra;6.1.8 +org.apache.activemq:activemq-rar;6.1.8 +org.apache.activemq:activemq-run;6.1.8 +org.apache.activemq:activemq-runtime-config;6.1.8 +org.apache.activemq:activemq-shiro;6.1.8 +org.apache.activemq:activemq-spring;6.1.8 +org.apache.activemq:activemq-stomp;6.1.8 +org.apache.activemq:activemq-web;6.1.8 +org.apache.activemq:activemq-web-console;6.1.8 +org.apache.activemq:activemq-web-demo;6.1.8 +org.apache.activemq:artemis-amqp-protocol;2.43.0 +org.apache.activemq:artemis-bom;2.43.0 +org.apache.activemq:artemis-boot;2.43.0 +org.apache.activemq:artemis-cdi-client;2.43.0 +org.apache.activemq:artemis-cli;2.43.0 +org.apache.activemq:artemis-commons;2.43.0 +org.apache.activemq:artemis-console;2.43.0 +org.apache.activemq:artemis-core-client;2.43.0 +org.apache.activemq:artemis-core-client-all;2.43.0 +org.apache.activemq:artemis-core-client-osgi;2.43.0 +org.apache.activemq:artemis-dto;2.43.0 +org.apache.activemq:artemis-features;2.43.0 +org.apache.activemq:artemis-hornetq-protocol;2.43.0 +org.apache.activemq:artemis-hqclient-protocol;2.43.0 +org.apache.activemq:artemis-jakarta-cdi-client;2.43.0 +org.apache.activemq:artemis-jakarta-client;2.43.0 +org.apache.activemq:artemis-jakarta-client-all;2.43.0 +org.apache.activemq:artemis-jakarta-openwire-protocol;2.43.0 +org.apache.activemq:artemis-jakarta-ra;2.43.0 +org.apache.activemq:artemis-jakarta-server;2.43.0 +org.apache.activemq:artemis-jakarta-service-extensions;2.43.0 +org.apache.activemq:artemis-jdbc-store;2.43.0 +org.apache.activemq:artemis-jms-client;2.43.0 +org.apache.activemq:artemis-jms-client-all;2.43.0 +org.apache.activemq:artemis-jms-client-osgi;2.43.0 +org.apache.activemq:artemis-jms-server;2.43.0 +org.apache.activemq:artemis-journal;2.43.0 +org.apache.activemq:artemis-lockmanager-api;2.43.0 +org.apache.activemq:artemis-lockmanager-ri;2.43.0 +org.apache.activemq:artemis-mqtt-protocol;2.43.0 +org.apache.activemq:artemis-openwire-protocol;2.43.0 +org.apache.activemq:artemis-ra;2.43.0 +org.apache.activemq:artemis-selector;2.43.0 +org.apache.activemq:artemis-server;2.43.0 +org.apache.activemq:artemis-server-osgi;2.43.0 +org.apache.activemq:artemis-service-extensions;2.43.0 +org.apache.activemq:artemis-stomp-protocol;2.43.0 +org.apache.activemq:artemis-web;2.43.0 +org.apache.activemq:artemis-website;2.43.0 +org.apache.cassandra:java-driver-bom;4.19.2 +org.apache.cassandra:java-driver-core;4.19.2 +org.apache.cassandra:java-driver-core-shaded;4.19.2 +org.apache.cassandra:java-driver-guava-shaded;4.19.2 +org.apache.cassandra:java-driver-mapper-processor;4.19.2 +org.apache.cassandra:java-driver-mapper-runtime;4.19.2 +org.apache.cassandra:java-driver-metrics-micrometer;4.19.2 +org.apache.cassandra:java-driver-metrics-microprofile;4.19.2 +org.apache.cassandra:java-driver-query-builder;4.19.2 +org.apache.cassandra:java-driver-test-infra;4.19.2 +org.apache.commons:commons-dbcp2;2.13.0 +org.apache.commons:commons-lang3;3.19.0 +org.apache.commons:commons-pool2;2.12.1 +org.apache.curator:curator-framework;5.9.0 +org.apache.curator:curator-recipes;5.9.0 +org.apache.curator:curator-test;5.9.0 +org.apache.curator:curator-x-discovery;5.9.0 +org.apache.derby:derby;10.16.1.1 +org.apache.derby:derbyclient;10.16.1.1 +org.apache.derby:derbynet;10.16.1.1 +org.apache.derby:derbyoptionaltools;10.16.1.1 +org.apache.derby:derbyshared;10.16.1.1 +org.apache.derby:derbytools;10.16.1.1 +org.apache.groovy:groovy;5.0.2 +org.apache.groovy:groovy-ant;5.0.2 +org.apache.groovy:groovy-astbuilder;5.0.2 +org.apache.groovy:groovy-bom;5.0.2 +org.apache.groovy:groovy-cli-commons;5.0.2 +org.apache.groovy:groovy-cli-picocli;5.0.2 +org.apache.groovy:groovy-console;5.0.2 +org.apache.groovy:groovy-contracts;5.0.2 +org.apache.groovy:groovy-datetime;5.0.2 +org.apache.groovy:groovy-dateutil;5.0.2 +org.apache.groovy:groovy-docgenerator;5.0.2 +org.apache.groovy:groovy-ginq;5.0.2 +org.apache.groovy:groovy-groovydoc;5.0.2 +org.apache.groovy:groovy-groovysh;5.0.2 +org.apache.groovy:groovy-jmx;5.0.2 +org.apache.groovy:groovy-json;5.0.2 +org.apache.groovy:groovy-jsr223;5.0.2 +org.apache.groovy:groovy-macro;5.0.2 +org.apache.groovy:groovy-macro-library;5.0.2 +org.apache.groovy:groovy-nio;5.0.2 +org.apache.groovy:groovy-servlet;5.0.2 +org.apache.groovy:groovy-sql;5.0.2 +org.apache.groovy:groovy-swing;5.0.2 +org.apache.groovy:groovy-templates;5.0.2 +org.apache.groovy:groovy-test;5.0.2 +org.apache.groovy:groovy-test-junit5;5.0.2 +org.apache.groovy:groovy-testng;5.0.2 +org.apache.groovy:groovy-toml;5.0.2 +org.apache.groovy:groovy-typecheckers;5.0.2 +org.apache.groovy:groovy-xml;5.0.2 +org.apache.groovy:groovy-yaml;5.0.2 +org.apache.httpcomponents.client5:httpclient5;5.5.1 +org.apache.httpcomponents.client5:httpclient5-cache;5.5.1 +org.apache.httpcomponents.client5:httpclient5-fluent;5.5.1 +org.apache.httpcomponents.core5:httpcore5;5.3.6 +org.apache.httpcomponents.core5:httpcore5-h2;5.3.6 +org.apache.httpcomponents.core5:httpcore5-reactive;5.3.6 +org.apache.httpcomponents:httpasyncclient;4.1.5 +org.apache.httpcomponents:httpcore;4.4.16 +org.apache.httpcomponents:httpcore-nio;4.4.16 +org.apache.kafka:connect;4.1.1 +org.apache.kafka:connect-api;4.1.1 +org.apache.kafka:connect-basic-auth-extension;4.1.1 +org.apache.kafka:connect-file;4.1.1 +org.apache.kafka:connect-json;4.1.1 +org.apache.kafka:connect-mirror;4.1.1 +org.apache.kafka:connect-mirror-client;4.1.1 +org.apache.kafka:connect-runtime;4.1.1 +org.apache.kafka:connect-transforms;4.1.1 +org.apache.kafka:generator;4.1.1 +org.apache.kafka:kafka-clients;4.1.1 +org.apache.kafka:kafka-metadata;4.1.1 +org.apache.kafka:kafka-raft;4.1.1 +org.apache.kafka:kafka-server;4.1.1 +org.apache.kafka:kafka-server-common;4.1.1 +org.apache.kafka:kafka-shell;4.1.1 +org.apache.kafka:kafka-storage;4.1.1 +org.apache.kafka:kafka-storage-api;4.1.1 +org.apache.kafka:kafka-streams;4.1.1 +org.apache.kafka:kafka-streams-scala_2.13;4.1.1 +org.apache.kafka:kafka-streams-test-utils;4.1.1 +org.apache.kafka:kafka-tools;4.1.1 +org.apache.kafka:kafka_2.13;4.1.1 +org.apache.kafka:trogdor;4.1.1 +org.apache.logging.log4j:log4j-1.2-api;2.25.2 +org.apache.logging.log4j:log4j-api;2.25.2 +org.apache.logging.log4j:log4j-api-test;2.25.2 +org.apache.logging.log4j:log4j-appserver;2.25.2 +org.apache.logging.log4j:log4j-bom;2.25.2 +org.apache.logging.log4j:log4j-cassandra;2.25.2 +org.apache.logging.log4j:log4j-core;2.25.2 +org.apache.logging.log4j:log4j-core-test;2.25.2 +org.apache.logging.log4j:log4j-couchdb;2.25.2 +org.apache.logging.log4j:log4j-docker;2.25.2 +org.apache.logging.log4j:log4j-flume-ng;2.23.1 +org.apache.logging.log4j:log4j-iostreams;2.25.2 +org.apache.logging.log4j:log4j-jakarta-jms;2.25.2 +org.apache.logging.log4j:log4j-jakarta-smtp;2.25.2 +org.apache.logging.log4j:log4j-jakarta-web;2.25.2 +org.apache.logging.log4j:log4j-jcl;2.25.2 +org.apache.logging.log4j:log4j-jpa;2.25.2 +org.apache.logging.log4j:log4j-jpl;2.25.2 +org.apache.logging.log4j:log4j-jul;2.25.2 +org.apache.logging.log4j:log4j-layout-template-json;2.25.2 +org.apache.logging.log4j:log4j-mongodb;2.25.2 +org.apache.logging.log4j:log4j-mongodb4;2.25.2 +org.apache.logging.log4j:log4j-slf4j-impl;2.25.2 +org.apache.logging.log4j:log4j-slf4j2-impl;2.25.2 +org.apache.logging.log4j:log4j-spring-boot;2.25.2 +org.apache.logging.log4j:log4j-spring-cloud-config-client;2.25.2 +org.apache.logging.log4j:log4j-taglib;2.25.2 +org.apache.logging.log4j:log4j-to-jul;2.25.2 +org.apache.logging.log4j:log4j-to-slf4j;2.25.2 +org.apache.logging.log4j:log4j-web;2.25.2 +org.apache.maven.plugins:maven-antrun-plugin;3.2.0 +org.apache.maven.plugins:maven-assembly-plugin;3.7.1 +org.apache.maven.plugins:maven-clean-plugin;3.5.0 +org.apache.maven.plugins:maven-compiler-plugin;3.14.1 +org.apache.maven.plugins:maven-dependency-plugin;3.9.0 +org.apache.maven.plugins:maven-deploy-plugin;3.1.4 +org.apache.maven.plugins:maven-enforcer-plugin;3.6.2 +org.apache.maven.plugins:maven-failsafe-plugin;3.5.4 +org.apache.maven.plugins:maven-help-plugin;3.5.1 +org.apache.maven.plugins:maven-install-plugin;3.1.4 +org.apache.maven.plugins:maven-invoker-plugin;3.9.1 +org.apache.maven.plugins:maven-jar-plugin;3.4.2 +org.apache.maven.plugins:maven-javadoc-plugin;3.12.0 +org.apache.maven.plugins:maven-release-plugin;3.2.0 +org.apache.maven.plugins:maven-resources-plugin;3.3.1 +org.apache.maven.plugins:maven-shade-plugin;3.6.1 +org.apache.maven.plugins:maven-source-plugin;3.3.1 +org.apache.maven.plugins:maven-surefire-plugin;3.5.4 +org.apache.maven.plugins:maven-war-plugin;3.4.0 +org.apache.pulsar:bouncy-castle-bc;4.1.1 +org.apache.pulsar:bouncy-castle-bcfips;4.1.1 +org.apache.pulsar:bouncy-castle-parent;4.1.1 +org.apache.pulsar:buildtools;4.1.1 +org.apache.pulsar:distribution;4.1.1 +org.apache.pulsar:docker-images;4.1.1 +org.apache.pulsar:jclouds-shaded;4.1.1 +org.apache.pulsar:managed-ledger;4.1.1 +org.apache.pulsar:pulsar;4.1.1 +org.apache.pulsar:pulsar-all-docker-image;4.1.1 +org.apache.pulsar:pulsar-bom;4.1.1 +org.apache.pulsar:pulsar-broker;4.1.1 +org.apache.pulsar:pulsar-broker-auth-athenz;4.1.1 +org.apache.pulsar:pulsar-broker-auth-oidc;4.1.1 +org.apache.pulsar:pulsar-broker-auth-sasl;4.1.1 +org.apache.pulsar:pulsar-broker-common;4.1.1 +org.apache.pulsar:pulsar-cli-utils;4.1.1 +org.apache.pulsar:pulsar-client;4.1.1 +org.apache.pulsar:pulsar-client-admin;4.1.1 +org.apache.pulsar:pulsar-client-admin-api;4.1.1 +org.apache.pulsar:pulsar-client-admin-original;4.1.1 +org.apache.pulsar:pulsar-client-all;4.1.1 +org.apache.pulsar:pulsar-client-api;4.1.1 +org.apache.pulsar:pulsar-client-auth-athenz;4.1.1 +org.apache.pulsar:pulsar-client-auth-sasl;4.1.1 +org.apache.pulsar:pulsar-client-messagecrypto-bc;4.1.1 +org.apache.pulsar:pulsar-client-original;4.1.1 +org.apache.pulsar:pulsar-client-tools;4.1.1 +org.apache.pulsar:pulsar-client-tools-api;4.1.1 +org.apache.pulsar:pulsar-common;4.1.1 +org.apache.pulsar:pulsar-config-validation;4.1.1 +org.apache.pulsar:pulsar-docker-image;4.1.1 +org.apache.pulsar:pulsar-docs-tools;4.1.1 +org.apache.pulsar:pulsar-functions;4.1.1 +org.apache.pulsar:pulsar-functions-api;4.1.1 +org.apache.pulsar:pulsar-functions-api-examples;4.1.1 +org.apache.pulsar:pulsar-functions-api-examples-builtin;4.1.1 +org.apache.pulsar:pulsar-functions-instance;4.1.1 +org.apache.pulsar:pulsar-functions-local-runner;4.1.1 +org.apache.pulsar:pulsar-functions-local-runner-original;4.1.1 +org.apache.pulsar:pulsar-functions-proto;4.1.1 +org.apache.pulsar:pulsar-functions-runtime;4.1.1 +org.apache.pulsar:pulsar-functions-runtime-all;4.1.1 +org.apache.pulsar:pulsar-functions-secrets;4.1.1 +org.apache.pulsar:pulsar-functions-utils;4.1.1 +org.apache.pulsar:pulsar-functions-worker;4.1.1 +org.apache.pulsar:pulsar-io;4.1.1 +org.apache.pulsar:pulsar-io-aerospike;4.1.1 +org.apache.pulsar:pulsar-io-alluxio;4.1.1 +org.apache.pulsar:pulsar-io-aws;4.1.1 +org.apache.pulsar:pulsar-io-batch-data-generator;4.1.1 +org.apache.pulsar:pulsar-io-batch-discovery-triggerers;4.1.1 +org.apache.pulsar:pulsar-io-canal;4.1.1 +org.apache.pulsar:pulsar-io-cassandra;4.1.1 +org.apache.pulsar:pulsar-io-common;4.1.1 +org.apache.pulsar:pulsar-io-core;4.1.1 +org.apache.pulsar:pulsar-io-data-generator;4.1.1 +org.apache.pulsar:pulsar-io-debezium;4.1.1 +org.apache.pulsar:pulsar-io-debezium-core;4.1.1 +org.apache.pulsar:pulsar-io-debezium-mongodb;4.1.1 +org.apache.pulsar:pulsar-io-debezium-mssql;4.1.1 +org.apache.pulsar:pulsar-io-debezium-mysql;4.1.1 +org.apache.pulsar:pulsar-io-debezium-oracle;4.1.1 +org.apache.pulsar:pulsar-io-debezium-postgres;4.1.1 +org.apache.pulsar:pulsar-io-distribution;4.1.1 +org.apache.pulsar:pulsar-io-docs;4.1.1 +org.apache.pulsar:pulsar-io-dynamodb;4.1.1 +org.apache.pulsar:pulsar-io-elastic-search;4.1.1 +org.apache.pulsar:pulsar-io-file;4.1.1 +org.apache.pulsar:pulsar-io-flume;4.1.1 +org.apache.pulsar:pulsar-io-hbase;4.1.1 +org.apache.pulsar:pulsar-io-hdfs3;4.1.1 +org.apache.pulsar:pulsar-io-http;4.1.1 +org.apache.pulsar:pulsar-io-influxdb;4.1.1 +org.apache.pulsar:pulsar-io-jdbc;4.1.1 +org.apache.pulsar:pulsar-io-jdbc-clickhouse;4.1.1 +org.apache.pulsar:pulsar-io-jdbc-core;4.1.1 +org.apache.pulsar:pulsar-io-jdbc-mariadb;4.1.1 +org.apache.pulsar:pulsar-io-jdbc-openmldb;4.1.1 +org.apache.pulsar:pulsar-io-jdbc-postgres;4.1.1 +org.apache.pulsar:pulsar-io-jdbc-sqlite;4.1.1 +org.apache.pulsar:pulsar-io-kafka;4.1.1 +org.apache.pulsar:pulsar-io-kafka-connect-adaptor;4.1.1 +org.apache.pulsar:pulsar-io-kafka-connect-adaptor-nar;4.1.1 +org.apache.pulsar:pulsar-io-kinesis;4.1.1 +org.apache.pulsar:pulsar-io-mongo;4.1.1 +org.apache.pulsar:pulsar-io-netty;4.1.1 +org.apache.pulsar:pulsar-io-nsq;4.1.1 +org.apache.pulsar:pulsar-io-rabbitmq;4.1.1 +org.apache.pulsar:pulsar-io-redis;4.1.1 +org.apache.pulsar:pulsar-io-solr;4.1.1 +org.apache.pulsar:pulsar-io-twitter;4.1.1 +org.apache.pulsar:pulsar-metadata;4.1.1 +org.apache.pulsar:pulsar-offloader-distribution;4.1.1 +org.apache.pulsar:pulsar-package-bookkeeper-storage;4.1.1 +org.apache.pulsar:pulsar-package-core;4.1.1 +org.apache.pulsar:pulsar-package-filesystem-storage;4.1.1 +org.apache.pulsar:pulsar-package-management;4.1.1 +org.apache.pulsar:pulsar-proxy;4.1.1 +org.apache.pulsar:pulsar-server-distribution;4.1.1 +org.apache.pulsar:pulsar-shell-distribution;4.1.1 +org.apache.pulsar:pulsar-testclient;4.1.1 +org.apache.pulsar:pulsar-transaction-common;4.1.1 +org.apache.pulsar:pulsar-transaction-coordinator;4.1.1 +org.apache.pulsar:pulsar-transaction-parent;4.1.1 +org.apache.pulsar:pulsar-websocket;4.1.1 +org.apache.pulsar:structured-event-log;4.1.1 +org.apache.pulsar:testmocks;4.1.1 +org.apache.pulsar:tiered-storage-file-system;4.1.1 +org.apache.pulsar:tiered-storage-jcloud;4.1.1 +org.apache.pulsar:tiered-storage-parent;4.1.1 +org.apache.tomcat.embed:tomcat-embed-core;11.0.14 +org.apache.tomcat.embed:tomcat-embed-el;11.0.14 +org.apache.tomcat.embed:tomcat-embed-jasper;11.0.14 +org.apache.tomcat.embed:tomcat-embed-websocket;11.0.14 +org.apache.tomcat:tomcat-annotations-api;11.0.14 +org.apache.tomcat:tomcat-jdbc;11.0.14 +org.apache.tomcat:tomcat-jsp-api;11.0.14 +org.aspectj:aspectjrt;1.9.25 +org.aspectj:aspectjtools;1.9.25 +org.aspectj:aspectjweaver;1.9.25 +org.assertj:assertj-bom;3.27.6 +org.assertj:assertj-core;3.27.6 +org.assertj:assertj-guava;3.27.6 +org.awaitility:awaitility;4.3.0 +org.awaitility:awaitility-groovy;4.3.0 +org.awaitility:awaitility-kotlin;4.3.0 +org.awaitility:awaitility-scala;4.3.0 +org.cache2k:cache2k-api;2.6.1.Final +org.cache2k:cache2k-config;2.6.1.Final +org.cache2k:cache2k-core;2.6.1.Final +org.cache2k:cache2k-jcache;2.6.1.Final +org.cache2k:cache2k-micrometer;2.6.1.Final +org.cache2k:cache2k-spring;2.6.1.Final +org.codehaus.janino:commons-compiler;3.1.12 +org.codehaus.janino:commons-compiler-jdk;3.1.12 +org.codehaus.janino:janino;3.1.12 +org.codehaus.mojo:build-helper-maven-plugin;3.6.1 +org.codehaus.mojo:versions-maven-plugin;2.19.1 +org.codehaus.mojo:xml-maven-plugin;1.2.0 +org.crac:crac;1.5.0 +org.cyclonedx:cyclonedx-maven-plugin;2.9.1 +org.eclipse.angus:angus-core;2.0.5 +org.eclipse.angus:angus-mail;2.0.5 +org.eclipse.angus:dsn;2.0.5 +org.eclipse.angus:gimap;2.0.5 +org.eclipse.angus:imap;2.0.5 +org.eclipse.angus:jakarta.mail;2.0.5 +org.eclipse.angus:logging-mailhandler;2.0.5 +org.eclipse.angus:pop3;2.0.5 +org.eclipse.angus:smtp;2.0.5 +org.eclipse.jetty.compression:jetty-compression-brotli;12.1.4 +org.eclipse.jetty.compression:jetty-compression-common;12.1.4 +org.eclipse.jetty.compression:jetty-compression-gzip;12.1.4 +org.eclipse.jetty.compression:jetty-compression-server;12.1.4 +org.eclipse.jetty.compression:jetty-compression-zstandard;12.1.4 +org.eclipse.jetty.demos:jetty-core-demo-handler;12.1.4 +org.eclipse.jetty.ee11.osgi:jetty-ee11-osgi-alpn;12.1.4 +org.eclipse.jetty.ee11.osgi:jetty-ee11-osgi-boot;12.1.4 +org.eclipse.jetty.ee11.osgi:jetty-ee11-osgi-boot-jsp;12.1.4 +org.eclipse.jetty.ee11.websocket:jetty-ee11-websocket-jakarta-client;12.1.4 +org.eclipse.jetty.ee11.websocket:jetty-ee11-websocket-jakarta-client-webapp;12.1.4 +org.eclipse.jetty.ee11.websocket:jetty-ee11-websocket-jakarta-common;12.1.4 +org.eclipse.jetty.ee11.websocket:jetty-ee11-websocket-jakarta-server;12.1.4 +org.eclipse.jetty.ee11.websocket:jetty-ee11-websocket-jetty-client-webapp;12.1.4 +org.eclipse.jetty.ee11.websocket:jetty-ee11-websocket-jetty-server;12.1.4 +org.eclipse.jetty.ee11.websocket:jetty-ee11-websocket-servlet;12.1.4 +org.eclipse.jetty.ee11:jetty-ee11-annotations;12.1.4 +org.eclipse.jetty.ee11:jetty-ee11-apache-jsp;12.1.4 +org.eclipse.jetty.ee11:jetty-ee11-bom;12.1.4 +org.eclipse.jetty.ee11:jetty-ee11-cdi;12.1.4 +org.eclipse.jetty.ee11:jetty-ee11-fcgi-proxy;12.1.4 +org.eclipse.jetty.ee11:jetty-ee11-glassfish-jstl;12.1.4 +org.eclipse.jetty.ee11:jetty-ee11-jaspi;12.1.4 +org.eclipse.jetty.ee11:jetty-ee11-jndi;12.1.4 +org.eclipse.jetty.ee11:jetty-ee11-jspc-maven-plugin;12.1.4 +org.eclipse.jetty.ee11:jetty-ee11-maven-plugin;12.1.4 +org.eclipse.jetty.ee11:jetty-ee11-plus;12.1.4 +org.eclipse.jetty.ee11:jetty-ee11-proxy;12.1.4 +org.eclipse.jetty.ee11:jetty-ee11-quickstart;12.1.4 +org.eclipse.jetty.ee11:jetty-ee11-servlet;12.1.4 +org.eclipse.jetty.ee11:jetty-ee11-servlets;12.1.4 +org.eclipse.jetty.ee11:jetty-ee11-webapp;12.1.4 +org.eclipse.jetty.ee:jetty-ee-webapp;12.1.4 +org.eclipse.jetty.fcgi:jetty-fcgi-client;12.1.4 +org.eclipse.jetty.fcgi:jetty-fcgi-proxy;12.1.4 +org.eclipse.jetty.fcgi:jetty-fcgi-server;12.1.4 +org.eclipse.jetty.http2:jetty-http2-client;12.1.4 +org.eclipse.jetty.http2:jetty-http2-client-transport;12.1.4 +org.eclipse.jetty.http2:jetty-http2-common;12.1.4 +org.eclipse.jetty.http2:jetty-http2-hpack;12.1.4 +org.eclipse.jetty.http2:jetty-http2-server;12.1.4 +org.eclipse.jetty.http3:jetty-http3-client;12.1.4 +org.eclipse.jetty.http3:jetty-http3-client-transport;12.1.4 +org.eclipse.jetty.http3:jetty-http3-common;12.1.4 +org.eclipse.jetty.http3:jetty-http3-qpack;12.1.4 +org.eclipse.jetty.http3:jetty-http3-server;12.1.4 +org.eclipse.jetty.quic:jetty-quic-common;12.1.4 +org.eclipse.jetty.quic:jetty-quic-quiche-client;12.1.4 +org.eclipse.jetty.quic:jetty-quic-quiche-common;12.1.4 +org.eclipse.jetty.quic:jetty-quic-quiche-foreign;12.1.4 +org.eclipse.jetty.quic:jetty-quic-quiche-jna;12.1.4 +org.eclipse.jetty.quic:jetty-quic-server;12.1.4 +org.eclipse.jetty.websocket:jetty-websocket-core-client;12.1.4 +org.eclipse.jetty.websocket:jetty-websocket-core-common;12.1.4 +org.eclipse.jetty.websocket:jetty-websocket-core-server;12.1.4 +org.eclipse.jetty.websocket:jetty-websocket-jetty-api;12.1.4 +org.eclipse.jetty.websocket:jetty-websocket-jetty-client;12.1.4 +org.eclipse.jetty.websocket:jetty-websocket-jetty-common;12.1.4 +org.eclipse.jetty.websocket:jetty-websocket-jetty-server;12.1.4 +org.eclipse.jetty:jetty-alpn-client;12.1.4 +org.eclipse.jetty:jetty-alpn-conscrypt-client;12.1.4 +org.eclipse.jetty:jetty-alpn-conscrypt-server;12.1.4 +org.eclipse.jetty:jetty-alpn-java-client;12.1.4 +org.eclipse.jetty:jetty-alpn-java-server;12.1.4 +org.eclipse.jetty:jetty-alpn-server;12.1.4 +org.eclipse.jetty:jetty-bom;12.1.4 +org.eclipse.jetty:jetty-client;12.1.4 +org.eclipse.jetty:jetty-coreapp;12.1.4 +org.eclipse.jetty:jetty-deploy;12.1.4 +org.eclipse.jetty:jetty-ethereum;12.1.4 +org.eclipse.jetty:jetty-http;12.1.4 +org.eclipse.jetty:jetty-http-spi;12.1.4 +org.eclipse.jetty:jetty-http-tools;12.1.4 +org.eclipse.jetty:jetty-io;12.1.4 +org.eclipse.jetty:jetty-jmx;12.1.4 +org.eclipse.jetty:jetty-jndi;12.1.4 +org.eclipse.jetty:jetty-keystore;12.1.4 +org.eclipse.jetty:jetty-openid;12.1.4 +org.eclipse.jetty:jetty-osgi;12.1.4 +org.eclipse.jetty:jetty-plus;12.1.4 +org.eclipse.jetty:jetty-proxy;12.1.4 +org.eclipse.jetty:jetty-reactive-httpclient;4.1.4 +org.eclipse.jetty:jetty-rewrite;12.1.4 +org.eclipse.jetty:jetty-security;12.1.4 +org.eclipse.jetty:jetty-server;12.1.4 +org.eclipse.jetty:jetty-session;12.1.4 +org.eclipse.jetty:jetty-slf4j-impl;12.1.4 +org.eclipse.jetty:jetty-start;12.1.4 +org.eclipse.jetty:jetty-staticapp;12.1.4 +org.eclipse.jetty:jetty-unixdomain-server;12.1.4 +org.eclipse.jetty:jetty-util;12.1.4 +org.eclipse.jetty:jetty-util-ajax;12.1.4 +org.eclipse.jetty:jetty-xml;12.1.4 +org.eclipse.jgit:org.eclipse.jgit;7.4.0.202509020913-r +org.eclipse.jgit:org.eclipse.jgit.http.apache;7.4.0.202509020913-r +org.eclipse.jgit:org.eclipse.jgit.junit.http;7.4.0.202509020913-r +org.eclipse.jgit:org.eclipse.jgit.ssh.apache;7.4.0.202509020913-r +org.eclipse:yasson;3.0.4 +org.ehcache:ehcache;3.11.1 +org.ehcache:ehcache-clustered;3.11.1 +org.ehcache:ehcache-transactions;3.11.1 +org.firebirdsql.jdbc:jaybird;6.0.3 +org.flywaydb:flyway-commandline;11.14.1 +org.flywaydb:flyway-core;11.14.1 +org.flywaydb:flyway-database-cassandra;11.14.1 +org.flywaydb:flyway-database-db2;11.14.1 +org.flywaydb:flyway-database-derby;11.14.1 +org.flywaydb:flyway-database-hsqldb;11.14.1 +org.flywaydb:flyway-database-informix;11.14.1 +org.flywaydb:flyway-database-mongodb;11.14.1 +org.flywaydb:flyway-database-oracle;11.14.1 +org.flywaydb:flyway-database-postgresql;11.14.1 +org.flywaydb:flyway-database-redshift;11.14.1 +org.flywaydb:flyway-database-saphana;11.14.1 +org.flywaydb:flyway-database-snowflake;11.14.1 +org.flywaydb:flyway-database-sybasease;11.14.1 +org.flywaydb:flyway-firebird;11.14.1 +org.flywaydb:flyway-gcp-bigquery;11.14.1 +org.flywaydb:flyway-gcp-spanner;11.14.1 +org.flywaydb:flyway-maven-plugin;11.14.1 +org.flywaydb:flyway-mysql;11.14.1 +org.flywaydb:flyway-singlestore;11.14.1 +org.flywaydb:flyway-sqlserver;11.14.1 +org.freemarker:freemarker;2.3.34 +org.glassfish.jaxb:codemodel;4.0.6 +org.glassfish.jaxb:jaxb-core;4.0.6 +org.glassfish.jaxb:jaxb-jxc;4.0.6 +org.glassfish.jaxb:jaxb-runtime;4.0.6 +org.glassfish.jaxb:jaxb-xjc;4.0.6 +org.glassfish.jaxb:txw2;4.0.6 +org.glassfish.jaxb:xsom;4.0.6 +org.glassfish.jersey.connectors:jersey-apache5-connector;4.0.0 +org.glassfish.jersey.connectors:jersey-grizzly-connector;4.0.0 +org.glassfish.jersey.connectors:jersey-helidon-connector;4.0.0 +org.glassfish.jersey.connectors:jersey-jdk-connector;4.0.0 +org.glassfish.jersey.connectors:jersey-jetty-connector;4.0.0 +org.glassfish.jersey.connectors:jersey-jetty-http2-connector;4.0.0 +org.glassfish.jersey.connectors:jersey-jnh-connector;4.0.0 +org.glassfish.jersey.connectors:jersey-netty-connector;4.0.0 +org.glassfish.jersey.containers.glassfish:jersey-gf-ejb;4.0.0 +org.glassfish.jersey.containers:jersey-container-grizzly2-http;4.0.0 +org.glassfish.jersey.containers:jersey-container-grizzly2-servlet;4.0.0 +org.glassfish.jersey.containers:jersey-container-helidon-http;4.0.0 +org.glassfish.jersey.containers:jersey-container-jdk-http;4.0.0 +org.glassfish.jersey.containers:jersey-container-jetty-http;4.0.0 +org.glassfish.jersey.containers:jersey-container-jetty-http2;4.0.0 +org.glassfish.jersey.containers:jersey-container-jetty-servlet;4.0.0 +org.glassfish.jersey.containers:jersey-container-netty-http;4.0.0 +org.glassfish.jersey.containers:jersey-container-servlet;4.0.0 +org.glassfish.jersey.core:jersey-client;4.0.0 +org.glassfish.jersey.core:jersey-common;4.0.0 +org.glassfish.jersey.core:jersey-server;4.0.0 +org.glassfish.jersey.ext.cdi:jersey-cdi-rs-inject;4.0.0 +org.glassfish.jersey.ext.cdi:jersey-cdi1x;4.0.0 +org.glassfish.jersey.ext.cdi:jersey-cdi1x-ban-custom-hk2-binding;4.0.0 +org.glassfish.jersey.ext.cdi:jersey-cdi1x-servlet;4.0.0 +org.glassfish.jersey.ext.cdi:jersey-cdi1x-transaction;4.0.0 +org.glassfish.jersey.ext.cdi:jersey-cdi1x-validation;4.0.0 +org.glassfish.jersey.ext.cdi:jersey-weld2-se;4.0.0 +org.glassfish.jersey.ext.microprofile:jersey-mp-config;4.0.0 +org.glassfish.jersey.ext.microprofile:jersey-mp-rest-client;4.0.0 +org.glassfish.jersey.ext.rx:jersey-rx-client-guava;4.0.0 +org.glassfish.jersey.ext.rx:jersey-rx-client-rxjava;4.0.0 +org.glassfish.jersey.ext.rx:jersey-rx-client-rxjava2;4.0.0 +org.glassfish.jersey.ext:jersey-bean-validation;4.0.0 +org.glassfish.jersey.ext:jersey-constants;4.0.0 +org.glassfish.jersey.ext:jersey-declarative-linking;4.0.0 +org.glassfish.jersey.ext:jersey-entity-filtering;4.0.0 +org.glassfish.jersey.ext:jersey-metainf-services;4.0.0 +org.glassfish.jersey.ext:jersey-micrometer;4.0.0 +org.glassfish.jersey.ext:jersey-mvc;4.0.0 +org.glassfish.jersey.ext:jersey-mvc-bean-validation;4.0.0 +org.glassfish.jersey.ext:jersey-mvc-freemarker;4.0.0 +org.glassfish.jersey.ext:jersey-mvc-jsp;4.0.0 +org.glassfish.jersey.ext:jersey-mvc-mustache;4.0.0 +org.glassfish.jersey.ext:jersey-proxy-client;4.0.0 +org.glassfish.jersey.ext:jersey-spring6;4.0.0 +org.glassfish.jersey.ext:jersey-wadl-doclet;4.0.0 +org.glassfish.jersey.inject:jersey-cdi2-se;4.0.0 +org.glassfish.jersey.inject:jersey-hk2;4.0.0 +org.glassfish.jersey.media:jersey-media-jaxb;4.0.0 +org.glassfish.jersey.media:jersey-media-json-binding;4.0.0 +org.glassfish.jersey.media:jersey-media-json-gson;4.0.0 +org.glassfish.jersey.media:jersey-media-json-jackson;4.0.0 +org.glassfish.jersey.media:jersey-media-json-jettison;4.0.0 +org.glassfish.jersey.media:jersey-media-json-processing;4.0.0 +org.glassfish.jersey.media:jersey-media-kryo;4.0.0 +org.glassfish.jersey.media:jersey-media-moxy;4.0.0 +org.glassfish.jersey.media:jersey-media-multipart;4.0.0 +org.glassfish.jersey.media:jersey-media-sse;4.0.0 +org.glassfish.jersey.security:oauth1-client;4.0.0 +org.glassfish.jersey.security:oauth1-server;4.0.0 +org.glassfish.jersey.security:oauth1-signature;4.0.0 +org.glassfish.jersey.security:oauth2-client;4.0.0 +org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-bundle;4.0.0 +org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-external;4.0.0 +org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2;4.0.0 +org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-helidon;4.0.0 +org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-inmemory;4.0.0 +org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jdk-http;4.0.0 +org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jetty;4.0.0 +org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jetty-http2;4.0.0 +org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-netty;4.0.0 +org.glassfish.jersey.test-framework:jersey-test-framework-core;4.0.0 +org.glassfish.jersey.test-framework:jersey-test-framework-util;4.0.0 +org.glassfish.jersey:jersey-bom;4.0.0 +org.glassfish.web:jakarta.servlet.jsp.jstl;3.0.1 +org.graalvm.buildtools:native-maven-plugin;0.11.3 +org.hamcrest:hamcrest;3.0 +org.hamcrest:hamcrest-core;3.0 +org.hamcrest:hamcrest-library;3.0 +org.hibernate.orm:hibernate-agroal;7.1.8.Final +org.hibernate.orm:hibernate-ant;7.1.8.Final +org.hibernate.orm:hibernate-c3p0;7.1.8.Final +org.hibernate.orm:hibernate-community-dialects;7.1.8.Final +org.hibernate.orm:hibernate-core;7.1.8.Final +org.hibernate.orm:hibernate-envers;7.1.8.Final +org.hibernate.orm:hibernate-graalvm;7.1.8.Final +org.hibernate.orm:hibernate-hikaricp;7.1.8.Final +org.hibernate.orm:hibernate-jcache;7.1.8.Final +org.hibernate.orm:hibernate-micrometer;7.1.8.Final +org.hibernate.orm:hibernate-processor;7.1.8.Final +org.hibernate.orm:hibernate-scan-jandex;7.1.8.Final +org.hibernate.orm:hibernate-spatial;7.1.8.Final +org.hibernate.orm:hibernate-testing;7.1.8.Final +org.hibernate.orm:hibernate-vector;7.1.8.Final +org.hibernate.validator:hibernate-validator;9.0.1.Final +org.hibernate.validator:hibernate-validator-annotation-processor;9.0.1.Final +org.hsqldb:hsqldb;2.7.3 +org.htmlunit:htmlunit;4.17.0 +org.infinispan.protostream:protostream;5.0.13.Final +org.infinispan.protostream:protostream-processor;5.0.13.Final +org.infinispan.protostream:protostream-types;5.0.13.Final +org.infinispan:infinispan-anchored-keys;15.2.6.Final +org.infinispan:infinispan-api;15.2.6.Final +org.infinispan:infinispan-bom;15.2.6.Final +org.infinispan:infinispan-cachestore-jdbc;15.2.6.Final +org.infinispan:infinispan-cachestore-jdbc-common;15.2.6.Final +org.infinispan:infinispan-cachestore-remote;15.2.6.Final +org.infinispan:infinispan-cachestore-rocksdb;15.2.6.Final +org.infinispan:infinispan-cachestore-sql;15.2.6.Final +org.infinispan:infinispan-cdi-common;15.2.6.Final +org.infinispan:infinispan-cdi-embedded;15.2.6.Final +org.infinispan:infinispan-cdi-remote;15.2.6.Final +org.infinispan:infinispan-checkstyle;15.2.6.Final +org.infinispan:infinispan-cli-client;15.2.6.Final +org.infinispan:infinispan-client-hotrod;15.2.6.Final +org.infinispan:infinispan-client-hotrod-legacy;15.2.6.Final +org.infinispan:infinispan-client-rest;15.2.6.Final +org.infinispan:infinispan-clustered-counter;15.2.6.Final +org.infinispan:infinispan-clustered-lock;15.2.6.Final +org.infinispan:infinispan-commons;15.2.6.Final +org.infinispan:infinispan-commons-graalvm;15.2.6.Final +org.infinispan:infinispan-commons-spi;15.2.6.Final +org.infinispan:infinispan-commons-test;15.2.6.Final +org.infinispan:infinispan-component-annotations;15.2.6.Final +org.infinispan:infinispan-component-processor;15.2.6.Final +org.infinispan:infinispan-console;15.2.1.Final +org.infinispan:infinispan-core;15.2.6.Final +org.infinispan:infinispan-core-graalvm;15.2.6.Final +org.infinispan:infinispan-counter-api;15.2.6.Final +org.infinispan:infinispan-hibernate-cache-commons;15.2.6.Final +org.infinispan:infinispan-hibernate-cache-spi;15.2.6.Final +org.infinispan:infinispan-hibernate-cache-v62;15.2.6.Final +org.infinispan:infinispan-jboss-marshalling;15.2.6.Final +org.infinispan:infinispan-jcache;15.2.6.Final +org.infinispan:infinispan-jcache-commons;15.2.6.Final +org.infinispan:infinispan-jcache-remote;15.2.6.Final +org.infinispan:infinispan-key-value-store-client;15.2.6.Final +org.infinispan:infinispan-logging-annotations;15.2.6.Final +org.infinispan:infinispan-logging-processor;15.2.6.Final +org.infinispan:infinispan-multimap;15.2.6.Final +org.infinispan:infinispan-objectfilter;15.2.6.Final +org.infinispan:infinispan-query;15.2.6.Final +org.infinispan:infinispan-query-core;15.2.6.Final +org.infinispan:infinispan-query-dsl;15.2.6.Final +org.infinispan:infinispan-remote-query-client;15.2.6.Final +org.infinispan:infinispan-remote-query-server;15.2.6.Final +org.infinispan:infinispan-scripting;15.2.6.Final +org.infinispan:infinispan-server-core;15.2.6.Final +org.infinispan:infinispan-server-hotrod;15.2.6.Final +org.infinispan:infinispan-server-memcached;15.2.6.Final +org.infinispan:infinispan-server-resp;15.2.6.Final +org.infinispan:infinispan-server-rest;15.2.6.Final +org.infinispan:infinispan-server-router;15.2.6.Final +org.infinispan:infinispan-server-runtime;15.2.6.Final +org.infinispan:infinispan-server-testdriver-core;15.2.6.Final +org.infinispan:infinispan-server-testdriver-junit4;15.2.6.Final +org.infinispan:infinispan-server-testdriver-junit5;15.2.6.Final +org.infinispan:infinispan-spring-boot3-starter-embedded;15.2.6.Final +org.infinispan:infinispan-spring-boot3-starter-remote;15.2.6.Final +org.infinispan:infinispan-spring6-common;15.2.6.Final +org.infinispan:infinispan-spring6-embedded;15.2.6.Final +org.infinispan:infinispan-spring6-remote;15.2.6.Final +org.infinispan:infinispan-tasks;15.2.6.Final +org.infinispan:infinispan-tasks-api;15.2.6.Final +org.infinispan:infinispan-tools;15.2.6.Final +org.influxdb:influxdb-java;2.25 +org.jboss.logging:jboss-logging;3.6.1.Final +org.jdom:jdom2;2.0.6.1 +org.jetbrains.kotlin:kotlin-bom;2.2.21 +org.jetbrains.kotlin:kotlin-compiler;2.2.21 +org.jetbrains.kotlin:kotlin-compiler-embeddable;2.2.21 +org.jetbrains.kotlin:kotlin-daemon-client;2.2.21 +org.jetbrains.kotlin:kotlin-main-kts;2.2.21 +org.jetbrains.kotlin:kotlin-maven-plugin;2.2.21 +org.jetbrains.kotlin:kotlin-osgi-bundle;2.2.21 +org.jetbrains.kotlin:kotlin-reflect;2.2.21 +org.jetbrains.kotlin:kotlin-script-runtime;2.2.21 +org.jetbrains.kotlin:kotlin-scripting-common;2.2.21 +org.jetbrains.kotlin:kotlin-scripting-ide-services;2.2.21 +org.jetbrains.kotlin:kotlin-scripting-jvm;2.2.21 +org.jetbrains.kotlin:kotlin-scripting-jvm-host;2.2.21 +org.jetbrains.kotlin:kotlin-stdlib;2.2.21 +org.jetbrains.kotlin:kotlin-stdlib-common;2.2.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk7;2.2.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk8;2.2.21 +org.jetbrains.kotlin:kotlin-stdlib-js;2.2.21 +org.jetbrains.kotlin:kotlin-test;2.2.21 +org.jetbrains.kotlin:kotlin-test-annotations-common;2.2.21 +org.jetbrains.kotlin:kotlin-test-common;2.2.21 +org.jetbrains.kotlin:kotlin-test-js;2.2.21 +org.jetbrains.kotlin:kotlin-test-junit;2.2.21 +org.jetbrains.kotlin:kotlin-test-junit5;2.2.21 +org.jetbrains.kotlin:kotlin-test-testng;2.2.21 +org.jetbrains.kotlinx:kotlinx-coroutines-android;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-bom;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-core;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-debug;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-guava;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-javafx;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-jdk8;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-jdk9;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-play-services;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-reactive;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-reactor;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-rx2;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-rx3;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-slf4j;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-swing;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-test;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-test-jvm;1.10.2 +org.jetbrains.kotlinx:kotlinx-serialization-bom;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-cbor;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-cbor-jvm;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-core;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-core-jvm;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-hocon;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-json;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-json-io;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-json-io-jvm;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-json-jvm;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-json-okio;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-json-okio-jvm;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-properties;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-properties-jvm;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-protobuf;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-protobuf-jvm;1.9.0 +org.jooq:jooq;3.19.28 +org.jooq:jooq-bom;3.19.28 +org.jooq:jooq-checker;3.19.28 +org.jooq:jooq-codegen;3.19.28 +org.jooq:jooq-codegen-gradle;3.19.28 +org.jooq:jooq-codegen-maven;3.19.28 +org.jooq:jooq-jackson-extensions;3.19.28 +org.jooq:jooq-kotlin;3.19.28 +org.jooq:jooq-kotlin-coroutines;3.19.28 +org.jooq:jooq-meta;3.19.28 +org.jooq:jooq-meta-extensions;3.19.28 +org.jooq:jooq-meta-extensions-hibernate;3.19.28 +org.jooq:jooq-meta-extensions-liquibase;3.19.28 +org.jooq:jooq-meta-kotlin;3.19.28 +org.jooq:jooq-migrations;3.19.28 +org.jooq:jooq-migrations-maven;3.19.28 +org.jooq:jooq-postgres-extensions;3.19.28 +org.jooq:jooq-scala_2.13;3.19.28 +org.jooq:jooq-xtend;3.19.28 +org.jspecify:jspecify;1.0.0 +org.junit.jupiter:junit-jupiter;6.0.1 +org.junit.jupiter:junit-jupiter-api;6.0.1 +org.junit.jupiter:junit-jupiter-engine;6.0.1 +org.junit.jupiter:junit-jupiter-migrationsupport;6.0.1 +org.junit.jupiter:junit-jupiter-params;6.0.1 +org.junit.platform:junit-platform-commons;6.0.1 +org.junit.platform:junit-platform-console;6.0.1 +org.junit.platform:junit-platform-engine;6.0.1 +org.junit.platform:junit-platform-launcher;6.0.1 +org.junit.platform:junit-platform-reporting;6.0.1 +org.junit.platform:junit-platform-suite;6.0.1 +org.junit.platform:junit-platform-suite-api;6.0.1 +org.junit.platform:junit-platform-suite-engine;6.0.1 +org.junit.platform:junit-platform-testkit;6.0.1 +org.junit.vintage:junit-vintage-engine;6.0.1 +org.junit:junit-bom;6.0.1 +org.liquibase:liquibase-cdi;5.0.1 +org.liquibase:liquibase-core;5.0.1 +org.liquibase:liquibase-maven-plugin;5.0.1 +org.mariadb.jdbc:mariadb-java-client;3.5.6 +org.mariadb:r2dbc-mariadb;1.3.0 +org.messaginghub:pooled-jms;3.1.7 +org.mockito:mockito-android;5.20.0 +org.mockito:mockito-bom;5.20.0 +org.mockito:mockito-core;5.20.0 +org.mockito:mockito-errorprone;5.20.0 +org.mockito:mockito-junit-jupiter;5.20.0 +org.mockito:mockito-proxy;5.20.0 +org.mockito:mockito-subclass;5.20.0 +org.mongodb.scala:mongo-scala-bson_2.11;5.6.1 +org.mongodb.scala:mongo-scala-bson_2.12;5.6.1 +org.mongodb.scala:mongo-scala-bson_2.13;5.6.1 +org.mongodb.scala:mongo-scala-driver_2.11;5.6.1 +org.mongodb.scala:mongo-scala-driver_2.12;5.6.1 +org.mongodb.scala:mongo-scala-driver_2.13;5.6.1 +org.mongodb:bson;5.6.1 +org.mongodb:bson-kotlin;5.6.1 +org.mongodb:bson-kotlinx;5.6.1 +org.mongodb:bson-record-codec;5.6.1 +org.mongodb:mongodb-crypt;5.6.1 +org.mongodb:mongodb-driver-bom;5.6.1 +org.mongodb:mongodb-driver-core;5.6.1 +org.mongodb:mongodb-driver-kotlin-coroutine;5.6.1 +org.mongodb:mongodb-driver-kotlin-extensions;5.6.1 +org.mongodb:mongodb-driver-kotlin-sync;5.6.1 +org.mongodb:mongodb-driver-reactivestreams;5.6.1 +org.mongodb:mongodb-driver-sync;5.6.1 +org.neo4j.bolt:neo4j-bolt-connection;10.1.0 +org.neo4j.bolt:neo4j-bolt-connection-bom;10.1.0 +org.neo4j.bolt:neo4j-bolt-connection-netty;10.1.0 +org.neo4j.bolt:neo4j-bolt-connection-pooled;10.1.0 +org.neo4j.bolt:neo4j-bolt-connection-query-api;10.1.0 +org.neo4j.bolt:neo4j-bolt-connection-routed;10.1.0 +org.neo4j.driver:neo4j-java-driver;6.0.2 +org.neo4j.driver:neo4j-java-driver-all;6.0.2 +org.neo4j.driver:neo4j-java-driver-bom;6.0.2 +org.neo4j.driver:neo4j-java-driver-observation-metrics;6.0.2 +org.neo4j.driver:neo4j-java-driver-observation-micrometer;6.0.2 +org.postgresql:postgresql;42.7.8 +org.postgresql:r2dbc-postgresql;1.1.1.RELEASE +org.projectlombok:lombok;1.18.42 +org.quartz-scheduler:quartz;2.5.1 +org.quartz-scheduler:quartz-jobs;2.5.1 +org.reactivestreams:reactive-streams;1.0.4 +org.seleniumhq.selenium:htmlunit3-driver;4.36.1 +org.seleniumhq.selenium:selenium-api;4.37.0 +org.seleniumhq.selenium:selenium-bom;4.37.0 +org.seleniumhq.selenium:selenium-chrome-driver;4.37.0 +org.seleniumhq.selenium:selenium-chromium-driver;4.37.0 +org.seleniumhq.selenium:selenium-devtools-v139;4.37.0 +org.seleniumhq.selenium:selenium-devtools-v140;4.37.0 +org.seleniumhq.selenium:selenium-devtools-v141;4.37.0 +org.seleniumhq.selenium:selenium-edge-driver;4.37.0 +org.seleniumhq.selenium:selenium-firefox-driver;4.37.0 +org.seleniumhq.selenium:selenium-grid;4.37.0 +org.seleniumhq.selenium:selenium-http;4.37.0 +org.seleniumhq.selenium:selenium-ie-driver;4.37.0 +org.seleniumhq.selenium:selenium-java;4.37.0 +org.seleniumhq.selenium:selenium-json;4.37.0 +org.seleniumhq.selenium:selenium-manager;4.37.0 +org.seleniumhq.selenium:selenium-remote-driver;4.37.0 +org.seleniumhq.selenium:selenium-safari-driver;4.37.0 +org.seleniumhq.selenium:selenium-session-map-jdbc;4.37.0 +org.seleniumhq.selenium:selenium-session-map-redis;4.37.0 +org.seleniumhq.selenium:selenium-support;4.37.0 +org.skyscreamer:jsonassert;1.5.3 +org.slf4j:jcl-over-slf4j;2.0.17 +org.slf4j:jul-to-slf4j;2.0.17 +org.slf4j:log4j-over-slf4j;2.0.17 +org.slf4j:slf4j-api;2.0.17 +org.slf4j:slf4j-ext;2.0.17 +org.slf4j:slf4j-jdk-platform-logging;2.0.17 +org.slf4j:slf4j-jdk14;2.0.17 +org.slf4j:slf4j-log4j12;2.0.17 +org.slf4j:slf4j-nop;2.0.17 +org.slf4j:slf4j-reload4j;2.0.17 +org.slf4j:slf4j-simple;2.0.17 +org.springframework.amqp:spring-amqp;4.0.0 +org.springframework.amqp:spring-amqp-bom;4.0.0 +org.springframework.amqp:spring-rabbit;4.0.0 +org.springframework.amqp:spring-rabbit-junit;4.0.0 +org.springframework.amqp:spring-rabbit-stream;4.0.0 +org.springframework.amqp:spring-rabbit-test;4.0.0 +org.springframework.amqp:spring-rabbitmq-client;4.0.0 +org.springframework.batch:spring-batch-bom;6.0.0 +org.springframework.batch:spring-batch-core;6.0.0 +org.springframework.batch:spring-batch-infrastructure;6.0.0 +org.springframework.batch:spring-batch-integration;6.0.0 +org.springframework.batch:spring-batch-test;6.0.0 +org.springframework.boot:spring-boot;4.0.0 +org.springframework.boot:spring-boot-activemq;4.0.0 +org.springframework.boot:spring-boot-actuator;4.0.0 +org.springframework.boot:spring-boot-actuator-autoconfigure;4.0.0 +org.springframework.boot:spring-boot-amqp;4.0.0 +org.springframework.boot:spring-boot-artemis;4.0.0 +org.springframework.boot:spring-boot-autoconfigure;4.0.0 +org.springframework.boot:spring-boot-autoconfigure-classic;4.0.0 +org.springframework.boot:spring-boot-autoconfigure-classic-modules;4.0.0 +org.springframework.boot:spring-boot-autoconfigure-processor;4.0.0 +org.springframework.boot:spring-boot-batch;4.0.0 +org.springframework.boot:spring-boot-batch-jdbc;4.0.0 +org.springframework.boot:spring-boot-buildpack-platform;4.0.0 +org.springframework.boot:spring-boot-cache;4.0.0 +org.springframework.boot:spring-boot-cache-test;4.0.0 +org.springframework.boot:spring-boot-cassandra;4.0.0 +org.springframework.boot:spring-boot-cloudfoundry;4.0.0 +org.springframework.boot:spring-boot-configuration-metadata;4.0.0 +org.springframework.boot:spring-boot-configuration-processor;4.0.0 +org.springframework.boot:spring-boot-couchbase;4.0.0 +org.springframework.boot:spring-boot-data-cassandra;4.0.0 +org.springframework.boot:spring-boot-data-cassandra-test;4.0.0 +org.springframework.boot:spring-boot-data-commons;4.0.0 +org.springframework.boot:spring-boot-data-couchbase;4.0.0 +org.springframework.boot:spring-boot-data-couchbase-test;4.0.0 +org.springframework.boot:spring-boot-data-elasticsearch;4.0.0 +org.springframework.boot:spring-boot-data-elasticsearch-test;4.0.0 +org.springframework.boot:spring-boot-data-jdbc;4.0.0 +org.springframework.boot:spring-boot-data-jdbc-test;4.0.0 +org.springframework.boot:spring-boot-data-jpa;4.0.0 +org.springframework.boot:spring-boot-data-jpa-test;4.0.0 +org.springframework.boot:spring-boot-data-ldap;4.0.0 +org.springframework.boot:spring-boot-data-ldap-test;4.0.0 +org.springframework.boot:spring-boot-data-mongodb;4.0.0 +org.springframework.boot:spring-boot-data-mongodb-test;4.0.0 +org.springframework.boot:spring-boot-data-neo4j;4.0.0 +org.springframework.boot:spring-boot-data-neo4j-test;4.0.0 +org.springframework.boot:spring-boot-data-r2dbc;4.0.0 +org.springframework.boot:spring-boot-data-r2dbc-test;4.0.0 +org.springframework.boot:spring-boot-data-redis;4.0.0 +org.springframework.boot:spring-boot-data-redis-test;4.0.0 +org.springframework.boot:spring-boot-data-rest;4.0.0 +org.springframework.boot:spring-boot-dependencies;4.0.0 +org.springframework.boot:spring-boot-devtools;4.0.0 +org.springframework.boot:spring-boot-docker-compose;4.0.0 +org.springframework.boot:spring-boot-elasticsearch;4.0.0 +org.springframework.boot:spring-boot-flyway;4.0.0 +org.springframework.boot:spring-boot-freemarker;4.0.0 +org.springframework.boot:spring-boot-graphql;4.0.0 +org.springframework.boot:spring-boot-graphql-test;4.0.0 +org.springframework.boot:spring-boot-groovy-templates;4.0.0 +org.springframework.boot:spring-boot-gson;4.0.0 +org.springframework.boot:spring-boot-h2console;4.0.0 +org.springframework.boot:spring-boot-hateoas;4.0.0 +org.springframework.boot:spring-boot-hazelcast;4.0.0 +org.springframework.boot:spring-boot-health;4.0.0 +org.springframework.boot:spring-boot-hibernate;4.0.0 +org.springframework.boot:spring-boot-http-client;4.0.0 +org.springframework.boot:spring-boot-http-codec;4.0.0 +org.springframework.boot:spring-boot-http-converter;4.0.0 +org.springframework.boot:spring-boot-integration;4.0.0 +org.springframework.boot:spring-boot-jackson;4.0.0 +org.springframework.boot:spring-boot-jackson2;4.0.0 +org.springframework.boot:spring-boot-jarmode-tools;4.0.0 +org.springframework.boot:spring-boot-jdbc;4.0.0 +org.springframework.boot:spring-boot-jdbc-test;4.0.0 +org.springframework.boot:spring-boot-jersey;4.0.0 +org.springframework.boot:spring-boot-jetty;4.0.0 +org.springframework.boot:spring-boot-jms;4.0.0 +org.springframework.boot:spring-boot-jooq;4.0.0 +org.springframework.boot:spring-boot-jooq-test;4.0.0 +org.springframework.boot:spring-boot-jpa;4.0.0 +org.springframework.boot:spring-boot-jpa-test;4.0.0 +org.springframework.boot:spring-boot-jsonb;4.0.0 +org.springframework.boot:spring-boot-kafka;4.0.0 +org.springframework.boot:spring-boot-kotlinx-serialization-json;4.0.0 +org.springframework.boot:spring-boot-ldap;4.0.0 +org.springframework.boot:spring-boot-liquibase;4.0.0 +org.springframework.boot:spring-boot-loader;4.0.0 +org.springframework.boot:spring-boot-mail;4.0.0 +org.springframework.boot:spring-boot-maven-plugin;4.0.0 +org.springframework.boot:spring-boot-micrometer-metrics;4.0.0 +org.springframework.boot:spring-boot-micrometer-metrics-test;4.0.0 +org.springframework.boot:spring-boot-micrometer-observation;4.0.0 +org.springframework.boot:spring-boot-micrometer-tracing;4.0.0 +org.springframework.boot:spring-boot-micrometer-tracing-brave;4.0.0 +org.springframework.boot:spring-boot-micrometer-tracing-opentelemetry;4.0.0 +org.springframework.boot:spring-boot-micrometer-tracing-test;4.0.0 +org.springframework.boot:spring-boot-mongodb;4.0.0 +org.springframework.boot:spring-boot-mustache;4.0.0 +org.springframework.boot:spring-boot-neo4j;4.0.0 +org.springframework.boot:spring-boot-netty;4.0.0 +org.springframework.boot:spring-boot-opentelemetry;4.0.0 +org.springframework.boot:spring-boot-persistence;4.0.0 +org.springframework.boot:spring-boot-properties-migrator;4.0.0 +org.springframework.boot:spring-boot-pulsar;4.0.0 +org.springframework.boot:spring-boot-quartz;4.0.0 +org.springframework.boot:spring-boot-r2dbc;4.0.0 +org.springframework.boot:spring-boot-reactor;4.0.0 +org.springframework.boot:spring-boot-reactor-netty;4.0.0 +org.springframework.boot:spring-boot-restclient;4.0.0 +org.springframework.boot:spring-boot-restclient-test;4.0.0 +org.springframework.boot:spring-boot-restdocs;4.0.0 +org.springframework.boot:spring-boot-resttestclient;4.0.0 +org.springframework.boot:spring-boot-rsocket;4.0.0 +org.springframework.boot:spring-boot-rsocket-test;4.0.0 +org.springframework.boot:spring-boot-security;4.0.0 +org.springframework.boot:spring-boot-security-oauth2-authorization-server;4.0.0 +org.springframework.boot:spring-boot-security-oauth2-client;4.0.0 +org.springframework.boot:spring-boot-security-oauth2-resource-server;4.0.0 +org.springframework.boot:spring-boot-security-saml2;4.0.0 +org.springframework.boot:spring-boot-security-test;4.0.0 +org.springframework.boot:spring-boot-sendgrid;4.0.0 +org.springframework.boot:spring-boot-servlet;4.0.0 +org.springframework.boot:spring-boot-session;4.0.0 +org.springframework.boot:spring-boot-session-data-redis;4.0.0 +org.springframework.boot:spring-boot-session-jdbc;4.0.0 +org.springframework.boot:spring-boot-sql;4.0.0 +org.springframework.boot:spring-boot-starter;4.0.0 +org.springframework.boot:spring-boot-starter-activemq;4.0.0 +org.springframework.boot:spring-boot-starter-activemq-test;4.0.0 +org.springframework.boot:spring-boot-starter-actuator;4.0.0 +org.springframework.boot:spring-boot-starter-actuator-test;4.0.0 +org.springframework.boot:spring-boot-starter-amqp;4.0.0 +org.springframework.boot:spring-boot-starter-amqp-test;4.0.0 +org.springframework.boot:spring-boot-starter-artemis;4.0.0 +org.springframework.boot:spring-boot-starter-artemis-test;4.0.0 +org.springframework.boot:spring-boot-starter-aspectj;4.0.0 +org.springframework.boot:spring-boot-starter-aspectj-test;4.0.0 +org.springframework.boot:spring-boot-starter-batch;4.0.0 +org.springframework.boot:spring-boot-starter-batch-jdbc;4.0.0 +org.springframework.boot:spring-boot-starter-batch-jdbc-test;4.0.0 +org.springframework.boot:spring-boot-starter-batch-test;4.0.0 +org.springframework.boot:spring-boot-starter-cache;4.0.0 +org.springframework.boot:spring-boot-starter-cache-test;4.0.0 +org.springframework.boot:spring-boot-starter-cassandra;4.0.0 +org.springframework.boot:spring-boot-starter-cassandra-test;4.0.0 +org.springframework.boot:spring-boot-starter-classic;4.0.0 +org.springframework.boot:spring-boot-starter-cloudfoundry;4.0.0 +org.springframework.boot:spring-boot-starter-cloudfoundry-test;4.0.0 +org.springframework.boot:spring-boot-starter-couchbase;4.0.0 +org.springframework.boot:spring-boot-starter-couchbase-test;4.0.0 +org.springframework.boot:spring-boot-starter-data-cassandra;4.0.0 +org.springframework.boot:spring-boot-starter-data-cassandra-reactive;4.0.0 +org.springframework.boot:spring-boot-starter-data-cassandra-reactive-test;4.0.0 +org.springframework.boot:spring-boot-starter-data-cassandra-test;4.0.0 +org.springframework.boot:spring-boot-starter-data-couchbase;4.0.0 +org.springframework.boot:spring-boot-starter-data-couchbase-reactive;4.0.0 +org.springframework.boot:spring-boot-starter-data-couchbase-reactive-test;4.0.0 +org.springframework.boot:spring-boot-starter-data-couchbase-test;4.0.0 +org.springframework.boot:spring-boot-starter-data-elasticsearch;4.0.0 +org.springframework.boot:spring-boot-starter-data-elasticsearch-test;4.0.0 +org.springframework.boot:spring-boot-starter-data-jdbc;4.0.0 +org.springframework.boot:spring-boot-starter-data-jdbc-test;4.0.0 +org.springframework.boot:spring-boot-starter-data-jpa;4.0.0 +org.springframework.boot:spring-boot-starter-data-jpa-test;4.0.0 +org.springframework.boot:spring-boot-starter-data-ldap;4.0.0 +org.springframework.boot:spring-boot-starter-data-ldap-test;4.0.0 +org.springframework.boot:spring-boot-starter-data-mongodb;4.0.0 +org.springframework.boot:spring-boot-starter-data-mongodb-reactive;4.0.0 +org.springframework.boot:spring-boot-starter-data-mongodb-reactive-test;4.0.0 +org.springframework.boot:spring-boot-starter-data-mongodb-test;4.0.0 +org.springframework.boot:spring-boot-starter-data-neo4j;4.0.0 +org.springframework.boot:spring-boot-starter-data-neo4j-test;4.0.0 +org.springframework.boot:spring-boot-starter-data-r2dbc;4.0.0 +org.springframework.boot:spring-boot-starter-data-r2dbc-test;4.0.0 +org.springframework.boot:spring-boot-starter-data-redis;4.0.0 +org.springframework.boot:spring-boot-starter-data-redis-reactive;4.0.0 +org.springframework.boot:spring-boot-starter-data-redis-reactive-test;4.0.0 +org.springframework.boot:spring-boot-starter-data-redis-test;4.0.0 +org.springframework.boot:spring-boot-starter-data-rest;4.0.0 +org.springframework.boot:spring-boot-starter-data-rest-test;4.0.0 +org.springframework.boot:spring-boot-starter-elasticsearch;4.0.0 +org.springframework.boot:spring-boot-starter-elasticsearch-test;4.0.0 +org.springframework.boot:spring-boot-starter-flyway;4.0.0 +org.springframework.boot:spring-boot-starter-flyway-test;4.0.0 +org.springframework.boot:spring-boot-starter-freemarker;4.0.0 +org.springframework.boot:spring-boot-starter-freemarker-test;4.0.0 +org.springframework.boot:spring-boot-starter-graphql;4.0.0 +org.springframework.boot:spring-boot-starter-graphql-test;4.0.0 +org.springframework.boot:spring-boot-starter-groovy-templates;4.0.0 +org.springframework.boot:spring-boot-starter-groovy-templates-test;4.0.0 +org.springframework.boot:spring-boot-starter-gson;4.0.0 +org.springframework.boot:spring-boot-starter-gson-test;4.0.0 +org.springframework.boot:spring-boot-starter-hateoas;4.0.0 +org.springframework.boot:spring-boot-starter-hateoas-test;4.0.0 +org.springframework.boot:spring-boot-starter-hazelcast;4.0.0 +org.springframework.boot:spring-boot-starter-hazelcast-test;4.0.0 +org.springframework.boot:spring-boot-starter-integration;4.0.0 +org.springframework.boot:spring-boot-starter-integration-test;4.0.0 +org.springframework.boot:spring-boot-starter-jackson;4.0.0 +org.springframework.boot:spring-boot-starter-jackson-test;4.0.0 +org.springframework.boot:spring-boot-starter-jdbc;4.0.0 +org.springframework.boot:spring-boot-starter-jdbc-test;4.0.0 +org.springframework.boot:spring-boot-starter-jersey;4.0.0 +org.springframework.boot:spring-boot-starter-jersey-test;4.0.0 +org.springframework.boot:spring-boot-starter-jetty;4.0.0 +org.springframework.boot:spring-boot-starter-jetty-runtime;4.0.0 +org.springframework.boot:spring-boot-starter-jms;4.0.0 +org.springframework.boot:spring-boot-starter-jms-test;4.0.0 +org.springframework.boot:spring-boot-starter-jooq;4.0.0 +org.springframework.boot:spring-boot-starter-jooq-test;4.0.0 +org.springframework.boot:spring-boot-starter-json;4.0.0 +org.springframework.boot:spring-boot-starter-jsonb;4.0.0 +org.springframework.boot:spring-boot-starter-jsonb-test;4.0.0 +org.springframework.boot:spring-boot-starter-kafka;4.0.0 +org.springframework.boot:spring-boot-starter-kafka-test;4.0.0 +org.springframework.boot:spring-boot-starter-kotlin-serialization;4.0.0 +org.springframework.boot:spring-boot-starter-kotlin-serialization-test;4.0.0 +org.springframework.boot:spring-boot-starter-ldap;4.0.0 +org.springframework.boot:spring-boot-starter-ldap-test;4.0.0 +org.springframework.boot:spring-boot-starter-liquibase;4.0.0 +org.springframework.boot:spring-boot-starter-liquibase-test;4.0.0 +org.springframework.boot:spring-boot-starter-log4j2;4.0.0 +org.springframework.boot:spring-boot-starter-logback;4.0.0 +org.springframework.boot:spring-boot-starter-logging;4.0.0 +org.springframework.boot:spring-boot-starter-mail;4.0.0 +org.springframework.boot:spring-boot-starter-mail-test;4.0.0 +org.springframework.boot:spring-boot-starter-micrometer-metrics;4.0.0 +org.springframework.boot:spring-boot-starter-micrometer-metrics-test;4.0.0 +org.springframework.boot:spring-boot-starter-mongodb;4.0.0 +org.springframework.boot:spring-boot-starter-mongodb-test;4.0.0 +org.springframework.boot:spring-boot-starter-mustache;4.0.0 +org.springframework.boot:spring-boot-starter-mustache-test;4.0.0 +org.springframework.boot:spring-boot-starter-neo4j;4.0.0 +org.springframework.boot:spring-boot-starter-neo4j-test;4.0.0 +org.springframework.boot:spring-boot-starter-oauth2-authorization-server;4.0.0 +org.springframework.boot:spring-boot-starter-oauth2-client;4.0.0 +org.springframework.boot:spring-boot-starter-oauth2-resource-server;4.0.0 +org.springframework.boot:spring-boot-starter-opentelemetry;4.0.0 +org.springframework.boot:spring-boot-starter-opentelemetry-test;4.0.0 +org.springframework.boot:spring-boot-starter-parent;4.0.0 +org.springframework.boot:spring-boot-starter-pulsar;4.0.0 +org.springframework.boot:spring-boot-starter-pulsar-test;4.0.0 +org.springframework.boot:spring-boot-starter-quartz;4.0.0 +org.springframework.boot:spring-boot-starter-quartz-test;4.0.0 +org.springframework.boot:spring-boot-starter-r2dbc;4.0.0 +org.springframework.boot:spring-boot-starter-r2dbc-test;4.0.0 +org.springframework.boot:spring-boot-starter-reactor-netty;4.0.0 +org.springframework.boot:spring-boot-starter-restclient;4.0.0 +org.springframework.boot:spring-boot-starter-restclient-test;4.0.0 +org.springframework.boot:spring-boot-starter-rsocket;4.0.0 +org.springframework.boot:spring-boot-starter-rsocket-test;4.0.0 +org.springframework.boot:spring-boot-starter-security;4.0.0 +org.springframework.boot:spring-boot-starter-security-oauth2-authorization-server;4.0.0 +org.springframework.boot:spring-boot-starter-security-oauth2-authorization-server-test;4.0.0 +org.springframework.boot:spring-boot-starter-security-oauth2-client;4.0.0 +org.springframework.boot:spring-boot-starter-security-oauth2-client-test;4.0.0 +org.springframework.boot:spring-boot-starter-security-oauth2-resource-server;4.0.0 +org.springframework.boot:spring-boot-starter-security-oauth2-resource-server-test;4.0.0 +org.springframework.boot:spring-boot-starter-security-saml2;4.0.0 +org.springframework.boot:spring-boot-starter-security-saml2-test;4.0.0 +org.springframework.boot:spring-boot-starter-security-test;4.0.0 +org.springframework.boot:spring-boot-starter-sendgrid;4.0.0 +org.springframework.boot:spring-boot-starter-sendgrid-test;4.0.0 +org.springframework.boot:spring-boot-starter-session-data-redis;4.0.0 +org.springframework.boot:spring-boot-starter-session-data-redis-test;4.0.0 +org.springframework.boot:spring-boot-starter-session-jdbc;4.0.0 +org.springframework.boot:spring-boot-starter-session-jdbc-test;4.0.0 +org.springframework.boot:spring-boot-starter-test;4.0.0 +org.springframework.boot:spring-boot-starter-test-classic;4.0.0 +org.springframework.boot:spring-boot-starter-thymeleaf;4.0.0 +org.springframework.boot:spring-boot-starter-thymeleaf-test;4.0.0 +org.springframework.boot:spring-boot-starter-tomcat;4.0.0 +org.springframework.boot:spring-boot-starter-tomcat-runtime;4.0.0 +org.springframework.boot:spring-boot-starter-validation;4.0.0 +org.springframework.boot:spring-boot-starter-validation-test;4.0.0 +org.springframework.boot:spring-boot-starter-web;4.0.0 +org.springframework.boot:spring-boot-starter-web-services;4.0.0 +org.springframework.boot:spring-boot-starter-webclient;4.0.0 +org.springframework.boot:spring-boot-starter-webclient-test;4.0.0 +org.springframework.boot:spring-boot-starter-webflux;4.0.0 +org.springframework.boot:spring-boot-starter-webflux-test;4.0.0 +org.springframework.boot:spring-boot-starter-webmvc;4.0.0 +org.springframework.boot:spring-boot-starter-webmvc-test;4.0.0 +org.springframework.boot:spring-boot-starter-webservices;4.0.0 +org.springframework.boot:spring-boot-starter-webservices-test;4.0.0 +org.springframework.boot:spring-boot-starter-websocket;4.0.0 +org.springframework.boot:spring-boot-starter-websocket-test;4.0.0 +org.springframework.boot:spring-boot-starter-zipkin;4.0.0 +org.springframework.boot:spring-boot-starter-zipkin-test;4.0.0 +org.springframework.boot:spring-boot-test;4.0.0 +org.springframework.boot:spring-boot-test-autoconfigure;4.0.0 +org.springframework.boot:spring-boot-test-classic-modules;4.0.0 +org.springframework.boot:spring-boot-testcontainers;4.0.0 +org.springframework.boot:spring-boot-thymeleaf;4.0.0 +org.springframework.boot:spring-boot-tomcat;4.0.0 +org.springframework.boot:spring-boot-transaction;4.0.0 +org.springframework.boot:spring-boot-validation;4.0.0 +org.springframework.boot:spring-boot-web-server;4.0.0 +org.springframework.boot:spring-boot-webclient;4.0.0 +org.springframework.boot:spring-boot-webclient-test;4.0.0 +org.springframework.boot:spring-boot-webflux;4.0.0 +org.springframework.boot:spring-boot-webflux-test;4.0.0 +org.springframework.boot:spring-boot-webmvc;4.0.0 +org.springframework.boot:spring-boot-webmvc-test;4.0.0 +org.springframework.boot:spring-boot-webservices;4.0.0 +org.springframework.boot:spring-boot-webservices-test;4.0.0 +org.springframework.boot:spring-boot-websocket;4.0.0 +org.springframework.boot:spring-boot-webtestclient;4.0.0 +org.springframework.boot:spring-boot-zipkin;4.0.0 +org.springframework.cloud:spring-cloud-bus;5.0.0 +org.springframework.cloud:spring-cloud-bus-dependencies;5.0.0 +org.springframework.cloud:spring-cloud-circuitbreaker-dependencies;5.0.0 +org.springframework.cloud:spring-cloud-circuitbreaker-framework-retry;5.0.0 +org.springframework.cloud:spring-cloud-circuitbreaker-resilience4j;5.0.0 +org.springframework.cloud:spring-cloud-circuitbreaker-spring-retry;5.0.0 +org.springframework.cloud:spring-cloud-commons;5.0.0 +org.springframework.cloud:spring-cloud-commons-dependencies;5.0.0 +org.springframework.cloud:spring-cloud-config-client;5.0.0 +org.springframework.cloud:spring-cloud-config-dependencies;5.0.0 +org.springframework.cloud:spring-cloud-config-monitor;5.0.0 +org.springframework.cloud:spring-cloud-config-server;5.0.0 +org.springframework.cloud:spring-cloud-consul-binder;5.0.0 +org.springframework.cloud:spring-cloud-consul-config;5.0.0 +org.springframework.cloud:spring-cloud-consul-core;5.0.0 +org.springframework.cloud:spring-cloud-consul-dependencies;5.0.0 +org.springframework.cloud:spring-cloud-consul-discovery;5.0.0 +org.springframework.cloud:spring-cloud-context;5.0.0 +org.springframework.cloud:spring-cloud-contract-converters;5.0.0 +org.springframework.cloud:spring-cloud-contract-dependencies;5.0.0 +org.springframework.cloud:spring-cloud-contract-gradle-plugin;5.0.0 +org.springframework.cloud:spring-cloud-contract-maven-plugin;5.0.0 +org.springframework.cloud:spring-cloud-contract-spec;5.0.0 +org.springframework.cloud:spring-cloud-contract-spec-groovy;5.0.0 +org.springframework.cloud:spring-cloud-contract-spec-java;5.0.0 +org.springframework.cloud:spring-cloud-contract-spec-kotlin;5.0.0 +org.springframework.cloud:spring-cloud-contract-stub-runner;5.0.0 +org.springframework.cloud:spring-cloud-contract-stub-runner-boot;5.0.0 +org.springframework.cloud:spring-cloud-contract-verifier;5.0.0 +org.springframework.cloud:spring-cloud-contract-wiremock;5.0.0 +org.springframework.cloud:spring-cloud-dependencies;2025.1.0 +org.springframework.cloud:spring-cloud-function-adapter-aws;5.0.0 +org.springframework.cloud:spring-cloud-function-adapter-azure;5.0.0 +org.springframework.cloud:spring-cloud-function-adapter-azure-web;5.0.0 +org.springframework.cloud:spring-cloud-function-adapter-gcp;5.0.0 +org.springframework.cloud:spring-cloud-function-context;5.0.0 +org.springframework.cloud:spring-cloud-function-core;5.0.0 +org.springframework.cloud:spring-cloud-function-dependencies;5.0.0 +org.springframework.cloud:spring-cloud-function-deployer;5.0.0 +org.springframework.cloud:spring-cloud-function-grpc;5.0.0 +org.springframework.cloud:spring-cloud-function-grpc-cloudevent-ext;5.0.0 +org.springframework.cloud:spring-cloud-function-integration;5.0.0 +org.springframework.cloud:spring-cloud-function-kotlin;5.0.0 +org.springframework.cloud:spring-cloud-function-rsocket;5.0.0 +org.springframework.cloud:spring-cloud-function-serverless-web;5.0.0 +org.springframework.cloud:spring-cloud-function-web;5.0.0 +org.springframework.cloud:spring-cloud-gateway-dependencies;5.0.0 +org.springframework.cloud:spring-cloud-gateway-proxyexchange-webflux;5.0.0 +org.springframework.cloud:spring-cloud-gateway-proxyexchange-webmvc;5.0.0 +org.springframework.cloud:spring-cloud-gateway-server-webflux;5.0.0 +org.springframework.cloud:spring-cloud-gateway-server-webmvc;5.0.0 +org.springframework.cloud:spring-cloud-kubernetes-client-autoconfig;5.0.0 +org.springframework.cloud:spring-cloud-kubernetes-client-config;5.0.0 +org.springframework.cloud:spring-cloud-kubernetes-client-discovery;5.0.0 +org.springframework.cloud:spring-cloud-kubernetes-client-loadbalancer;5.0.0 +org.springframework.cloud:spring-cloud-kubernetes-commons;5.0.0 +org.springframework.cloud:spring-cloud-kubernetes-dependencies;5.0.0 +org.springframework.cloud:spring-cloud-kubernetes-discovery;5.0.0 +org.springframework.cloud:spring-cloud-kubernetes-fabric8-autoconfig;5.0.0 +org.springframework.cloud:spring-cloud-kubernetes-fabric8-config;5.0.0 +org.springframework.cloud:spring-cloud-kubernetes-fabric8-discovery;5.0.0 +org.springframework.cloud:spring-cloud-kubernetes-fabric8-istio;5.0.0 +org.springframework.cloud:spring-cloud-kubernetes-fabric8-leader;5.0.0 +org.springframework.cloud:spring-cloud-kubernetes-fabric8-loadbalancer;5.0.0 +org.springframework.cloud:spring-cloud-kubernetes-test-support;5.0.0 +org.springframework.cloud:spring-cloud-loadbalancer;5.0.0 +org.springframework.cloud:spring-cloud-netflix-dependencies;5.0.0 +org.springframework.cloud:spring-cloud-netflix-eureka-client;5.0.0 +org.springframework.cloud:spring-cloud-netflix-eureka-server;5.0.0 +org.springframework.cloud:spring-cloud-openfeign-core;5.0.0 +org.springframework.cloud:spring-cloud-openfeign-dependencies;5.0.0 +org.springframework.cloud:spring-cloud-starter;5.0.0 +org.springframework.cloud:spring-cloud-starter-bootstrap;5.0.0 +org.springframework.cloud:spring-cloud-starter-bus-amqp;5.0.0 +org.springframework.cloud:spring-cloud-starter-bus-kafka;5.0.0 +org.springframework.cloud:spring-cloud-starter-bus-stream;5.0.0 +org.springframework.cloud:spring-cloud-starter-circuitbreaker-framework-retry;5.0.0 +org.springframework.cloud:spring-cloud-starter-circuitbreaker-reactor-resilience4j;5.0.0 +org.springframework.cloud:spring-cloud-starter-circuitbreaker-resilience4j;5.0.0 +org.springframework.cloud:spring-cloud-starter-circuitbreaker-spring-retry;5.0.0 +org.springframework.cloud:spring-cloud-starter-config;5.0.0 +org.springframework.cloud:spring-cloud-starter-consul;5.0.0 +org.springframework.cloud:spring-cloud-starter-consul-all;5.0.0 +org.springframework.cloud:spring-cloud-starter-consul-bus;5.0.0 +org.springframework.cloud:spring-cloud-starter-consul-config;5.0.0 +org.springframework.cloud:spring-cloud-starter-consul-discovery;5.0.0 +org.springframework.cloud:spring-cloud-starter-contract-stub-runner;5.0.0 +org.springframework.cloud:spring-cloud-starter-contract-stub-runner-jetty;5.0.0 +org.springframework.cloud:spring-cloud-starter-contract-verifier;5.0.0 +org.springframework.cloud:spring-cloud-starter-function-web;5.0.0 +org.springframework.cloud:spring-cloud-starter-function-webflux;5.0.0 +org.springframework.cloud:spring-cloud-starter-gateway-server-webflux;5.0.0 +org.springframework.cloud:spring-cloud-starter-gateway-server-webmvc;5.0.0 +org.springframework.cloud:spring-cloud-starter-kubernetes-client;5.0.0 +org.springframework.cloud:spring-cloud-starter-kubernetes-client-all;5.0.0 +org.springframework.cloud:spring-cloud-starter-kubernetes-client-config;5.0.0 +org.springframework.cloud:spring-cloud-starter-kubernetes-client-loadbalancer;5.0.0 +org.springframework.cloud:spring-cloud-starter-kubernetes-discoveryclient;5.0.0 +org.springframework.cloud:spring-cloud-starter-kubernetes-fabric8;5.0.0 +org.springframework.cloud:spring-cloud-starter-kubernetes-fabric8-all;5.0.0 +org.springframework.cloud:spring-cloud-starter-kubernetes-fabric8-config;5.0.0 +org.springframework.cloud:spring-cloud-starter-kubernetes-fabric8-loadbalancer;5.0.0 +org.springframework.cloud:spring-cloud-starter-loadbalancer;5.0.0 +org.springframework.cloud:spring-cloud-starter-netflix-eureka-client;5.0.0 +org.springframework.cloud:spring-cloud-starter-netflix-eureka-server;5.0.0 +org.springframework.cloud:spring-cloud-starter-openfeign;5.0.0 +org.springframework.cloud:spring-cloud-starter-stream-kafka;5.0.0 +org.springframework.cloud:spring-cloud-starter-stream-rabbit;5.0.0 +org.springframework.cloud:spring-cloud-starter-task;5.0.0 +org.springframework.cloud:spring-cloud-starter-vault-config;5.0.0 +org.springframework.cloud:spring-cloud-starter-zookeeper;5.0.0 +org.springframework.cloud:spring-cloud-starter-zookeeper-all;5.0.0 +org.springframework.cloud:spring-cloud-starter-zookeeper-config;5.0.0 +org.springframework.cloud:spring-cloud-starter-zookeeper-discovery;5.0.0 +org.springframework.cloud:spring-cloud-stream;5.0.0 +org.springframework.cloud:spring-cloud-stream-binder-kafka;5.0.0 +org.springframework.cloud:spring-cloud-stream-binder-kafka-core;5.0.0 +org.springframework.cloud:spring-cloud-stream-binder-kafka-reactive;5.0.0 +org.springframework.cloud:spring-cloud-stream-binder-kafka-streams;5.0.0 +org.springframework.cloud:spring-cloud-stream-binder-pulsar;5.0.0 +org.springframework.cloud:spring-cloud-stream-binder-rabbit;5.0.0 +org.springframework.cloud:spring-cloud-stream-binder-rabbit-core;5.0.0 +org.springframework.cloud:spring-cloud-stream-binder-rabbit-test-support;5.0.0 +org.springframework.cloud:spring-cloud-stream-dependencies;5.0.0 +org.springframework.cloud:spring-cloud-stream-schema-registry-client;5.0.0 +org.springframework.cloud:spring-cloud-stream-schema-registry-core;5.0.0 +org.springframework.cloud:spring-cloud-stream-schema-registry-server;5.0.0 +org.springframework.cloud:spring-cloud-stream-test-binder;5.0.0 +org.springframework.cloud:spring-cloud-stream-test-support;5.0.0 +org.springframework.cloud:spring-cloud-task-batch;5.0.0 +org.springframework.cloud:spring-cloud-task-core;5.0.0 +org.springframework.cloud:spring-cloud-task-dependencies;5.0.0 +org.springframework.cloud:spring-cloud-task-stream;5.0.0 +org.springframework.cloud:spring-cloud-test-support;5.0.0 +org.springframework.cloud:spring-cloud-vault-config;5.0.0 +org.springframework.cloud:spring-cloud-vault-config-aws;5.0.0 +org.springframework.cloud:spring-cloud-vault-config-consul;5.0.0 +org.springframework.cloud:spring-cloud-vault-config-databases;5.0.0 +org.springframework.cloud:spring-cloud-vault-config-rabbitmq;5.0.0 +org.springframework.cloud:spring-cloud-vault-dependencies;5.0.0 +org.springframework.cloud:spring-cloud-zookeeper-config;5.0.0 +org.springframework.cloud:spring-cloud-zookeeper-core;5.0.0 +org.springframework.cloud:spring-cloud-zookeeper-dependencies;5.0.0 +org.springframework.cloud:spring-cloud-zookeeper-discovery;5.0.0 +org.springframework.credhub:spring-credhub-core;3.5.0 +org.springframework.data:spring-data-bom;2025.1.0 +org.springframework.data:spring-data-cassandra;5.0.0 +org.springframework.data:spring-data-commons;4.0.0 +org.springframework.data:spring-data-couchbase;6.0.0 +org.springframework.data:spring-data-elasticsearch;6.0.0 +org.springframework.data:spring-data-envers;4.0.0 +org.springframework.data:spring-data-jdbc;4.0.0 +org.springframework.data:spring-data-jpa;4.0.0 +org.springframework.data:spring-data-keyvalue;4.0.0 +org.springframework.data:spring-data-ldap;4.0.0 +org.springframework.data:spring-data-mongodb;5.0.0 +org.springframework.data:spring-data-neo4j;8.0.0 +org.springframework.data:spring-data-r2dbc;4.0.0 +org.springframework.data:spring-data-redis;4.0.0 +org.springframework.data:spring-data-relational;4.0.0 +org.springframework.data:spring-data-rest-core;5.0.0 +org.springframework.data:spring-data-rest-hal-explorer;5.0.0 +org.springframework.data:spring-data-rest-webmvc;5.0.0 +org.springframework.graphql:spring-graphql;2.0.0 +org.springframework.graphql:spring-graphql-test;2.0.0 +org.springframework.hateoas:spring-hateoas;3.0.0 +org.springframework.integration:spring-integration-amqp;7.0.0 +org.springframework.integration:spring-integration-bom;7.0.0 +org.springframework.integration:spring-integration-camel;7.0.0 +org.springframework.integration:spring-integration-cassandra;7.0.0 +org.springframework.integration:spring-integration-core;7.0.0 +org.springframework.integration:spring-integration-debezium;7.0.0 +org.springframework.integration:spring-integration-event;7.0.0 +org.springframework.integration:spring-integration-feed;7.0.0 +org.springframework.integration:spring-integration-file;7.0.0 +org.springframework.integration:spring-integration-ftp;7.0.0 +org.springframework.integration:spring-integration-graphql;7.0.0 +org.springframework.integration:spring-integration-groovy;7.0.0 +org.springframework.integration:spring-integration-hazelcast;7.0.0 +org.springframework.integration:spring-integration-http;7.0.0 +org.springframework.integration:spring-integration-ip;7.0.0 +org.springframework.integration:spring-integration-jdbc;7.0.0 +org.springframework.integration:spring-integration-jms;7.0.0 +org.springframework.integration:spring-integration-jmx;7.0.0 +org.springframework.integration:spring-integration-jpa;7.0.0 +org.springframework.integration:spring-integration-kafka;7.0.0 +org.springframework.integration:spring-integration-mail;7.0.0 +org.springframework.integration:spring-integration-mongodb;7.0.0 +org.springframework.integration:spring-integration-mqtt;7.0.0 +org.springframework.integration:spring-integration-r2dbc;7.0.0 +org.springframework.integration:spring-integration-redis;7.0.0 +org.springframework.integration:spring-integration-rsocket;7.0.0 +org.springframework.integration:spring-integration-scripting;7.0.0 +org.springframework.integration:spring-integration-sftp;7.0.0 +org.springframework.integration:spring-integration-smb;7.0.0 +org.springframework.integration:spring-integration-stomp;7.0.0 +org.springframework.integration:spring-integration-stream;7.0.0 +org.springframework.integration:spring-integration-syslog;7.0.0 +org.springframework.integration:spring-integration-test;7.0.0 +org.springframework.integration:spring-integration-test-support;7.0.0 +org.springframework.integration:spring-integration-webflux;7.0.0 +org.springframework.integration:spring-integration-websocket;7.0.0 +org.springframework.integration:spring-integration-ws;7.0.0 +org.springframework.integration:spring-integration-xml;7.0.0 +org.springframework.integration:spring-integration-xmpp;7.0.0 +org.springframework.integration:spring-integration-zeromq;7.0.0 +org.springframework.integration:spring-integration-zip;7.0.0 +org.springframework.integration:spring-integration-zookeeper;7.0.0 +org.springframework.kafka:spring-kafka;4.0.0 +org.springframework.kafka:spring-kafka-test;4.0.0 +org.springframework.ldap:spring-ldap-core;4.0.0 +org.springframework.ldap:spring-ldap-ldif-core;4.0.0 +org.springframework.ldap:spring-ldap-odm;4.0.0 +org.springframework.ldap:spring-ldap-test;4.0.0 +org.springframework.pulsar:spring-pulsar;2.0.0 +org.springframework.pulsar:spring-pulsar-bom;2.0.0 +org.springframework.pulsar:spring-pulsar-cache-provider;2.0.0 +org.springframework.pulsar:spring-pulsar-cache-provider-caffeine;2.0.0 +org.springframework.pulsar:spring-pulsar-test;2.0.0 +org.springframework.restdocs:spring-restdocs-asciidoctor;4.0.0 +org.springframework.restdocs:spring-restdocs-bom;4.0.0 +org.springframework.restdocs:spring-restdocs-core;4.0.0 +org.springframework.restdocs:spring-restdocs-mockmvc;4.0.0 +org.springframework.restdocs:spring-restdocs-webtestclient;4.0.0 +org.springframework.retry:spring-retry;2.0.12 +org.springframework.security:spring-security-access;7.0.0 +org.springframework.security:spring-security-acl;7.0.0 +org.springframework.security:spring-security-aspects;7.0.0 +org.springframework.security:spring-security-bom;7.0.0 +org.springframework.security:spring-security-cas;7.0.0 +org.springframework.security:spring-security-config;7.0.0 +org.springframework.security:spring-security-core;7.0.0 +org.springframework.security:spring-security-crypto;7.0.0 +org.springframework.security:spring-security-data;7.0.0 +org.springframework.security:spring-security-kerberos-client;7.0.0 +org.springframework.security:spring-security-kerberos-core;7.0.0 +org.springframework.security:spring-security-kerberos-test;7.0.0 +org.springframework.security:spring-security-kerberos-web;7.0.0 +org.springframework.security:spring-security-ldap;7.0.0 +org.springframework.security:spring-security-messaging;7.0.0 +org.springframework.security:spring-security-oauth2-authorization-server;7.0.0 +org.springframework.security:spring-security-oauth2-client;7.0.0 +org.springframework.security:spring-security-oauth2-core;7.0.0 +org.springframework.security:spring-security-oauth2-jose;7.0.0 +org.springframework.security:spring-security-oauth2-resource-server;7.0.0 +org.springframework.security:spring-security-rsocket;7.0.0 +org.springframework.security:spring-security-saml2-service-provider;7.0.0 +org.springframework.security:spring-security-taglibs;7.0.0 +org.springframework.security:spring-security-test;7.0.0 +org.springframework.security:spring-security-web;7.0.0 +org.springframework.security:spring-security-webauthn;7.0.0 +org.springframework.session:spring-session-bom;4.0.0 +org.springframework.session:spring-session-core;4.0.0 +org.springframework.session:spring-session-data-redis;4.0.0 +org.springframework.session:spring-session-jdbc;4.0.0 +org.springframework.vault:spring-vault-core;4.0.0 +org.springframework.ws:spring-ws-bom;5.0.0 +org.springframework.ws:spring-ws-core;5.0.0 +org.springframework.ws:spring-ws-security;5.0.0 +org.springframework.ws:spring-ws-support;5.0.0 +org.springframework.ws:spring-ws-test;5.0.0 +org.springframework.ws:spring-xml;5.0.0 +org.springframework:spring-aop;7.0.1 +org.springframework:spring-aspects;7.0.1 +org.springframework:spring-beans;7.0.1 +org.springframework:spring-context;7.0.1 +org.springframework:spring-context-indexer;7.0.1 +org.springframework:spring-context-support;7.0.1 +org.springframework:spring-core;7.0.1 +org.springframework:spring-core-test;7.0.1 +org.springframework:spring-expression;7.0.1 +org.springframework:spring-framework-bom;7.0.1 +org.springframework:spring-instrument;7.0.1 +org.springframework:spring-jdbc;7.0.1 +org.springframework:spring-jms;7.0.1 +org.springframework:spring-messaging;7.0.1 +org.springframework:spring-orm;7.0.1 +org.springframework:spring-oxm;7.0.1 +org.springframework:spring-r2dbc;7.0.1 +org.springframework:spring-test;7.0.1 +org.springframework:spring-tx;7.0.1 +org.springframework:spring-web;7.0.1 +org.springframework:spring-webflux;7.0.1 +org.springframework:spring-webmvc;7.0.1 +org.springframework:spring-websocket;7.0.1 +org.testcontainers:testcontainers;2.0.2 +org.testcontainers:testcontainers-activemq;2.0.2 +org.testcontainers:testcontainers-azure;2.0.2 +org.testcontainers:testcontainers-bom;2.0.2 +org.testcontainers:testcontainers-cassandra;2.0.2 +org.testcontainers:testcontainers-chromadb;2.0.2 +org.testcontainers:testcontainers-clickhouse;2.0.2 +org.testcontainers:testcontainers-cockroachdb;2.0.2 +org.testcontainers:testcontainers-consul;2.0.2 +org.testcontainers:testcontainers-couchbase;2.0.2 +org.testcontainers:testcontainers-cratedb;2.0.2 +org.testcontainers:testcontainers-database-commons;2.0.2 +org.testcontainers:testcontainers-databend;2.0.2 +org.testcontainers:testcontainers-db2;2.0.2 +org.testcontainers:testcontainers-elasticsearch;2.0.2 +org.testcontainers:testcontainers-gcloud;2.0.2 +org.testcontainers:testcontainers-grafana;2.0.2 +org.testcontainers:testcontainers-hivemq;2.0.2 +org.testcontainers:testcontainers-influxdb;2.0.2 +org.testcontainers:testcontainers-jdbc;2.0.2 +org.testcontainers:testcontainers-junit-jupiter;2.0.2 +org.testcontainers:testcontainers-k3s;2.0.2 +org.testcontainers:testcontainers-k6;2.0.2 +org.testcontainers:testcontainers-kafka;2.0.2 +org.testcontainers:testcontainers-ldap;2.0.2 +org.testcontainers:testcontainers-localstack;2.0.2 +org.testcontainers:testcontainers-mariadb;2.0.2 +org.testcontainers:testcontainers-milvus;2.0.2 +org.testcontainers:testcontainers-minio;2.0.2 +org.testcontainers:testcontainers-mockserver;2.0.2 +org.testcontainers:testcontainers-mongodb;2.0.2 +org.testcontainers:testcontainers-mssqlserver;2.0.2 +org.testcontainers:testcontainers-mysql;2.0.2 +org.testcontainers:testcontainers-neo4j;2.0.2 +org.testcontainers:testcontainers-nginx;2.0.2 +org.testcontainers:testcontainers-oceanbase;2.0.2 +org.testcontainers:testcontainers-ollama;2.0.2 +org.testcontainers:testcontainers-openfga;2.0.2 +org.testcontainers:testcontainers-oracle-free;2.0.2 +org.testcontainers:testcontainers-oracle-xe;2.0.2 +org.testcontainers:testcontainers-orientdb;2.0.2 +org.testcontainers:testcontainers-pinecone;2.0.2 +org.testcontainers:testcontainers-postgresql;2.0.2 +org.testcontainers:testcontainers-presto;2.0.2 +org.testcontainers:testcontainers-pulsar;2.0.2 +org.testcontainers:testcontainers-qdrant;2.0.2 +org.testcontainers:testcontainers-questdb;2.0.2 +org.testcontainers:testcontainers-r2dbc;2.0.2 +org.testcontainers:testcontainers-rabbitmq;2.0.2 +org.testcontainers:testcontainers-redpanda;2.0.2 +org.testcontainers:testcontainers-scylladb;2.0.2 +org.testcontainers:testcontainers-selenium;2.0.2 +org.testcontainers:testcontainers-solace;2.0.2 +org.testcontainers:testcontainers-solr;2.0.2 +org.testcontainers:testcontainers-spock;2.0.2 +org.testcontainers:testcontainers-tidb;2.0.2 +org.testcontainers:testcontainers-timeplus;2.0.2 +org.testcontainers:testcontainers-toxiproxy;2.0.2 +org.testcontainers:testcontainers-trino;2.0.2 +org.testcontainers:testcontainers-typesense;2.0.2 +org.testcontainers:testcontainers-vault;2.0.2 +org.testcontainers:testcontainers-weaviate;2.0.2 +org.testcontainers:testcontainers-yugabytedb;2.0.2 +org.thymeleaf.extras:thymeleaf-extras-springsecurity6;3.1.3.RELEASE +org.thymeleaf:thymeleaf;3.1.3.RELEASE +org.thymeleaf:thymeleaf-spring6;3.1.3.RELEASE +org.tmatesoft.svnkit:svnkit;1.10.11 +org.vibur:vibur-dbcp;26.0 +org.vibur:vibur-object-pool;26.0 +org.webjars:webjars-locator-core;0.59 +org.webjars:webjars-locator-lite;1.1.2 +org.wiremock:wiremock-standalone;3.13.2 +org.xerial:sqlite-jdbc;3.50.3.0 +org.xmlunit:xmlunit-assertj;2.10.4 +org.xmlunit:xmlunit-assertj3;2.10.4 +org.xmlunit:xmlunit-core;2.10.4 +org.xmlunit:xmlunit-jakarta-jaxb-impl;2.10.4 +org.xmlunit:xmlunit-legacy;2.10.4 +org.xmlunit:xmlunit-matchers;2.10.4 +org.xmlunit:xmlunit-placeholders;2.10.4 +org.yaml:snakeyaml;2.5 +redis.clients:jedis;7.0.0 +tools.jackson.core:jackson-core;3.0.2 +tools.jackson.core:jackson-databind;3.0.2 +tools.jackson.dataformat:jackson-dataformat-avro;3.0.2 +tools.jackson.dataformat:jackson-dataformat-cbor;3.0.2 +tools.jackson.dataformat:jackson-dataformat-csv;3.0.2 +tools.jackson.dataformat:jackson-dataformat-ion;3.0.2 +tools.jackson.dataformat:jackson-dataformat-properties;3.0.2 +tools.jackson.dataformat:jackson-dataformat-protobuf;3.0.2 +tools.jackson.dataformat:jackson-dataformat-smile;3.0.2 +tools.jackson.dataformat:jackson-dataformat-toml;3.0.2 +tools.jackson.dataformat:jackson-dataformat-xml;3.0.2 +tools.jackson.dataformat:jackson-dataformat-yaml;3.0.2 +tools.jackson.datatype:jackson-datatype-eclipse-collections;3.0.2 +tools.jackson.datatype:jackson-datatype-guava;3.0.2 +tools.jackson.datatype:jackson-datatype-hibernate4;3.0.2 +tools.jackson.datatype:jackson-datatype-hibernate5;3.0.2 +tools.jackson.datatype:jackson-datatype-hibernate5-jakarta;3.0.2 +tools.jackson.datatype:jackson-datatype-hibernate6;3.0.2 +tools.jackson.datatype:jackson-datatype-hibernate7;3.0.2 +tools.jackson.datatype:jackson-datatype-hppc;3.0.2 +tools.jackson.datatype:jackson-datatype-jakarta-jsonp;3.0.2 +tools.jackson.datatype:jackson-datatype-javax-money;3.0.2 +tools.jackson.datatype:jackson-datatype-jaxrs;3.0.2 +tools.jackson.datatype:jackson-datatype-joda;3.0.2 +tools.jackson.datatype:jackson-datatype-joda-money;3.0.2 +tools.jackson.datatype:jackson-datatype-json-org;3.0.2 +tools.jackson.datatype:jackson-datatype-jsr353;3.0.2 +tools.jackson.datatype:jackson-datatype-moneta;3.0.2 +tools.jackson.datatype:jackson-datatype-pcollections;3.0.2 +tools.jackson.jakarta.rs:jackson-jakarta-rs-base;3.0.2 +tools.jackson.jakarta.rs:jackson-jakarta-rs-cbor-provider;3.0.2 +tools.jackson.jakarta.rs:jackson-jakarta-rs-json-provider;3.0.2 +tools.jackson.jakarta.rs:jackson-jakarta-rs-smile-provider;3.0.2 +tools.jackson.jakarta.rs:jackson-jakarta-rs-xml-provider;3.0.2 +tools.jackson.jakarta.rs:jackson-jakarta-rs-yaml-provider;3.0.2 +tools.jackson.jaxrs:jackson-jaxrs-base;3.0.2 +tools.jackson.jaxrs:jackson-jaxrs-cbor-provider;3.0.2 +tools.jackson.jaxrs:jackson-jaxrs-json-provider;3.0.2 +tools.jackson.jaxrs:jackson-jaxrs-smile-provider;3.0.2 +tools.jackson.jaxrs:jackson-jaxrs-xml-provider;3.0.2 +tools.jackson.jaxrs:jackson-jaxrs-yaml-provider;3.0.2 +tools.jackson.jr:jackson-jr-all;3.0.2 +tools.jackson.jr:jackson-jr-annotation-support;3.0.2 +tools.jackson.jr:jackson-jr-extension-javatime;3.0.2 +tools.jackson.jr:jackson-jr-objects;3.0.2 +tools.jackson.jr:jackson-jr-retrofit2;3.0.2 +tools.jackson.jr:jackson-jr-stree;3.0.2 +tools.jackson.module:jackson-module-afterburner;3.0.2 +tools.jackson.module:jackson-module-android-record;3.0.2 +tools.jackson.module:jackson-module-blackbird;3.0.2 +tools.jackson.module:jackson-module-guice;3.0.2 +tools.jackson.module:jackson-module-guice7;3.0.2 +tools.jackson.module:jackson-module-jakarta-xmlbind-annotations;3.0.2 +tools.jackson.module:jackson-module-jaxb-annotations;3.0.2 +tools.jackson.module:jackson-module-kotlin;3.0.2 +tools.jackson.module:jackson-module-mrbean;3.0.2 +tools.jackson.module:jackson-module-no-ctor-deser;3.0.2 +tools.jackson.module:jackson-module-osgi;3.0.2 +tools.jackson.module:jackson-module-scala_2.12;3.0.2 +tools.jackson.module:jackson-module-scala_2.13;3.0.2 +tools.jackson.module:jackson-module-scala_3;3.0.2 +tools.jackson:jackson-bom;3.0.2 +wsdl4j:wsdl4j;1.6.3 diff --git a/sdk/spring/scripts/sync_external_dependencies.py b/sdk/spring/scripts/sync_external_dependencies.py index 34e6594899b2..8b67bafaf9ab 100644 --- a/sdk/spring/scripts/sync_external_dependencies.py +++ b/sdk/spring/scripts/sync_external_dependencies.py @@ -11,6 +11,8 @@ # Or `python .\sdk\spring\scripts\sync_external_dependencies.py --spring-boot-dependencies-version 2.7.18`. # 3.2 Sync Spring Boot 3.x, run command: `python .\sdk\spring\scripts\sync_external_dependencies.py -b 3.3.1 -sbmvn 3`. # Or `python .\sdk\spring\scripts\sync_external_dependencies.py --spring-boot-dependencies-version 3.3.1 --spring-boot-major-version-number 3`. +# 3.3 Sync Spring Boot 4.x, run command: `python .\sdk\spring\scripts\sync_external_dependencies.py -b 4.0.0 -sbmvn 4`. +# Or `python .\sdk\spring\scripts\sync_external_dependencies.py --spring-boot-dependencies-version 4.0.0 --spring-boot-major-version-number 4`. # 4. Then `eng/versioning/external_dependencies.txt` will be updated. # # Please refer to ./README.md to get more information about this script. @@ -23,7 +25,7 @@ from version_util import version_greater_than from log import log -from _constants import SPRING_BOOT_MAJOR_2_VERSION_NAME, SPRING_BOOT_MAJOR_3_VERSION_NAME, get_spring_boot_version_tag_prefix +from _constants import SPRING_BOOT_MAJOR_2_VERSION_NAME, SPRING_BOOT_MAJOR_3_VERSION_NAME, SPRING_BOOT_MAJOR_4_VERSION_NAME, get_spring_boot_version_tag_prefix EXTERNAL_DEPENDENCIES_FILE = 'eng/versioning/external_dependencies.txt' SKIP_IDS = [ @@ -50,7 +52,7 @@ def get_args(): '-sbmvn', '--spring-boot-major-version-number', type=str, - choices=[SPRING_BOOT_MAJOR_2_VERSION_NAME, SPRING_BOOT_MAJOR_3_VERSION_NAME], + choices=[SPRING_BOOT_MAJOR_2_VERSION_NAME, SPRING_BOOT_MAJOR_3_VERSION_NAME, SPRING_BOOT_MAJOR_4_VERSION_NAME], required=False, default=SPRING_BOOT_MAJOR_2_VERSION_NAME, help='Update the dependencies of Spring Boot major version. The default is ' + SPRING_BOOT_MAJOR_2_VERSION_NAME + '.' diff --git a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/pom.xml b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/pom.xml index 2338af63e250..df7395dc8983 100644 --- a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/pom.xml +++ b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/pom.xml @@ -41,13 +41,13 @@ org.springframework.boot spring-boot-actuator-autoconfigure - 3.5.5 + 4.0.0 compile com.fasterxml.jackson.core jackson-databind - 2.19.2 + 2.20.1 com.azure.spring @@ -128,7 +128,7 @@ org.springframework.boot spring-boot-starter-test - 3.5.5 + 4.0.0 test @@ -136,7 +136,7 @@ org.mockito mockito-core - 5.17.0 + 5.20.0 test @@ -144,13 +144,13 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test @@ -160,7 +160,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -194,14 +194,14 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.2 - com.fasterxml.jackson.core:jackson-databind:[2.19.2] - org.springframework.boot:spring-boot-actuator:[3.5.5] - org.springframework.boot:spring-boot-actuator-autoconfigure:[3.5.5] + com.fasterxml.jackson.core:jackson-databind:[2.20.1] + org.springframework.boot:spring-boot-actuator:[4.0.0] + org.springframework.boot:spring-boot-actuator-autoconfigure:[4.0.0] @@ -210,7 +210,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -255,7 +255,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/appconfiguration/AppConfigurationConfigHealthConfiguration.java b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/appconfiguration/AppConfigurationConfigHealthConfiguration.java index 976088cbcf9a..8a333c0a61e5 100644 --- a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/appconfiguration/AppConfigurationConfigHealthConfiguration.java +++ b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/appconfiguration/AppConfigurationConfigHealthConfiguration.java @@ -3,8 +3,8 @@ package com.azure.spring.cloud.actuator.autoconfigure.implementation.appconfiguration; -import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator; -import org.springframework.boot.actuate.health.HealthIndicator; +import org.springframework.boot.health.autoconfigure.contributor.ConditionalOnEnabledHealthIndicator; +import org.springframework.boot.health.contributor.HealthIndicator; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/appconfiguration/AppConfigurationHealthConfiguration.java b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/appconfiguration/AppConfigurationHealthConfiguration.java index d633b5e331bf..d6dda6513f4e 100644 --- a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/appconfiguration/AppConfigurationHealthConfiguration.java +++ b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/appconfiguration/AppConfigurationHealthConfiguration.java @@ -6,8 +6,8 @@ import com.azure.data.appconfiguration.ConfigurationAsyncClient; import com.azure.spring.cloud.actuator.implementation.appconfiguration.AppConfigurationHealthIndicator; import com.azure.spring.cloud.autoconfigure.implementation.appconfiguration.AzureAppConfigurationAutoConfiguration; -import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator; -import org.springframework.boot.actuate.health.HealthIndicator; +import org.springframework.boot.health.autoconfigure.contributor.ConditionalOnEnabledHealthIndicator; +import org.springframework.boot.health.contributor.HealthIndicator; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/cosmos/CosmosHealthConfiguration.java b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/cosmos/CosmosHealthConfiguration.java index d26b7a15a877..68992a770b2e 100644 --- a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/cosmos/CosmosHealthConfiguration.java +++ b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/cosmos/CosmosHealthConfiguration.java @@ -7,8 +7,8 @@ import com.azure.spring.cloud.actuator.implementation.cosmos.CosmosHealthIndicator; import com.azure.spring.cloud.autoconfigure.implementation.cosmos.AzureCosmosAutoConfiguration; import com.azure.spring.cloud.autoconfigure.implementation.cosmos.properties.AzureCosmosProperties; -import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator; -import org.springframework.boot.actuate.health.HealthIndicator; +import org.springframework.boot.health.autoconfigure.contributor.ConditionalOnEnabledHealthIndicator; +import org.springframework.boot.health.contributor.HealthIndicator; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/eventhubs/EventHubsHealthConfiguration.java b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/eventhubs/EventHubsHealthConfiguration.java index 048c4318315d..84d3f5f2ea02 100644 --- a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/eventhubs/EventHubsHealthConfiguration.java +++ b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/eventhubs/EventHubsHealthConfiguration.java @@ -9,8 +9,8 @@ import com.azure.spring.cloud.actuator.implementation.eventhubs.EventHubsHealthIndicator; import com.azure.spring.cloud.autoconfigure.implementation.eventhubs.AzureEventHubsAutoConfiguration; import org.springframework.beans.factory.ObjectProvider; -import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator; -import org.springframework.boot.actuate.health.HealthIndicator; +import org.springframework.boot.health.autoconfigure.contributor.ConditionalOnEnabledHealthIndicator; +import org.springframework.boot.health.contributor.HealthIndicator; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/keyvault/KeyVaultCertificateHealthConfiguration.java b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/keyvault/KeyVaultCertificateHealthConfiguration.java index 8958fd052e7e..671ea3f38e40 100644 --- a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/keyvault/KeyVaultCertificateHealthConfiguration.java +++ b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/keyvault/KeyVaultCertificateHealthConfiguration.java @@ -6,8 +6,8 @@ import com.azure.security.keyvault.certificates.CertificateAsyncClient; import com.azure.spring.cloud.actuator.implementation.keyvault.KeyVaultCertificateHealthIndicator; import com.azure.spring.cloud.autoconfigure.implementation.keyvault.certificates.AzureKeyVaultCertificateAutoConfiguration; -import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator; -import org.springframework.boot.actuate.health.HealthIndicator; +import org.springframework.boot.health.autoconfigure.contributor.ConditionalOnEnabledHealthIndicator; +import org.springframework.boot.health.contributor.HealthIndicator; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/keyvault/KeyVaultSecretHealthConfiguration.java b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/keyvault/KeyVaultSecretHealthConfiguration.java index e432b3fd0df0..22c0688daec1 100644 --- a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/keyvault/KeyVaultSecretHealthConfiguration.java +++ b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/keyvault/KeyVaultSecretHealthConfiguration.java @@ -6,8 +6,8 @@ import com.azure.security.keyvault.secrets.SecretAsyncClient; import com.azure.spring.cloud.actuator.implementation.keyvault.KeyVaultSecretHealthIndicator; import com.azure.spring.cloud.autoconfigure.implementation.keyvault.secrets.AzureKeyVaultSecretAutoConfiguration; -import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator; -import org.springframework.boot.actuate.health.HealthIndicator; +import org.springframework.boot.health.autoconfigure.contributor.ConditionalOnEnabledHealthIndicator; +import org.springframework.boot.health.contributor.HealthIndicator; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/storage/StorageBlobHealthConfiguration.java b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/storage/StorageBlobHealthConfiguration.java index 194b23d55303..551735866abc 100644 --- a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/storage/StorageBlobHealthConfiguration.java +++ b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/storage/StorageBlobHealthConfiguration.java @@ -6,8 +6,8 @@ import com.azure.spring.cloud.actuator.implementation.storage.StorageBlobHealthIndicator; import com.azure.spring.cloud.autoconfigure.implementation.storage.blob.AzureStorageBlobAutoConfiguration; import com.azure.storage.blob.BlobServiceAsyncClient; -import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator; -import org.springframework.boot.actuate.health.HealthIndicator; +import org.springframework.boot.health.autoconfigure.contributor.ConditionalOnEnabledHealthIndicator; +import org.springframework.boot.health.contributor.HealthIndicator; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/storage/StorageFileShareHealthConfiguration.java b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/storage/StorageFileShareHealthConfiguration.java index 36bd8867ce73..13c224da607d 100644 --- a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/storage/StorageFileShareHealthConfiguration.java +++ b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/storage/StorageFileShareHealthConfiguration.java @@ -6,8 +6,8 @@ import com.azure.spring.cloud.actuator.implementation.storage.StorageFileShareHealthIndicator; import com.azure.spring.cloud.autoconfigure.implementation.storage.fileshare.AzureStorageFileShareAutoConfiguration; import com.azure.storage.file.share.ShareServiceAsyncClient; -import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator; -import org.springframework.boot.actuate.health.HealthIndicator; +import org.springframework.boot.health.autoconfigure.contributor.ConditionalOnEnabledHealthIndicator; +import org.springframework.boot.health.contributor.HealthIndicator; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/storage/StorageQueueHealthConfiguration.java b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/storage/StorageQueueHealthConfiguration.java index 2458921f9018..4bfe3c08ad1d 100644 --- a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/storage/StorageQueueHealthConfiguration.java +++ b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/storage/StorageQueueHealthConfiguration.java @@ -6,8 +6,8 @@ import com.azure.spring.cloud.actuator.implementation.storage.StorageQueueHealthIndicator; import com.azure.spring.cloud.autoconfigure.implementation.storage.queue.AzureStorageQueueAutoConfiguration; import com.azure.storage.queue.QueueServiceAsyncClient; -import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator; -import org.springframework.boot.actuate.health.HealthIndicator; +import org.springframework.boot.health.autoconfigure.contributor.ConditionalOnEnabledHealthIndicator; +import org.springframework.boot.health.contributor.HealthIndicator; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/sdk/spring/spring-cloud-azure-actuator/pom.xml b/sdk/spring/spring-cloud-azure-actuator/pom.xml index 666ff849a58b..53669088bd8d 100644 --- a/sdk/spring/spring-cloud-azure-actuator/pom.xml +++ b/sdk/spring/spring-cloud-azure-actuator/pom.xml @@ -45,9 +45,14 @@ org.springframework.boot spring-boot-actuator - 3.5.5 + 4.0.0 compile + + org.springframework.boot + spring-boot-health + 4.0.0 + + 4.0.0 test @@ -124,7 +129,7 @@ org.mockito mockito-core - 5.17.0 + 5.20.0 test @@ -132,13 +137,13 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test @@ -148,7 +153,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -179,12 +184,13 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.2 - org.springframework.boot:spring-boot-actuator:[3.5.5] + org.springframework.boot:spring-boot-actuator:[4.0.0] + org.springframework.boot:spring-boot-health:[4.0.0] @@ -193,7 +199,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -238,7 +244,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-actuator/src/main/java/com/azure/spring/cloud/actuator/implementation/appconfiguration/AppConfigurationConfigHealthIndicator.java b/sdk/spring/spring-cloud-azure-actuator/src/main/java/com/azure/spring/cloud/actuator/implementation/appconfiguration/AppConfigurationConfigHealthIndicator.java index cdfa7ca638fe..aed923da5deb 100644 --- a/sdk/spring/spring-cloud-azure-actuator/src/main/java/com/azure/spring/cloud/actuator/implementation/appconfiguration/AppConfigurationConfigHealthIndicator.java +++ b/sdk/spring/spring-cloud-azure-actuator/src/main/java/com/azure/spring/cloud/actuator/implementation/appconfiguration/AppConfigurationConfigHealthIndicator.java @@ -3,8 +3,8 @@ package com.azure.spring.cloud.actuator.implementation.appconfiguration; -import org.springframework.boot.actuate.health.AbstractHealthIndicator; -import org.springframework.boot.actuate.health.Health.Builder; +import org.springframework.boot.health.contributor.AbstractHealthIndicator; +import org.springframework.boot.health.contributor.Health.Builder; import com.azure.spring.cloud.appconfiguration.config.AppConfigurationRefresh; import com.azure.spring.cloud.appconfiguration.config.AppConfigurationStoreHealth; diff --git a/sdk/spring/spring-cloud-azure-actuator/src/main/java/com/azure/spring/cloud/actuator/implementation/appconfiguration/AppConfigurationHealthIndicator.java b/sdk/spring/spring-cloud-azure-actuator/src/main/java/com/azure/spring/cloud/actuator/implementation/appconfiguration/AppConfigurationHealthIndicator.java index 6b08d540c4fd..77bf535d117f 100644 --- a/sdk/spring/spring-cloud-azure-actuator/src/main/java/com/azure/spring/cloud/actuator/implementation/appconfiguration/AppConfigurationHealthIndicator.java +++ b/sdk/spring/spring-cloud-azure-actuator/src/main/java/com/azure/spring/cloud/actuator/implementation/appconfiguration/AppConfigurationHealthIndicator.java @@ -5,8 +5,8 @@ import com.azure.core.exception.ResourceNotFoundException; import com.azure.data.appconfiguration.ConfigurationAsyncClient; -import org.springframework.boot.actuate.health.AbstractHealthIndicator; -import org.springframework.boot.actuate.health.Health; +import org.springframework.boot.health.contributor.AbstractHealthIndicator; +import org.springframework.boot.health.contributor.Health; import java.time.Duration; diff --git a/sdk/spring/spring-cloud-azure-actuator/src/main/java/com/azure/spring/cloud/actuator/implementation/cosmos/CosmosHealthIndicator.java b/sdk/spring/spring-cloud-azure-actuator/src/main/java/com/azure/spring/cloud/actuator/implementation/cosmos/CosmosHealthIndicator.java index 9f89d7465f98..74f08c43f4d7 100644 --- a/sdk/spring/spring-cloud-azure-actuator/src/main/java/com/azure/spring/cloud/actuator/implementation/cosmos/CosmosHealthIndicator.java +++ b/sdk/spring/spring-cloud-azure-actuator/src/main/java/com/azure/spring/cloud/actuator/implementation/cosmos/CosmosHealthIndicator.java @@ -7,10 +7,10 @@ import com.azure.cosmos.models.CosmosDatabaseResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.boot.actuate.health.AbstractHealthIndicator; -import org.springframework.boot.actuate.health.Health.Builder; -import org.springframework.boot.actuate.health.HealthIndicator; -import org.springframework.boot.actuate.health.Status; +import org.springframework.boot.health.contributor.AbstractHealthIndicator; +import org.springframework.boot.health.contributor.Health.Builder; +import org.springframework.boot.health.contributor.HealthIndicator; +import org.springframework.boot.health.contributor.Status; import org.springframework.util.Assert; import java.time.Duration; diff --git a/sdk/spring/spring-cloud-azure-actuator/src/main/java/com/azure/spring/cloud/actuator/implementation/eventhubs/EventHubsHealthIndicator.java b/sdk/spring/spring-cloud-azure-actuator/src/main/java/com/azure/spring/cloud/actuator/implementation/eventhubs/EventHubsHealthIndicator.java index 68395918439b..d0f716140dc8 100644 --- a/sdk/spring/spring-cloud-azure-actuator/src/main/java/com/azure/spring/cloud/actuator/implementation/eventhubs/EventHubsHealthIndicator.java +++ b/sdk/spring/spring-cloud-azure-actuator/src/main/java/com/azure/spring/cloud/actuator/implementation/eventhubs/EventHubsHealthIndicator.java @@ -5,8 +5,8 @@ import com.azure.messaging.eventhubs.EventHubConsumerAsyncClient; import com.azure.messaging.eventhubs.EventHubProducerAsyncClient; -import org.springframework.boot.actuate.health.AbstractHealthIndicator; -import org.springframework.boot.actuate.health.Health; +import org.springframework.boot.health.contributor.AbstractHealthIndicator; +import org.springframework.boot.health.contributor.Health; import java.time.Duration; diff --git a/sdk/spring/spring-cloud-azure-actuator/src/main/java/com/azure/spring/cloud/actuator/implementation/keyvault/KeyVaultCertificateHealthIndicator.java b/sdk/spring/spring-cloud-azure-actuator/src/main/java/com/azure/spring/cloud/actuator/implementation/keyvault/KeyVaultCertificateHealthIndicator.java index 2690407ef4a3..4b965302aff1 100644 --- a/sdk/spring/spring-cloud-azure-actuator/src/main/java/com/azure/spring/cloud/actuator/implementation/keyvault/KeyVaultCertificateHealthIndicator.java +++ b/sdk/spring/spring-cloud-azure-actuator/src/main/java/com/azure/spring/cloud/actuator/implementation/keyvault/KeyVaultCertificateHealthIndicator.java @@ -5,8 +5,8 @@ import com.azure.core.exception.ResourceNotFoundException; import com.azure.security.keyvault.certificates.CertificateAsyncClient; -import org.springframework.boot.actuate.health.AbstractHealthIndicator; -import org.springframework.boot.actuate.health.Health; +import org.springframework.boot.health.contributor.AbstractHealthIndicator; +import org.springframework.boot.health.contributor.Health; import java.time.Duration; diff --git a/sdk/spring/spring-cloud-azure-actuator/src/main/java/com/azure/spring/cloud/actuator/implementation/keyvault/KeyVaultSecretHealthIndicator.java b/sdk/spring/spring-cloud-azure-actuator/src/main/java/com/azure/spring/cloud/actuator/implementation/keyvault/KeyVaultSecretHealthIndicator.java index 597a8a0afd61..4a20b7d3c351 100644 --- a/sdk/spring/spring-cloud-azure-actuator/src/main/java/com/azure/spring/cloud/actuator/implementation/keyvault/KeyVaultSecretHealthIndicator.java +++ b/sdk/spring/spring-cloud-azure-actuator/src/main/java/com/azure/spring/cloud/actuator/implementation/keyvault/KeyVaultSecretHealthIndicator.java @@ -5,8 +5,8 @@ import com.azure.core.exception.ResourceNotFoundException; import com.azure.security.keyvault.secrets.SecretAsyncClient; -import org.springframework.boot.actuate.health.AbstractHealthIndicator; -import org.springframework.boot.actuate.health.Health; +import org.springframework.boot.health.contributor.AbstractHealthIndicator; +import org.springframework.boot.health.contributor.Health; import java.time.Duration; diff --git a/sdk/spring/spring-cloud-azure-actuator/src/main/java/com/azure/spring/cloud/actuator/implementation/storage/StorageBlobHealthIndicator.java b/sdk/spring/spring-cloud-azure-actuator/src/main/java/com/azure/spring/cloud/actuator/implementation/storage/StorageBlobHealthIndicator.java index f42ead8b828c..84401ee574fc 100644 --- a/sdk/spring/spring-cloud-azure-actuator/src/main/java/com/azure/spring/cloud/actuator/implementation/storage/StorageBlobHealthIndicator.java +++ b/sdk/spring/spring-cloud-azure-actuator/src/main/java/com/azure/spring/cloud/actuator/implementation/storage/StorageBlobHealthIndicator.java @@ -6,8 +6,8 @@ import com.azure.core.http.rest.Response; import com.azure.storage.blob.BlobContainerAsyncClient; import com.azure.storage.blob.BlobServiceAsyncClient; -import org.springframework.boot.actuate.health.AbstractHealthIndicator; -import org.springframework.boot.actuate.health.Health; +import org.springframework.boot.health.contributor.AbstractHealthIndicator; +import org.springframework.boot.health.contributor.Health; import java.time.Duration; diff --git a/sdk/spring/spring-cloud-azure-actuator/src/main/java/com/azure/spring/cloud/actuator/implementation/storage/StorageFileShareHealthIndicator.java b/sdk/spring/spring-cloud-azure-actuator/src/main/java/com/azure/spring/cloud/actuator/implementation/storage/StorageFileShareHealthIndicator.java index 332761eda642..40a9314b98bd 100644 --- a/sdk/spring/spring-cloud-azure-actuator/src/main/java/com/azure/spring/cloud/actuator/implementation/storage/StorageFileShareHealthIndicator.java +++ b/sdk/spring/spring-cloud-azure-actuator/src/main/java/com/azure/spring/cloud/actuator/implementation/storage/StorageFileShareHealthIndicator.java @@ -6,8 +6,8 @@ import com.azure.core.http.rest.Response; import com.azure.storage.file.share.ShareServiceAsyncClient; import com.azure.storage.file.share.models.ShareServiceProperties; -import org.springframework.boot.actuate.health.AbstractHealthIndicator; -import org.springframework.boot.actuate.health.Health; +import org.springframework.boot.health.contributor.AbstractHealthIndicator; +import org.springframework.boot.health.contributor.Health; import java.time.Duration; diff --git a/sdk/spring/spring-cloud-azure-actuator/src/main/java/com/azure/spring/cloud/actuator/implementation/storage/StorageHealthConstants.java b/sdk/spring/spring-cloud-azure-actuator/src/main/java/com/azure/spring/cloud/actuator/implementation/storage/StorageHealthConstants.java index 81a973d2b2fa..d18ad6c209db 100644 --- a/sdk/spring/spring-cloud-azure-actuator/src/main/java/com/azure/spring/cloud/actuator/implementation/storage/StorageHealthConstants.java +++ b/sdk/spring/spring-cloud-azure-actuator/src/main/java/com/azure/spring/cloud/actuator/implementation/storage/StorageHealthConstants.java @@ -3,7 +3,7 @@ package com.azure.spring.cloud.actuator.implementation.storage; -import org.springframework.boot.actuate.health.Status; +import org.springframework.boot.health.contributor.Status; /** * Azure Storage actuator related constants. diff --git a/sdk/spring/spring-cloud-azure-actuator/src/main/java/com/azure/spring/cloud/actuator/implementation/storage/StorageQueueHealthIndicator.java b/sdk/spring/spring-cloud-azure-actuator/src/main/java/com/azure/spring/cloud/actuator/implementation/storage/StorageQueueHealthIndicator.java index 00958087eedc..5f03788a456a 100644 --- a/sdk/spring/spring-cloud-azure-actuator/src/main/java/com/azure/spring/cloud/actuator/implementation/storage/StorageQueueHealthIndicator.java +++ b/sdk/spring/spring-cloud-azure-actuator/src/main/java/com/azure/spring/cloud/actuator/implementation/storage/StorageQueueHealthIndicator.java @@ -6,8 +6,8 @@ import com.azure.core.http.rest.Response; import com.azure.storage.queue.QueueServiceAsyncClient; import com.azure.storage.queue.models.QueueServiceProperties; -import org.springframework.boot.actuate.health.AbstractHealthIndicator; -import org.springframework.boot.actuate.health.Health; +import org.springframework.boot.health.contributor.AbstractHealthIndicator; +import org.springframework.boot.health.contributor.Health; import java.time.Duration; diff --git a/sdk/spring/spring-cloud-azure-actuator/src/test/java/com/azure/spring/cloud/actuator/implementation/appconfiguration/AppConfigurationHealthIndicatorTests.java b/sdk/spring/spring-cloud-azure-actuator/src/test/java/com/azure/spring/cloud/actuator/implementation/appconfiguration/AppConfigurationHealthIndicatorTests.java index 078a599bfc22..d9f73ed925fb 100644 --- a/sdk/spring/spring-cloud-azure-actuator/src/test/java/com/azure/spring/cloud/actuator/implementation/appconfiguration/AppConfigurationHealthIndicatorTests.java +++ b/sdk/spring/spring-cloud-azure-actuator/src/test/java/com/azure/spring/cloud/actuator/implementation/appconfiguration/AppConfigurationHealthIndicatorTests.java @@ -6,8 +6,8 @@ import com.azure.data.appconfiguration.ConfigurationAsyncClient; import com.azure.data.appconfiguration.models.ConfigurationSetting; import org.junit.jupiter.api.Test; -import org.springframework.boot.actuate.health.Health; -import org.springframework.boot.actuate.health.Status; +import org.springframework.boot.health.contributor.Health; +import org.springframework.boot.health.contributor.Status; import reactor.core.publisher.Mono; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sdk/spring/spring-cloud-azure-actuator/src/test/java/com/azure/spring/cloud/actuator/implementation/cosmos/CosmosHealthIndicatorTests.java b/sdk/spring/spring-cloud-azure-actuator/src/test/java/com/azure/spring/cloud/actuator/implementation/cosmos/CosmosHealthIndicatorTests.java index f6cfd3062679..bddb08d05b32 100644 --- a/sdk/spring/spring-cloud-azure-actuator/src/test/java/com/azure/spring/cloud/actuator/implementation/cosmos/CosmosHealthIndicatorTests.java +++ b/sdk/spring/spring-cloud-azure-actuator/src/test/java/com/azure/spring/cloud/actuator/implementation/cosmos/CosmosHealthIndicatorTests.java @@ -10,8 +10,8 @@ import com.azure.cosmos.models.CosmosDatabaseProperties; import com.azure.cosmos.models.CosmosDatabaseResponse; import org.junit.jupiter.api.Test; -import org.springframework.boot.actuate.health.Health; -import org.springframework.boot.actuate.health.Status; +import org.springframework.boot.health.contributor.Health; +import org.springframework.boot.health.contributor.Status; import reactor.core.publisher.Mono; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sdk/spring/spring-cloud-azure-actuator/src/test/java/com/azure/spring/cloud/actuator/implementation/eventhubs/EventHubsHealthIndicatorTests.java b/sdk/spring/spring-cloud-azure-actuator/src/test/java/com/azure/spring/cloud/actuator/implementation/eventhubs/EventHubsHealthIndicatorTests.java index 7544be9e02d9..eb4eeed124aa 100644 --- a/sdk/spring/spring-cloud-azure-actuator/src/test/java/com/azure/spring/cloud/actuator/implementation/eventhubs/EventHubsHealthIndicatorTests.java +++ b/sdk/spring/spring-cloud-azure-actuator/src/test/java/com/azure/spring/cloud/actuator/implementation/eventhubs/EventHubsHealthIndicatorTests.java @@ -9,8 +9,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import org.springframework.boot.actuate.health.Health; -import org.springframework.boot.actuate.health.Status; +import org.springframework.boot.health.contributor.Health; +import org.springframework.boot.health.contributor.Status; import reactor.core.publisher.Mono; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sdk/spring/spring-cloud-azure-actuator/src/test/java/com/azure/spring/cloud/actuator/implementation/keyvault/KeyVaultCertificateHealthIndicatorTests.java b/sdk/spring/spring-cloud-azure-actuator/src/test/java/com/azure/spring/cloud/actuator/implementation/keyvault/KeyVaultCertificateHealthIndicatorTests.java index ba45f25bebbf..c1263ff25285 100644 --- a/sdk/spring/spring-cloud-azure-actuator/src/test/java/com/azure/spring/cloud/actuator/implementation/keyvault/KeyVaultCertificateHealthIndicatorTests.java +++ b/sdk/spring/spring-cloud-azure-actuator/src/test/java/com/azure/spring/cloud/actuator/implementation/keyvault/KeyVaultCertificateHealthIndicatorTests.java @@ -8,8 +8,8 @@ import com.azure.security.keyvault.certificates.models.KeyVaultCertificateWithPolicy; import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import org.springframework.boot.actuate.health.Health; -import org.springframework.boot.actuate.health.Status; +import org.springframework.boot.health.contributor.Health; +import org.springframework.boot.health.contributor.Status; import reactor.core.publisher.Mono; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sdk/spring/spring-cloud-azure-actuator/src/test/java/com/azure/spring/cloud/actuator/implementation/keyvault/KeyVaultSecretHealthIndicatorTests.java b/sdk/spring/spring-cloud-azure-actuator/src/test/java/com/azure/spring/cloud/actuator/implementation/keyvault/KeyVaultSecretHealthIndicatorTests.java index 889e1b6a17dc..9ff86cff7646 100644 --- a/sdk/spring/spring-cloud-azure-actuator/src/test/java/com/azure/spring/cloud/actuator/implementation/keyvault/KeyVaultSecretHealthIndicatorTests.java +++ b/sdk/spring/spring-cloud-azure-actuator/src/test/java/com/azure/spring/cloud/actuator/implementation/keyvault/KeyVaultSecretHealthIndicatorTests.java @@ -8,8 +8,8 @@ import com.azure.security.keyvault.secrets.models.KeyVaultSecret; import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import org.springframework.boot.actuate.health.Health; -import org.springframework.boot.actuate.health.Status; +import org.springframework.boot.health.contributor.Health; +import org.springframework.boot.health.contributor.Status; import reactor.core.publisher.Mono; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sdk/spring/spring-cloud-azure-actuator/src/test/java/com/azure/spring/cloud/actuator/implementation/storage/StorageBlobHealthIndicatorTests.java b/sdk/spring/spring-cloud-azure-actuator/src/test/java/com/azure/spring/cloud/actuator/implementation/storage/StorageBlobHealthIndicatorTests.java index 1f724a018d6a..d7f7e2a9c70f 100644 --- a/sdk/spring/spring-cloud-azure-actuator/src/test/java/com/azure/spring/cloud/actuator/implementation/storage/StorageBlobHealthIndicatorTests.java +++ b/sdk/spring/spring-cloud-azure-actuator/src/test/java/com/azure/spring/cloud/actuator/implementation/storage/StorageBlobHealthIndicatorTests.java @@ -10,8 +10,8 @@ import com.azure.storage.blob.BlobServiceAsyncClient; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.springframework.boot.actuate.health.Health; -import org.springframework.boot.actuate.health.Status; +import org.springframework.boot.health.contributor.Health; +import org.springframework.boot.health.contributor.Status; import reactor.core.publisher.Mono; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sdk/spring/spring-cloud-azure-actuator/src/test/java/com/azure/spring/cloud/actuator/implementation/storage/StorageFileShareHealthIndicatorTests.java b/sdk/spring/spring-cloud-azure-actuator/src/test/java/com/azure/spring/cloud/actuator/implementation/storage/StorageFileShareHealthIndicatorTests.java index 28ed556e3e51..80af13eede2b 100644 --- a/sdk/spring/spring-cloud-azure-actuator/src/test/java/com/azure/spring/cloud/actuator/implementation/storage/StorageFileShareHealthIndicatorTests.java +++ b/sdk/spring/spring-cloud-azure-actuator/src/test/java/com/azure/spring/cloud/actuator/implementation/storage/StorageFileShareHealthIndicatorTests.java @@ -8,8 +8,8 @@ import com.azure.storage.file.share.models.ShareServiceProperties; import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import org.springframework.boot.actuate.health.Health; -import org.springframework.boot.actuate.health.Status; +import org.springframework.boot.health.contributor.Health; +import org.springframework.boot.health.contributor.Status; import reactor.core.publisher.Mono; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sdk/spring/spring-cloud-azure-actuator/src/test/java/com/azure/spring/cloud/actuator/implementation/storage/StorageQueueHealthIndicatorTests.java b/sdk/spring/spring-cloud-azure-actuator/src/test/java/com/azure/spring/cloud/actuator/implementation/storage/StorageQueueHealthIndicatorTests.java index 5c0c697f37bd..eab7abd1ac2e 100644 --- a/sdk/spring/spring-cloud-azure-actuator/src/test/java/com/azure/spring/cloud/actuator/implementation/storage/StorageQueueHealthIndicatorTests.java +++ b/sdk/spring/spring-cloud-azure-actuator/src/test/java/com/azure/spring/cloud/actuator/implementation/storage/StorageQueueHealthIndicatorTests.java @@ -8,8 +8,8 @@ import com.azure.storage.queue.models.QueueServiceProperties; import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import org.springframework.boot.actuate.health.Health; -import org.springframework.boot.actuate.health.Status; +import org.springframework.boot.health.contributor.Health; +import org.springframework.boot.health.contributor.Status; import reactor.core.publisher.Mono; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sdk/spring/spring-cloud-azure-appconfiguration-config-web/pom.xml b/sdk/spring/spring-cloud-azure-appconfiguration-config-web/pom.xml index ced190f354a2..c139390ff563 100644 --- a/sdk/spring/spring-cloud-azure-appconfiguration-config-web/pom.xml +++ b/sdk/spring/spring-cloud-azure-appconfiguration-config-web/pom.xml @@ -25,25 +25,25 @@ org.springframework.boot - spring-boot-starter-web - 3.5.5 + spring-boot-starter-webmvc + 4.0.0 org.springframework.boot spring-boot-starter-actuator - 3.5.5 + 4.0.0 true org.springframework.cloud spring-cloud-bus - 4.3.0 + 5.0.0 true org.springframework.boot spring-boot-starter-test - 3.5.5 + 4.0.0 test @@ -51,7 +51,7 @@ org.mockito mockito-core - 5.17.0 + 5.20.0 test @@ -59,13 +59,13 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test @@ -74,7 +74,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 -Xlint:deprecation @@ -113,14 +113,14 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.2 - org.springframework.boot:spring-boot-starter-actuator:[3.5.5] - org.springframework.boot:spring-boot-starter-web:[3.5.5] - org.springframework.cloud:spring-cloud-bus:[4.3.0] + org.springframework.boot:spring-boot-starter-actuator:[4.0.0] + org.springframework.boot:spring-boot-starter-webmvc:[4.0.0] + org.springframework.cloud:spring-cloud-bus:[5.0.0] @@ -129,7 +129,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -177,7 +177,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.11.3 + 3.12.0 attach-javadocs @@ -193,7 +193,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-appconfiguration-config-web/src/main/java/com/azure/spring/cloud/appconfiguration/config/web/implementation/pullrefresh/AppConfigurationEventListener.java b/sdk/spring/spring-cloud-azure-appconfiguration-config-web/src/main/java/com/azure/spring/cloud/appconfiguration/config/web/implementation/pullrefresh/AppConfigurationEventListener.java index 8fafe59374a6..54962d6d0765 100644 --- a/sdk/spring/spring-cloud-azure-appconfiguration-config-web/src/main/java/com/azure/spring/cloud/appconfiguration/config/web/implementation/pullrefresh/AppConfigurationEventListener.java +++ b/sdk/spring/spring-cloud-azure-appconfiguration-config-web/src/main/java/com/azure/spring/cloud/appconfiguration/config/web/implementation/pullrefresh/AppConfigurationEventListener.java @@ -17,6 +17,7 @@ /** * Listens for ServletRequestHandledEvents to check if the configurations need to be updated. */ +@SuppressWarnings("deprecation") public final class AppConfigurationEventListener implements ApplicationListener { private static final Logger LOGGER = LoggerFactory.getLogger(AppConfigurationEventListener.class); diff --git a/sdk/spring/spring-cloud-azure-appconfiguration-config-web/src/main/java/com/azure/spring/cloud/appconfiguration/config/web/implementation/pushbusrefresh/AppConfigurationBusRefreshEventListener.java b/sdk/spring/spring-cloud-azure-appconfiguration-config-web/src/main/java/com/azure/spring/cloud/appconfiguration/config/web/implementation/pushbusrefresh/AppConfigurationBusRefreshEventListener.java index 296f554f51ec..bdc86fe534f0 100644 --- a/sdk/spring/spring-cloud-azure-appconfiguration-config-web/src/main/java/com/azure/spring/cloud/appconfiguration/config/web/implementation/pushbusrefresh/AppConfigurationBusRefreshEventListener.java +++ b/sdk/spring/spring-cloud-azure-appconfiguration-config-web/src/main/java/com/azure/spring/cloud/appconfiguration/config/web/implementation/pushbusrefresh/AppConfigurationBusRefreshEventListener.java @@ -12,6 +12,7 @@ /** * Listens for AppConfigurationBusRefreshEvents and sets the App Configuration watch interval to zero. */ +@SuppressWarnings("deprecation") public final class AppConfigurationBusRefreshEventListener implements ApplicationListener { private static final Logger LOGGER = LoggerFactory.getLogger(AppConfigurationBusRefreshEventListener.class); diff --git a/sdk/spring/spring-cloud-azure-appconfiguration-config-web/src/main/java/com/azure/spring/cloud/appconfiguration/config/web/implementation/pushrefresh/AppConfigurationRefreshEndpoint.java b/sdk/spring/spring-cloud-azure-appconfiguration-config-web/src/main/java/com/azure/spring/cloud/appconfiguration/config/web/implementation/pushrefresh/AppConfigurationRefreshEndpoint.java index 1a97678e0cd9..913bbfadd5ab 100644 --- a/sdk/spring/spring-cloud-azure-appconfiguration-config-web/src/main/java/com/azure/spring/cloud/appconfiguration/config/web/implementation/pushrefresh/AppConfigurationRefreshEndpoint.java +++ b/sdk/spring/spring-cloud-azure-appconfiguration-config-web/src/main/java/com/azure/spring/cloud/appconfiguration/config/web/implementation/pushrefresh/AppConfigurationRefreshEndpoint.java @@ -31,6 +31,7 @@ * Endpoint for requesting new configurations to be loaded. */ @Endpoint(id = APPCONFIGURATION_REFRESH) +@SuppressWarnings("deprecation") public class AppConfigurationRefreshEndpoint implements ApplicationEventPublisherAware { private static final Logger LOGGER = LoggerFactory.getLogger(AppConfigurationRefreshEndpoint.class); diff --git a/sdk/spring/spring-cloud-azure-appconfiguration-config-web/src/main/java/com/azure/spring/cloud/appconfiguration/config/web/implementation/pushrefresh/AppConfigurationRefreshEventListener.java b/sdk/spring/spring-cloud-azure-appconfiguration-config-web/src/main/java/com/azure/spring/cloud/appconfiguration/config/web/implementation/pushrefresh/AppConfigurationRefreshEventListener.java index cfaf05050bc9..3a4836319df3 100644 --- a/sdk/spring/spring-cloud-azure-appconfiguration-config-web/src/main/java/com/azure/spring/cloud/appconfiguration/config/web/implementation/pushrefresh/AppConfigurationRefreshEventListener.java +++ b/sdk/spring/spring-cloud-azure-appconfiguration-config-web/src/main/java/com/azure/spring/cloud/appconfiguration/config/web/implementation/pushrefresh/AppConfigurationRefreshEventListener.java @@ -12,6 +12,7 @@ /** * Listens for AppConfigurationRefreshEvents and sets the App Configuration watch interval to zero. */ +@SuppressWarnings("deprecation") public final class AppConfigurationRefreshEventListener implements ApplicationListener { private static final Logger LOGGER = LoggerFactory.getLogger(AppConfigurationRefreshEventListener.class); diff --git a/sdk/spring/spring-cloud-azure-appconfiguration-config/pom.xml b/sdk/spring/spring-cloud-azure-appconfiguration-config/pom.xml index 2c9630490c3d..236f636d7baf 100644 --- a/sdk/spring/spring-cloud-azure-appconfiguration-config/pom.xml +++ b/sdk/spring/spring-cloud-azure-appconfiguration-config/pom.xml @@ -21,29 +21,29 @@ org.springframework.boot spring-boot-autoconfigure - 3.5.5 + 4.0.0 org.springframework.boot spring-boot-configuration-processor - 3.5.5 + 4.0.0 true org.springframework.cloud spring-cloud-context - 4.3.0 + 5.0.0 org.springframework.boot spring-boot-actuator - 3.5.5 + 4.0.0 compile jakarta.annotation jakarta.annotation-api - 3.0.0 + 3.0.0 @@ -80,7 +80,7 @@ org.springframework.boot spring-boot-starter-test - 3.5.5 + 4.0.0 test @@ -88,7 +88,7 @@ org.mockito mockito-core - 5.17.0 + 5.20.0 test @@ -96,13 +96,13 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test + 3.0.2 provided @@ -121,7 +121,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 -Xlint:deprecation @@ -172,18 +172,18 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.2 - com.fasterxml.jackson.core:jackson-annotations:[2.19.2] - com.fasterxml.jackson.core:jackson-databind:[2.19.2] - org.springframework.boot:spring-boot-actuator:[3.5.5] - org.springframework.boot:spring-boot-autoconfigure:[3.5.5] - org.springframework.cloud:spring-cloud-context:[4.3.0] - jakarta.annotation:jakarta.annotation-api:[3.0.0] - org.springframework.boot:spring-boot-configuration-processor:[3.5.5] + com.fasterxml.jackson.core:jackson-annotations:[2.20] + com.fasterxml.jackson.core:jackson-databind:[2.20.1] + org.springframework.boot:spring-boot-actuator:[4.0.0] + org.springframework.boot:spring-boot-autoconfigure:[4.0.0] + org.springframework.cloud:spring-cloud-context:[5.0.0] + jakarta.annotation:jakarta.annotation-api:[3.0.0] + org.springframework.boot:spring-boot-configuration-processor:[4.0.0] @@ -192,7 +192,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 diff --git a/sdk/spring/spring-cloud-azure-appconfiguration-config/src/main/java/com/azure/spring/cloud/appconfiguration/config/AppConfigurationWatchAutoConfiguration.java b/sdk/spring/spring-cloud-azure-appconfiguration-config/src/main/java/com/azure/spring/cloud/appconfiguration/config/AppConfigurationWatchAutoConfiguration.java index 9b0d4be6c0a0..8c3330ad6826 100644 --- a/sdk/spring/spring-cloud-azure-appconfiguration-config/src/main/java/com/azure/spring/cloud/appconfiguration/config/AppConfigurationWatchAutoConfiguration.java +++ b/sdk/spring/spring-cloud-azure-appconfiguration-config/src/main/java/com/azure/spring/cloud/appconfiguration/config/AppConfigurationWatchAutoConfiguration.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. package com.azure.spring.cloud.appconfiguration.config; -import org.springframework.boot.BootstrapContext; +import org.springframework.boot.bootstrap.BootstrapContext; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/sdk/spring/spring-cloud-azure-appconfiguration-config/src/main/java/com/azure/spring/cloud/appconfiguration/config/implementation/AzureAppConfigBoostrapRegistrar.java b/sdk/spring/spring-cloud-azure-appconfiguration-config/src/main/java/com/azure/spring/cloud/appconfiguration/config/implementation/AzureAppConfigBoostrapRegistrar.java index fb0a090f0910..9f414c0ca37f 100644 --- a/sdk/spring/spring-cloud-azure-appconfiguration-config/src/main/java/com/azure/spring/cloud/appconfiguration/config/implementation/AzureAppConfigBoostrapRegistrar.java +++ b/sdk/spring/spring-cloud-azure-appconfiguration-config/src/main/java/com/azure/spring/cloud/appconfiguration/config/implementation/AzureAppConfigBoostrapRegistrar.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. package com.azure.spring.cloud.appconfiguration.config.implementation; -import org.springframework.boot.BootstrapRegistry.InstanceSupplier; +import org.springframework.boot.bootstrap.BootstrapRegistry.InstanceSupplier; import org.springframework.boot.context.config.ConfigDataLocationResolverContext; import org.springframework.boot.context.properties.bind.Bindable; import org.springframework.boot.context.properties.bind.Binder; diff --git a/sdk/spring/spring-cloud-azure-appconfiguration-config/src/main/java/com/azure/spring/cloud/appconfiguration/config/implementation/AzureAppConfigDataLoader.java b/sdk/spring/spring-cloud-azure-appconfiguration-config/src/main/java/com/azure/spring/cloud/appconfiguration/config/implementation/AzureAppConfigDataLoader.java index 8daa346b2d34..7cd92ea3387b 100644 --- a/sdk/spring/spring-cloud-azure-appconfiguration-config/src/main/java/com/azure/spring/cloud/appconfiguration/config/implementation/AzureAppConfigDataLoader.java +++ b/sdk/spring/spring-cloud-azure-appconfiguration-config/src/main/java/com/azure/spring/cloud/appconfiguration/config/implementation/AzureAppConfigDataLoader.java @@ -10,7 +10,7 @@ import java.util.List; import org.apache.commons.logging.Log; -import org.springframework.boot.BootstrapRegistry.InstanceSupplier; +import org.springframework.boot.bootstrap.BootstrapRegistry.InstanceSupplier; import org.springframework.boot.context.config.ConfigData; import org.springframework.boot.context.config.ConfigDataLoader; import org.springframework.boot.context.config.ConfigDataLoaderContext; @@ -30,7 +30,7 @@ /** * Azure App Configuration data loader implementation for Spring Boot's ConfigDataLoader. - * + * * @since 6.0.0 */ diff --git a/sdk/spring/spring-cloud-azure-appconfiguration-config/src/main/java/com/azure/spring/cloud/appconfiguration/config/implementation/AzureAppConfigDataLocationResolver.java b/sdk/spring/spring-cloud-azure-appconfiguration-config/src/main/java/com/azure/spring/cloud/appconfiguration/config/implementation/AzureAppConfigDataLocationResolver.java index b4ecd1b477ba..1baf28093558 100644 --- a/sdk/spring/spring-cloud-azure-appconfiguration-config/src/main/java/com/azure/spring/cloud/appconfiguration/config/implementation/AzureAppConfigDataLocationResolver.java +++ b/sdk/spring/spring-cloud-azure-appconfiguration-config/src/main/java/com/azure/spring/cloud/appconfiguration/config/implementation/AzureAppConfigDataLocationResolver.java @@ -10,7 +10,7 @@ import javax.naming.NamingException; import org.apache.commons.logging.Log; -import org.springframework.boot.BootstrapRegistry.InstanceSupplier; +import org.springframework.boot.bootstrap.BootstrapRegistry.InstanceSupplier; import org.springframework.boot.context.config.ConfigDataLocation; import org.springframework.boot.context.config.ConfigDataLocationNotFoundException; import org.springframework.boot.context.config.ConfigDataLocationResolver; @@ -29,7 +29,7 @@ /** * Resolves Azure App Configuration data locations for Spring Boot's ConfigData API. - * + * * @since 6.0.0 */ @@ -46,7 +46,7 @@ public class AzureAppConfigDataLocationResolver /** * Determines if the given location can be resolved by this resolver. - * + * * @param context the resolver context containing binder and bootstrap information * @param location the configuration data location to check * @return true if this resolver can handle the location, false otherwise @@ -63,7 +63,7 @@ public boolean isResolvable(ConfigDataLocationResolverContext context, ConfigDat /** * Checks if the required configuration properties for Azure App Configuration are present. - * + * * @param binder the binder to check for properties * @return true if at least one of the required properties is present, false otherwise */ @@ -83,7 +83,7 @@ private boolean hasNonEmptyProperty(Binder binder, String propertyPath) { /** * Resolves configuration data resources for the given location. - * + * * @param context the resolver context * @param location the configuration data location * @return empty list of resources @@ -97,7 +97,7 @@ public List resolve(ConfigDataLocationResolverContex /** * Resolves profile-specific configuration data resources. - * + * * @param resolverContext the resolver context * @param location the configuration data location * @param profiles the active Spring profiles @@ -128,7 +128,7 @@ public List resolveProfileSpecific( /** * Loads and validates Azure App Configuration properties from the configuration context. - * + * * @param context the configuration data location resolver context * @return validated Azure App Configuration properties */ diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml index e7f5403d8805..f48096749898 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml +++ b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml @@ -84,15 +84,15 @@ - org.springframework.kafka - spring-kafka - 3.3.9 + org.springframework.boot + spring-boot-kafka + 4.0.0 true org.springframework.cloud spring-cloud-starter-stream-kafka - 4.3.0 + 5.0.0 true @@ -100,19 +100,19 @@ io.lettuce lettuce-core - 6.6.0.RELEASE + 6.8.1.RELEASE true - org.springframework.data - spring-data-redis - 3.5.3 + org.springframework.boot + spring-boot-data-redis + 4.0.0 true org.springframework spring-tx - 6.2.10 + 7.0.1 true @@ -126,15 +126,15 @@ - org.springframework - spring-jms - 6.2.10 + org.springframework.boot + spring-boot-jms + 4.0.0 true org.messaginghub pooled-jms - 3.1.7 + 3.1.7 true @@ -154,6 +154,29 @@ + + + org.springframework.boot + spring-boot-jdbc + 4.0.0 + true + + + + + org.springframework.boot + spring-boot-restclient + 4.0.0 + true + + + + + org.springframework.boot + spring-boot-jackson2 + 4.0.0 + + @@ -300,51 +323,51 @@ org.springframework.boot spring-boot-autoconfigure - 3.5.5 + 4.0.0 org.springframework spring-context-support - 6.2.10 + 7.0.1 true org.springframework.boot spring-boot-actuator-autoconfigure - 3.5.5 + 4.0.0 true org.springframework.boot spring-boot-configuration-processor - 3.5.5 + 4.0.0 true - - - org.springframework.security - spring-security-oauth2-client - 6.5.3 + org.springframework.boot + spring-boot-http-converter + 4.0.0 true + + - org.springframework.security - spring-security-oauth2-resource-server - 6.5.3 + org.springframework.boot + spring-boot-security + 4.0.0 true - org.springframework.security - spring-security-oauth2-jose - 6.5.3 + org.springframework.boot + spring-boot-security-oauth2-client + 4.0.0 true - org.springframework.security - spring-security-config - 6.5.3 + org.springframework.boot + spring-boot-security-oauth2-resource-server + 4.0.0 true @@ -354,26 +377,26 @@ com.google.code.findbugs jsr305 - 3.0.2 + 3.0.2 provided jakarta.servlet jakarta.servlet-api - 6.0.0 + 6.1.0 true org.hibernate.validator hibernate-validator - 8.0.3.Final + 9.0.1.Final true jakarta.validation jakarta.validation-api - 3.0.2 + 3.1.1 @@ -383,61 +406,23 @@ true - - - com.fasterxml.jackson.core - jackson-databind - 2.19.2 - true - - - com.fasterxml.jackson.core - jackson-core - 2.19.2 - true - - - com.fasterxml.jackson.core - jackson-annotations - 2.19.2 - true - - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - 2.19.2 - true - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - 2.19.2 - true - - - com.fasterxml.jackson.module - jackson-module-afterburner - 2.19.2 - true - - org.springframework.boot spring-boot-starter-test - 3.5.5 + 4.0.0 test org.springframework spring-core-test - 6.2.10 + 7.0.1 test org.springframework.boot spring-boot-configuration-metadata - 3.5.5 + 4.0.0 test @@ -445,7 +430,7 @@ org.mockito mockito-core - 5.17.0 + 5.20.0 test @@ -453,34 +438,27 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test com.mysql mysql-connector-j - 9.4.0 + 9.5.0 test org.postgresql postgresql - 42.7.7 - test - - - - org.springframework - spring-jdbc - 6.2.10 + 42.7.8 test @@ -491,7 +469,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -537,39 +515,35 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.2 com.azure:azure-servicebus-jms:[2.1.0] - com.mysql:mysql-connector-j:[9.4.0] - com.fasterxml.jackson.core:jackson-annotations:[2.19.2] - com.fasterxml.jackson.core:jackson-core:[2.19.2] - com.fasterxml.jackson.core:jackson-databind:[2.19.2] - com.fasterxml.jackson.dataformat:jackson-dataformat-xml:[2.19.2] - com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.19.2] - com.fasterxml.jackson.module:jackson-module-afterburner:[2.19.2] - io.lettuce:lettuce-core:[6.6.0.RELEASE] - jakarta.servlet:jakarta.servlet-api:[6.0.0] - jakarta.validation:jakarta.validation-api:[3.0.2] - org.hibernate.validator:hibernate-validator:[8.0.3.Final] - org.messaginghub:pooled-jms:[3.1.7] - org.postgresql:postgresql:[42.7.7] - org.springframework.boot:spring-boot-actuator-autoconfigure:[3.5.5] - org.springframework.boot:spring-boot-autoconfigure:[3.5.5] - org.springframework.boot:spring-boot-configuration-processor:[3.5.5] - org.springframework.cloud:spring-cloud-starter-stream-kafka:[4.3.0] - org.springframework.data:spring-data-redis:[3.5.3] - org.springframework.kafka:spring-kafka:[3.3.9] - org.springframework.security:spring-security-config:[6.5.3] - org.springframework.security:spring-security-oauth2-client:[6.5.3] - org.springframework.security:spring-security-oauth2-jose:[6.5.3] - org.springframework.security:spring-security-oauth2-resource-server:[6.5.3] - org.springframework:spring-context-support:[6.2.10] - org.springframework:spring-jdbc:[6.2.10] - org.springframework:spring-jms:[6.2.10] - org.springframework:spring-tx:[6.2.10] + com.mysql:mysql-connector-j:[9.5.0] + io.lettuce:lettuce-core:[6.8.1.RELEASE] + jakarta.servlet:jakarta.servlet-api:[6.1.0] + jakarta.validation:jakarta.validation-api:[3.1.1] + org.hibernate.validator:hibernate-validator:[9.0.1.Final] + org.messaginghub:pooled-jms:[3.1.7] + org.postgresql:postgresql:[42.7.8] + org.springframework.boot:spring-boot-actuator-autoconfigure:[4.0.0] + org.springframework.boot:spring-boot-autoconfigure:[4.0.0] + org.springframework.boot:spring-boot-configuration-processor:[4.0.0] + org.springframework.boot:spring-boot-data-redis:[4.0.0] + org.springframework.boot:spring-boot-http-converter:[4.0.0] + org.springframework.boot:spring-boot-kafka:[4.0.0] + org.springframework.boot:spring-boot-jackson2:[4.0.0] + org.springframework.boot:spring-boot-jdbc:[4.0.0] + org.springframework.boot:spring-boot-jms:[4.0.0] + org.springframework.boot:spring-boot-restclient:[4.0.0] + org.springframework.boot:spring-boot-security:[4.0.0] + org.springframework.boot:spring-boot-security-oauth2-client:[4.0.0] + org.springframework.boot:spring-boot-security-oauth2-resource-server:[4.0.0] + org.springframework.cloud:spring-cloud-starter-stream-kafka:[5.0.0] + org.springframework:spring-context-support:[7.0.1] + org.springframework:spring-tx:[7.0.1] @@ -578,7 +552,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadAuthenticationFilterAutoConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadAuthenticationFilterAutoConfiguration.java index 651a0cee6eff..38bf21cf8ee0 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadAuthenticationFilterAutoConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadAuthenticationFilterAutoConfiguration.java @@ -19,7 +19,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadOAuth2ClientConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadOAuth2ClientConfiguration.java index 421b0cd6d7cc..90ad31c7ab0d 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadOAuth2ClientConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadOAuth2ClientConfiguration.java @@ -3,22 +3,22 @@ package com.azure.spring.cloud.autoconfigure.implementation.aad.configuration; -import com.azure.spring.cloud.autoconfigure.implementation.aad.security.AadClientRegistrationRepository; import com.azure.spring.cloud.autoconfigure.implementation.aad.configuration.conditions.ClientCertificatePropertiesCondition; import com.azure.spring.cloud.autoconfigure.implementation.aad.configuration.conditions.ClientRegistrationCondition; +import com.azure.spring.cloud.autoconfigure.implementation.aad.configuration.properties.AadAuthenticationProperties; +import com.azure.spring.cloud.autoconfigure.implementation.aad.security.AadAzureDelegatedOAuth2AuthorizedClientProvider; +import com.azure.spring.cloud.autoconfigure.implementation.aad.security.AadClientRegistrationRepository; +import com.azure.spring.cloud.autoconfigure.implementation.aad.security.AadJwtBearerGrantRequestParametersConverter; import com.azure.spring.cloud.autoconfigure.implementation.aad.security.AadJwtClientAuthenticationParametersConverter; import com.azure.spring.cloud.autoconfigure.implementation.aad.security.AadOAuth2ClientAuthenticationJwkResolver; +import com.azure.spring.cloud.autoconfigure.implementation.aad.security.AadOidcIdTokenDecoderFactory; import com.azure.spring.cloud.autoconfigure.implementation.aad.security.JacksonHttpSessionOAuth2AuthorizedClientRepository; import com.azure.spring.cloud.autoconfigure.implementation.aad.security.OAuth2ClientAuthenticationJwkResolver; -import com.azure.spring.cloud.autoconfigure.implementation.aad.security.AadJwtBearerGrantRequestEntityConverter; -import com.azure.spring.cloud.autoconfigure.implementation.aad.security.AadAzureDelegatedOAuth2AuthorizedClientProvider; -import com.azure.spring.cloud.autoconfigure.implementation.aad.security.AadOidcIdTokenDecoderFactory; -import com.azure.spring.cloud.autoconfigure.implementation.aad.configuration.properties.AadAuthenticationProperties; import com.azure.spring.cloud.autoconfigure.implementation.aad.security.properties.AadAuthorizationServerEndpoints; import com.azure.spring.cloud.autoconfigure.implementation.aad.configuration.properties.AadProfileProperties; import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; @@ -27,16 +27,15 @@ import org.springframework.security.oauth2.client.OAuth2AuthorizedClientProvider; import org.springframework.security.oauth2.client.OAuth2AuthorizedClientProviderBuilder; import org.springframework.security.oauth2.client.RefreshTokenOAuth2AuthorizedClientProvider; -import org.springframework.security.oauth2.client.endpoint.DefaultClientCredentialsTokenResponseClient; -import org.springframework.security.oauth2.client.endpoint.DefaultJwtBearerTokenResponseClient; -import org.springframework.security.oauth2.client.endpoint.DefaultRefreshTokenTokenResponseClient; -import org.springframework.security.oauth2.client.endpoint.OAuth2ClientCredentialsGrantRequestEntityConverter; -import org.springframework.security.oauth2.client.endpoint.OAuth2RefreshTokenGrantRequestEntityConverter; +import org.springframework.security.oauth2.client.endpoint.RestClientClientCredentialsTokenResponseClient; +import org.springframework.security.oauth2.client.endpoint.RestClientJwtBearerTokenResponseClient; +import org.springframework.security.oauth2.client.endpoint.RestClientRefreshTokenTokenResponseClient; import org.springframework.security.oauth2.client.registration.ClientRegistration; import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository; import org.springframework.security.oauth2.client.web.DefaultOAuth2AuthorizedClientManager; import org.springframework.security.oauth2.client.web.OAuth2AuthorizedClientRepository; import org.springframework.security.oauth2.jwt.JwtDecoderFactory; +import org.springframework.web.client.RestClient; import static com.azure.spring.cloud.autoconfigure.implementation.aad.utils.AadRestTemplateCreator.createOAuth2AccessTokenResponseClientRestTemplate; import static com.azure.spring.cloud.autoconfigure.implementation.aad.utils.AadRestTemplateCreator.createRestTemplate; @@ -102,35 +101,30 @@ OAuth2AuthorizedClientManager authorizedClientManager( @Bean @ConditionalOnMissingBean - @SuppressWarnings({"deprecation", "removal"}) JwtBearerOAuth2AuthorizedClientProvider azureAdJwtBearerProvider( ObjectProvider resolvers) { JwtBearerOAuth2AuthorizedClientProvider provider = new JwtBearerOAuth2AuthorizedClientProvider(); OAuth2ClientAuthenticationJwkResolver resolver = resolvers.getIfUnique(); - DefaultJwtBearerTokenResponseClient client = new DefaultJwtBearerTokenResponseClient(); - client.setRestOperations(createOAuth2AccessTokenResponseClientRestTemplate(restTemplateBuilder)); - AadJwtBearerGrantRequestEntityConverter converter = new AadJwtBearerGrantRequestEntityConverter(); + RestClientJwtBearerTokenResponseClient client = new RestClientJwtBearerTokenResponseClient(); + client.setRestClient(RestClient.create(createOAuth2AccessTokenResponseClientRestTemplate(restTemplateBuilder))); + client.addParametersConverter(new AadJwtBearerGrantRequestParametersConverter()); if (resolver != null) { - converter.addParametersConverter(new AadJwtClientAuthenticationParametersConverter<>(resolver::resolve)); + client.addParametersConverter(new AadJwtClientAuthenticationParametersConverter<>(resolver::resolve)); } - client.setRequestEntityConverter(converter); provider.setAccessTokenResponseClient(client); return provider; } @Bean @ConditionalOnMissingBean - @SuppressWarnings({"deprecation", "removal"}) RefreshTokenOAuth2AuthorizedClientProvider azureRefreshTokenProvider( ObjectProvider resolvers) { RefreshTokenOAuth2AuthorizedClientProvider provider = new RefreshTokenOAuth2AuthorizedClientProvider(); OAuth2ClientAuthenticationJwkResolver resolver = resolvers.getIfUnique(); - DefaultRefreshTokenTokenResponseClient client = new DefaultRefreshTokenTokenResponseClient(); - client.setRestOperations(createOAuth2AccessTokenResponseClientRestTemplate(restTemplateBuilder)); + RestClientRefreshTokenTokenResponseClient client = new RestClientRefreshTokenTokenResponseClient(); + client.setRestClient(RestClient.create(createOAuth2AccessTokenResponseClientRestTemplate(restTemplateBuilder))); if (resolver != null) { - OAuth2RefreshTokenGrantRequestEntityConverter converter = new OAuth2RefreshTokenGrantRequestEntityConverter(); - converter.addParametersConverter(new AadJwtClientAuthenticationParametersConverter<>(resolver::resolve)); - client.setRequestEntityConverter(converter); + client.addParametersConverter(new AadJwtClientAuthenticationParametersConverter<>(resolver::resolve)); } provider.setAccessTokenResponseClient(client); return provider; @@ -145,17 +139,13 @@ JwtDecoderFactory azureAdJwtDecoderFactory(AadAuthentication return new AadOidcIdTokenDecoderFactory(endpoints.getJwkSetEndpoint(), createRestTemplate(restTemplateBuilder)); } - @SuppressWarnings({"deprecation", "removal"}) private void clientCredentialsGrantBuilderAccessTokenResponseClientCustomizer( OAuth2AuthorizedClientProviderBuilder.ClientCredentialsGrantBuilder builder, OAuth2ClientAuthenticationJwkResolver resolver) { - DefaultClientCredentialsTokenResponseClient client = new DefaultClientCredentialsTokenResponseClient(); - client.setRestOperations(createOAuth2AccessTokenResponseClientRestTemplate(restTemplateBuilder)); + RestClientClientCredentialsTokenResponseClient client = new RestClientClientCredentialsTokenResponseClient(); + client.setRestClient(RestClient.create(createOAuth2AccessTokenResponseClientRestTemplate(restTemplateBuilder))); if (resolver != null) { - OAuth2ClientCredentialsGrantRequestEntityConverter converter = - new OAuth2ClientCredentialsGrantRequestEntityConverter(); - converter.addParametersConverter(new AadJwtClientAuthenticationParametersConverter<>(resolver::resolve)); - client.setRequestEntityConverter(converter); + client.addParametersConverter(new AadJwtClientAuthenticationParametersConverter<>(resolver::resolve)); } builder.accessTokenResponseClient(client); } diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadResourceServerConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadResourceServerConfiguration.java index 671b8f9bb457..94b43b0a0a45 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadResourceServerConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadResourceServerConfiguration.java @@ -12,8 +12,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.boot.autoconfigure.security.ConditionalOnDefaultWebSecurity; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.security.autoconfigure.web.servlet.ConditionalOnDefaultWebSecurity; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadWebApplicationConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadWebApplicationConfiguration.java index 4771c94a0863..fa86e54351c2 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadWebApplicationConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadWebApplicationConfiguration.java @@ -8,8 +8,8 @@ import com.azure.spring.cloud.autoconfigure.implementation.aad.security.AadOAuth2UserService; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.boot.autoconfigure.security.ConditionalOnDefaultWebSecurity; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.security.autoconfigure.web.servlet.ConditionalOnDefaultWebSecurity; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/AadAuthenticationFilter.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/AadAuthenticationFilter.java index 0d5460f2d010..d1d55f186b2f 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/AadAuthenticationFilter.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/AadAuthenticationFilter.java @@ -19,7 +19,7 @@ import jakarta.servlet.http.HttpSession; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.security.core.Authentication; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/AadGraphClient.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/AadGraphClient.java index 294cf4e28bfe..fe52cb63f35b 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/AadGraphClient.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/AadGraphClient.java @@ -19,7 +19,7 @@ import com.microsoft.aad.msal4j.UserAssertion; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadJwtBearerGrantRequestEntityConverter.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadJwtBearerGrantRequestEntityConverter.java deleted file mode 100644 index 378b13cfc165..000000000000 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadJwtBearerGrantRequestEntityConverter.java +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -package com.azure.spring.cloud.autoconfigure.implementation.aad.security; - -import org.springframework.security.oauth2.client.endpoint.JwtBearerGrantRequest; -import org.springframework.security.oauth2.client.endpoint.JwtBearerGrantRequestEntityConverter; -import org.springframework.util.MultiValueMap; - -/** - * This is a special JWT Bearer flow implementation for Microsoft identify platform. - * - * @since 4.3.0 - * @see OAuth 2.0 On-Behalf-Of - */ -@SuppressWarnings({"deprecation", "removal"}) -public class AadJwtBearerGrantRequestEntityConverter extends JwtBearerGrantRequestEntityConverter { - - @Override - protected MultiValueMap createParameters(JwtBearerGrantRequest jwtBearerGrantRequest) { - MultiValueMap parameters = super.createParameters(jwtBearerGrantRequest); - parameters.add("requested_token_use", "on_behalf_of"); - return parameters; - } -} - diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadJwtBearerGrantRequestParametersConverter.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadJwtBearerGrantRequestParametersConverter.java new file mode 100644 index 000000000000..234e2c8f2a02 --- /dev/null +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadJwtBearerGrantRequestParametersConverter.java @@ -0,0 +1,29 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package com.azure.spring.cloud.autoconfigure.implementation.aad.security; + +import org.springframework.core.convert.converter.Converter; +import org.springframework.security.oauth2.client.endpoint.DefaultOAuth2TokenRequestParametersConverter; +import org.springframework.security.oauth2.client.endpoint.JwtBearerGrantRequest; +import org.springframework.util.MultiValueMap; + +/** + * This is a special JWT Bearer flow implementation for Microsoft identify platform. + * + * @since 7.0.0 + * @see OAuth 2.0 On-Behalf-Of + */ +public class AadJwtBearerGrantRequestParametersConverter + implements Converter> { + + private final DefaultOAuth2TokenRequestParametersConverter delegate = + new DefaultOAuth2TokenRequestParametersConverter<>(); + + @Override + public MultiValueMap convert(JwtBearerGrantRequest jwtBearerGrantRequest) { + MultiValueMap parameters = delegate.convert(jwtBearerGrantRequest); + parameters.add("requested_token_use", "on_behalf_of"); + return parameters; + } +} diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2AuthorizationCodeGrantRequestHeadersConverter.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2AuthorizationCodeGrantRequestHeadersConverter.java new file mode 100644 index 000000000000..73a65f200226 --- /dev/null +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2AuthorizationCodeGrantRequestHeadersConverter.java @@ -0,0 +1,28 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package com.azure.spring.cloud.autoconfigure.implementation.aad.security; + +import com.azure.spring.cloud.core.implementation.util.AzureSpringIdentifier; +import org.springframework.core.convert.converter.Converter; +import org.springframework.http.HttpHeaders; +import org.springframework.security.oauth2.client.endpoint.OAuth2AuthorizationCodeGrantRequest; + +import java.util.Collections; +import java.util.UUID; + +/** + * When using "auth-code" in AAD, it's used to expand head parameters of the request. + */ +public class AadOAuth2AuthorizationCodeGrantRequestHeadersConverter + implements Converter { + + @Override + public HttpHeaders convert(OAuth2AuthorizationCodeGrantRequest request) { + HttpHeaders httpHeaders = new HttpHeaders(); + httpHeaders.put("x-client-SKU", Collections.singletonList(AzureSpringIdentifier.AZURE_SPRING_AAD)); + httpHeaders.put("x-client-VER", Collections.singletonList(AzureSpringIdentifier.VERSION)); + httpHeaders.put("client-request-id", Collections.singletonList(UUID.randomUUID().toString())); + return httpHeaders; + } +} diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2AuthorizationCodeGrantRequestEntityConverter.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2AuthorizationCodeGrantRequestParametersConverter.java similarity index 65% rename from sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2AuthorizationCodeGrantRequestEntityConverter.java rename to sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2AuthorizationCodeGrantRequestParametersConverter.java index 40e2469875e6..a723305e7feb 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2AuthorizationCodeGrantRequestEntityConverter.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2AuthorizationCodeGrantRequestParametersConverter.java @@ -3,7 +3,7 @@ package com.azure.spring.cloud.autoconfigure.implementation.aad.security; -import com.azure.spring.cloud.core.implementation.util.AzureSpringIdentifier; +import org.springframework.core.convert.converter.Converter; import org.springframework.security.oauth2.client.endpoint.AbstractOAuth2AuthorizationGrantRequest; import org.springframework.security.oauth2.client.endpoint.OAuth2AuthorizationCodeGrantRequest; import org.springframework.security.oauth2.client.registration.ClientRegistration; @@ -17,46 +17,32 @@ /** * Used to set "scope" parameter when use "auth-code" to get "access_token". - * - * @see AbstractOAuth2AuthorizationCodeGrantRequestEntityConverter */ -public class AadOAuth2AuthorizationCodeGrantRequestEntityConverter - extends AbstractOAuth2AuthorizationCodeGrantRequestEntityConverter { +public class AadOAuth2AuthorizationCodeGrantRequestParametersConverter + implements Converter> { private final Set azureClientAccessTokenScopes; /** - * Creates a new instance of {@link AadOAuth2AuthorizationCodeGrantRequestEntityConverter}. + * Creates a new instance of {@link AadOAuth2AuthorizationCodeGrantRequestParametersConverter}. * * @param azureClientAccessTokenScopes the Azure client access token scopes */ - public AadOAuth2AuthorizationCodeGrantRequestEntityConverter(Set azureClientAccessTokenScopes) { + public AadOAuth2AuthorizationCodeGrantRequestParametersConverter(Set azureClientAccessTokenScopes) { this.azureClientAccessTokenScopes = azureClientAccessTokenScopes; } - /** - * Get application id. - * - * @return application id - */ @Override - protected String getApplicationId() { - return AzureSpringIdentifier.AZURE_SPRING_AAD; - } + public MultiValueMap convert(OAuth2AuthorizationCodeGrantRequest request) { + MultiValueMap parameters = new LinkedMultiValueMap<>(); - /** - * Get http body. - * - * @return http body - */ - @Override - public MultiValueMap getHttpBody(OAuth2AuthorizationCodeGrantRequest request) { - MultiValueMap body = new LinkedMultiValueMap<>(); + // Add custom scope for Azure client String scopes = String.join(" ", isRequestForAzureClient(request) ? azureClientAccessTokenScopes : request.getClientRegistration().getScopes()); - body.add("scope", scopes); - return body; + parameters.add("scope", scopes); + + return parameters; } private boolean isRequestForAzureClient(OAuth2AuthorizationCodeGrantRequest request) { diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2UserService.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2UserService.java index 580170847f8e..cf6b4ae37088 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2UserService.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2UserService.java @@ -11,7 +11,7 @@ import jakarta.servlet.http.HttpSession; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.security.core.Authentication; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadResourceServerHttpSecurityConfigurer.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadResourceServerHttpSecurityConfigurer.java index be05dc42a27a..4bf969b23754 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadResourceServerHttpSecurityConfigurer.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadResourceServerHttpSecurityConfigurer.java @@ -31,8 +31,12 @@ public class AadResourceServerHttpSecurityConfigurer extends AbstractHttpConfigu private Converter> jwtGrantedAuthoritiesConverter; @Override - public void init(HttpSecurity builder) throws Exception { - super.init(builder); + public void init(HttpSecurity builder) { + try { + super.init(builder); + } catch (Exception e) { + throw new RuntimeException("Failed to initialize AadResourceServerHttpSecurityConfigurer", e); + } ApplicationContext context = builder.getSharedObject(ApplicationContext.class); this.properties = context.getBean(AadResourceServerProperties.class); // @formatter:off diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadWebApplicationHttpSecurityConfigurer.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadWebApplicationHttpSecurityConfigurer.java index 61f65944f10b..b52f0a359590 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadWebApplicationHttpSecurityConfigurer.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadWebApplicationHttpSecurityConfigurer.java @@ -6,15 +6,15 @@ import com.azure.spring.cloud.autoconfigure.implementation.aad.configuration.properties.AadAuthenticationProperties; import jakarta.servlet.Filter; import org.springframework.beans.factory.ObjectProvider; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.context.ApplicationContext; import org.springframework.core.ResolvableType; import org.springframework.security.config.annotation.SecurityConfigurer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; -import org.springframework.security.oauth2.client.endpoint.DefaultAuthorizationCodeTokenResponseClient; import org.springframework.security.oauth2.client.endpoint.OAuth2AccessTokenResponseClient; import org.springframework.security.oauth2.client.endpoint.OAuth2AuthorizationCodeGrantRequest; +import org.springframework.security.oauth2.client.endpoint.RestClientAuthorizationCodeTokenResponseClient; import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserRequest; import org.springframework.security.oauth2.client.oidc.web.logout.OidcClientInitiatedLogoutSuccessHandler; import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository; @@ -24,6 +24,7 @@ import org.springframework.security.oauth2.core.oidc.user.OidcUser; import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; import org.springframework.util.StringUtils; +import org.springframework.web.client.RestClient; import static com.azure.spring.cloud.autoconfigure.implementation.aad.utils.AadRestTemplateCreator.createOAuth2AccessTokenResponseClientRestTemplate; @@ -64,8 +65,12 @@ public class AadWebApplicationHttpSecurityConfigurer extends AbstractHttpConfigu private Filter conditionalAccessFilter; @Override - public void init(HttpSecurity builder)throws Exception { - super.init(builder); + public void init(HttpSecurity builder) { + try { + super.init(builder); + } catch (Exception e) { + throw new RuntimeException("Failed to initialize AadWebApplicationHttpSecurityConfigurer", e); + } ApplicationContext context = builder.getSharedObject(ApplicationContext.class); this.repo = context.getBean(ClientRegistrationRepository.class); @@ -87,7 +92,7 @@ public void init(HttpSecurity builder)throws Exception { } @Override - public void configure(HttpSecurity builder) throws Exception { + public void configure(HttpSecurity builder) { if (conditionalAccessFilter != null) { builder.addFilterAfter(conditionalAccessFilter, OAuth2AuthorizationRequestRedirectFilter.class); } @@ -133,19 +138,17 @@ protected LogoutSuccessHandler oidcLogoutSuccessHandler() { * * @return the access token response client */ - @SuppressWarnings("removal") protected OAuth2AccessTokenResponseClient accessTokenResponseClient() { - DefaultAuthorizationCodeTokenResponseClient result = new DefaultAuthorizationCodeTokenResponseClient(); - result.setRestOperations(createOAuth2AccessTokenResponseClientRestTemplate(restTemplateBuilder)); + RestClientAuthorizationCodeTokenResponseClient result = new RestClientAuthorizationCodeTokenResponseClient(); + result.setRestClient(RestClient.create(createOAuth2AccessTokenResponseClientRestTemplate(restTemplateBuilder))); if (repo instanceof AadClientRegistrationRepository) { - AadOAuth2AuthorizationCodeGrantRequestEntityConverter converter = - new AadOAuth2AuthorizationCodeGrantRequestEntityConverter( - ((AadClientRegistrationRepository) repo).getAzureClientAccessTokenScopes()); + result.addHeadersConverter(new AadOAuth2AuthorizationCodeGrantRequestHeadersConverter()); + result.addParametersConverter(new AadOAuth2AuthorizationCodeGrantRequestParametersConverter( + ((AadClientRegistrationRepository) repo).getAzureClientAccessTokenScopes())); OAuth2ClientAuthenticationJwkResolver jwkResolver = jwkResolvers.getIfUnique(); if (jwkResolver != null) { - converter.addParametersConverter(new AadJwtClientAuthenticationParametersConverter<>(jwkResolver::resolve)); + result.addParametersConverter(new AadJwtClientAuthenticationParametersConverter<>(jwkResolver::resolve)); } - result.setRequestEntityConverter(converter); } return result; } diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AbstractOAuth2AuthorizationCodeGrantRequestEntityConverter.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AbstractOAuth2AuthorizationCodeGrantRequestEntityConverter.java deleted file mode 100644 index a75da05ec468..000000000000 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AbstractOAuth2AuthorizationCodeGrantRequestEntityConverter.java +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -package com.azure.spring.cloud.autoconfigure.implementation.aad.security; - -import com.azure.spring.cloud.core.implementation.util.AzureSpringIdentifier; -import org.springframework.http.HttpHeaders; -import org.springframework.security.oauth2.client.endpoint.OAuth2AuthorizationCodeGrantRequest; -import org.springframework.security.oauth2.client.endpoint.OAuth2AuthorizationCodeGrantRequestEntityConverter; -import org.springframework.util.MultiValueMap; -import org.springframework.util.MultiValueMapAdapter; - -import java.util.Collections; -import java.util.UUID; - -/** - * When using "auth-code" in AAD and AAD B2C, it's used to expand head and body parameters of the request. - */ -@SuppressWarnings({"deprecation", "removal"}) -public abstract class AbstractOAuth2AuthorizationCodeGrantRequestEntityConverter - extends OAuth2AuthorizationCodeGrantRequestEntityConverter { - - private static final MultiValueMap EMPTY_MULTI_VALUE_MAP = - new MultiValueMapAdapter<>(Collections.emptyMap()); - - protected AbstractOAuth2AuthorizationCodeGrantRequestEntityConverter() { - addHeadersConverter(this::getHttpHeaders); - addParametersConverter(this::getHttpBody); - } - - /** - * Gets the application ID. - * - * @return the application ID - */ - protected abstract String getApplicationId(); - - /** - * Additional default headers information. - * @return HttpHeaders - */ - protected HttpHeaders getHttpHeaders(OAuth2AuthorizationCodeGrantRequest request) { - HttpHeaders httpHeaders = new HttpHeaders(); - httpHeaders.put("x-client-SKU", Collections.singletonList(getApplicationId())); - httpHeaders.put("x-client-VER", Collections.singletonList(AzureSpringIdentifier.VERSION)); - httpHeaders.put("client-request-id", Collections.singletonList(UUID.randomUUID().toString())); - return httpHeaders; - } - - /** - * Default body of OAuth2AuthorizationCodeGrantRequest. - * @param request OAuth2AuthorizationCodeGrantRequest - * @return MultiValueMap - */ - protected MultiValueMap getHttpBody(OAuth2AuthorizationCodeGrantRequest request) { - return EMPTY_MULTI_VALUE_MAP; - } -} diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/graph/GraphClient.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/graph/GraphClient.java index ed6e55e2961e..422fee37c3ae 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/graph/GraphClient.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/graph/GraphClient.java @@ -6,7 +6,7 @@ import com.azure.spring.cloud.autoconfigure.implementation.aad.configuration.properties.AadAuthenticationProperties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/jose/RestOperationsResourceRetriever.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/jose/RestOperationsResourceRetriever.java index e8baacc407ac..89a2b6529a74 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/jose/RestOperationsResourceRetriever.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/jose/RestOperationsResourceRetriever.java @@ -5,7 +5,7 @@ import com.nimbusds.jose.util.Resource; import com.nimbusds.jose.util.ResourceRetriever; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.MediaType; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/jwt/AadIssuerJwsKeySelector.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/jwt/AadIssuerJwsKeySelector.java index 366013d1e508..debef6484e4c 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/jwt/AadIssuerJwsKeySelector.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/jwt/AadIssuerJwsKeySelector.java @@ -14,7 +14,7 @@ import com.nimbusds.jose.util.ResourceRetriever; import com.nimbusds.jwt.JWTClaimsSet; import com.nimbusds.jwt.proc.JWTClaimsSetAwareJWSKeySelector; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.web.client.RestOperations; import java.net.URL; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/serde/jackson/SerializerUtils.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/serde/jackson/SerializerUtils.java index cb6fb358a3b6..20f17730ac89 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/serde/jackson/SerializerUtils.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/serde/jackson/SerializerUtils.java @@ -13,6 +13,7 @@ import java.util.Collections; import java.util.Map; +@SuppressWarnings("removal") public final class SerializerUtils { private static final ObjectMapper OBJECT_MAPPER; private static final TypeReference> TYPE_REFERENCE = new TypeReference<>() { }; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/utils/AadRestTemplateCreator.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/utils/AadRestTemplateCreator.java index ffdd2ee2d5b4..bdd95b5c6aad 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/utils/AadRestTemplateCreator.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/utils/AadRestTemplateCreator.java @@ -3,7 +3,7 @@ package com.azure.spring.cloud.autoconfigure.implementation.aad.utils; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.http.converter.FormHttpMessageConverter; import org.springframework.security.oauth2.client.http.OAuth2ErrorResponseErrorHandler; import org.springframework.security.oauth2.core.http.converter.OAuth2AccessTokenResponseHttpMessageConverter; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cAutoConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cAutoConfiguration.java index ae577e16a327..f4a3efa4a038 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cAutoConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cAutoConfiguration.java @@ -11,7 +11,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cOAuth2ClientConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cOAuth2ClientConfiguration.java index 75d4b5f174d1..7a1f933034f7 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cOAuth2ClientConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cOAuth2ClientConfiguration.java @@ -13,7 +13,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; @@ -25,8 +25,8 @@ import org.springframework.security.oauth2.client.OAuth2AuthorizedClientProviderBuilder; import org.springframework.security.oauth2.client.OAuth2AuthorizedClientService; import org.springframework.security.oauth2.client.RefreshTokenOAuth2AuthorizedClientProvider; -import org.springframework.security.oauth2.client.endpoint.DefaultClientCredentialsTokenResponseClient; -import org.springframework.security.oauth2.client.endpoint.DefaultRefreshTokenTokenResponseClient; +import org.springframework.security.oauth2.client.endpoint.RestClientClientCredentialsTokenResponseClient; +import org.springframework.security.oauth2.client.endpoint.RestClientRefreshTokenTokenResponseClient; import org.springframework.security.oauth2.client.registration.ClientRegistration; import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository; import org.springframework.security.oauth2.client.web.AuthenticatedPrincipalOAuth2AuthorizedClientRepository; @@ -35,6 +35,7 @@ import org.springframework.security.oauth2.client.web.OAuth2LoginAuthenticationFilter; import org.springframework.security.oauth2.core.AuthorizationGrantType; import org.springframework.security.oauth2.core.ClientAuthenticationMethod; +import org.springframework.web.client.RestClient; import java.util.List; import java.util.Map; @@ -152,20 +153,18 @@ OAuth2AuthorizedClientManager authorizedClientManager(ClientRegistrationReposito return manager; } - @SuppressWarnings({"deprecation", "removal"}) private RefreshTokenOAuth2AuthorizedClientProvider azureRefreshTokenProvider() { RefreshTokenOAuth2AuthorizedClientProvider provider = new RefreshTokenOAuth2AuthorizedClientProvider(); - DefaultRefreshTokenTokenResponseClient responseClient = new DefaultRefreshTokenTokenResponseClient(); - responseClient.setRestOperations(createOAuth2AccessTokenResponseClientRestTemplate(restTemplateBuilder)); + RestClientRefreshTokenTokenResponseClient responseClient = new RestClientRefreshTokenTokenResponseClient(); + responseClient.setRestClient(RestClient.create(createOAuth2AccessTokenResponseClientRestTemplate(restTemplateBuilder))); provider.setAccessTokenResponseClient(responseClient); return provider; } - @SuppressWarnings({"deprecation", "removal"}) private ClientCredentialsOAuth2AuthorizedClientProvider azureClientCredentialProvider() { ClientCredentialsOAuth2AuthorizedClientProvider provider = new ClientCredentialsOAuth2AuthorizedClientProvider(); - DefaultClientCredentialsTokenResponseClient responseClient = new DefaultClientCredentialsTokenResponseClient(); - responseClient.setRestOperations(createOAuth2AccessTokenResponseClientRestTemplate(restTemplateBuilder)); + RestClientClientCredentialsTokenResponseClient responseClient = new RestClientClientCredentialsTokenResponseClient(); + responseClient.setRestClient(RestClient.create(createOAuth2AccessTokenResponseClientRestTemplate(restTemplateBuilder))); provider.setAccessTokenResponseClient(responseClient); return provider; } diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cResourceServerAutoConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cResourceServerAutoConfiguration.java index 11030fd55ac0..a35b2c75065a 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cResourceServerAutoConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cResourceServerAutoConfiguration.java @@ -19,7 +19,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/security/AadB2cOAuth2AuthorizationCodeGrantRequestEntityConverter.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/security/AadB2cOAuth2AuthorizationCodeGrantRequestEntityConverter.java deleted file mode 100644 index 5588f24a5af4..000000000000 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/security/AadB2cOAuth2AuthorizationCodeGrantRequestEntityConverter.java +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -package com.azure.spring.cloud.autoconfigure.implementation.aadb2c.security; - -import com.azure.spring.cloud.autoconfigure.implementation.aad.security.AbstractOAuth2AuthorizationCodeGrantRequestEntityConverter; -import com.azure.spring.cloud.core.implementation.util.AzureSpringIdentifier; - -/** - * Used to set azure service header tag when use "auth-code" to get "access_token". - */ -public class AadB2cOAuth2AuthorizationCodeGrantRequestEntityConverter - extends AbstractOAuth2AuthorizationCodeGrantRequestEntityConverter { - - @Override - protected String getApplicationId() { - return AzureSpringIdentifier.AZURE_SPRING_B2C; - } -} diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/security/AadB2cOAuth2AuthorizationCodeGrantRequestHeadersConverter.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/security/AadB2cOAuth2AuthorizationCodeGrantRequestHeadersConverter.java new file mode 100644 index 000000000000..bc508366804f --- /dev/null +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/security/AadB2cOAuth2AuthorizationCodeGrantRequestHeadersConverter.java @@ -0,0 +1,29 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package com.azure.spring.cloud.autoconfigure.implementation.aadb2c.security; + +import com.azure.spring.cloud.core.implementation.util.AzureSpringIdentifier; +import org.springframework.core.convert.converter.Converter; +import org.springframework.http.HttpHeaders; +import org.springframework.security.oauth2.client.endpoint.OAuth2AuthorizationCodeGrantRequest; + +import java.util.Collections; +import java.util.UUID; + +/** + * Converter that adds Azure AD B2C specific HTTP headers to authorization code grant requests. + * These headers are used for telemetry and tracking purposes by Azure AD B2C. + */ +public class AadB2cOAuth2AuthorizationCodeGrantRequestHeadersConverter + implements Converter { + + @Override + public HttpHeaders convert(OAuth2AuthorizationCodeGrantRequest request) { + HttpHeaders headers = new HttpHeaders(); + headers.put("x-client-SKU", Collections.singletonList(AzureSpringIdentifier.AZURE_SPRING_B2C)); + headers.put("x-client-VER", Collections.singletonList(AzureSpringIdentifier.VERSION)); + headers.put("client-request-id", Collections.singletonList(UUID.randomUUID().toString())); + return headers; + } +} diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/security/AadB2cOidcLoginConfigurer.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/security/AadB2cOidcLoginConfigurer.java index ad0617029ec7..4af30a83ec74 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/security/AadB2cOidcLoginConfigurer.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/security/AadB2cOidcLoginConfigurer.java @@ -2,14 +2,15 @@ // Licensed under the MIT License. package com.azure.spring.cloud.autoconfigure.implementation.aadb2c.security; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; -import org.springframework.security.oauth2.client.endpoint.DefaultAuthorizationCodeTokenResponseClient; import org.springframework.security.oauth2.client.endpoint.OAuth2AccessTokenResponseClient; import org.springframework.security.oauth2.client.endpoint.OAuth2AuthorizationCodeGrantRequest; +import org.springframework.security.oauth2.client.endpoint.RestClientAuthorizationCodeTokenResponseClient; import org.springframework.security.oauth2.client.web.OAuth2AuthorizationRequestResolver; import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; +import org.springframework.web.client.RestClient; import static com.azure.spring.cloud.autoconfigure.implementation.aad.utils.AadRestTemplateCreator.createOAuth2AccessTokenResponseClientRestTemplate; @@ -74,10 +75,9 @@ public AadB2cOidcLoginConfigurer(LogoutSuccessHandler handler, * Initialize the SecurityBuilder. * * @param http the http - * @throws Exception failed to initialize SecurityBuilder */ @Override - public void init(HttpSecurity http) throws Exception { + public void init(HttpSecurity http) { // @formatter:off http.logout(logout -> logout.logoutSuccessHandler(handler)) .oauth2Login(oauth2 -> oauth2 @@ -92,14 +92,13 @@ public void init(HttpSecurity http) throws Exception { * * @return the access token response client */ - @SuppressWarnings({"deprecation", "removal"}) protected OAuth2AccessTokenResponseClient accessTokenResponseClient() { if (accessTokenResponseClient != null) { return accessTokenResponseClient; } - DefaultAuthorizationCodeTokenResponseClient client = new DefaultAuthorizationCodeTokenResponseClient(); - client.setRequestEntityConverter(new AadB2cOAuth2AuthorizationCodeGrantRequestEntityConverter()); - client.setRestOperations(createOAuth2AccessTokenResponseClientRestTemplate(restTemplateBuilder)); + RestClientAuthorizationCodeTokenResponseClient client = new RestClientAuthorizationCodeTokenResponseClient(); + client.addHeadersConverter(new AadB2cOAuth2AuthorizationCodeGrantRequestHeadersConverter()); + client.setRestClient(RestClient.create(createOAuth2AccessTokenResponseClientRestTemplate(restTemplateBuilder))); return client; } } diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/compatibility/AzureSpringBootVersionVerifier.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/compatibility/AzureSpringBootVersionVerifier.java index 7a9eedd74ec5..acdcd0857c37 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/compatibility/AzureSpringBootVersionVerifier.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/compatibility/AzureSpringBootVersionVerifier.java @@ -18,14 +18,10 @@ public class AzureSpringBootVersionVerifier { private static final Logger LOGGER = LoggerFactory.getLogger(AzureSpringBootVersionVerifier.class); - static final String SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_3_0 = "org.springframework.boot.autoconfigure.validation.ValidationConfigurationCustomizer"; - static final String SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_3_1 = "org.springframework.boot.autoconfigure.validation.ValidationConfigurationCustomizer.ValidationConfigurationCustomizer,setIgnoreRegistrationFailure,"; - static final String SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_3_2 = "org.springframework.boot.autoconfigure.web.client.RestClientSsl"; - static final String SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_3_3 = "org.springframework.boot.autoconfigure.ldap.PropertiesLdapConnectionDetails"; - static final String SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_3_4 = "org.springframework.boot.autoconfigure.http.client.HttpClientProperties"; - static final String SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_3_5 = "org.springframework.boot.autoconfigure.http.codec.HttpCodecsProperties"; + static final String SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_4_0 = "org.springframework.boot.autoconfigure.preinitialize.BackgroundPreinitializer"; + /** - * Versions supported by Spring Cloud Azure, for present is [3.0, 3.1, 3.2, 3.3, 3.4, 3.5]. Update this value if needed. + * Versions supported by Spring Cloud Azure, for present is [4.0]. Update this value if needed. */ private final Map supportedVersions = new HashMap<>(); @@ -47,12 +43,7 @@ public AzureSpringBootVersionVerifier(List acceptedVersions, ClassNameRe * Init default supported Spring Boot Version compatibility check meta data. */ private void initDefaultSupportedBootVersionCheckMeta() { - supportedVersions.put("3.0", SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_3_0); - supportedVersions.put("3.1", SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_3_1); - supportedVersions.put("3.2", SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_3_2); - supportedVersions.put("3.3", SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_3_3); - supportedVersions.put("3.4", SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_3_4); - supportedVersions.put("3.5", SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_3_5); + supportedVersions.put("4.0", SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_4_0); } /** diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/compatibility/properties/AzureCompatibilityVerifierProperties.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/compatibility/properties/AzureCompatibilityVerifierProperties.java index 6b5d92fa3381..bf80ec79cc08 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/compatibility/properties/AzureCompatibilityVerifierProperties.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/compatibility/properties/AzureCompatibilityVerifierProperties.java @@ -18,7 +18,7 @@ public class AzureCompatibilityVerifierProperties { /** * Comma-delimited list of Spring Boot versions that are compatible with current Spring Cloud Azure's version. */ - private List compatibleBootVersions = Arrays.asList("3.0.x", "3.1.x", "3.2.x", "3.3.x", "3.4.x", "3.5.x"); + private List compatibleBootVersions = Arrays.asList("4.0.x"); public boolean isEnabled() { return this.enabled; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/context/AzureGlobalConfigurationEnvironmentPostProcessor.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/context/AzureGlobalConfigurationEnvironmentPostProcessor.java index b7342a2dc7bc..a15158401714 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/context/AzureGlobalConfigurationEnvironmentPostProcessor.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/context/AzureGlobalConfigurationEnvironmentPostProcessor.java @@ -5,7 +5,7 @@ import org.apache.commons.logging.Log; import org.springframework.boot.SpringApplication; -import org.springframework.boot.env.EnvironmentPostProcessor; +import org.springframework.boot.EnvironmentPostProcessor; import org.springframework.boot.logging.DeferredLog; import org.springframework.core.Ordered; import org.springframework.core.env.ConfigurableEnvironment; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/data/redis/AzureLettucePasswordlessAutoConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/data/redis/AzureLettucePasswordlessAutoConfiguration.java index e10df681b455..940c7d30dbf1 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/data/redis/AzureLettucePasswordlessAutoConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/data/redis/AzureLettucePasswordlessAutoConfiguration.java @@ -16,9 +16,9 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.autoconfigure.data.redis.LettuceClientConfigurationBuilderCustomizer; -import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration; -import org.springframework.boot.autoconfigure.data.redis.RedisProperties; +import org.springframework.boot.data.redis.autoconfigure.LettuceClientConfigurationBuilderCustomizer; +import org.springframework.boot.data.redis.autoconfigure.DataRedisAutoConfiguration; +import org.springframework.boot.data.redis.autoconfigure.DataRedisProperties; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -38,9 +38,9 @@ @Configuration(proxyBeanMethods = false) @ConditionalOnClass({LettuceConnection.class, RedisCredentials.class}) @ConditionalOnExpression("${spring.data.redis.azure.passwordless-enabled:false}") -@AutoConfigureBefore(RedisAutoConfiguration.class) +@AutoConfigureBefore(DataRedisAutoConfiguration.class) @ConditionalOnProperty(prefix = "spring.data.redis", name = {"host"}) -@EnableConfigurationProperties(RedisProperties.class) +@EnableConfigurationProperties(DataRedisProperties.class) public class AzureLettucePasswordlessAutoConfiguration { @Bean @@ -51,7 +51,7 @@ AzureRedisPasswordlessProperties redisPasswordlessProperties() { @Bean(name = "azureRedisCredentials") @ConditionalOnMissingBean - AzureRedisCredentials azureRedisCredentials(RedisProperties redisProperties, + AzureRedisCredentials azureRedisCredentials(DataRedisProperties redisProperties, AzureRedisPasswordlessProperties azureRedisPasswordlessProperties, AzureGlobalProperties azureGlobalProperties) { AzureRedisPasswordlessProperties redisPasswordlessProperties = mergeAzureProperties(azureGlobalProperties, azureRedisPasswordlessProperties); diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/AzureEventHubsConsumerClientConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/AzureEventHubsConsumerClientConfiguration.java index f1a8bc145d36..a7fd2cbd2b76 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/AzureEventHubsConsumerClientConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/AzureEventHubsConsumerClientConfiguration.java @@ -51,7 +51,7 @@ static class SharedConsumerConnectionConfiguration { SharedConsumerConnectionConfiguration(AzureEventHubsProperties properties, EventHubClientBuilder builder) { this.builder = builder; - PropertyMapper mapper = PropertyMapper.get().alwaysApplyingWhenNonNull(); + PropertyMapper mapper = PropertyMapper.get(); mapper.from(properties.getConsumer().getConsumerGroup()).to(builder::consumerGroup); mapper.from(properties.getConsumer().getPrefetchCount()).to(builder::prefetchCount); } diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/kafka/KafkaPropertiesBeanPostProcessor.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/kafka/KafkaPropertiesBeanPostProcessor.java index b8e0e0fef93e..a1bf6c6754a3 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/kafka/KafkaPropertiesBeanPostProcessor.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/kafka/KafkaPropertiesBeanPostProcessor.java @@ -10,7 +10,7 @@ import org.springframework.beans.BeansException; import org.springframework.beans.factory.ObjectProvider; import org.springframework.beans.factory.config.BeanPostProcessor; -import org.springframework.boot.autoconfigure.kafka.KafkaProperties; +import org.springframework.boot.kafka.autoconfigure.KafkaProperties; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.core.ResolvableType; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/properties/AzureEventHubsProperties.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/properties/AzureEventHubsProperties.java index a0ca762af1e2..0b55ae5ae3a4 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/properties/AzureEventHubsProperties.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/properties/AzureEventHubsProperties.java @@ -44,7 +44,7 @@ public class AzureEventHubsProperties extends AzureEventHubsCommonProperties private final Processor processor = new Processor(); public Producer buildProducerProperties() { - PropertyMapper propertyMapper = PropertyMapper.get().alwaysApplyingWhenNonNull(); + PropertyMapper propertyMapper = PropertyMapper.get(); Producer properties = new Producer(); AzurePropertiesUtils.mergeAzureCommonProperties(this, this.producer, properties); @@ -65,7 +65,7 @@ public Producer buildProducerProperties() { } public Consumer buildConsumerProperties() { - PropertyMapper propertyMapper = PropertyMapper.get().alwaysApplyingWhenNonNull(); + PropertyMapper propertyMapper = PropertyMapper.get(); Consumer properties = new Consumer(); AzurePropertiesUtils.mergeAzureCommonProperties(this, this.consumer, properties); @@ -88,7 +88,7 @@ public Consumer buildConsumerProperties() { } public Processor buildProcessorProperties() { - PropertyMapper propertyMapper = PropertyMapper.get().alwaysApplyingWhenNonNull(); + PropertyMapper propertyMapper = PropertyMapper.get(); Processor properties = new Processor(); AzurePropertiesUtils.mergeAzureCommonProperties(this, this.processor, properties); diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/AzureJdbcAutoConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/AzureJdbcAutoConfiguration.java index ac381ec55213..737bef6c12c3 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/AzureJdbcAutoConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/AzureJdbcAutoConfiguration.java @@ -8,8 +8,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; -import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; +import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration; +import org.springframework.boot.jdbc.autoconfigure.DataSourceProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/JdbcConnectionStringEnhancer.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/JdbcConnectionStringEnhancer.java index 1df3ce2349fc..d9fecd8b7f17 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/JdbcConnectionStringEnhancer.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/JdbcConnectionStringEnhancer.java @@ -22,6 +22,7 @@ * append more attributes value to an existing property. An enhanced JDBC URL can be * built from this enhancer. */ +@SuppressWarnings("deprecation") public final class JdbcConnectionStringEnhancer { private static final Logger LOGGER = LoggerFactory.getLogger(JdbcConnectionStringEnhancer.class); diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/JdbcPropertiesBeanPostProcessor.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/JdbcPropertiesBeanPostProcessor.java index fe160a3e071b..69b0feb1f19f 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/JdbcPropertiesBeanPostProcessor.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/JdbcPropertiesBeanPostProcessor.java @@ -11,7 +11,7 @@ import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.BeanPostProcessor; -import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; +import org.springframework.boot.jdbc.autoconfigure.DataSourceProperties; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.bind.Binder; import org.springframework.context.ApplicationContext; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/PasswordlessRuntimeHints.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/PasswordlessRuntimeHints.java index 9778643b82f9..2936b240e992 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/PasswordlessRuntimeHints.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/PasswordlessRuntimeHints.java @@ -12,6 +12,7 @@ class PasswordlessRuntimeHints implements RuntimeHintsRegistrar { @Override + @SuppressWarnings("removal") public void registerHints(RuntimeHints hints, ClassLoader classLoader) { BindableRuntimeHintsRegistrar.forTypes(AzurePasswordlessProperties.class) .registerHints(hints); diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsAutoConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsAutoConfiguration.java index 5642251af150..16dd582f6311 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsAutoConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsAutoConfiguration.java @@ -20,8 +20,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.autoconfigure.jms.JmsAutoConfiguration; -import org.springframework.boot.autoconfigure.jms.JndiConnectionFactoryAutoConfiguration; +import org.springframework.boot.jms.autoconfigure.JmsAutoConfiguration; +import org.springframework.boot.jms.autoconfigure.JndiConnectionFactoryAutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsConnectionFactoryConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsConnectionFactoryConfiguration.java index f1f26807d1fd..c48fb2de2f72 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsConnectionFactoryConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsConnectionFactoryConfiguration.java @@ -14,8 +14,8 @@ import org.springframework.beans.factory.ObjectProvider; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.BeanDefinitionRegistry; -import org.springframework.boot.autoconfigure.jms.JmsPoolConnectionFactoryFactory; -import org.springframework.boot.autoconfigure.jms.JmsProperties; +import org.springframework.boot.jms.autoconfigure.JmsPoolConnectionFactoryFactory; +import org.springframework.boot.jms.autoconfigure.JmsProperties; import org.springframework.boot.context.properties.bind.BindResult; import org.springframework.boot.context.properties.bind.Binder; import org.springframework.context.EnvironmentAware; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsContainerConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsContainerConfiguration.java index 1e0cc92b9f60..82bff9332874 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsContainerConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsContainerConfiguration.java @@ -7,7 +7,7 @@ import jakarta.jms.ConnectionFactory; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.boot.autoconfigure.jms.DefaultJmsListenerContainerFactoryConfigurer; +import org.springframework.boot.jms.autoconfigure.DefaultJmsListenerContainerFactoryConfigurer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.jms.annotation.EnableJms; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jms/properties/AzureServiceBusJmsProperties.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jms/properties/AzureServiceBusJmsProperties.java index 4731890b14d4..7bedd219a565 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jms/properties/AzureServiceBusJmsProperties.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jms/properties/AzureServiceBusJmsProperties.java @@ -7,7 +7,7 @@ import com.azure.spring.cloud.autoconfigure.implementation.properties.core.profile.AzureProfileConfigurationProperties; import com.azure.spring.cloud.core.properties.PasswordlessProperties; import org.springframework.beans.factory.InitializingBean; -import org.springframework.boot.autoconfigure.jms.JmsPoolConnectionFactoryProperties; +import org.springframework.boot.jms.autoconfigure.JmsPoolConnectionFactoryProperties; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.NestedConfigurationProperty; import org.springframework.jms.support.QosSettings; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/AbstractKafkaPropertiesBeanPostProcessor.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/AbstractKafkaPropertiesBeanPostProcessor.java index 2dfb2f6ab0ce..950c4d1816b5 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/AbstractKafkaPropertiesBeanPostProcessor.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/AbstractKafkaPropertiesBeanPostProcessor.java @@ -17,7 +17,7 @@ import org.springframework.beans.BeansException; import org.springframework.beans.factory.ObjectProvider; import org.springframework.beans.factory.config.BeanPostProcessor; -import org.springframework.boot.autoconfigure.kafka.KafkaProperties; +import org.springframework.boot.kafka.autoconfigure.KafkaProperties; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.util.ReflectionUtils; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/KafkaBinderConfigurationPropertiesBeanPostProcessor.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/KafkaBinderConfigurationPropertiesBeanPostProcessor.java index c93ad1aa1016..9c9aece92f2a 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/KafkaBinderConfigurationPropertiesBeanPostProcessor.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/KafkaBinderConfigurationPropertiesBeanPostProcessor.java @@ -7,7 +7,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.config.BeanPostProcessor; -import org.springframework.boot.autoconfigure.kafka.KafkaProperties; +import org.springframework.boot.kafka.autoconfigure.KafkaProperties; import org.springframework.cloud.stream.binder.kafka.properties.KafkaBinderConfigurationProperties; import java.util.HashMap; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/KafkaPropertiesBeanPostProcessor.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/KafkaPropertiesBeanPostProcessor.java index fffbd5885a18..d320b22ac3d7 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/KafkaPropertiesBeanPostProcessor.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/KafkaPropertiesBeanPostProcessor.java @@ -4,7 +4,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.boot.autoconfigure.kafka.KafkaProperties; +import org.springframework.boot.kafka.autoconfigure.KafkaProperties; import java.util.Map; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/keyvault/environment/KeyVaultEnvironmentPostProcessor.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/keyvault/environment/KeyVaultEnvironmentPostProcessor.java index 734fffc13211..8fc6b848c5e6 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/keyvault/environment/KeyVaultEnvironmentPostProcessor.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/keyvault/environment/KeyVaultEnvironmentPostProcessor.java @@ -13,12 +13,12 @@ import com.azure.spring.cloud.core.implementation.util.AzureSpringIdentifier; import com.azure.spring.cloud.service.implementation.keyvault.secrets.SecretClientBuilderFactory; import org.apache.commons.logging.Log; -import org.springframework.boot.ConfigurableBootstrapContext; +import org.springframework.boot.bootstrap.ConfigurableBootstrapContext; import org.springframework.boot.SpringApplication; import org.springframework.boot.context.config.ConfigDataEnvironmentPostProcessor; import org.springframework.boot.context.properties.bind.Bindable; import org.springframework.boot.context.properties.bind.Binder; -import org.springframework.boot.env.EnvironmentPostProcessor; +import org.springframework.boot.EnvironmentPostProcessor; import org.springframework.boot.logging.DeferredLogFactory; import org.springframework.core.Ordered; import org.springframework.core.env.ConfigurableEnvironment; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/keyvault/environment/KeyVaultPropertySource.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/keyvault/environment/KeyVaultPropertySource.java index da693d288af1..6686fe22cf9f 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/keyvault/environment/KeyVaultPropertySource.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/keyvault/environment/KeyVaultPropertySource.java @@ -24,6 +24,7 @@ * * @since 4.0.0 */ +@SuppressWarnings("deprecation") public class KeyVaultPropertySource extends EnumerablePropertySource { /** diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/redis/AzureRedisAutoConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/redis/AzureRedisAutoConfiguration.java index f43140b3a612..92521c68c3e6 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/redis/AzureRedisAutoConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/redis/AzureRedisAutoConfiguration.java @@ -13,7 +13,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.autoconfigure.data.redis.RedisProperties; +import org.springframework.boot.data.redis.autoconfigure.DataRedisProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -41,7 +41,7 @@ public class AzureRedisAutoConfiguration { @Primary @Bean - RedisProperties redisProperties(AzureRedisProperties azureRedisProperties, + DataRedisProperties redisProperties(AzureRedisProperties azureRedisProperties, AzureResourceManager azureResourceManager) throws InvocationTargetException, IllegalAccessException { String cacheName = azureRedisProperties.getName(); @@ -50,7 +50,7 @@ RedisProperties redisProperties(AzureRedisProperties azureRedisProperties, RedisCache redisCache = azureResourceManager.redisCaches() .getByResourceGroup(resourceGroup, cacheName); - RedisProperties redisProperties = new RedisProperties(); + DataRedisProperties redisProperties = new DataRedisProperties(); boolean useSsl = !redisCache.nonSslPort(); int port = useSsl ? redisCache.sslPort() : redisCache.port(); @@ -58,7 +58,7 @@ RedisProperties redisProperties(AzureRedisProperties azureRedisProperties, boolean isCluster = redisCache.shardCount() > 0; if (isCluster) { - RedisProperties.Cluster cluster = new RedisProperties.Cluster(); + DataRedisProperties.Cluster cluster = new DataRedisProperties.Cluster(); cluster.setNodes(Arrays.asList(redisCache.hostname() + ":" + port)); redisProperties.setCluster(cluster); } else { @@ -67,10 +67,10 @@ RedisProperties redisProperties(AzureRedisProperties azureRedisProperties, } redisProperties.setPassword(redisCache.keys().primaryKey()); - Method setSsl = ReflectionUtils.findMethod(RedisProperties.class, "setSsl", boolean.class); + Method setSsl = ReflectionUtils.findMethod(DataRedisProperties.class, "setSsl", boolean.class); if (setSsl == null) { - Object ssl = ReflectionUtils.findMethod(RedisProperties.class, "getSsl").invoke(redisProperties); - Class[] innerClasses = RedisProperties.class.getDeclaredClasses(); + Object ssl = ReflectionUtils.findMethod(DataRedisProperties.class, "getSsl").invoke(redisProperties); + Class[] innerClasses = DataRedisProperties.class.getDeclaredClasses(); Class targetInnerClass = null; for (Class innerClass : innerClasses) { if (innerClass.getSimpleName().equals("Ssl")) { diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/servicebus/properties/AzureServiceBusProperties.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/servicebus/properties/AzureServiceBusProperties.java index 780d0168ea0c..314f938cef45 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/servicebus/properties/AzureServiceBusProperties.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/servicebus/properties/AzureServiceBusProperties.java @@ -57,7 +57,7 @@ public Processor getProcessor() { } public Producer buildProducerProperties() { - PropertyMapper propertyMapper = PropertyMapper.get().alwaysApplyingWhenNonNull(); + PropertyMapper propertyMapper = PropertyMapper.get(); Producer properties = new Producer(); @@ -81,7 +81,7 @@ public Producer buildProducerProperties() { } public Consumer buildConsumerProperties() { - PropertyMapper propertyMapper = PropertyMapper.get().alwaysApplyingWhenNonNull(); + PropertyMapper propertyMapper = PropertyMapper.get(); Consumer properties = new Consumer(); @@ -113,7 +113,7 @@ public Consumer buildConsumerProperties() { } public Processor buildProcessorProperties() { - PropertyMapper propertyMapper = PropertyMapper.get().alwaysApplyingWhenNonNull(); + PropertyMapper propertyMapper = PropertyMapper.get(); Processor properties = new Processor(); diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/resources/META-INF/spring.factories b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/resources/META-INF/spring.factories index c095ef164a17..92e50809d002 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/resources/META-INF/spring.factories +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/resources/META-INF/spring.factories @@ -1,4 +1,4 @@ -org.springframework.boot.env.EnvironmentPostProcessor=\ +org.springframework.boot.EnvironmentPostProcessor=\ com.azure.spring.cloud.autoconfigure.implementation.context.AzureGlobalConfigurationEnvironmentPostProcessor,\ com.azure.spring.cloud.autoconfigure.implementation.keyvault.environment.KeyVaultEnvironmentPostProcessor diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/RestTemplateTestUtil.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/RestTemplateTestUtil.java index 8793efcf690a..cf7aa3ea207c 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/RestTemplateTestUtil.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/RestTemplateTestUtil.java @@ -26,6 +26,7 @@ import org.springframework.security.oauth2.jwt.JwtDecoderFactory; import org.springframework.security.oauth2.jwt.NimbusJwtDecoder; import org.springframework.security.web.FilterChainProxy; +import org.springframework.web.client.RestClient; import org.springframework.web.client.RestTemplate; import java.util.List; @@ -98,8 +99,9 @@ private static List getAllOAuth2AuthorizedClient } private static void assertRestTemplateWellConfiguredInOAuth2AccessTokenResponseClient(OAuth2AccessTokenResponseClient client) { - RestTemplate restTemplate = (RestTemplate) getField(client.getClass(), "restOperations", client); - assertEquals(FACTORY, restTemplate.getRequestFactory()); + RestClient restClient = (RestClient) getField(client.getClass(), "restClient", client); + Object clientRequestFactory = getField(restClient.getClass(), "clientRequestFactory", restClient); + assertEquals(FACTORY, clientRequestFactory); } @SuppressWarnings({"unchecked", "deprecation"}) diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/WebApplicationContextRunnerUtils.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/WebApplicationContextRunnerUtils.java index 70abdf1b0b78..a50d0bbe7bd8 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/WebApplicationContextRunnerUtils.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/WebApplicationContextRunnerUtils.java @@ -6,9 +6,9 @@ import com.azure.spring.cloud.autoconfigure.implementation.aad.configuration.AadAutoConfiguration; import com.azure.spring.cloud.autoconfigure.implementation.context.AzureGlobalPropertiesAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration; +import org.springframework.boot.http.converter.autoconfigure.HttpMessageConvertersAutoConfiguration; import org.springframework.boot.autoconfigure.logging.ConditionEvaluationReportLoggingListener; -import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration; +import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.runner.WebApplicationContextRunner; import org.springframework.http.HttpEntity; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadOAuth2ClientConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadOAuth2ClientConfigurationTests.java index cfa6d65b5604..a8daec063143 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadOAuth2ClientConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadOAuth2ClientConfigurationTests.java @@ -6,22 +6,20 @@ import com.azure.spring.cloud.autoconfigure.implementation.aad.jwk.TestJwks; import com.azure.spring.cloud.autoconfigure.implementation.aad.configuration.properties.AadAuthenticationProperties; import com.azure.spring.cloud.autoconfigure.implementation.aad.security.AadClientRegistrationRepository; -import com.azure.spring.cloud.autoconfigure.implementation.aad.security.AadJwtBearerGrantRequestEntityConverter; import com.azure.spring.cloud.autoconfigure.implementation.aad.security.OAuth2ClientAuthenticationJwkResolver; import com.nimbusds.jose.jwk.JWK; import com.nimbusds.jose.jwk.RSAKey; import com.nimbusds.jose.util.Base64URL; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration; -import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration; +import org.springframework.boot.http.converter.autoconfigure.HttpMessageConvertersAutoConfiguration; +import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration; import org.springframework.boot.test.context.runner.WebApplicationContextRunner; import org.springframework.core.convert.converter.Converter; import org.springframework.security.oauth2.client.JwtBearerOAuth2AuthorizedClientProvider; -import org.springframework.security.oauth2.client.endpoint.DefaultJwtBearerTokenResponseClient; import org.springframework.security.oauth2.client.endpoint.JwtBearerGrantRequest; -import org.springframework.security.oauth2.client.endpoint.JwtBearerGrantRequestEntityConverter; import org.springframework.security.oauth2.client.endpoint.OAuth2AccessTokenResponseClient; +import org.springframework.security.oauth2.client.endpoint.RestClientJwtBearerTokenResponseClient; import org.springframework.security.oauth2.client.registration.ClientRegistration; import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository; import org.springframework.security.oauth2.client.web.OAuth2AuthorizedClientRepository; @@ -253,19 +251,15 @@ void restTemplateWellConfiguredWhenUsingPrivateKeyJwtMethod() { }); } - @SuppressWarnings({"deprecation", "removal", "unchecked"}) + @SuppressWarnings({"unchecked"}) private MultiValueMap convertParameters(JwtBearerOAuth2AuthorizedClientProvider jwtBearerProvider, ClientRegistrationRepository clientRepository) { OAuth2AccessTokenResponseClient client = - (OAuth2AccessTokenResponseClient) ReflectionTestUtils.getField(jwtBearerProvider, "accessTokenResponseClient"); - assertThat(client.getClass().getSimpleName()).isEqualTo(DefaultJwtBearerTokenResponseClient.class.getSimpleName()); - - JwtBearerGrantRequestEntityConverter requestEntityConverter = - (JwtBearerGrantRequestEntityConverter) ReflectionTestUtils.getField(client, "requestEntityConverter"); - assertThat(requestEntityConverter.getClass().getSimpleName()).isEqualTo(AadJwtBearerGrantRequestEntityConverter.class.getSimpleName()); + (OAuth2AccessTokenResponseClient) ReflectionTestUtils.getField(jwtBearerProvider, "accessTokenResponseClient"); + assertThat(client.getClass().getSimpleName()).isEqualTo(RestClientJwtBearerTokenResponseClient.class.getSimpleName()); Converter> parametersConverter = - (Converter>) ReflectionTestUtils.getField(requestEntityConverter, "parametersConverter"); + (Converter>) ReflectionTestUtils.getField(client, "parametersConverter"); JwtBearerGrantRequest request = new JwtBearerGrantRequest(clientRepository.findByRegistrationId("graph"), mock(Jwt.class)); return parametersConverter.convert(request); } diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadResourceServerConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadResourceServerConfigurationTests.java index 62dba94aef8b..53902ba4260e 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadResourceServerConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadResourceServerConfigurationTests.java @@ -9,9 +9,9 @@ import com.nimbusds.jwt.proc.JWTClaimsSetAwareJWSKeySelector; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration; +import org.springframework.boot.http.converter.autoconfigure.HttpMessageConvertersAutoConfiguration; import org.springframework.boot.autoconfigure.logging.ConditionEvaluationReportLoggingListener; -import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration; +import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration; import org.springframework.boot.logging.LogLevel; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.runner.WebApplicationContextRunner; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadWebApplicationConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadWebApplicationConfigurationTests.java index 2a6af88ca741..59d66b9ee79d 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadWebApplicationConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadWebApplicationConfigurationTests.java @@ -6,9 +6,9 @@ import com.azure.spring.cloud.autoconfigure.implementation.context.AzureGlobalPropertiesAutoConfiguration; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration; +import org.springframework.boot.http.converter.autoconfigure.HttpMessageConvertersAutoConfiguration; import org.springframework.boot.autoconfigure.logging.ConditionEvaluationReportLoggingListener; -import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration; +import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration; import org.springframework.boot.logging.LogLevel; import org.springframework.boot.test.context.runner.WebApplicationContextRunner; import org.springframework.context.annotation.Bean; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/RestTemplateProxyCustomizerTestConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/RestTemplateProxyCustomizerTestConfiguration.java index abe271cf31a3..f504feb8b1bd 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/RestTemplateProxyCustomizerTestConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/RestTemplateProxyCustomizerTestConfiguration.java @@ -3,7 +3,7 @@ package com.azure.spring.cloud.autoconfigure.implementation.aad.configuration; -import org.springframework.boot.web.client.RestTemplateCustomizer; +import org.springframework.boot.restclient.RestTemplateCustomizer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.client.SimpleClientHttpRequestFactory; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/AadAuthenticationFilterTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/AadAuthenticationFilterTests.java index 26382c1c8ba8..6a2e629fcf7c 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/AadAuthenticationFilterTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/AadAuthenticationFilterTests.java @@ -18,10 +18,10 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration; -import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration; +import org.springframework.boot.http.converter.autoconfigure.HttpMessageConvertersAutoConfiguration; +import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration; import org.springframework.boot.test.context.runner.ApplicationContextRunner; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.security.core.Authentication; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.context.SecurityContext; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/AadGraphClientTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/AadGraphClientTests.java index c4e7c3c16130..acb5edb353f6 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/AadGraphClientTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/AadGraphClientTests.java @@ -8,7 +8,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mock; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/ResourceRetrieverTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/ResourceRetrieverTests.java index 8e369f8769f3..f2277a896a44 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/ResourceRetrieverTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/ResourceRetrieverTests.java @@ -9,8 +9,8 @@ import com.nimbusds.jose.util.ResourceRetriever; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration; -import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration; +import org.springframework.boot.http.converter.autoconfigure.HttpMessageConvertersAutoConfiguration; +import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.runner.WebApplicationContextRunner; import org.springframework.security.oauth2.server.resource.authentication.BearerTokenAuthenticationToken; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/UserPrincipalMicrosoftGraphTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/UserPrincipalMicrosoftGraphTests.java index b4189a50f2bb..aa31ed3bb442 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/UserPrincipalMicrosoftGraphTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/UserPrincipalMicrosoftGraphTests.java @@ -14,7 +14,7 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadAccessTokenGroupRolesExtractionTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadAccessTokenGroupRolesExtractionTests.java index a487765d93e0..0251103a61e3 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadAccessTokenGroupRolesExtractionTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadAccessTokenGroupRolesExtractionTests.java @@ -13,7 +13,7 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.security.oauth2.core.OAuth2AccessToken; import java.util.ArrayList; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadJwtBearerGrantRequestEntityConverterTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadJwtBearerGrantRequestEntityConverterTests.java index ce771c846038..bdeb4fe16707 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadJwtBearerGrantRequestEntityConverterTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadJwtBearerGrantRequestEntityConverterTests.java @@ -3,8 +3,8 @@ package com.azure.spring.cloud.autoconfigure.implementation.aad.security; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.springframework.http.RequestEntity; import org.springframework.security.oauth2.client.endpoint.JwtBearerGrantRequest; import org.springframework.security.oauth2.client.registration.ClientRegistration; import org.springframework.security.oauth2.core.AuthorizationGrantType; @@ -17,9 +17,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -class AadJwtBearerGrantRequestEntityConverterTests { +class AadJwtBearerGrantRequestParametersConverterTests { - @SuppressWarnings("unchecked") @Test void requestedTokenUseParameter() { ClientRegistration clientRegistration = ClientRegistration.withRegistrationId("test") @@ -35,11 +34,10 @@ void requestedTokenUseParameter() { .expiresAt(Instant.ofEpochMilli(Instant.now().plusSeconds(60).toEpochMilli())) .build(); JwtBearerGrantRequest request = new JwtBearerGrantRequest(clientRegistration, jwt); - AadJwtBearerGrantRequestEntityConverter converter = - new AadJwtBearerGrantRequestEntityConverter(); - RequestEntity> entity = - (RequestEntity>) converter.convert(request); - MultiValueMap parameters = entity.getBody(); + AadJwtBearerGrantRequestParametersConverter converter = + new AadJwtBearerGrantRequestParametersConverter(); + MultiValueMap parameters = converter.convert(request); + Assertions.assertNotNull(parameters); assertTrue(parameters.containsKey("requested_token_use")); assertEquals("on_behalf_of", parameters.getFirst("requested_token_use")); } diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2AuthorizationCodeGrantRequestEntityConverterTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2AuthorizationCodeGrantRequestEntityConverterTests.java index 53400928a42b..4b5573ed99a1 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2AuthorizationCodeGrantRequestEntityConverterTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2AuthorizationCodeGrantRequestEntityConverterTests.java @@ -7,9 +7,7 @@ import com.azure.spring.cloud.core.implementation.util.AzureSpringIdentifier; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.runner.WebApplicationContextRunner; -import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; -import org.springframework.http.RequestEntity; import org.springframework.security.oauth2.client.endpoint.OAuth2AuthorizationCodeGrantRequest; import org.springframework.security.oauth2.client.registration.ClientRegistration; import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository; @@ -19,13 +17,12 @@ import org.springframework.util.MultiValueMap; import java.util.Collections; -import java.util.Optional; import static com.azure.spring.cloud.autoconfigure.implementation.aad.security.AadClientRegistrationRepository.AZURE_CLIENT_REGISTRATION_ID; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -class AadOAuth2AuthorizationCodeGrantRequestEntityConverterTests { +class AadOAuth2AuthorizationCodeGrantRequestConvertersTests { private WebApplicationContextRunner getContextRunner() { return WebApplicationContextRunnerUtils @@ -65,14 +62,13 @@ void onlyAddScopeOnceEvenConvertMethodExecutedMultipleTimes() { getContextRunner().run(context -> { AadClientRegistrationRepository repository = (AadClientRegistrationRepository) context.getBean(ClientRegistrationRepository.class); - AadOAuth2AuthorizationCodeGrantRequestEntityConverter converter = - new AadOAuth2AuthorizationCodeGrantRequestEntityConverter(repository.getAzureClientAccessTokenScopes()); + AadOAuth2AuthorizationCodeGrantRequestParametersConverter converter = + new AadOAuth2AuthorizationCodeGrantRequestParametersConverter(repository.getAzureClientAccessTokenScopes()); ClientRegistration azure = repository.findByRegistrationId(AZURE_CLIENT_REGISTRATION_ID); OAuth2AuthorizationCodeGrantRequest request = createCodeGrantRequest(azure); // Convert method execute 2 times converter.convert(request); - RequestEntity entity = converter.convert(request); - MultiValueMap map = WebApplicationContextRunnerUtils.toMultiValueMap(entity); + MultiValueMap map = converter.convert(request); assertEquals(1, map.get("scope").size()); }); } @@ -83,7 +79,7 @@ void addHeadersForAzureClient() { AadClientRegistrationRepository repository = (AadClientRegistrationRepository) context.getBean(ClientRegistrationRepository.class); ClientRegistration azure = repository.findByRegistrationId(AZURE_CLIENT_REGISTRATION_ID); - HttpHeaders httpHeaders = convertedHeaderOf(repository, createCodeGrantRequest(azure)); + HttpHeaders httpHeaders = convertedHeaderOf(createCodeGrantRequest(azure)); testHttpHeaders(httpHeaders); }); } @@ -94,35 +90,30 @@ void addHeadersForAuthorizationCodeClient() { AadClientRegistrationRepository repository = (AadClientRegistrationRepository) context.getBean(ClientRegistrationRepository.class); ClientRegistration arm = repository.findByRegistrationId("arm"); - HttpHeaders httpHeaders = convertedHeaderOf(repository, createCodeGrantRequest(arm)); + HttpHeaders httpHeaders = convertedHeaderOf(createCodeGrantRequest(arm)); testHttpHeaders(httpHeaders); }); } - private HttpHeaders convertedHeaderOf(AadClientRegistrationRepository repository, - OAuth2AuthorizationCodeGrantRequest request) { - AadOAuth2AuthorizationCodeGrantRequestEntityConverter converter = - new AadOAuth2AuthorizationCodeGrantRequestEntityConverter(repository.getAzureClientAccessTokenScopes()); - RequestEntity entity = converter.convert(request); - return Optional.ofNullable(entity) - .map(HttpEntity::getHeaders) - .orElse(null); + private HttpHeaders convertedHeaderOf(OAuth2AuthorizationCodeGrantRequest request) { + AadOAuth2AuthorizationCodeGrantRequestHeadersConverter converter = + new AadOAuth2AuthorizationCodeGrantRequestHeadersConverter(); + return converter.convert(request); } private void testHttpHeaders(HttpHeaders headers) { - assertTrue(headers.containsKey("x-client-SKU")); + assertTrue(headers.containsHeader("x-client-SKU")); assertEquals(Collections.singletonList(AzureSpringIdentifier.AZURE_SPRING_AAD), headers.get("x-client-SKU")); - assertTrue(headers.containsKey("x-client-VER")); + assertTrue(headers.containsHeader("x-client-VER")); assertEquals(Collections.singletonList(AzureSpringIdentifier.VERSION), headers.get("x-client-VER")); - assertTrue(headers.containsKey("client-request-id")); + assertTrue(headers.containsHeader("client-request-id")); } private MultiValueMap convertedBodyOf(AadClientRegistrationRepository repository, OAuth2AuthorizationCodeGrantRequest request) { - AadOAuth2AuthorizationCodeGrantRequestEntityConverter converter = - new AadOAuth2AuthorizationCodeGrantRequestEntityConverter(repository.getAzureClientAccessTokenScopes()); - RequestEntity entity = converter.convert(request); - return WebApplicationContextRunnerUtils.toMultiValueMap(entity); + AadOAuth2AuthorizationCodeGrantRequestParametersConverter converter = + new AadOAuth2AuthorizationCodeGrantRequestParametersConverter(repository.getAzureClientAccessTokenScopes()); + return converter.convert(request); } private OAuth2AuthorizationCodeGrantRequest createCodeGrantRequest(ClientRegistration client) { diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2UserServiceIdTokenRolesExtractionTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2UserServiceIdTokenRolesExtractionTests.java index 1662e257a9c9..967a7d945a61 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2UserServiceIdTokenRolesExtractionTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2UserServiceIdTokenRolesExtractionTests.java @@ -5,7 +5,7 @@ import com.azure.spring.cloud.autoconfigure.implementation.aad.configuration.properties.AadAuthenticationProperties; import net.minidev.json.JSONArray; import org.junit.jupiter.api.Test; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.security.oauth2.core.oidc.OidcIdToken; import java.util.Collections; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/utils/AadRestTemplateCreatorTest.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/utils/AadRestTemplateCreatorTest.java index 01fa87d77254..203bcc663254 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/utils/AadRestTemplateCreatorTest.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/utils/AadRestTemplateCreatorTest.java @@ -5,9 +5,9 @@ import com.azure.spring.cloud.autoconfigure.implementation.aad.configuration.RestTemplateProxyCustomizerTestConfiguration; import org.junit.jupiter.api.Test; -import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration; +import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration; import org.springframework.boot.test.context.runner.ApplicationContextRunner; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cAutoConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cAutoConfigurationTests.java index 25982b9b01f4..6a0e0026ebfd 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cAutoConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cAutoConfigurationTests.java @@ -18,8 +18,8 @@ import org.mockito.Mockito; import org.springframework.beans.BeanUtils; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration; -import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration; +import org.springframework.boot.http.converter.autoconfigure.HttpMessageConvertersAutoConfiguration; +import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.runner.WebApplicationContextRunner; import org.springframework.context.annotation.Bean; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cResourceServerAutoConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cResourceServerAutoConfigurationTests.java index c5374bf2133c..2418871d3d5d 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cResourceServerAutoConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cResourceServerAutoConfigurationTests.java @@ -19,8 +19,8 @@ import org.mockito.Mockito; import org.springframework.beans.BeanUtils; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration; -import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration; +import org.springframework.boot.http.converter.autoconfigure.HttpMessageConvertersAutoConfiguration; +import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.runner.ContextConsumer; import org.springframework.boot.test.context.runner.WebApplicationContextRunner; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/WebOAuth2ClientTestApp.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/WebOAuth2ClientTestApp.java index 7ed90b86aecc..6019cc1699d4 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/WebOAuth2ClientTestApp.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/WebOAuth2ClientTestApp.java @@ -3,12 +3,12 @@ package com.azure.spring.cloud.autoconfigure.implementation.aadb2c.configuration; +import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; import org.springframework.context.annotation.Import; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -@SuppressWarnings({"removal", "deprecation"}) @EnableWebSecurity -@Import(org.springframework.boot.autoconfigure.security.oauth2.client.servlet.OAuth2ClientAutoConfiguration.class) +@Import(OAuth2ClientAutoConfiguration.class) public class WebOAuth2ClientTestApp { } diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/security/AadB2cAuthorizationRequestResolverTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/security/AadB2cAuthorizationRequestResolverTests.java index 7f026ec54a90..337528561b93 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/security/AadB2cAuthorizationRequestResolverTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/security/AadB2cAuthorizationRequestResolverTests.java @@ -10,8 +10,8 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration; -import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration; +import org.springframework.boot.http.converter.autoconfigure.HttpMessageConvertersAutoConfiguration; +import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.runner.WebApplicationContextRunner; import org.springframework.http.HttpMethod; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/compatibility/AzureSpringBootVersionVerifierTest.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/compatibility/AzureSpringBootVersionVerifierTest.java index eee0c8cb66be..7c174f17e3e1 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/compatibility/AzureSpringBootVersionVerifierTest.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/compatibility/AzureSpringBootVersionVerifierTest.java @@ -15,7 +15,7 @@ import java.util.Collections; import java.util.List; -import static com.azure.spring.cloud.autoconfigure.implementation.compatibility.AzureSpringBootVersionVerifier.SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_3_0; +import static com.azure.spring.cloud.autoconfigure.implementation.compatibility.AzureSpringBootVersionVerifier.SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_4_0; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -60,11 +60,11 @@ String getVersionFromManifest() { @ParameterizedTest - @ValueSource(strings = { "3.0", "3.0.x" }) + @ValueSource(strings = { "4.0", "4.0.x" }) void shouldMatchWhenManifestNumberNotPresentAndAcceptedNumberSpecifiedCase1(String acceptedVersion) { List acceptedVersions = Collections.singletonList(acceptedVersion); ClassNameResolverPredicate mockResolver = mock(ClassNameResolverPredicate.class); - when(mockResolver.resolve(SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_3_0)).thenReturn(true); + when(mockResolver.resolve(SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_4_0)).thenReturn(true); AzureSpringBootVersionVerifier versionVerifier = new AzureSpringBootVersionVerifier(acceptedVersions, mockResolver) { @@ -81,11 +81,11 @@ String getVersionFromManifest() { @ParameterizedTest - @ValueSource(strings = { "3.1", "3.1.x" }) + @ValueSource(strings = { "4.1", "4.1.x" }) void shouldNotMatchWhenManifestNumberNotPresentAndAcceptedNumberSpecifiedCase1(String acceptedVersion) { List acceptedVersions = Collections.singletonList(acceptedVersion); ClassNameResolverPredicate mockResolver = mock(ClassNameResolverPredicate.class); - when(mockResolver.resolve(SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_3_0)).thenReturn(true); + when(mockResolver.resolve(SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_4_0)).thenReturn(true); AzureSpringBootVersionVerifier versionVerifier = new AzureSpringBootVersionVerifier(acceptedVersions, mockResolver) { @@ -98,11 +98,11 @@ String getVersionFromManifest() { } @ParameterizedTest - @ValueSource(strings = { "3.0.0-M3" }) + @ValueSource(strings = { "4.0.0-M3" }) void shouldNotMatchWhenManifestNumberNotPresentAndAcceptedNumberSpecifiedCase2(String acceptedVersion) { List acceptedVersions = Collections.singletonList(acceptedVersion); ClassNameResolverPredicate mockResolver = mock(ClassNameResolverPredicate.class); - when(mockResolver.resolve(SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_3_0)).thenReturn(true); + when(mockResolver.resolve(SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_4_0)).thenReturn(true); AzureSpringBootVersionVerifier versionVerifier = new AzureSpringBootVersionVerifier(acceptedVersions, mockResolver) { @@ -115,11 +115,11 @@ String getVersionFromManifest() { } @ParameterizedTest - @ValueSource(strings = { "3.0.0-M4" }) + @ValueSource(strings = { "4.0.0-M4" }) void shouldNotMatchWhenManifestNumberNotPresentAndAcceptedNumberSpecifiedCase3(String acceptedVersion) { List acceptedVersions = Collections.singletonList(acceptedVersion); ClassNameResolverPredicate mockResolver = mock(ClassNameResolverPredicate.class); - when(mockResolver.resolve(SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_3_0)).thenReturn(true); + when(mockResolver.resolve(SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_4_0)).thenReturn(true); AzureSpringBootVersionVerifier versionVerifier = new AzureSpringBootVersionVerifier(acceptedVersions, mockResolver) { @@ -133,11 +133,11 @@ String getVersionFromManifest() { @ParameterizedTest - @ValueSource(strings = { "3.0", "3.0.x" }) + @ValueSource(strings = { "4.0", "4.0.x" }) void shouldNotMatchWhenManifestNumberNotPresentAndAcceptedNumberSpecifiedCase4(String acceptedVersion) { List acceptedVersions = Collections.singletonList(acceptedVersion); ClassNameResolverPredicate mockResolver = mock(ClassNameResolverPredicate.class); - when(mockResolver.resolve(SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_3_0)).thenReturn(false); + when(mockResolver.resolve(SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_4_0)).thenReturn(false); AzureSpringBootVersionVerifier versionVerifier = new AzureSpringBootVersionVerifier(acceptedVersions, mockResolver) { diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/context/AzureGlobalConfigurationEnvironmentPostProcessorTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/context/AzureGlobalConfigurationEnvironmentPostProcessorTests.java index e72a5c8443e5..8b6ba59e8ef8 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/context/AzureGlobalConfigurationEnvironmentPostProcessorTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/context/AzureGlobalConfigurationEnvironmentPostProcessorTests.java @@ -10,7 +10,7 @@ import com.azure.spring.cloud.core.provider.AzureProfileOptionsProvider; import org.junit.jupiter.api.Test; import org.springframework.boot.context.properties.bind.Binder; -import org.springframework.boot.env.EnvironmentPostProcessor; +import org.springframework.boot.EnvironmentPostProcessor; import org.springframework.boot.logging.DeferredLog; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.PropertiesPropertySource; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/AzureEventHubsMessagingAutoConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/AzureEventHubsMessagingAutoConfigurationTests.java index 24dbb96eb7e0..8ae0399acb60 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/AzureEventHubsMessagingAutoConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/AzureEventHubsMessagingAutoConfigurationTests.java @@ -18,7 +18,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; +import org.springframework.boot.jackson2.autoconfigure.Jackson2AutoConfiguration; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.context.annotation.Bean; @@ -89,10 +89,11 @@ void connectionInfoAndCheckpointStoreProvidedShouldConfigure() { } @Test + @SuppressWarnings("removal") void withoutObjectMapperShouldNotConfigure() { this.contextRunner .withClassLoader(new FilteredClassLoader(ObjectMapper.class)) - .withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class)) + .withConfiguration(AutoConfigurations.of(Jackson2AutoConfiguration.class)) .withPropertyValues( "spring.cloud.azure.eventhubs.connection-string=" + String.format(CONNECTION_STRING_FORMAT, "test-namespace") ) @@ -101,11 +102,12 @@ void withoutObjectMapperShouldNotConfigure() { } @Test + @SuppressWarnings("removal") void withIsolatedObjectMapper() { this.contextRunner .withPropertyValues("spring.cloud.azure.eventhubs.connection-string=" + String.format(CONNECTION_STRING_FORMAT, "test-namespace")) .withUserConfiguration(AzureEventHubsPropertiesTestConfiguration.class) - .withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class)) + .withConfiguration(AutoConfigurations.of(Jackson2AutoConfiguration.class)) .run(context -> { assertThat(context).hasBean("defaultEventHubsMessageConverter"); assertThat(context).hasSingleBean(EventHubsMessageConverter.class); @@ -114,12 +116,13 @@ void withIsolatedObjectMapper() { } @Test + @SuppressWarnings("removal") void withNonIsolatedObjectMapper() { this.contextRunner .withPropertyValues("spring.cloud.azure.eventhubs.connection-string=" + String.format(CONNECTION_STRING_FORMAT, "test-namespace"), "spring.cloud.azure.message-converter.isolated-object-mapper=false") .withUserConfiguration(AzureEventHubsPropertiesTestConfiguration.class) - .withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class)) + .withConfiguration(AutoConfigurations.of(Jackson2AutoConfiguration.class)) .run(context -> { assertThat(context).hasBean("eventHubsMessageConverter"); assertThat(context).hasSingleBean(EventHubsMessageConverter.class); @@ -128,13 +131,14 @@ void withNonIsolatedObjectMapper() { } @Test + @SuppressWarnings("removal") void withUserProvidedObjectMapper() { this.contextRunner .withPropertyValues("spring.cloud.azure.eventhubs.connection-string=" + String.format(CONNECTION_STRING_FORMAT, "test-namespace"), "spring.cloud.azure.message-converter.isolated-object-mapper=false") .withUserConfiguration(AzureEventHubsPropertiesTestConfiguration.class) - .withBean("userObjectMapper", ObjectMapper.class, ObjectMapper::new) - .withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class)) + .withBean("userObjectMapper", ObjectMapper.class, () -> new ObjectMapper()) + .withConfiguration(AutoConfigurations.of(Jackson2AutoConfiguration.class)) .run(context -> { assertThat(context).hasBean("userObjectMapper"); assertThat(context).hasSingleBean(ObjectMapper.class); diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/AbstractAzureJdbcAutoConfigurationTest.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/AbstractAzureJdbcAutoConfigurationTest.java index 3937d0aeb9b0..f978f80b60c8 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/AbstractAzureJdbcAutoConfigurationTest.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/AbstractAzureJdbcAutoConfigurationTest.java @@ -15,8 +15,8 @@ import org.mockito.MockedStatic; import org.mockito.Mockito; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; -import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; +import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration; +import org.springframework.boot.jdbc.autoconfigure.DataSourceProperties; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.context.ApplicationContext; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/JdbcPropertiesBeanPostProcessorTest.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/JdbcPropertiesBeanPostProcessorTest.java index b9d54f3beef1..f32493eba87a 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/JdbcPropertiesBeanPostProcessorTest.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/JdbcPropertiesBeanPostProcessorTest.java @@ -15,7 +15,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; +import org.springframework.boot.jdbc.autoconfigure.DataSourceProperties; import org.springframework.context.ApplicationContext; import org.springframework.context.support.GenericApplicationContext; import org.springframework.mock.env.MockEnvironment; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/JdbcPropertiesBeanPostProcessorWithApplicationContextRunnerTest.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/JdbcPropertiesBeanPostProcessorWithApplicationContextRunnerTest.java index 67b662f44ff8..238cf4b10bdd 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/JdbcPropertiesBeanPostProcessorWithApplicationContextRunnerTest.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/JdbcPropertiesBeanPostProcessorWithApplicationContextRunnerTest.java @@ -11,7 +11,7 @@ import com.azure.spring.cloud.autoconfigure.implementation.passwordless.properties.AzureJdbcPasswordlessProperties; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; +import org.springframework.boot.jdbc.autoconfigure.DataSourceProperties; import org.springframework.boot.context.properties.bind.Binder; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.runner.ApplicationContextRunner; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/MySqlAzureJdbcAutoConfigurationTest.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/MySqlAzureJdbcAutoConfigurationTest.java index 80b0c216784c..3e92815771e9 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/MySqlAzureJdbcAutoConfigurationTest.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/MySqlAzureJdbcAutoConfigurationTest.java @@ -6,7 +6,7 @@ import com.azure.identity.extensions.implementation.enums.AuthProperty; import com.azure.spring.cloud.core.implementation.util.AzureSpringIdentifier; import com.azure.spring.cloud.service.implementation.identity.credential.provider.SpringTokenCredentialProvider; -import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; +import org.springframework.boot.jdbc.autoconfigure.DataSourceProperties; import org.springframework.boot.test.context.FilteredClassLoader; import static com.azure.spring.cloud.autoconfigure.implementation.jdbc.JdbcPropertiesBeanPostProcessorTest.MANAGED_IDENTITY_ENABLED_DEFAULT; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/PostgreSqlAzureJdbcAutoConfigurationTest.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/PostgreSqlAzureJdbcAutoConfigurationTest.java index 7ec7353b962e..3ebb45bd2255 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/PostgreSqlAzureJdbcAutoConfigurationTest.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/PostgreSqlAzureJdbcAutoConfigurationTest.java @@ -6,7 +6,7 @@ import com.azure.identity.extensions.implementation.enums.AuthProperty; import com.azure.spring.cloud.core.implementation.util.AzureSpringIdentifier; import com.azure.spring.cloud.service.implementation.identity.credential.provider.SpringTokenCredentialProvider; -import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; +import org.springframework.boot.jdbc.autoconfigure.DataSourceProperties; import org.springframework.boot.test.context.FilteredClassLoader; import static com.azure.spring.cloud.autoconfigure.implementation.jdbc.JdbcPropertiesBeanPostProcessorTest.MANAGED_IDENTITY_ENABLED_DEFAULT; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsAutoConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsAutoConfigurationTests.java index ca0025ea6ed5..efc13e46a700 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsAutoConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsAutoConfigurationTests.java @@ -16,9 +16,9 @@ import org.junit.jupiter.params.provider.ValueSource; import org.messaginghub.pooled.jms.JmsPoolConnectionFactory; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.autoconfigure.jms.DefaultJmsListenerContainerFactoryConfigurer; -import org.springframework.boot.autoconfigure.jms.JmsAutoConfiguration; -import org.springframework.boot.autoconfigure.jms.JmsProperties; +import org.springframework.boot.jms.autoconfigure.DefaultJmsListenerContainerFactoryConfigurer; +import org.springframework.boot.jms.autoconfigure.JmsAutoConfiguration; +import org.springframework.boot.jms.autoconfigure.JmsProperties; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.assertj.AssertableApplicationContext; import org.springframework.boot.test.context.runner.ApplicationContextRunner; @@ -230,7 +230,7 @@ void jmsPropertiesConfiguredCorrectly(String pricingTier) { "spring.jms.servicebus.pricing-tier=" + pricingTier, "spring.jms.listener.autoStartup=false", "spring.jms.listener.session.acknowledge-mode=client", - "spring.jms.listener.concurrency=2", + "spring.jms.listener.minConcurrency=2", "spring.jms.listener.receiveTimeout=2s", "spring.jms.listener.maxConcurrency=10", "spring.jms.servicebus.connection-string=" + CONNECTION_STRING @@ -271,7 +271,7 @@ void jmsListenerContainerFactoryConfiguredCorrectly(String pricingTier) { "spring.jms.servicebus.pricing-tier=" + pricingTier, "spring.jms.listener.autoStartup=false", "spring.jms.listener.session.acknowledge-mode=client", - "spring.jms.listener.concurrency=2", + "spring.jms.listener.minConcurrency=2", "spring.jms.listener.receiveTimeout=2s", "spring.jms.listener.maxConcurrency=10", "spring.jms.servicebus.connection-string=" + CONNECTION_STRING, diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsConnectionFactoryConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsConnectionFactoryConfigurationTests.java index 2fe44abbb1ff..8ac71f7c9e03 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsConnectionFactoryConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsConnectionFactoryConfigurationTests.java @@ -16,7 +16,7 @@ import org.junit.jupiter.params.provider.ValueSource; import org.messaginghub.pooled.jms.JmsPoolConnectionFactory; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.autoconfigure.jms.JmsAutoConfiguration; +import org.springframework.boot.jms.autoconfigure.JmsAutoConfiguration; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.context.annotation.Configuration; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/AzureKafkaOAuth2BinderConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/AzureKafkaOAuth2BinderConfigurationTests.java index 14b9cbee0bce..5315b310a5ce 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/AzureKafkaOAuth2BinderConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/AzureKafkaOAuth2BinderConfigurationTests.java @@ -14,8 +14,8 @@ import org.apache.kafka.common.config.types.Password; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.autoconfigure.kafka.KafkaAutoConfiguration; -import org.springframework.boot.autoconfigure.kafka.KafkaProperties; +import org.springframework.boot.kafka.autoconfigure.KafkaAutoConfiguration; +import org.springframework.boot.kafka.autoconfigure.KafkaProperties; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.cloud.stream.binder.kafka.KafkaMessageChannelBinder; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/AzureKafkaOAuth2BootConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/AzureKafkaOAuth2BootConfigurationTests.java index 797e6dde7b20..6f612db8a20c 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/AzureKafkaOAuth2BootConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/AzureKafkaOAuth2BootConfigurationTests.java @@ -15,8 +15,8 @@ import org.apache.kafka.common.config.types.Password; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.autoconfigure.kafka.KafkaAutoConfiguration; -import org.springframework.boot.autoconfigure.kafka.KafkaProperties; +import org.springframework.boot.kafka.autoconfigure.KafkaAutoConfiguration; +import org.springframework.boot.kafka.autoconfigure.KafkaProperties; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.context.ApplicationContext; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/KafkaPropertiesBeanPostProcessorTest.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/KafkaPropertiesBeanPostProcessorTest.java index 7f9838bf7014..c6067e719ff3 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/KafkaPropertiesBeanPostProcessorTest.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/KafkaPropertiesBeanPostProcessorTest.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. package com.azure.spring.cloud.autoconfigure.implementation.kafka; -import org.springframework.boot.autoconfigure.kafka.KafkaProperties; +import org.springframework.boot.kafka.autoconfigure.KafkaProperties; class KafkaPropertiesBeanPostProcessorTest extends AbstractKafkaPropertiesBeanPostProcessorTest { diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/keyvault/environment/KeyVaultEnvironmentPostProcessorTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/keyvault/environment/KeyVaultEnvironmentPostProcessorTests.java index 29f223be86b6..cfee276d1a73 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/keyvault/environment/KeyVaultEnvironmentPostProcessorTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/keyvault/environment/KeyVaultEnvironmentPostProcessorTests.java @@ -11,7 +11,7 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.mockito.MockedStatic; -import org.springframework.boot.ConfigurableBootstrapContext; +import org.springframework.boot.bootstrap.ConfigurableBootstrapContext; import org.springframework.boot.SpringApplication; import org.springframework.boot.logging.DeferredLogs; import org.springframework.core.env.MutablePropertySources; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/redis/AzureRedisAutoConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/redis/AzureRedisAutoConfigurationTests.java index 4ee0959d4f53..de666b3ecf9c 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/redis/AzureRedisAutoConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/redis/AzureRedisAutoConfigurationTests.java @@ -10,7 +10,7 @@ import com.azure.spring.cloud.autoconfigure.implementation.redis.properties.AzureRedisProperties; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.autoconfigure.data.redis.RedisProperties; +import org.springframework.boot.data.redis.autoconfigure.DataRedisProperties; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.data.redis.core.RedisOperations; @@ -105,15 +105,15 @@ void shouldConfigureWithNameAndResourceGroupAndResourceManager() { assertThat(azureRedisProperties.getName()).isEqualTo("redis"); assertThat(azureRedisProperties.getResource().getResourceGroup()).isEqualTo("rg"); - assertThat(context).hasSingleBean(RedisProperties.class); - RedisProperties redisProperties = context.getBean(RedisProperties.class); + assertThat(context).hasSingleBean(DataRedisProperties.class); + DataRedisProperties redisProperties = context.getBean(DataRedisProperties.class); assertThat(redisProperties.getPassword()).isEqualTo(KEY); assertThat(redisProperties.getHost()).isEqualTo(HOST); assertThat(redisProperties.getPort()).isEqualTo(PORT); - Method isSsl = ReflectionUtils.findMethod(RedisProperties.class, "isSsl"); + Method isSsl = ReflectionUtils.findMethod(DataRedisProperties.class, "isSsl"); if (isSsl == null) { - Object ssl = ReflectionUtils.findMethod(RedisProperties.class, "getSsl").invoke(redisProperties); - Class[] innerClasses = RedisProperties.class.getDeclaredClasses(); + Object ssl = ReflectionUtils.findMethod(DataRedisProperties.class, "getSsl").invoke(redisProperties); + Class[] innerClasses = DataRedisProperties.class.getDeclaredClasses(); Class targetInnerClass = null; for (Class innerClass : innerClasses) { if (innerClass.getSimpleName().equals("Ssl")) { diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/servicebus/AzureServiceBusMessagingAutoConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/servicebus/AzureServiceBusMessagingAutoConfigurationTests.java index 18890bedfdda..283e1c788648 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/servicebus/AzureServiceBusMessagingAutoConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/servicebus/AzureServiceBusMessagingAutoConfigurationTests.java @@ -17,7 +17,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; +import org.springframework.boot.jackson2.autoconfigure.Jackson2AutoConfiguration; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.context.annotation.Bean; @@ -86,23 +86,25 @@ void connectionInfoProvidedShouldConfigure() { } @Test + @SuppressWarnings("removal") void withoutObjectMapperShouldNotConfigure() { this.contextRunner .withClassLoader(new FilteredClassLoader(ObjectMapper.class)) .withPropertyValues( "spring.cloud.azure.servicebus.connection-string=" + String.format(CONNECTION_STRING_FORMAT, "test-namespace") ) - .withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class)) + .withConfiguration(AutoConfigurations.of(Jackson2AutoConfiguration.class)) .withUserConfiguration(AzureServiceBusPropertiesTestConfiguration.class) .run(context -> assertThatIllegalStateException()); } @Test + @SuppressWarnings("removal") void withIsolatedObjectMapper() { this.contextRunner .withPropertyValues("spring.cloud.azure.servicebus.connection-string=" + String.format(CONNECTION_STRING_FORMAT, "test-namespace")) .withUserConfiguration(AzureServiceBusPropertiesTestConfiguration.class) - .withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class)) + .withConfiguration(AutoConfigurations.of(Jackson2AutoConfiguration.class)) .run(context -> { assertThat(context).hasBean("defaultServiceBusMessageConverter"); assertThat(context).hasSingleBean(ServiceBusMessageConverter.class); @@ -111,12 +113,13 @@ void withIsolatedObjectMapper() { } @Test + @SuppressWarnings("removal") void withNonIsolatedObjectMapper() { this.contextRunner .withPropertyValues("spring.cloud.azure.servicebus.connection-string=" + String.format(CONNECTION_STRING_FORMAT, "test-namespace"), "spring.cloud.azure.message-converter.isolated-object-mapper=false") .withUserConfiguration(AzureServiceBusPropertiesTestConfiguration.class) - .withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class)) + .withConfiguration(AutoConfigurations.of(Jackson2AutoConfiguration.class)) .run(context -> { assertThat(context).hasBean("serviceBusMessageConverter"); assertThat(context).hasSingleBean(ServiceBusMessageConverter.class); @@ -125,13 +128,14 @@ void withNonIsolatedObjectMapper() { } @Test + @SuppressWarnings("removal") void withUserProvidedObjectMapper() { this.contextRunner .withPropertyValues("spring.cloud.azure.servicebus.connection-string=" + String.format(CONNECTION_STRING_FORMAT, "test-namespace"), "spring.cloud.azure.message-converter.isolated-object-mapper=false") .withUserConfiguration(AzureServiceBusPropertiesTestConfiguration.class) - .withBean("userObjectMapper", ObjectMapper.class, ObjectMapper::new) - .withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class)) + .withBean("userObjectMapper", ObjectMapper.class, () -> new ObjectMapper()) + .withConfiguration(AutoConfigurations.of(Jackson2AutoConfiguration.class)) .run(context -> { assertThat(context).hasBean("userObjectMapper"); assertThat(context).hasSingleBean(ObjectMapper.class); diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/storage/AzureStorageQueueMessagingAutoConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/storage/AzureStorageQueueMessagingAutoConfigurationTests.java index 981d4cd400a1..8e350f23b9d2 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/storage/AzureStorageQueueMessagingAutoConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/storage/AzureStorageQueueMessagingAutoConfigurationTests.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; +import org.springframework.boot.jackson2.autoconfigure.Jackson2AutoConfiguration; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.runner.ApplicationContextRunner; @@ -25,20 +25,22 @@ public class AzureStorageQueueMessagingAutoConfigurationTests { .withConfiguration(AutoConfigurations.of(AzureStorageQueueMessagingAutoConfiguration.class)); @Test + @SuppressWarnings("removal") void withoutObjectMapperShouldNotConfigure() { this.contextRunner .withClassLoader(new FilteredClassLoader(ObjectMapper.class)) - .withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class)) + .withConfiguration(AutoConfigurations.of(Jackson2AutoConfiguration.class)) .withPropertyValues("spring.cloud.azure.storage.queue.enabled=true") .withUserConfiguration(AzureStorageQueuePropertiesTestConfiguration.class) .run(context -> assertThatIllegalStateException()); } @Test + @SuppressWarnings("removal") void withIsolatedObjectMapper() { this.contextRunner .withPropertyValues("spring.cloud.azure.storage.queue.enabled=true") - .withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class)) + .withConfiguration(AutoConfigurations.of(Jackson2AutoConfiguration.class)) .withUserConfiguration(AzureStorageQueuePropertiesTestConfiguration.class) .run(context -> { assertThat(context).hasBean("defaultStorageQueueMessageConverter"); @@ -48,11 +50,12 @@ void withIsolatedObjectMapper() { } @Test + @SuppressWarnings("removal") void withNonIsolatedObjectMapper() { this.contextRunner .withPropertyValues("spring.cloud.azure.storage.queue.enabled=true", "spring.cloud.azure.message-converter.isolated-object-mapper=false") - .withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class)) + .withConfiguration(AutoConfigurations.of(Jackson2AutoConfiguration.class)) .withUserConfiguration(AzureStorageQueuePropertiesTestConfiguration.class) .run(context -> { assertThat(context).hasBean("storageQueueMessageConverter"); @@ -62,11 +65,12 @@ void withNonIsolatedObjectMapper() { } @Test + @SuppressWarnings("removal") void withUserProvidedObjectMapper() { this.contextRunner .withPropertyValues("spring.cloud.azure.storage.queue.enabled=true", "spring.cloud.azure.message-converter.isolated-object-mapper=false") - .withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class)) + .withConfiguration(AutoConfigurations.of(Jackson2AutoConfiguration.class)) .withUserConfiguration(AzureStorageQueuePropertiesTestConfiguration.class) .withBean("userObjectMapper", ObjectMapper.class, () -> new ObjectMapper()) .run(context -> { diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/util/TestCompatibilityUtils.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/util/TestCompatibilityUtils.java index d2af6ee01f07..1a84aafa460f 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/util/TestCompatibilityUtils.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/util/TestCompatibilityUtils.java @@ -3,7 +3,7 @@ package com.azure.spring.cloud.autoconfigure.implementation.util; -import org.springframework.boot.autoconfigure.kafka.KafkaProperties; +import org.springframework.boot.kafka.autoconfigure.KafkaProperties; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/sdk/spring/spring-cloud-azure-core/pom.xml b/sdk/spring/spring-cloud-azure-core/pom.xml index 12b4051c06ac..1198cd318fdd 100644 --- a/sdk/spring/spring-cloud-azure-core/pom.xml +++ b/sdk/spring/spring-cloud-azure-core/pom.xml @@ -40,7 +40,7 @@ org.springframework spring-context - 6.2.10 + 7.0.1 com.azure @@ -98,7 +98,7 @@ org.mockito mockito-core - 5.17.0 + 5.20.0 test @@ -106,25 +106,25 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test org.junit.jupiter junit-jupiter - 5.12.2 + 6.0.1 test org.springframework spring-test - 6.2.10 + 7.0.1 test @@ -135,7 +135,7 @@ com.google.code.findbugs jsr305 - 3.0.2 + 3.0.2 provided @@ -145,7 +145,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -176,12 +176,12 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.2 - org.springframework:spring-context:[6.2.10] + org.springframework:spring-context:[7.0.1] @@ -190,7 +190,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 diff --git a/sdk/spring/spring-cloud-azure-core/src/main/java/com/azure/spring/cloud/core/implementation/connectionstring/ConnectionString.java b/sdk/spring/spring-cloud-azure-core/src/main/java/com/azure/spring/cloud/core/implementation/connectionstring/ConnectionString.java index 74d0b6e53636..3798e783095d 100644 --- a/sdk/spring/spring-cloud-azure-core/src/main/java/com/azure/spring/cloud/core/implementation/connectionstring/ConnectionString.java +++ b/sdk/spring/spring-cloud-azure-core/src/main/java/com/azure/spring/cloud/core/implementation/connectionstring/ConnectionString.java @@ -23,6 +23,7 @@ import static com.azure.spring.cloud.core.implementation.connectionstring.ConnectionStringSegments.ENDPOINT; +@SuppressWarnings("deprecation") class ConnectionString { private static final Logger LOGGER = LoggerFactory.getLogger(ConnectionString.class); diff --git a/sdk/spring/spring-cloud-azure-core/src/main/java/com/azure/spring/cloud/core/implementation/converter/AzureHttpRetryOptionsConverter.java b/sdk/spring/spring-cloud-azure-core/src/main/java/com/azure/spring/cloud/core/implementation/converter/AzureHttpRetryOptionsConverter.java index b409dbfca1a9..7033a6ce0ad6 100644 --- a/sdk/spring/spring-cloud-azure-core/src/main/java/com/azure/spring/cloud/core/implementation/converter/AzureHttpRetryOptionsConverter.java +++ b/sdk/spring/spring-cloud-azure-core/src/main/java/com/azure/spring/cloud/core/implementation/converter/AzureHttpRetryOptionsConverter.java @@ -15,6 +15,7 @@ /** * Converts a {@link RetryOptionsProvider.RetryOptions} to a {@link RetryOptions}. */ +@SuppressWarnings("deprecation") public final class AzureHttpRetryOptionsConverter implements Converter { private static final Logger LOGGER = LoggerFactory.getLogger(AzureHttpRetryOptionsConverter.class); diff --git a/sdk/spring/spring-cloud-azure-core/src/main/java/com/azure/spring/cloud/core/resource/AzureStorageResource.java b/sdk/spring/spring-cloud-azure-core/src/main/java/com/azure/spring/cloud/core/resource/AzureStorageResource.java index 1446f01a6d54..b6e8960ea0f8 100644 --- a/sdk/spring/spring-cloud-azure-core/src/main/java/com/azure/spring/cloud/core/resource/AzureStorageResource.java +++ b/sdk/spring/spring-cloud-azure-core/src/main/java/com/azure/spring/cloud/core/resource/AzureStorageResource.java @@ -16,6 +16,7 @@ * Abstract implementation of {@link WritableResource} for reading and writing objects in Azure StorageAccount. * */ +@SuppressWarnings("deprecation") abstract class AzureStorageResource extends AbstractResource implements WritableResource { private static final String PATH_DELIMITER = "/"; diff --git a/sdk/spring/spring-cloud-azure-docker-compose/pom.xml b/sdk/spring/spring-cloud-azure-docker-compose/pom.xml index c6935639df5d..5fbab7c18b03 100644 --- a/sdk/spring/spring-cloud-azure-docker-compose/pom.xml +++ b/sdk/spring/spring-cloud-azure-docker-compose/pom.xml @@ -81,7 +81,12 @@ org.springframework.boot spring-boot-docker-compose - 3.5.5 + 4.0.0 + + + com.fasterxml.jackson.core + jackson-databind + 2.20.1 + 3.0.2 provided org.springframework.boot spring-boot-test - 3.5.5 + 4.0.0 test org.springframework spring-test - 6.2.10 + 7.0.1 test org.junit.jupiter junit-jupiter - 5.12.2 + 6.0.1 test org.assertj assertj-core - 3.27.4 + 3.27.6 test @@ -124,7 +129,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -155,12 +160,13 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.2 - org.springframework.boot:spring-boot-docker-compose:[3.5.5] + com.fasterxml.jackson.core:jackson-databind:[2.20.1] + org.springframework.boot:spring-boot-docker-compose:[4.0.0] @@ -169,7 +175,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -214,7 +220,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-feature-management-web/pom.xml b/sdk/spring/spring-cloud-azure-feature-management-web/pom.xml index 08ca28efc359..f144c5b143dd 100644 --- a/sdk/spring/spring-cloud-azure-feature-management-web/pom.xml +++ b/sdk/spring/spring-cloud-azure-feature-management-web/pom.xml @@ -29,12 +29,12 @@ org.springframework spring-web - 6.2.10 + 7.0.1 org.springframework spring-webmvc - 6.2.10 + 7.0.1 com.azure.spring @@ -44,26 +44,26 @@ jakarta.servlet jakarta.servlet-api - 6.0.0 + 6.1.0 provided org.springframework.boot spring-boot-starter-test - 3.5.5 + 4.0.0 test net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test @@ -72,7 +72,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -88,7 +88,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -122,15 +122,15 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.2 com.azure.spring:spring-cloud-azure-feature-management:[6.2.0-beta.1] - jakarta.servlet:jakarta.servlet-api:[6.0.0] - org.springframework:spring-web:[6.2.10] - org.springframework:spring-webmvc:[6.2.10] + jakarta.servlet:jakarta.servlet-api:[6.1.0] + org.springframework:spring-web:[7.0.1] + org.springframework:spring-webmvc:[7.0.1] diff --git a/sdk/spring/spring-cloud-azure-feature-management/pom.xml b/sdk/spring/spring-cloud-azure-feature-management/pom.xml index 08ae2b18f090..a5408ae186ab 100644 --- a/sdk/spring/spring-cloud-azure-feature-management/pom.xml +++ b/sdk/spring/spring-cloud-azure-feature-management/pom.xml @@ -29,12 +29,12 @@ org.springframework spring-context - 6.2.10 + 7.0.1 org.springframework.boot spring-boot-starter - 3.5.5 + 4.0.0 ch.qos.logback @@ -45,35 +45,35 @@ org.springframework.boot spring-boot-configuration-processor - 3.5.5 + 4.0.0 true com.fasterxml.jackson.core jackson-annotations - 2.19.2 + 2.20 com.fasterxml.jackson.core jackson-databind - 2.19.2 + 2.20.1 io.projectreactor.netty reactor-netty - 1.2.9 + 1.3.0 org.springframework.boot spring-boot-starter-test - 3.5.5 + 4.0.0 test org.mockito mockito-core - 5.17.0 + 5.20.0 test @@ -81,19 +81,19 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test ch.qos.logback logback-classic - 1.5.18 + 1.5.21 test @@ -102,7 +102,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -118,7 +118,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -161,17 +161,17 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.2 - com.fasterxml.jackson.core:jackson-annotations:[2.19.2] - com.fasterxml.jackson.core:jackson-databind:[2.19.2] - io.projectreactor.netty:reactor-netty:[1.2.9] - org.springframework.boot:spring-boot-configuration-processor:[3.5.5] - org.springframework.boot:spring-boot-starter:[3.5.5] - org.springframework:spring-context:[6.2.10] + com.fasterxml.jackson.core:jackson-annotations:[2.20] + com.fasterxml.jackson.core:jackson-databind:[2.20.1] + io.projectreactor.netty:reactor-netty:[1.3.0] + org.springframework.boot:spring-boot-configuration-processor:[4.0.0] + org.springframework.boot:spring-boot-starter:[4.0.0] + org.springframework:spring-context:[7.0.1] diff --git a/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/FeatureManagementConfiguration.java b/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/FeatureManagementConfiguration.java index 9096856a8082..3ba7bacbcc0b 100644 --- a/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/FeatureManagementConfiguration.java +++ b/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/FeatureManagementConfiguration.java @@ -29,6 +29,7 @@ */ @Configuration @EnableConfigurationProperties({ FeatureManagementConfigProperties.class, FeatureManagementProperties.class }) +@SuppressWarnings("deprecation") class FeatureManagementConfiguration implements ApplicationContextAware { private ApplicationContext appContext; diff --git a/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/models/FeatureDefinition.java b/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/models/FeatureDefinition.java index 7905f652e13d..3b99c38f47ad 100644 --- a/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/models/FeatureDefinition.java +++ b/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/models/FeatureDefinition.java @@ -16,6 +16,7 @@ * and variant references for feature flags that support multiple variations. */ @JsonIgnoreProperties(ignoreUnknown = true) +@SuppressWarnings("deprecation") public class FeatureDefinition { /** diff --git a/sdk/spring/spring-cloud-azure-integration-test-appconfiguration-config/pom.xml b/sdk/spring/spring-cloud-azure-integration-test-appconfiguration-config/pom.xml index 1458dfc78f93..02bbfeacdca3 100644 --- a/sdk/spring/spring-cloud-azure-integration-test-appconfiguration-config/pom.xml +++ b/sdk/spring/spring-cloud-azure-integration-test-appconfiguration-config/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 3.5.5 + 4.0.0 com.azure.spring @@ -25,12 +25,12 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc org.springframework.boot spring-boot-starter-test - 3.5.5 + 4.0.0 test @@ -39,7 +39,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.5.3 + 3.5.4 default diff --git a/sdk/spring/spring-cloud-azure-integration-tests/pom.xml b/sdk/spring/spring-cloud-azure-integration-tests/pom.xml index 8dcd3e9f7267..be59091a6c5a 100644 --- a/sdk/spring/spring-cloud-azure-integration-tests/pom.xml +++ b/sdk/spring/spring-cloud-azure-integration-tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 3.5.5 + 4.0.0 @@ -107,7 +107,7 @@ org.springframework.cloud spring-cloud-starter-stream-kafka - 4.3.0 + 5.0.0 org.springframework.boot @@ -142,7 +142,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.5.3 + 3.5.4 default diff --git a/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/AzureCloudTypeEnvironmentPostProcessor.java b/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/AzureCloudTypeEnvironmentPostProcessor.java index 5a357212f50c..1f7d8de43065 100644 --- a/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/AzureCloudTypeEnvironmentPostProcessor.java +++ b/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/AzureCloudTypeEnvironmentPostProcessor.java @@ -7,7 +7,7 @@ import com.azure.spring.cloud.core.provider.AzureProfileOptionsProvider; import org.apache.commons.logging.Log; import org.springframework.boot.SpringApplication; -import org.springframework.boot.env.EnvironmentPostProcessor; +import org.springframework.boot.EnvironmentPostProcessor; import org.springframework.boot.logging.DeferredLog; import org.springframework.core.Ordered; import org.springframework.core.env.ConfigurableEnvironment; diff --git a/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/keyvault/secret/TestBootstrapRegistryInitializer.java b/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/keyvault/secret/TestBootstrapRegistryInitializer.java index 15a384ae7e64..ee03574e33ef 100644 --- a/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/keyvault/secret/TestBootstrapRegistryInitializer.java +++ b/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/keyvault/secret/TestBootstrapRegistryInitializer.java @@ -5,8 +5,8 @@ import com.azure.core.credential.TokenCredential; import com.azure.spring.cloud.integration.tests.util.TestCredentialUtils; -import org.springframework.boot.BootstrapRegistry; -import org.springframework.boot.BootstrapRegistryInitializer; +import org.springframework.boot.bootstrap.BootstrapRegistry; +import org.springframework.boot.bootstrap.BootstrapRegistryInitializer; class TestBootstrapRegistryInitializer implements BootstrapRegistryInitializer { diff --git a/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/servicebus/jms/ServiceBusJmsConnectionStringIT.java b/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/servicebus/jms/ServiceBusJmsConnectionStringIT.java index bfafe08d71dc..2a97d3844206 100644 --- a/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/servicebus/jms/ServiceBusJmsConnectionStringIT.java +++ b/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/servicebus/jms/ServiceBusJmsConnectionStringIT.java @@ -2,11 +2,11 @@ // Licensed under the MIT License. package com.azure.spring.cloud.integration.tests.servicebus.jms; +import com.azure.servicebus.jms.ServiceBusJmsConnectionFactory; import jakarta.jms.ConnectionFactory; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; -import org.messaginghub.pooled.jms.JmsPoolConnectionFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -36,7 +36,7 @@ public ServiceBusJmsConnectionStringIT() { @Test @Timeout(70) void testJmsOperationViaConnStringAndCachingConnection() throws InterruptedException { - Assertions.assertSame(JmsPoolConnectionFactory.class, connectionFactory.getClass()); + Assertions.assertSame(ServiceBusJmsConnectionFactory.class, connectionFactory.getClass()); LOGGER.info("ServiceBusJmsConnectionStringIT begin."); this.exchangeMessage(jmsTemplate, CONNECTION_STRING_POOL_API_QUEUE_NAME); LOGGER.info("ServiceBusJmsConnectionStringIT end."); diff --git a/sdk/spring/spring-cloud-azure-integration-tests/src/test/resources/META-INF/spring.factories b/sdk/spring/spring-cloud-azure-integration-tests/src/test/resources/META-INF/spring.factories index cb9011b2f326..bc96fcb50b32 100644 --- a/sdk/spring/spring-cloud-azure-integration-tests/src/test/resources/META-INF/spring.factories +++ b/sdk/spring/spring-cloud-azure-integration-tests/src/test/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ -org.springframework.boot.env.EnvironmentPostProcessor=com.azure.spring.cloud.integration.tests.AzureCloudTypeEnvironmentPostProcessor -org.springframework.boot.BootstrapRegistryInitializer=com.azure.spring.cloud.integration.tests.keyvault.secret.TestBootstrapRegistryInitializer +org.springframework.boot.EnvironmentPostProcessor=com.azure.spring.cloud.integration.tests.AzureCloudTypeEnvironmentPostProcessor +org.springframework.boot.bootstrap.BootstrapRegistryInitializer=com.azure.spring.cloud.integration.tests.keyvault.secret.TestBootstrapRegistryInitializer diff --git a/sdk/spring/spring-cloud-azure-integration-tests/src/test/resources/application-servicebus-jms-passwordless-caching.yml b/sdk/spring/spring-cloud-azure-integration-tests/src/test/resources/application-servicebus-jms-passwordless-caching.yml index 8e63cf1e26b8..2b8ca5c54cf1 100644 --- a/sdk/spring/spring-cloud-azure-integration-tests/src/test/resources/application-servicebus-jms-passwordless-caching.yml +++ b/sdk/spring/spring-cloud-azure-integration-tests/src/test/resources/application-servicebus-jms-passwordless-caching.yml @@ -4,6 +4,9 @@ spring: credential: token-credential-bean-name: integrationTestTokenCredential jms: + cache: + enabled: + true servicebus: pool: enabled: false diff --git a/sdk/spring/spring-cloud-azure-integration-tests/src/test/resources/application-servicebus-jms-passwordless-pool.yml b/sdk/spring/spring-cloud-azure-integration-tests/src/test/resources/application-servicebus-jms-passwordless-pool.yml index 4154ed97a9a5..70fbf7b20195 100644 --- a/sdk/spring/spring-cloud-azure-integration-tests/src/test/resources/application-servicebus-jms-passwordless-pool.yml +++ b/sdk/spring/spring-cloud-azure-integration-tests/src/test/resources/application-servicebus-jms-passwordless-pool.yml @@ -9,3 +9,5 @@ spring: pricing-tier: standard passwordless-enabled: true namespace: ${AZURE_SERVICE_BUS_NAMESPACE} + pool: + enabled: true diff --git a/sdk/spring/spring-cloud-azure-integration-tests/test-resources/cosmos-spring/test-resources.json b/sdk/spring/spring-cloud-azure-integration-tests/test-resources/cosmos-spring/test-resources.json index d96fc0f599fe..ae625011a033 100644 --- a/sdk/spring/spring-cloud-azure-integration-tests/test-resources/cosmos-spring/test-resources.json +++ b/sdk/spring/spring-cloud-azure-integration-tests/test-resources/cosmos-spring/test-resources.json @@ -44,7 +44,7 @@ "newAccountName": "[toLower(concat(parameters('baseName'), '2'))]", "resourceId": "[resourceId('Microsoft.DocumentDB/databaseAccounts', variables('accountName'))]", "newResourceId": "[resourceId('Microsoft.DocumentDB/databaseAccounts', variables('newAccountName'))]", - "location": "westcentralus" + "location": "[resourceGroup().location]" }, "resources": [ { diff --git a/sdk/spring/spring-cloud-azure-resourcemanager/pom.xml b/sdk/spring/spring-cloud-azure-resourcemanager/pom.xml index b48de2f0b228..7fc5b9a4437c 100644 --- a/sdk/spring/spring-cloud-azure-resourcemanager/pom.xml +++ b/sdk/spring/spring-cloud-azure-resourcemanager/pom.xml @@ -53,7 +53,7 @@ org.mockito mockito-core - 5.17.0 + 5.20.0 test @@ -61,25 +61,25 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test org.junit.jupiter junit-jupiter - 5.12.2 + 6.0.1 test org.springframework spring-test - 6.2.10 + 7.0.1 test @@ -90,7 +90,7 @@ com.google.code.findbugs jsr305 - 3.0.2 + 3.0.2 provided @@ -100,7 +100,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -131,7 +131,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -176,7 +176,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/com/azure/spring/cloud/resourcemanager/implementation/crud/AbstractResourceCrud.java b/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/com/azure/spring/cloud/resourcemanager/implementation/crud/AbstractResourceCrud.java index 932c3a560cd3..752e52f91106 100644 --- a/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/com/azure/spring/cloud/resourcemanager/implementation/crud/AbstractResourceCrud.java +++ b/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/com/azure/spring/cloud/resourcemanager/implementation/crud/AbstractResourceCrud.java @@ -19,6 +19,7 @@ * @param The type of resource key. * @param

Azure resource properties. */ +@SuppressWarnings("deprecation") public abstract class AbstractResourceCrud implements ResourceCrud { private static final Logger LOGGER = LoggerFactory.getLogger(AbstractResourceCrud.class); diff --git a/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/com/azure/spring/cloud/resourcemanager/implementation/crud/ServiceBusNamespaceCrud.java b/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/com/azure/spring/cloud/resourcemanager/implementation/crud/ServiceBusNamespaceCrud.java index 469cfd467dc8..7bd58516c408 100644 --- a/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/com/azure/spring/cloud/resourcemanager/implementation/crud/ServiceBusNamespaceCrud.java +++ b/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/com/azure/spring/cloud/resourcemanager/implementation/crud/ServiceBusNamespaceCrud.java @@ -12,6 +12,7 @@ /** * Resource manager for Service Bus namespace. */ +@SuppressWarnings("deprecation") public class ServiceBusNamespaceCrud extends AbstractResourceCrud { public ServiceBusNamespaceCrud(@NonNull AzureResourceManager azureResourceManager, diff --git a/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/com/azure/spring/cloud/resourcemanager/implementation/crud/ServiceBusQueueCrud.java b/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/com/azure/spring/cloud/resourcemanager/implementation/crud/ServiceBusQueueCrud.java index f480b774a2b9..a563bcaa7ee9 100644 --- a/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/com/azure/spring/cloud/resourcemanager/implementation/crud/ServiceBusQueueCrud.java +++ b/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/com/azure/spring/cloud/resourcemanager/implementation/crud/ServiceBusQueueCrud.java @@ -16,6 +16,7 @@ /** * Resource manager for Service Bus queue. */ +@SuppressWarnings("deprecation") public class ServiceBusQueueCrud extends AbstractResourceCrud, ServiceBusQueueProperties> { diff --git a/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/com/azure/spring/cloud/resourcemanager/implementation/crud/ServiceBusTopicCrud.java b/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/com/azure/spring/cloud/resourcemanager/implementation/crud/ServiceBusTopicCrud.java index 9215a7c23612..3f026d56647e 100644 --- a/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/com/azure/spring/cloud/resourcemanager/implementation/crud/ServiceBusTopicCrud.java +++ b/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/com/azure/spring/cloud/resourcemanager/implementation/crud/ServiceBusTopicCrud.java @@ -16,6 +16,7 @@ /** * Resource manager for Service Bus topic. */ +@SuppressWarnings("deprecation") public class ServiceBusTopicCrud extends AbstractResourceCrud, ServiceBusTopicProperties> { public ServiceBusTopicCrud(AzureResourceManager azureResourceManager, AzureResourceMetadata azureResourceMetadata) { diff --git a/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/com/azure/spring/cloud/resourcemanager/implementation/crud/ServiceBusTopicSubscriptionCrud.java b/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/com/azure/spring/cloud/resourcemanager/implementation/crud/ServiceBusTopicSubscriptionCrud.java index 4bd7bdf98e35..c925e7d52db1 100644 --- a/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/com/azure/spring/cloud/resourcemanager/implementation/crud/ServiceBusTopicSubscriptionCrud.java +++ b/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/com/azure/spring/cloud/resourcemanager/implementation/crud/ServiceBusTopicSubscriptionCrud.java @@ -16,6 +16,7 @@ /** * Resource manager for Service Bus topic subscription. */ +@SuppressWarnings("deprecation") public class ServiceBusTopicSubscriptionCrud extends AbstractResourceCrud, ServiceBusTopicProperties> { diff --git a/sdk/spring/spring-cloud-azure-service/pom.xml b/sdk/spring/spring-cloud-azure-service/pom.xml index f2832c9d02b9..d3340195660c 100644 --- a/sdk/spring/spring-cloud-azure-service/pom.xml +++ b/sdk/spring/spring-cloud-azure-service/pom.xml @@ -116,7 +116,7 @@ org.apache.kafka kafka-clients - 3.9.1 + 4.1.1 true @@ -131,7 +131,7 @@ org.mockito mockito-core - 5.17.0 + 5.20.0 test @@ -139,25 +139,25 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test org.junit.jupiter junit-jupiter - 5.12.2 + 6.0.1 test org.springframework spring-test - 6.2.10 + 7.0.1 test @@ -168,7 +168,7 @@ com.google.code.findbugs jsr305 - 3.0.2 + 3.0.2 provided @@ -178,7 +178,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -209,13 +209,13 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.2 - org.apache.kafka:kafka-clients:[3.9.1] - org.postgresql:postgresql:[42.7.7] + org.apache.kafka:kafka-clients:[4.1.1] + org.postgresql:postgresql:[42.7.8] com.nimbusds:nimbus-jose-jwt:[9.37.3] @@ -225,7 +225,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 diff --git a/sdk/spring/spring-cloud-azure-service/src/main/java/com/azure/spring/cloud/service/implementation/storage/AzureStorageRetryOptionsConverter.java b/sdk/spring/spring-cloud-azure-service/src/main/java/com/azure/spring/cloud/service/implementation/storage/AzureStorageRetryOptionsConverter.java index 2d4099e99e0e..34c26a4c2b5f 100644 --- a/sdk/spring/spring-cloud-azure-service/src/main/java/com/azure/spring/cloud/service/implementation/storage/AzureStorageRetryOptionsConverter.java +++ b/sdk/spring/spring-cloud-azure-service/src/main/java/com/azure/spring/cloud/service/implementation/storage/AzureStorageRetryOptionsConverter.java @@ -18,6 +18,7 @@ /** * Converts a {@link StorageRetry} to a {@link RequestRetryOptions}. */ +@SuppressWarnings("deprecation") public final class AzureStorageRetryOptionsConverter implements Converter { public static final AzureStorageRetryOptionsConverter STORAGE_RETRY_CONVERTER = new AzureStorageRetryOptionsConverter(); diff --git a/sdk/spring/spring-cloud-azure-starter-active-directory-b2c/pom.xml b/sdk/spring/spring-cloud-azure-starter-active-directory-b2c/pom.xml index d614306fcbe0..72887c420eee 100644 --- a/sdk/spring/spring-cloud-azure-starter-active-directory-b2c/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-active-directory-b2c/pom.xml @@ -93,24 +93,29 @@ 6.2.0-beta.1 - org.springframework.security - spring-security-config - 6.5.3 + org.springframework.boot + spring-boot-restclient + 4.0.0 - org.springframework.security - spring-security-oauth2-client - 6.5.3 + org.springframework.boot + spring-boot-security + 4.0.0 - org.springframework.security - spring-security-oauth2-jose - 6.5.3 + org.springframework.boot + spring-boot-security-oauth2-client + 4.0.0 - org.springframework.security - spring-security-oauth2-resource-server - 6.5.3 + org.springframework.boot + spring-boot-security-oauth2-resource-server + 4.0.0 + + + org.springframework.boot + spring-boot-http-converter + 4.0.0 @@ -119,7 +124,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -127,7 +132,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -135,7 +140,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -151,7 +156,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -199,7 +204,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-active-directory/pom.xml b/sdk/spring/spring-cloud-azure-starter-active-directory/pom.xml index 3bfe9ecba1f8..b3566ee5d209 100644 --- a/sdk/spring/spring-cloud-azure-starter-active-directory/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-active-directory/pom.xml @@ -92,19 +92,24 @@ 6.2.0-beta.1 - org.springframework.security - spring-security-web - 6.5.3 + org.springframework.boot + spring-boot-restclient + 4.0.0 - org.springframework.security - spring-security-config - 6.5.3 + org.springframework.boot + spring-boot-security + 4.0.0 + + + org.springframework.boot + spring-boot-http-converter + 4.0.0 com.nimbusds nimbus-jose-jwt - 9.37.3 + 9.37.3 @@ -113,7 +118,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -121,7 +126,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -129,7 +134,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -145,7 +150,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -193,7 +198,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-actuator/pom.xml b/sdk/spring/spring-cloud-azure-starter-actuator/pom.xml index 569b5047ec23..aece76048e21 100644 --- a/sdk/spring/spring-cloud-azure-starter-actuator/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-actuator/pom.xml @@ -99,7 +99,7 @@ org.springframework.boot spring-boot-starter-actuator - 3.5.5 + 4.0.0 @@ -108,7 +108,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -116,7 +116,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -124,7 +124,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -140,7 +140,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -188,7 +188,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-appconfiguration-config/pom.xml b/sdk/spring/spring-cloud-azure-starter-appconfiguration-config/pom.xml index aa1170386a7f..8c2a77d00a14 100644 --- a/sdk/spring/spring-cloud-azure-starter-appconfiguration-config/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-appconfiguration-config/pom.xml @@ -102,7 +102,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -110,7 +110,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -118,7 +118,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -134,7 +134,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -185,7 +185,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-appconfiguration/pom.xml b/sdk/spring/spring-cloud-azure-starter-appconfiguration/pom.xml index feb3a99d6b5b..4bee34a6e170 100644 --- a/sdk/spring/spring-cloud-azure-starter-appconfiguration/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-appconfiguration/pom.xml @@ -103,7 +103,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -111,7 +111,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -119,7 +119,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -135,7 +135,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -183,7 +183,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-cosmos/pom.xml b/sdk/spring/spring-cloud-azure-starter-cosmos/pom.xml index 113b650b8727..982e329fb64d 100644 --- a/sdk/spring/spring-cloud-azure-starter-cosmos/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-cosmos/pom.xml @@ -103,7 +103,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -111,7 +111,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -119,7 +119,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -135,7 +135,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -183,7 +183,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-data-cosmos/pom.xml b/sdk/spring/spring-cloud-azure-starter-data-cosmos/pom.xml index fb25392ece63..321ec4a50341 100644 --- a/sdk/spring/spring-cloud-azure-starter-data-cosmos/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-data-cosmos/pom.xml @@ -103,7 +103,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -111,7 +111,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -119,7 +119,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -135,7 +135,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -183,7 +183,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-data-redis-lettuce/pom.xml b/sdk/spring/spring-cloud-azure-starter-data-redis-lettuce/pom.xml index 2c1f3fa02a96..48d508844db6 100644 --- a/sdk/spring/spring-cloud-azure-starter-data-redis-lettuce/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-data-redis-lettuce/pom.xml @@ -93,15 +93,15 @@ - org.springframework.data - spring-data-redis - 3.5.3 + org.springframework.boot + spring-boot-data-redis + 4.0.0 io.lettuce lettuce-core - 6.6.0.RELEASE + 6.8.1.RELEASE true @@ -118,7 +118,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -126,7 +126,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -134,7 +134,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -150,7 +150,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -198,7 +198,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-eventgrid/pom.xml b/sdk/spring/spring-cloud-azure-starter-eventgrid/pom.xml index 585a7c2de1e0..24d953c4ddc8 100644 --- a/sdk/spring/spring-cloud-azure-starter-eventgrid/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-eventgrid/pom.xml @@ -105,7 +105,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -113,7 +113,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -121,7 +121,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -137,7 +137,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -185,7 +185,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-eventhubs/pom.xml b/sdk/spring/spring-cloud-azure-starter-eventhubs/pom.xml index a1cb90e500d3..e456c58ce7fc 100644 --- a/sdk/spring/spring-cloud-azure-starter-eventhubs/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-eventhubs/pom.xml @@ -111,7 +111,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -119,7 +119,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -127,7 +127,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -143,7 +143,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -191,7 +191,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-integration-eventhubs/pom.xml b/sdk/spring/spring-cloud-azure-starter-integration-eventhubs/pom.xml index 76e71522419c..3671344aa619 100644 --- a/sdk/spring/spring-cloud-azure-starter-integration-eventhubs/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-integration-eventhubs/pom.xml @@ -95,7 +95,7 @@ org.springframework.boot spring-boot-starter-integration - 3.5.5 + 4.0.0 com.azure.spring @@ -109,7 +109,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -117,7 +117,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -125,7 +125,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -141,7 +141,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -189,7 +189,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-integration-servicebus/pom.xml b/sdk/spring/spring-cloud-azure-starter-integration-servicebus/pom.xml index e29676cf2dfe..aaae8051abd5 100644 --- a/sdk/spring/spring-cloud-azure-starter-integration-servicebus/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-integration-servicebus/pom.xml @@ -95,7 +95,7 @@ org.springframework.boot spring-boot-starter-integration - 3.5.5 + 4.0.0 com.azure.spring @@ -109,7 +109,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -117,7 +117,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -125,7 +125,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -141,7 +141,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -189,7 +189,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-integration-storage-queue/pom.xml b/sdk/spring/spring-cloud-azure-starter-integration-storage-queue/pom.xml index e6b12f28487c..0ee1f10d919a 100644 --- a/sdk/spring/spring-cloud-azure-starter-integration-storage-queue/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-integration-storage-queue/pom.xml @@ -98,7 +98,7 @@ org.springframework.boot spring-boot-starter-integration - 3.5.5 + 4.0.0 com.azure.spring @@ -112,7 +112,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -120,7 +120,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -128,7 +128,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -144,7 +144,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -192,7 +192,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-jdbc-mysql/pom.xml b/sdk/spring/spring-cloud-azure-starter-jdbc-mysql/pom.xml index 438cdb5d6e09..6b3d15841b7e 100644 --- a/sdk/spring/spring-cloud-azure-starter-jdbc-mysql/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-jdbc-mysql/pom.xml @@ -101,7 +101,13 @@ com.mysql mysql-connector-j - 9.4.0 + 9.5.0 + + + + org.springframework.boot + spring-boot-jdbc + 4.0.0 @@ -110,7 +116,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -118,7 +124,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -126,7 +132,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -142,7 +148,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -190,7 +196,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-jdbc-postgresql/pom.xml b/sdk/spring/spring-cloud-azure-starter-jdbc-postgresql/pom.xml index 7bd5169465b0..a403614f4439 100644 --- a/sdk/spring/spring-cloud-azure-starter-jdbc-postgresql/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-jdbc-postgresql/pom.xml @@ -101,7 +101,13 @@ org.postgresql postgresql - 42.7.7 + 42.7.8 + + + + org.springframework.boot + spring-boot-jdbc + 4.0.0 @@ -110,7 +116,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -118,7 +124,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -126,7 +132,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -142,7 +148,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -190,7 +196,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-keyvault-certificates/pom.xml b/sdk/spring/spring-cloud-azure-starter-keyvault-certificates/pom.xml index 719f153c3faf..dad55e56d881 100644 --- a/sdk/spring/spring-cloud-azure-starter-keyvault-certificates/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-keyvault-certificates/pom.xml @@ -103,7 +103,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -111,7 +111,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -119,7 +119,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -135,7 +135,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -183,7 +183,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-keyvault-jca/pom.xml b/sdk/spring/spring-cloud-azure-starter-keyvault-jca/pom.xml index 15c21a0daf22..0bf9536ffb74 100644 --- a/sdk/spring/spring-cloud-azure-starter-keyvault-jca/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-keyvault-jca/pom.xml @@ -103,7 +103,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -111,7 +111,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -119,7 +119,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -135,7 +135,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -183,7 +183,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-keyvault-secrets/pom.xml b/sdk/spring/spring-cloud-azure-starter-keyvault-secrets/pom.xml index 2b9f68e438eb..6489d1155f5e 100644 --- a/sdk/spring/spring-cloud-azure-starter-keyvault-secrets/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-keyvault-secrets/pom.xml @@ -103,7 +103,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -111,7 +111,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -119,7 +119,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -135,7 +135,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -183,7 +183,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-keyvault/pom.xml b/sdk/spring/spring-cloud-azure-starter-keyvault/pom.xml index 6f073d73b67e..d911dc587f85 100644 --- a/sdk/spring/spring-cloud-azure-starter-keyvault/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-keyvault/pom.xml @@ -108,7 +108,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -116,7 +116,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -124,7 +124,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -140,7 +140,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -188,7 +188,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-monitor-test/pom.xml b/sdk/spring/spring-cloud-azure-starter-monitor-test/pom.xml index b71e65e821cc..e42630d5d49c 100644 --- a/sdk/spring/spring-cloud-azure-starter-monitor-test/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-monitor-test/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 3.5.5 + 4.0.0 @@ -47,18 +47,24 @@ org.springframework.boot - spring-boot-starter-web - 3.5.5 + spring-boot-starter-webmvc + 4.0.0 org.springframework.boot spring-boot-starter-data-jdbc - 3.5.5 + 4.0.0 org.springframework.boot spring-boot-starter-test - 3.5.5 + 4.0.0 + test + + + org.springframework.boot + spring-boot-resttestclient + 4.0.0 test diff --git a/sdk/spring/spring-cloud-azure-starter-monitor-test/src/test/java/com/azure/spring/cloud/autoconfigure/monitor/SpringMonitorTest.java b/sdk/spring/spring-cloud-azure-starter-monitor-test/src/test/java/com/azure/spring/cloud/autoconfigure/monitor/SpringMonitorTest.java index 9e31cb5db718..d2174eba171c 100644 --- a/sdk/spring/spring-cloud-azure-starter-monitor-test/src/test/java/com/azure/spring/cloud/autoconfigure/monitor/SpringMonitorTest.java +++ b/sdk/spring/spring-cloud-azure-starter-monitor-test/src/test/java/com/azure/spring/cloud/autoconfigure/monitor/SpringMonitorTest.java @@ -15,9 +15,10 @@ import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureTestRestTemplate; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.TestConfiguration; -import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.boot.resttestclient.TestRestTemplate; import org.springframework.context.annotation.Bean; import reactor.util.annotation.Nullable; @@ -35,6 +36,7 @@ @SpringBootTest( classes = {Application.class, SpringMonitorTest.TestConfig.class}, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@AutoConfigureTestRestTemplate class SpringMonitorTest { private static CountDownLatch countDownLatch; diff --git a/sdk/spring/spring-cloud-azure-starter-monitor/pom.xml b/sdk/spring/spring-cloud-azure-starter-monitor/pom.xml index 86d98055e039..f16c42f62dbc 100644 --- a/sdk/spring/spring-cloud-azure-starter-monitor/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-monitor/pom.xml @@ -87,7 +87,7 @@ org.springframework.boot spring-boot-starter - 3.5.5 + 4.0.0 provided @@ -160,13 +160,13 @@ org.slf4j slf4j-simple - 2.0.17 + 2.0.17 test org.springframework.boot spring-boot-starter-test - 3.5.5 + 4.0.0 test @@ -178,7 +178,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -222,7 +222,7 @@ io.opentelemetry:opentelemetry-sdk-metrics:[1.49.0] io.opentelemetry:opentelemetry-sdk-logs:[1.49.0] io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:[1.49.0] - org.springframework.boot:spring-boot-starter:[3.5.5] + org.springframework.boot:spring-boot-starter:[4.0.0] diff --git a/sdk/spring/spring-cloud-azure-starter-servicebus-jms/pom.xml b/sdk/spring/spring-cloud-azure-starter-servicebus-jms/pom.xml index ee79ced057a8..1f34942418a9 100644 --- a/sdk/spring/spring-cloud-azure-starter-servicebus-jms/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-servicebus-jms/pom.xml @@ -94,14 +94,14 @@ - org.springframework - spring-jms - 6.2.10 + org.springframework.boot + spring-boot-jms + 4.0.0 org.messaginghub pooled-jms - 3.1.7 + 3.1.7 com.azure @@ -136,37 +136,37 @@ currently released version and a lower version is resolved. --> io.netty netty-buffer - 4.1.124.Final + 4.2.7.Final io.netty netty-common - 4.1.124.Final + 4.2.7.Final io.netty netty-handler - 4.1.124.Final + 4.2.7.Final io.netty netty-transport - 4.1.124.Final + 4.2.7.Final io.netty netty-transport-native-epoll - 4.1.124.Final + 4.2.7.Final io.netty netty-transport-native-kqueue - 4.1.124.Final + 4.2.7.Final io.netty netty-codec-http - 4.1.124.Final + 4.2.7.Final com.azure @@ -180,7 +180,7 @@ currently released version and a lower version is resolved. --> com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -188,7 +188,7 @@ currently released version and a lower version is resolved. --> com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -196,7 +196,7 @@ currently released version and a lower version is resolved. --> org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -212,7 +212,7 @@ currently released version and a lower version is resolved. --> org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -260,7 +260,7 @@ currently released version and a lower version is resolved. --> org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-servicebus/pom.xml b/sdk/spring/spring-cloud-azure-starter-servicebus/pom.xml index 323d6a351ad4..9f55192c1fd7 100644 --- a/sdk/spring/spring-cloud-azure-starter-servicebus/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-servicebus/pom.xml @@ -104,7 +104,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -112,7 +112,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -120,7 +120,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -136,7 +136,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -184,7 +184,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-storage-blob/pom.xml b/sdk/spring/spring-cloud-azure-starter-storage-blob/pom.xml index e77654e8c8ab..bf1a05474489 100644 --- a/sdk/spring/spring-cloud-azure-starter-storage-blob/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-storage-blob/pom.xml @@ -104,7 +104,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -112,7 +112,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -120,7 +120,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -136,7 +136,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -184,7 +184,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-storage-file-share/pom.xml b/sdk/spring/spring-cloud-azure-starter-storage-file-share/pom.xml index 871270d07226..905eeb904b4d 100644 --- a/sdk/spring/spring-cloud-azure-starter-storage-file-share/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-storage-file-share/pom.xml @@ -104,7 +104,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -112,7 +112,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -120,7 +120,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -136,7 +136,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -184,7 +184,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-storage-queue/pom.xml b/sdk/spring/spring-cloud-azure-starter-storage-queue/pom.xml index a5b26446d4ac..0c2b5f1dae78 100644 --- a/sdk/spring/spring-cloud-azure-starter-storage-queue/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-storage-queue/pom.xml @@ -107,7 +107,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -115,7 +115,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -123,7 +123,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -139,7 +139,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -187,7 +187,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-storage/pom.xml b/sdk/spring/spring-cloud-azure-starter-storage/pom.xml index 244c8a473616..9d89c02d6bed 100644 --- a/sdk/spring/spring-cloud-azure-starter-storage/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-storage/pom.xml @@ -110,7 +110,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -118,7 +118,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -126,7 +126,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -142,7 +142,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -190,7 +190,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-stream-eventhubs/pom.xml b/sdk/spring/spring-cloud-azure-starter-stream-eventhubs/pom.xml index 80a89f7c0f6a..d9857fe1c5f4 100644 --- a/sdk/spring/spring-cloud-azure-starter-stream-eventhubs/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-stream-eventhubs/pom.xml @@ -99,7 +99,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -107,7 +107,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -115,7 +115,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -131,7 +131,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -179,7 +179,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-stream-servicebus/pom.xml b/sdk/spring/spring-cloud-azure-starter-stream-servicebus/pom.xml index 1ef730d41bc8..7d03bf74e835 100644 --- a/sdk/spring/spring-cloud-azure-starter-stream-servicebus/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-stream-servicebus/pom.xml @@ -99,7 +99,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -107,7 +107,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -115,7 +115,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -131,7 +131,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -179,7 +179,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter/pom.xml b/sdk/spring/spring-cloud-azure-starter/pom.xml index e8be611f8954..d292c0ca66b7 100644 --- a/sdk/spring/spring-cloud-azure-starter/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter/pom.xml @@ -89,7 +89,7 @@ org.springframework.boot spring-boot-starter - 3.5.5 + 4.0.0 com.azure.spring @@ -103,7 +103,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -111,7 +111,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -119,7 +119,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -135,7 +135,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -192,7 +192,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-stream-binder-eventhubs-core/pom.xml b/sdk/spring/spring-cloud-azure-stream-binder-eventhubs-core/pom.xml index a0d6b2ae3b1c..035a98b826d9 100644 --- a/sdk/spring/spring-cloud-azure-stream-binder-eventhubs-core/pom.xml +++ b/sdk/spring/spring-cloud-azure-stream-binder-eventhubs-core/pom.xml @@ -46,8 +46,12 @@ org.springframework.integration spring-integration-core + + io.projectreactor + reactor-core + - 4.3.0 + 5.0.0 @@ -59,14 +63,14 @@ org.springframework.boot spring-boot-configuration-processor - 3.5.5 + 4.0.0 true org.mockito mockito-core - 5.17.0 + 5.20.0 test @@ -74,25 +78,25 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test org.junit.jupiter junit-jupiter - 5.12.2 + 6.0.1 test org.springframework spring-test - 6.2.10 + 7.0.1 test @@ -102,19 +106,19 @@ com.google.code.findbugs jsr305 - 3.0.2 + 3.0.2 provided org.springframework.boot spring-boot-test - 3.5.5 + 4.0.0 test org.assertj assertj-core - 3.27.4 + 3.27.6 test @@ -123,7 +127,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -166,13 +170,13 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.2 - org.springframework.boot:spring-boot-configuration-processor:[3.5.5] - org.springframework.cloud:spring-cloud-stream:[4.3.0] + org.springframework.boot:spring-boot-configuration-processor:[4.0.0] + org.springframework.cloud:spring-cloud-stream:[5.0.0] @@ -181,7 +185,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 diff --git a/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/pom.xml b/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/pom.xml index 9e24e4db4c7a..ef5648e8b100 100644 --- a/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/pom.xml +++ b/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/pom.xml @@ -57,7 +57,7 @@ org.springframework.boot spring-boot-starter-actuator - 3.5.5 + 4.0.0 true @@ -70,7 +70,7 @@ org.springframework.cloud spring-cloud-stream-test-binder - 4.3.0 + 5.0.0 test @@ -82,7 +82,7 @@ org.springframework.boot spring-boot-starter-test - 3.5.5 + 4.0.0 test @@ -90,13 +90,13 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test + 3.0.2 provided @@ -113,7 +113,7 @@ org.mockito mockito-core - 5.17.0 + 5.20.0 test @@ -123,7 +123,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -157,12 +157,12 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.2 - org.springframework.boot:spring-boot-starter-actuator:[3.5.5] + org.springframework.boot:spring-boot-starter-actuator:[4.0.0] @@ -171,7 +171,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 diff --git a/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/src/main/java/com/azure/spring/cloud/stream/binder/eventhubs/implementation/EventHubsHealthIndicator.java b/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/src/main/java/com/azure/spring/cloud/stream/binder/eventhubs/implementation/EventHubsHealthIndicator.java index 08dafd89667e..85c68cd7e397 100644 --- a/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/src/main/java/com/azure/spring/cloud/stream/binder/eventhubs/implementation/EventHubsHealthIndicator.java +++ b/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/src/main/java/com/azure/spring/cloud/stream/binder/eventhubs/implementation/EventHubsHealthIndicator.java @@ -5,8 +5,8 @@ import com.azure.spring.integration.core.instrumentation.Instrumentation; import com.azure.spring.integration.core.instrumentation.InstrumentationManager; -import org.springframework.boot.actuate.health.AbstractHealthIndicator; -import org.springframework.boot.actuate.health.Health; +import org.springframework.boot.health.contributor.AbstractHealthIndicator; +import org.springframework.boot.health.contributor.Health; /** * Health indicator for Event Hubs. diff --git a/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/src/main/java/com/azure/spring/cloud/stream/binder/eventhubs/implementation/config/EventHubsBinderHealthIndicatorConfiguration.java b/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/src/main/java/com/azure/spring/cloud/stream/binder/eventhubs/implementation/config/EventHubsBinderHealthIndicatorConfiguration.java index 3db24821020b..db74cda781c0 100644 --- a/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/src/main/java/com/azure/spring/cloud/stream/binder/eventhubs/implementation/config/EventHubsBinderHealthIndicatorConfiguration.java +++ b/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/src/main/java/com/azure/spring/cloud/stream/binder/eventhubs/implementation/config/EventHubsBinderHealthIndicatorConfiguration.java @@ -5,7 +5,7 @@ import com.azure.spring.cloud.stream.binder.eventhubs.implementation.EventHubsHealthIndicator; import com.azure.spring.cloud.stream.binder.eventhubs.implementation.EventHubsMessageChannelBinder; -import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator; +import org.springframework.boot.health.autoconfigure.contributor.ConditionalOnEnabledHealthIndicator; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -14,7 +14,7 @@ * Auto configuration for {@link EventHubsHealthIndicator}. */ @Configuration(proxyBeanMethods = false) -@ConditionalOnClass(name = "org.springframework.boot.actuate.health.HealthIndicator") +@ConditionalOnClass(name = "org.springframework.boot.health.contributor.HealthIndicator") @ConditionalOnEnabledHealthIndicator("binders") class EventHubsBinderHealthIndicatorConfiguration { diff --git a/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/src/main/java/com/azure/spring/cloud/stream/binder/eventhubs/implementation/provisioning/EventHubsChannelResourceManagerProvisioner.java b/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/src/main/java/com/azure/spring/cloud/stream/binder/eventhubs/implementation/provisioning/EventHubsChannelResourceManagerProvisioner.java index ed33006b0ed7..5b60941550af 100644 --- a/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/src/main/java/com/azure/spring/cloud/stream/binder/eventhubs/implementation/provisioning/EventHubsChannelResourceManagerProvisioner.java +++ b/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/src/main/java/com/azure/spring/cloud/stream/binder/eventhubs/implementation/provisioning/EventHubsChannelResourceManagerProvisioner.java @@ -11,6 +11,7 @@ /** * */ +@SuppressWarnings("deprecation") public class EventHubsChannelResourceManagerProvisioner extends EventHubsChannelProvisioner { private final String namespace; diff --git a/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/src/test/java/com/azure/spring/cloud/stream/binder/eventhubs/implementation/EventHubsHealthIndicatorTests.java b/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/src/test/java/com/azure/spring/cloud/stream/binder/eventhubs/implementation/EventHubsHealthIndicatorTests.java index e3d4504ea8ab..9f13966f25ac 100644 --- a/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/src/test/java/com/azure/spring/cloud/stream/binder/eventhubs/implementation/EventHubsHealthIndicatorTests.java +++ b/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/src/test/java/com/azure/spring/cloud/stream/binder/eventhubs/implementation/EventHubsHealthIndicatorTests.java @@ -21,8 +21,8 @@ import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.springframework.boot.actuate.health.Health; -import org.springframework.boot.actuate.health.Status; +import org.springframework.boot.health.contributor.Health; +import org.springframework.boot.health.contributor.Status; import org.springframework.cloud.stream.binder.BinderHeaders; import org.springframework.cloud.stream.binder.ExtendedConsumerProperties; import org.springframework.cloud.stream.binder.ExtendedProducerProperties; @@ -78,6 +78,7 @@ public class EventHubsHealthIndicatorTests { public void init() { MockitoAnnotations.openMocks(this); GenericApplicationContext context = new GenericApplicationContext(); + context.refresh(); binder.setApplicationContext(context); healthIndicator = new EventHubsHealthIndicator(binder); } diff --git a/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/src/test/java/com/azure/spring/cloud/stream/binder/eventhubs/implementation/EventHubsMessageChannelBinderTests.java b/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/src/test/java/com/azure/spring/cloud/stream/binder/eventhubs/implementation/EventHubsMessageChannelBinderTests.java index 066e030c936b..e86f04fe63e5 100644 --- a/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/src/test/java/com/azure/spring/cloud/stream/binder/eventhubs/implementation/EventHubsMessageChannelBinderTests.java +++ b/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/src/test/java/com/azure/spring/cloud/stream/binder/eventhubs/implementation/EventHubsMessageChannelBinderTests.java @@ -42,7 +42,9 @@ class EventHubsMessageChannelBinderTests { void init() { MockitoAnnotations.openMocks(this); when(producerDestination.getName()).thenReturn("producer-test"); - binder.setApplicationContext(new GenericApplicationContext()); + GenericApplicationContext context = new GenericApplicationContext(); + context.refresh(); + binder.setApplicationContext(context); } @Test diff --git a/sdk/spring/spring-cloud-azure-stream-binder-servicebus-core/pom.xml b/sdk/spring/spring-cloud-azure-stream-binder-servicebus-core/pom.xml index 6b5e4e198fbd..0b4fb95f1626 100644 --- a/sdk/spring/spring-cloud-azure-stream-binder-servicebus-core/pom.xml +++ b/sdk/spring/spring-cloud-azure-stream-binder-servicebus-core/pom.xml @@ -41,7 +41,7 @@ org.springframework.cloud spring-cloud-stream - 4.3.0 + 5.0.0 @@ -57,14 +57,14 @@ org.springframework.boot spring-boot-configuration-processor - 3.5.5 + 4.0.0 true org.mockito mockito-core - 5.17.0 + 5.20.0 test @@ -72,25 +72,25 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test org.junit.jupiter junit-jupiter - 5.12.2 + 6.0.1 test org.springframework spring-test - 6.2.10 + 7.0.1 test @@ -100,19 +100,19 @@ com.google.code.findbugs jsr305 - 3.0.2 + 3.0.2 provided org.springframework.boot spring-boot-test - 3.5.5 + 4.0.0 test org.assertj assertj-core - 3.27.4 + 3.27.6 test @@ -122,7 +122,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -165,13 +165,13 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.2 - org.springframework.boot:spring-boot-configuration-processor:[3.5.5] - org.springframework.cloud:spring-cloud-stream:[4.3.0] + org.springframework.boot:spring-boot-configuration-processor:[4.0.0] + org.springframework.cloud:spring-cloud-stream:[5.0.0] @@ -180,7 +180,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 diff --git a/sdk/spring/spring-cloud-azure-stream-binder-servicebus/pom.xml b/sdk/spring/spring-cloud-azure-stream-binder-servicebus/pom.xml index 768844ec7b6e..770ad7c1ea49 100644 --- a/sdk/spring/spring-cloud-azure-stream-binder-servicebus/pom.xml +++ b/sdk/spring/spring-cloud-azure-stream-binder-servicebus/pom.xml @@ -56,7 +56,7 @@ org.springframework.boot spring-boot-starter-actuator - 3.5.5 + 4.0.0 true + 3.0.2 provided org.springframework.cloud spring-cloud-stream-test-binder - 4.3.0 + 5.0.0 test @@ -84,7 +84,7 @@ org.springframework.boot spring-boot-starter-test - 3.5.5 + 4.0.0 test @@ -92,7 +92,7 @@ org.mockito mockito-core - 5.17.0 + 5.20.0 test @@ -100,13 +100,13 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test @@ -116,7 +116,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -150,12 +150,12 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.2 - org.springframework.boot:spring-boot-starter-actuator:[3.5.5] + org.springframework.boot:spring-boot-starter-actuator:[4.0.0] @@ -164,7 +164,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 diff --git a/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/main/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/ServiceBusHealthIndicator.java b/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/main/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/ServiceBusHealthIndicator.java index c9e066f25ed8..7bbead2d141e 100644 --- a/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/main/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/ServiceBusHealthIndicator.java +++ b/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/main/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/ServiceBusHealthIndicator.java @@ -4,8 +4,8 @@ import com.azure.spring.integration.core.instrumentation.Instrumentation; import com.azure.spring.integration.core.instrumentation.InstrumentationManager; -import org.springframework.boot.actuate.health.AbstractHealthIndicator; -import org.springframework.boot.actuate.health.Health; +import org.springframework.boot.health.contributor.AbstractHealthIndicator; +import org.springframework.boot.health.contributor.Health; /** * Implementation of a {@link AbstractHealthIndicator} returning status information for diff --git a/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/main/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/config/ServiceBusBinderHealthIndicatorConfiguration.java b/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/main/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/config/ServiceBusBinderHealthIndicatorConfiguration.java index 915a78c0548a..35c4e2bafcdb 100644 --- a/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/main/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/config/ServiceBusBinderHealthIndicatorConfiguration.java +++ b/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/main/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/config/ServiceBusBinderHealthIndicatorConfiguration.java @@ -4,7 +4,7 @@ import com.azure.spring.cloud.stream.binder.servicebus.implementation.ServiceBusHealthIndicator; import com.azure.spring.cloud.stream.binder.servicebus.implementation.ServiceBusMessageChannelBinder; -import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator; +import org.springframework.boot.health.autoconfigure.contributor.ConditionalOnEnabledHealthIndicator; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -13,7 +13,7 @@ * Auto configuration for {@link ServiceBusHealthIndicator}. */ @Configuration(proxyBeanMethods = false) -@ConditionalOnClass(name = "org.springframework.boot.actuate.health.HealthIndicator") +@ConditionalOnClass(name = "org.springframework.boot.health.contributor.HealthIndicator") @ConditionalOnEnabledHealthIndicator("binders") public class ServiceBusBinderHealthIndicatorConfiguration { diff --git a/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/main/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/provisioning/ServiceBusChannelResourceManagerProvisioner.java b/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/main/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/provisioning/ServiceBusChannelResourceManagerProvisioner.java index dcdaef375dde..e9176a2fef17 100644 --- a/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/main/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/provisioning/ServiceBusChannelResourceManagerProvisioner.java +++ b/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/main/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/provisioning/ServiceBusChannelResourceManagerProvisioner.java @@ -26,6 +26,7 @@ /** * */ +@SuppressWarnings("deprecation") public class ServiceBusChannelResourceManagerProvisioner extends ServiceBusChannelProvisioner { private final String namespace; diff --git a/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/test/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/ServiceBusHealthIndicatorTests.java b/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/test/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/ServiceBusHealthIndicatorTests.java index 99c5bbc57783..e44123f5b039 100644 --- a/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/test/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/ServiceBusHealthIndicatorTests.java +++ b/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/test/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/ServiceBusHealthIndicatorTests.java @@ -19,8 +19,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; -import org.springframework.boot.actuate.health.Health; -import org.springframework.boot.actuate.health.Status; +import org.springframework.boot.health.contributor.Health; +import org.springframework.boot.health.contributor.Status; import org.springframework.cloud.stream.binder.BinderHeaders; import org.springframework.cloud.stream.binder.ExtendedConsumerProperties; import org.springframework.cloud.stream.binder.ExtendedProducerProperties; @@ -28,6 +28,8 @@ import org.springframework.cloud.stream.provisioning.ConsumerDestination; import org.springframework.cloud.stream.provisioning.ProducerDestination; import org.springframework.context.support.GenericApplicationContext; +import org.springframework.expression.spel.support.StandardEvaluationContext; +import org.springframework.integration.context.IntegrationContextUtils; import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.MessageChannel; import org.springframework.test.util.ReflectionTestUtils; @@ -74,6 +76,10 @@ class ServiceBusHealthIndicatorTests { void init() { MockitoAnnotations.openMocks(this); GenericApplicationContext context = new GenericApplicationContext(); + StandardEvaluationContext sec = new StandardEvaluationContext(); + when(beanFactory.containsBean(IntegrationContextUtils.INTEGRATION_EVALUATION_CONTEXT_BEAN_NAME)).thenReturn(true); + when(beanFactory.getBean(IntegrationContextUtils.INTEGRATION_EVALUATION_CONTEXT_BEAN_NAME, StandardEvaluationContext.class)).thenReturn(sec); + context.refresh(); binder.setApplicationContext(context); serviceBusHealthIndicator = new ServiceBusHealthIndicator(binder); } diff --git a/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/test/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/ServiceBusMessageChannelBinderTest.java b/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/test/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/ServiceBusMessageChannelBinderTest.java index 75e3b905ccd0..749e16e2329b 100644 --- a/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/test/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/ServiceBusMessageChannelBinderTest.java +++ b/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/test/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/ServiceBusMessageChannelBinderTest.java @@ -64,6 +64,7 @@ class ServiceBusMessageChannelBinderTest { void init() { MockitoAnnotations.openMocks(this); GenericApplicationContext context = new GenericApplicationContext(); + context.refresh(); binder.setApplicationContext(context); } diff --git a/sdk/spring/spring-cloud-azure-testcontainers/pom.xml b/sdk/spring/spring-cloud-azure-testcontainers/pom.xml index a80d218256a8..afdee353855a 100644 --- a/sdk/spring/spring-cloud-azure-testcontainers/pom.xml +++ b/sdk/spring/spring-cloud-azure-testcontainers/pom.xml @@ -82,12 +82,12 @@ org.springframework.boot spring-boot-testcontainers - 3.5.5 + 4.0.0 org.testcontainers azure - 1.21.3 + 1.21.3 true + 3.0.2 provided org.springframework spring-test - 6.2.10 + 7.0.1 test org.junit.jupiter junit-jupiter - 5.12.2 + 6.0.1 test org.assertj assertj-core - 3.27.4 + 3.27.6 test org.testcontainers junit-jupiter - 1.21.3 + 1.21.3 test @@ -131,7 +131,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -162,13 +162,13 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.2 - org.springframework.boot:spring-boot-testcontainers:[3.5.5] - org.testcontainers:azure:[1.21.3] + org.springframework.boot:spring-boot-testcontainers:[4.0.0] + org.testcontainers:azure:[1.21.3] @@ -177,7 +177,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -222,7 +222,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-integration-azure-core/pom.xml b/sdk/spring/spring-integration-azure-core/pom.xml index a551ddc6793b..7aae2684b0bb 100644 --- a/sdk/spring/spring-integration-azure-core/pom.xml +++ b/sdk/spring/spring-integration-azure-core/pom.xml @@ -48,7 +48,7 @@ org.springframework.integration spring-integration-core - 6.5.1 + 7.0.0 + 3.0.2 provided org.mockito mockito-core - 5.17.0 + 5.20.0 test @@ -71,31 +71,31 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test org.springframework spring-test - 6.2.10 + 7.0.1 test org.junit.jupiter junit-jupiter - 5.12.2 + 6.0.1 test org.assertj assertj-core - 3.27.4 + 3.27.6 test @@ -105,7 +105,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -136,12 +136,12 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.2 - org.springframework.integration:spring-integration-core:[6.5.1] + org.springframework.integration:spring-integration-core:[7.0.0] @@ -150,7 +150,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 diff --git a/sdk/spring/spring-integration-azure-core/src/main/java/com/azure/spring/integration/core/handler/DefaultMessageHandler.java b/sdk/spring/spring-integration-azure-core/src/main/java/com/azure/spring/integration/core/handler/DefaultMessageHandler.java index f05d310d7a0c..bbe3dad3a05e 100644 --- a/sdk/spring/spring-integration-azure-core/src/main/java/com/azure/spring/integration/core/handler/DefaultMessageHandler.java +++ b/sdk/spring/spring-integration-azure-core/src/main/java/com/azure/spring/integration/core/handler/DefaultMessageHandler.java @@ -23,7 +23,6 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageDeliveryException; import org.springframework.util.Assert; -import org.springframework.util.concurrent.ListenableFutureCallback; import reactor.core.publisher.Mono; import reactor.core.scheduler.Schedulers; @@ -33,6 +32,7 @@ import java.util.Map; import java.util.Optional; import java.util.concurrent.TimeoutException; +import java.util.function.BiConsumer; import static com.azure.spring.messaging.AzureHeaders.PARTITION_ID; import static com.azure.spring.messaging.AzureHeaders.PARTITION_KEY; @@ -43,6 +43,7 @@ *

* It delegates real operation to {@link SendOperation} which supports synchronous and asynchronous sending. */ +@SuppressWarnings("deprecation") public class DefaultMessageHandler extends AbstractMessageProducingHandler { private static final Logger LOGGER = LoggerFactory.getLogger(DefaultMessageHandler.class); private static final long DEFAULT_SEND_TIMEOUT = 10000; @@ -50,8 +51,7 @@ public class DefaultMessageHandler extends AbstractMessageProducingHandler { private final SendOperation sendOperation; private boolean sync = false; - @SuppressWarnings("removal") - private ListenableFutureCallback sendCallback; + private BiConsumer sendCallback; private EvaluationContext evaluationContext; private Expression sendTimeoutExpression = new ValueExpression<>(DEFAULT_SEND_TIMEOUT); private ErrorMessageStrategy errorMessageStrategy = new DefaultErrorMessageStrategy(); @@ -108,14 +108,13 @@ protected void handleMessageInternal(Message message) { } - @SuppressWarnings("removal") private void handleSendResponseAsync(Mono mono, Message message) { mono.doOnError(ex -> { if (LOGGER.isWarnEnabled()) { LOGGER.warn("{} sent failed in async mode due to {}", message, ex.getMessage()); } if (this.sendCallback != null) { - this.sendCallback.onFailure(ex); + this.sendCallback.accept(null, ex); } if (getSendFailureChannel() != null) { @@ -127,7 +126,7 @@ private void handleSendResponseAsync(Mono mono, Message message) { LOGGER.debug("{} sent successfully in async mode", message); } if (this.sendCallback != null) { - this.sendCallback.onSuccess((Void) t); + this.sendCallback.accept(null, null); } }).subscribe(); } @@ -264,8 +263,7 @@ private Map buildPropertiesMap() { * * @param callback the call back */ - @SuppressWarnings("removal") - public void setSendCallback(ListenableFutureCallback callback) { + public void setSendCallback(BiConsumer callback) { this.sendCallback = callback; } diff --git a/sdk/spring/spring-integration-azure-core/src/main/java/com/azure/spring/integration/core/implementation/instrumentation/InstrumentationSendCallback.java b/sdk/spring/spring-integration-azure-core/src/main/java/com/azure/spring/integration/core/implementation/instrumentation/InstrumentationSendCallback.java index 1ded138c1d89..58598bd018d2 100644 --- a/sdk/spring/spring-integration-azure-core/src/main/java/com/azure/spring/integration/core/implementation/instrumentation/InstrumentationSendCallback.java +++ b/sdk/spring/spring-integration-azure-core/src/main/java/com/azure/spring/integration/core/implementation/instrumentation/InstrumentationSendCallback.java @@ -5,13 +5,12 @@ import com.azure.spring.integration.core.instrumentation.Instrumentation; import com.azure.spring.integration.core.instrumentation.InstrumentationManager; -import org.springframework.util.concurrent.ListenableFutureCallback; +import java.util.function.BiConsumer; /** * */ -@SuppressWarnings({"deprecation", "removal"}) -public class InstrumentationSendCallback implements ListenableFutureCallback { +public class InstrumentationSendCallback implements BiConsumer { private final InstrumentationManager instrumentationManager; @@ -29,13 +28,13 @@ public InstrumentationSendCallback(String instrumentationId, InstrumentationMana } @Override - public void onFailure(Throwable ex) { - this.instrumentationManager.getHealthInstrumentation(instrumentationId) - .setStatus(Instrumentation.Status.DOWN, ex); - } - - @Override - public void onSuccess(Void result) { - this.instrumentationManager.getHealthInstrumentation(instrumentationId).setStatus(Instrumentation.Status.UP); + public void accept(Void result, Throwable ex) { + if (ex != null) { + instrumentationManager.getHealthInstrumentation(instrumentationId) + .setStatus(Instrumentation.Status.DOWN, ex); + } else { + instrumentationManager.getHealthInstrumentation(instrumentationId) + .setStatus(Instrumentation.Status.UP); + } } } diff --git a/sdk/spring/spring-integration-azure-core/src/test/java/com/azure/spring/integration/core/handler/DefaultMessageHandlerTests.java b/sdk/spring/spring-integration-azure-core/src/test/java/com/azure/spring/integration/core/handler/DefaultMessageHandlerTests.java index 4a7046abf615..015cf82c775b 100644 --- a/sdk/spring/spring-integration-azure-core/src/test/java/com/azure/spring/integration/core/handler/DefaultMessageHandlerTests.java +++ b/sdk/spring/spring-integration-azure-core/src/test/java/com/azure/spring/integration/core/handler/DefaultMessageHandlerTests.java @@ -11,18 +11,20 @@ import org.springframework.expression.Expression; import org.springframework.expression.ExpressionParser; import org.springframework.expression.spel.standard.SpelExpressionParser; +import org.springframework.expression.spel.support.StandardEvaluationContext; import org.springframework.integration.MessageTimeoutException; +import org.springframework.integration.context.IntegrationContextUtils; import org.springframework.integration.expression.FunctionExpression; import org.springframework.messaging.Message; import org.springframework.messaging.support.GenericMessage; import org.springframework.test.util.ReflectionTestUtils; -import org.springframework.util.concurrent.ListenableFutureCallback; import reactor.core.publisher.Mono; import java.nio.charset.StandardCharsets; import java.util.Collections; import java.util.HashMap; import java.util.Map; +import java.util.function.BiConsumer; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -60,7 +62,11 @@ public DefaultMessageHandlerTests() { valueMap.put("key2", "value2"); message = new GenericMessage<>("testPayload", valueMap); } - public abstract void setUp(); + public void setUp() { + StandardEvaluationContext sec = new StandardEvaluationContext(); + when(beanFactory.containsBean(IntegrationContextUtils.INTEGRATION_EVALUATION_CONTEXT_BEAN_NAME)).thenReturn(true); + when(beanFactory.getBean(IntegrationContextUtils.INTEGRATION_EVALUATION_CONTEXT_BEAN_NAME, StandardEvaluationContext.class)).thenReturn(sec); + } @Test @SuppressWarnings("unchecked") @@ -70,15 +76,10 @@ public void testSend() { } @Test - @SuppressWarnings({"deprecation", "removal"}) public void testSendCallback() { - ListenableFutureCallback callbackSpy = spy(new ListenableFutureCallback() { - @Override - public void onFailure(Throwable ex) { - } - + BiConsumer callbackSpy = spy(new BiConsumer() { @Override - public void onSuccess(Void v) { + public void accept(Void v, Throwable ex) { } }); @@ -86,7 +87,7 @@ public void onSuccess(Void v) { this.handler.handleMessage(this.message); - verify(callbackSpy, times(1)).onSuccess(eq(null)); + verify(callbackSpy, times(1)).accept(eq(null), eq(null)); } @Test diff --git a/sdk/spring/spring-integration-azure-eventhubs/pom.xml b/sdk/spring/spring-integration-azure-eventhubs/pom.xml index 599ce0f025db..0a34ed2882e5 100644 --- a/sdk/spring/spring-integration-azure-eventhubs/pom.xml +++ b/sdk/spring/spring-integration-azure-eventhubs/pom.xml @@ -61,13 +61,13 @@ com.google.code.findbugs jsr305 - 3.0.2 + 3.0.2 provided org.mockito mockito-core - 5.17.0 + 5.20.0 test @@ -75,31 +75,31 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test org.springframework spring-test - 6.2.10 + 7.0.1 test org.assertj assertj-core - 3.27.4 + 3.27.6 test org.junit.jupiter junit-jupiter - 5.12.2 + 6.0.1 test @@ -109,7 +109,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -140,7 +140,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 diff --git a/sdk/spring/spring-integration-azure-eventhubs/src/test/java/com/azure/spring/integration/eventhubs/inbound/EventHubsInboundChannelAdapterTests.java b/sdk/spring/spring-integration-azure-eventhubs/src/test/java/com/azure/spring/integration/eventhubs/inbound/EventHubsInboundChannelAdapterTests.java index ef6dcc33b0ea..6f991a5d5115 100644 --- a/sdk/spring/spring-integration-azure-eventhubs/src/test/java/com/azure/spring/integration/eventhubs/inbound/EventHubsInboundChannelAdapterTests.java +++ b/sdk/spring/spring-integration-azure-eventhubs/src/test/java/com/azure/spring/integration/eventhubs/inbound/EventHubsInboundChannelAdapterTests.java @@ -26,9 +26,13 @@ import com.azure.spring.messaging.eventhubs.implementation.core.listener.adapter.BatchMessagingMessageListenerAdapter; import com.azure.spring.messaging.eventhubs.implementation.support.converter.EventHubsBatchMessageConverter; import com.azure.spring.messaging.eventhubs.implementation.support.converter.EventHubsMessageConverter; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.springframework.beans.factory.BeanFactory; import org.springframework.integration.channel.DirectChannel; import reactor.core.publisher.Mono; @@ -55,12 +59,16 @@ class EventHubsInboundChannelAdapterTests { private EventHubsInboundChannelAdapter adapter; private EventHubsProcessorFactory processorFactory; private EventHubsContainerProperties containerProperties; + @Mock + private BeanFactory beanFactory; + private AutoCloseable closeable; private static final String CONSUMER_GROUP = "group"; private static final String EVENT_HUB = "dest"; @BeforeEach void setUp() { + this.closeable = MockitoAnnotations.openMocks(this); this.processorFactory = mock(EventHubsProcessorFactory.class); when(processorFactory.createProcessor(eq(EVENT_HUB), eq(CONSUMER_GROUP), isA(EventHubsContainerProperties.class))).thenReturn(mock(EventProcessorClient.class)); @@ -72,6 +80,11 @@ void setUp() { new EventHubsMessageListenerContainer(processorFactory, containerProperties)); } + @AfterEach + void close() throws Exception { + closeable.close(); + } + @Test void defaultRecordListenerMode() { EventHubsInboundChannelAdapter channelAdapter = new EventHubsInboundChannelAdapter( @@ -132,6 +145,7 @@ void setBatchMessageConverter() { @Test void setPayloadType() { + this.adapter.setBeanFactory(this.beanFactory); this.adapter.afterPropertiesSet(); assertThat(this.adapter).extracting("recordListener").extracting("payloadType").isEqualTo(byte[].class); this.adapter.setPayloadType(Long.class); diff --git a/sdk/spring/spring-integration-azure-eventhubs/src/test/java/com/azure/spring/integration/eventhubs/outbound/EventHubsMessageHandlerTests.java b/sdk/spring/spring-integration-azure-eventhubs/src/test/java/com/azure/spring/integration/eventhubs/outbound/EventHubsMessageHandlerTests.java index 30602b66a56d..594b081d3c59 100644 --- a/sdk/spring/spring-integration-azure-eventhubs/src/test/java/com/azure/spring/integration/eventhubs/outbound/EventHubsMessageHandlerTests.java +++ b/sdk/spring/spring-integration-azure-eventhubs/src/test/java/com/azure/spring/integration/eventhubs/outbound/EventHubsMessageHandlerTests.java @@ -25,6 +25,7 @@ class EventHubsMessageHandlerTests extends DefaultMessageHandlerTests com.google.code.findbugs jsr305 - 3.0.2 + 3.0.2 provided @@ -66,7 +66,7 @@ org.mockito mockito-core - 5.17.0 + 5.20.0 test @@ -74,31 +74,31 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test org.junit.jupiter junit-jupiter - 5.12.2 + 6.0.1 test org.springframework spring-test - 6.2.10 + 7.0.1 test org.assertj assertj-core - 3.27.4 + 3.27.6 test @@ -108,7 +108,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -139,7 +139,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 diff --git a/sdk/spring/spring-integration-azure-servicebus/src/test/java/com/azure/spring/integration/servicebus/inbound/ServiceBusInboundChannelAdapterTests.java b/sdk/spring/spring-integration-azure-servicebus/src/test/java/com/azure/spring/integration/servicebus/inbound/ServiceBusInboundChannelAdapterTests.java index 2c2f9a31f3bf..bb72a17d3a18 100644 --- a/sdk/spring/spring-integration-azure-servicebus/src/test/java/com/azure/spring/integration/servicebus/inbound/ServiceBusInboundChannelAdapterTests.java +++ b/sdk/spring/spring-integration-azure-servicebus/src/test/java/com/azure/spring/integration/servicebus/inbound/ServiceBusInboundChannelAdapterTests.java @@ -21,9 +21,13 @@ import com.azure.spring.messaging.servicebus.core.listener.ServiceBusMessageListenerContainer; import com.azure.spring.messaging.servicebus.core.properties.ServiceBusContainerProperties; import com.azure.spring.messaging.servicebus.implementation.support.converter.ServiceBusMessageConverter; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.springframework.beans.factory.BeanFactory; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; @@ -57,9 +61,13 @@ class ServiceBusInboundChannelAdapterTests { private List> messages = Arrays.stream(payloads) .map(p -> MessageBuilder.withPayload(p).build()) .collect(Collectors.toList()); + @Mock + private BeanFactory beanFactory; + private AutoCloseable closeable; @BeforeEach public void setUp() { + this.closeable = MockitoAnnotations.openMocks(this); this.processorFactory = mock(ServiceBusProcessorFactory.class); when(processorFactory.createProcessor(eq(destination), eq(subscription), isA(ServiceBusContainerProperties.class))).thenReturn(mock(ServiceBusProcessorClient.class)); @@ -71,6 +79,11 @@ public void setUp() { new ServiceBusMessageListenerContainer(processorFactory, containerProperties)); } + @AfterEach + void close() throws Exception { + closeable.close(); + } + @Test void defaultRecordListenerMode() { ServiceBusInboundChannelAdapter channelAdapter = new ServiceBusInboundChannelAdapter( @@ -110,6 +123,7 @@ void setMessageConverter() { @Test void setPayloadType() { + this.adapter.setBeanFactory(this.beanFactory); this.adapter.afterPropertiesSet(); assertThat(this.adapter).extracting("recordListener").extracting("payloadType").isEqualTo(byte[].class); this.adapter.setPayloadType(Long.class); diff --git a/sdk/spring/spring-integration-azure-servicebus/src/test/java/com/azure/spring/integration/servicebus/outbound/ServiceBusMessageHandlerTests.java b/sdk/spring/spring-integration-azure-servicebus/src/test/java/com/azure/spring/integration/servicebus/outbound/ServiceBusMessageHandlerTests.java index 817f8e200f3a..393a34d5a9cd 100644 --- a/sdk/spring/spring-integration-azure-servicebus/src/test/java/com/azure/spring/integration/servicebus/outbound/ServiceBusMessageHandlerTests.java +++ b/sdk/spring/spring-integration-azure-servicebus/src/test/java/com/azure/spring/integration/servicebus/outbound/ServiceBusMessageHandlerTests.java @@ -25,6 +25,7 @@ class ServiceBusMessageHandlerTests extends DefaultMessageHandlerTests com.google.code.findbugs jsr305 - 3.0.2 + 3.0.2 provided org.mockito mockito-core - 5.17.0 + 5.20.0 test @@ -71,19 +71,19 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test org.junit.jupiter junit-jupiter - 5.12.2 + 6.0.1 test @@ -93,7 +93,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -124,7 +124,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 diff --git a/sdk/spring/spring-messaging-azure-eventhubs/pom.xml b/sdk/spring/spring-messaging-azure-eventhubs/pom.xml index c7dd8baf7e34..d21341d34d1b 100644 --- a/sdk/spring/spring-messaging-azure-eventhubs/pom.xml +++ b/sdk/spring/spring-messaging-azure-eventhubs/pom.xml @@ -59,19 +59,19 @@ org.springframework spring-tx - 6.2.10 + 7.0.1 true org.springframework.retry spring-retry - 2.0.12 + 2.0.12 true org.springframework.data spring-data-commons - 3.5.3 + 4.0.0 org.slf4j @@ -83,27 +83,27 @@ io.micrometer micrometer-core - 1.15.3 + 1.16.0 true com.google.code.findbugs jsr305 - 3.0.2 + 3.0.2 provided org.springframework spring-test - 6.2.10 + 7.0.1 test org.mockito mockito-core - 5.17.0 + 5.20.0 test @@ -111,25 +111,25 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test org.junit.jupiter junit-jupiter - 5.12.2 + 6.0.1 test io.projectreactor reactor-test - 3.7.9 + 3.8.0 test @@ -138,7 +138,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -169,15 +169,15 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.2 - io.micrometer:micrometer-core:[1.15.3] - org.springframework:spring-tx:[6.2.10] - org.springframework.retry:spring-retry:[2.0.12] - org.springframework.data:spring-data-commons:[3.5.3] + io.micrometer:micrometer-core:[1.16.0] + org.springframework:spring-tx:[7.0.1] + org.springframework.retry:spring-retry:[2.0.12] + org.springframework.data:spring-data-commons:[4.0.0] @@ -186,7 +186,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 diff --git a/sdk/spring/spring-messaging-azure-eventhubs/src/main/java/com/azure/spring/messaging/eventhubs/core/DefaultEventHubsNamespaceProcessorFactory.java b/sdk/spring/spring-messaging-azure-eventhubs/src/main/java/com/azure/spring/messaging/eventhubs/core/DefaultEventHubsNamespaceProcessorFactory.java index 5c9a3e4b7aba..68ec28c600da 100644 --- a/sdk/spring/spring-messaging-azure-eventhubs/src/main/java/com/azure/spring/messaging/eventhubs/core/DefaultEventHubsNamespaceProcessorFactory.java +++ b/sdk/spring/spring-messaging-azure-eventhubs/src/main/java/com/azure/spring/messaging/eventhubs/core/DefaultEventHubsNamespaceProcessorFactory.java @@ -51,6 +51,7 @@ * advantage. *

*/ +@SuppressWarnings("deprecation") public final class DefaultEventHubsNamespaceProcessorFactory implements EventHubsProcessorFactory, DisposableBean { private static final Logger LOGGER = LoggerFactory.getLogger(DefaultEventHubsNamespaceProcessorFactory.class); diff --git a/sdk/spring/spring-messaging-azure-eventhubs/src/main/java/com/azure/spring/messaging/eventhubs/core/DefaultEventHubsNamespaceProducerFactory.java b/sdk/spring/spring-messaging-azure-eventhubs/src/main/java/com/azure/spring/messaging/eventhubs/core/DefaultEventHubsNamespaceProducerFactory.java index 8cd6d5713b3f..815b1021cc76 100644 --- a/sdk/spring/spring-messaging-azure-eventhubs/src/main/java/com/azure/spring/messaging/eventhubs/core/DefaultEventHubsNamespaceProducerFactory.java +++ b/sdk/spring/spring-messaging-azure-eventhubs/src/main/java/com/azure/spring/messaging/eventhubs/core/DefaultEventHubsNamespaceProducerFactory.java @@ -39,6 +39,7 @@ * take advantage. *

*/ +@SuppressWarnings("deprecation") public final class DefaultEventHubsNamespaceProducerFactory implements EventHubsProducerFactory, DisposableBean { private final List listeners = new ArrayList<>(); diff --git a/sdk/spring/spring-messaging-azure-eventhubs/src/main/java/com/azure/spring/messaging/eventhubs/implementation/core/config/MethodEventHubsListenerEndpoint.java b/sdk/spring/spring-messaging-azure-eventhubs/src/main/java/com/azure/spring/messaging/eventhubs/implementation/core/config/MethodEventHubsListenerEndpoint.java index 83adc1d605cd..391488fd06bc 100644 --- a/sdk/spring/spring-messaging-azure-eventhubs/src/main/java/com/azure/spring/messaging/eventhubs/implementation/core/config/MethodEventHubsListenerEndpoint.java +++ b/sdk/spring/spring-messaging-azure-eventhubs/src/main/java/com/azure/spring/messaging/eventhubs/implementation/core/config/MethodEventHubsListenerEndpoint.java @@ -28,6 +28,7 @@ * an incoming message for this endpoint. * */ +@SuppressWarnings("deprecation") public class MethodEventHubsListenerEndpoint extends AbstractEventHubsListenerEndpoint implements MethodAzureListenerEndpoint { diff --git a/sdk/spring/spring-messaging-azure-servicebus/pom.xml b/sdk/spring/spring-messaging-azure-servicebus/pom.xml index fcb2dbf0e6cb..5757cb4a93a3 100644 --- a/sdk/spring/spring-messaging-azure-servicebus/pom.xml +++ b/sdk/spring/spring-messaging-azure-servicebus/pom.xml @@ -52,19 +52,19 @@ org.springframework spring-tx - 6.2.10 + 7.0.1 true org.springframework.retry spring-retry - 2.0.12 + 2.0.12 true org.springframework.data spring-data-commons - 3.5.3 + 4.0.0 org.slf4j @@ -76,13 +76,13 @@ io.micrometer micrometer-core - 1.15.3 + 1.16.0 true org.mockito mockito-core - 5.17.0 + 5.20.0 test @@ -90,25 +90,25 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test org.junit.jupiter junit-jupiter - 5.12.2 + 6.0.1 test com.google.code.findbugs jsr305 - 3.0.2 + 3.0.2 provided @@ -123,7 +123,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -154,15 +154,15 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.2 - io.micrometer:micrometer-core:[1.15.3] - org.springframework:spring-tx:[6.2.10] - org.springframework.retry:spring-retry:[2.0.12] - org.springframework.data:spring-data-commons:[3.5.3] + io.micrometer:micrometer-core:[1.16.0] + org.springframework:spring-tx:[7.0.1] + org.springframework.retry:spring-retry:[2.0.12] + org.springframework.data:spring-data-commons:[4.0.0] @@ -171,7 +171,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 diff --git a/sdk/spring/spring-messaging-azure-servicebus/src/main/java/com/azure/spring/messaging/servicebus/core/DefaultServiceBusNamespaceConsumerFactory.java b/sdk/spring/spring-messaging-azure-servicebus/src/main/java/com/azure/spring/messaging/servicebus/core/DefaultServiceBusNamespaceConsumerFactory.java index 3d7802983cc1..a3c645ec5a9a 100644 --- a/sdk/spring/spring-messaging-azure-servicebus/src/main/java/com/azure/spring/messaging/servicebus/core/DefaultServiceBusNamespaceConsumerFactory.java +++ b/sdk/spring/spring-messaging-azure-servicebus/src/main/java/com/azure/spring/messaging/servicebus/core/DefaultServiceBusNamespaceConsumerFactory.java @@ -40,6 +40,7 @@ *

* @since 5.22.0 */ +@SuppressWarnings("deprecation") public final class DefaultServiceBusNamespaceConsumerFactory implements ServiceBusConsumerFactory, DisposableBean { private static final Logger LOGGER = LoggerFactory.getLogger(DefaultServiceBusNamespaceConsumerFactory.class); private final List listeners = new ArrayList<>(); diff --git a/sdk/spring/spring-messaging-azure-servicebus/src/main/java/com/azure/spring/messaging/servicebus/core/DefaultServiceBusNamespaceProcessorFactory.java b/sdk/spring/spring-messaging-azure-servicebus/src/main/java/com/azure/spring/messaging/servicebus/core/DefaultServiceBusNamespaceProcessorFactory.java index b59b5b90c960..402561e4b18a 100644 --- a/sdk/spring/spring-messaging-azure-servicebus/src/main/java/com/azure/spring/messaging/servicebus/core/DefaultServiceBusNamespaceProcessorFactory.java +++ b/sdk/spring/spring-messaging-azure-servicebus/src/main/java/com/azure/spring/messaging/servicebus/core/DefaultServiceBusNamespaceProcessorFactory.java @@ -49,6 +49,7 @@ * advantage. *

*/ +@SuppressWarnings("deprecation") public final class DefaultServiceBusNamespaceProcessorFactory implements ServiceBusProcessorFactory, DisposableBean { private static final Logger LOGGER = LoggerFactory.getLogger(DefaultServiceBusNamespaceProcessorFactory.class); diff --git a/sdk/spring/spring-messaging-azure-servicebus/src/main/java/com/azure/spring/messaging/servicebus/core/DefaultServiceBusNamespaceProducerFactory.java b/sdk/spring/spring-messaging-azure-servicebus/src/main/java/com/azure/spring/messaging/servicebus/core/DefaultServiceBusNamespaceProducerFactory.java index af5926c76caf..883da541e15d 100644 --- a/sdk/spring/spring-messaging-azure-servicebus/src/main/java/com/azure/spring/messaging/servicebus/core/DefaultServiceBusNamespaceProducerFactory.java +++ b/sdk/spring/spring-messaging-azure-servicebus/src/main/java/com/azure/spring/messaging/servicebus/core/DefaultServiceBusNamespaceProducerFactory.java @@ -37,6 +37,7 @@ * take advantage. *

*/ +@SuppressWarnings("deprecation") public final class DefaultServiceBusNamespaceProducerFactory implements ServiceBusProducerFactory, DisposableBean { private final List listeners = new ArrayList<>(); diff --git a/sdk/spring/spring-messaging-azure-servicebus/src/main/java/com/azure/spring/messaging/servicebus/core/ServiceBusTemplate.java b/sdk/spring/spring-messaging-azure-servicebus/src/main/java/com/azure/spring/messaging/servicebus/core/ServiceBusTemplate.java index cef8e34bee93..7469ccb7a402 100644 --- a/sdk/spring/spring-messaging-azure-servicebus/src/main/java/com/azure/spring/messaging/servicebus/core/ServiceBusTemplate.java +++ b/sdk/spring/spring-messaging-azure-servicebus/src/main/java/com/azure/spring/messaging/servicebus/core/ServiceBusTemplate.java @@ -34,6 +34,7 @@ * via related {@link NamespaceProperties} or producer {@link PropertiesSupplier}. *

*/ +@SuppressWarnings("deprecation") public class ServiceBusTemplate implements SendOperation { private static final Logger LOGGER = LoggerFactory.getLogger(ServiceBusTemplate.class); private static final ServiceBusMessageConverter DEFAULT_CONVERTER = new ServiceBusMessageConverter(); diff --git a/sdk/spring/spring-messaging-azure-servicebus/src/main/java/com/azure/spring/messaging/servicebus/implementation/core/config/MethodServiceBusListenerEndpoint.java b/sdk/spring/spring-messaging-azure-servicebus/src/main/java/com/azure/spring/messaging/servicebus/implementation/core/config/MethodServiceBusListenerEndpoint.java index 5f7a4cf07257..6700289b778e 100644 --- a/sdk/spring/spring-messaging-azure-servicebus/src/main/java/com/azure/spring/messaging/servicebus/implementation/core/config/MethodServiceBusListenerEndpoint.java +++ b/sdk/spring/spring-messaging-azure-servicebus/src/main/java/com/azure/spring/messaging/servicebus/implementation/core/config/MethodServiceBusListenerEndpoint.java @@ -27,6 +27,7 @@ * an incoming message for this endpoint. * */ +@SuppressWarnings("deprecation") public class MethodServiceBusListenerEndpoint extends AbstractAzureListenerEndpoint implements MethodAzureListenerEndpoint { diff --git a/sdk/spring/spring-messaging-azure-storage-queue/pom.xml b/sdk/spring/spring-messaging-azure-storage-queue/pom.xml index 22f51251a3a5..4b1325965d6a 100644 --- a/sdk/spring/spring-messaging-azure-storage-queue/pom.xml +++ b/sdk/spring/spring-messaging-azure-storage-queue/pom.xml @@ -52,7 +52,7 @@ org.mockito mockito-core - 5.17.0 + 5.20.0 test @@ -60,31 +60,31 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test org.junit.jupiter junit-jupiter - 5.12.2 + 6.0.1 test org.springframework.boot spring-boot-starter-test - 3.5.5 + 4.0.0 test com.google.code.findbugs jsr305 - 3.0.2 + 3.0.2 provided @@ -100,7 +100,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -131,7 +131,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 diff --git a/sdk/spring/spring-messaging-azure-storage-queue/src/main/java/com/azure/spring/messaging/storage/queue/core/StorageQueueTemplate.java b/sdk/spring/spring-messaging-azure-storage-queue/src/main/java/com/azure/spring/messaging/storage/queue/core/StorageQueueTemplate.java index 383f34d8d2b5..7eb9becabf5c 100644 --- a/sdk/spring/spring-messaging-azure-storage-queue/src/main/java/com/azure/spring/messaging/storage/queue/core/StorageQueueTemplate.java +++ b/sdk/spring/spring-messaging-azure-storage-queue/src/main/java/com/azure/spring/messaging/storage/queue/core/StorageQueueTemplate.java @@ -31,6 +31,7 @@ * You should checkpoint if message has been processed successfully, otherwise it will be visible again after certain * time specified by {@link #receiveAsync(String, Duration)} }. */ +@SuppressWarnings("deprecation") public class StorageQueueTemplate implements SendOperation { private static final Logger LOG = LoggerFactory.getLogger(StorageQueueTemplate.class); private static final String MSG_FAIL_CHECKPOINT = "Failed to checkpoint %s in storage queue '%s'"; diff --git a/sdk/spring/spring-messaging-azure-storage-queue/src/main/java/com/azure/spring/messaging/storage/queue/implementation/factory/DefaultStorageQueueClientFactory.java b/sdk/spring/spring-messaging-azure-storage-queue/src/main/java/com/azure/spring/messaging/storage/queue/implementation/factory/DefaultStorageQueueClientFactory.java index 3be2568070a3..9034267adf8b 100644 --- a/sdk/spring/spring-messaging-azure-storage-queue/src/main/java/com/azure/spring/messaging/storage/queue/implementation/factory/DefaultStorageQueueClientFactory.java +++ b/sdk/spring/spring-messaging-azure-storage-queue/src/main/java/com/azure/spring/messaging/storage/queue/implementation/factory/DefaultStorageQueueClientFactory.java @@ -21,6 +21,7 @@ * The {@link StorageQueueClientFactory} implementation to produce new {@link QueueAsyncClient} instances * for provided {@link QueueServiceAsyncClient} on each {@link #createQueueClient} invocation. */ +@SuppressWarnings("deprecation") public final class DefaultStorageQueueClientFactory implements StorageQueueClientFactory, DisposableBean { private final List listeners = new ArrayList<>(); diff --git a/sdk/spring/spring-messaging-azure/pom.xml b/sdk/spring/spring-messaging-azure/pom.xml index 06ef9717ad60..f264144c49f0 100644 --- a/sdk/spring/spring-messaging-azure/pom.xml +++ b/sdk/spring/spring-messaging-azure/pom.xml @@ -46,24 +46,24 @@ org.springframework spring-messaging - 6.2.10 + 7.0.1 org.springframework spring-tx - 6.2.10 + 7.0.1 true org.springframework.retry spring-retry - 2.0.12 + 2.0.12 true org.springframework.data spring-data-commons - 3.5.3 + 4.0.0 org.slf4j @@ -75,7 +75,7 @@ io.micrometer micrometer-core - 1.15.3 + 1.16.0 true + 3.0.2 provided @@ -92,14 +92,14 @@ org.springframework.boot spring-boot-starter-test - 3.5.5 + 4.0.0 test org.mockito mockito-core - 5.17.0 + 5.20.0 test @@ -107,13 +107,13 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test @@ -123,7 +123,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -154,16 +154,16 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.2 - io.micrometer:micrometer-core:[1.15.3] - org.springframework.data:spring-data-commons:[3.5.3] - org.springframework:spring-messaging:[6.2.10] - org.springframework:spring-tx:[6.2.10] - org.springframework.retry:spring-retry:[2.0.12] + io.micrometer:micrometer-core:[1.16.0] + org.springframework.data:spring-data-commons:[4.0.0] + org.springframework:spring-messaging:[7.0.1] + org.springframework:spring-tx:[7.0.1] + org.springframework.retry:spring-retry:[2.0.12] @@ -172,7 +172,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 diff --git a/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/converter/AzureMessageConverter.java b/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/converter/AzureMessageConverter.java index c48629154d47..ff2665739817 100644 --- a/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/converter/AzureMessageConverter.java +++ b/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/converter/AzureMessageConverter.java @@ -17,6 +17,7 @@ * @param The Azure message type when sending to the broker using Azure SDK. * @param The Azure message type when receiving from the broker using Azure SDK. */ +@SuppressWarnings("deprecation") public interface AzureMessageConverter { /** diff --git a/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/annotation/AzureListenerAnnotationBeanPostProcessorAdapter.java b/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/annotation/AzureListenerAnnotationBeanPostProcessorAdapter.java index 2ccd3f16deff..1fd2dd427f22 100644 --- a/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/annotation/AzureListenerAnnotationBeanPostProcessorAdapter.java +++ b/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/annotation/AzureListenerAnnotationBeanPostProcessorAdapter.java @@ -63,6 +63,7 @@ * @see AzureListenerEndpointRegistrar * @see AzureListenerEndpointRegistry */ +@SuppressWarnings("deprecation") public abstract class AzureListenerAnnotationBeanPostProcessorAdapter implements MergedBeanDefinitionPostProcessor, Ordered, BeanFactoryAware, SmartInitializingSingleton { diff --git a/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/checkpoint/AzureCheckpointer.java b/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/checkpoint/AzureCheckpointer.java index 66d85e7cfbc0..30bd63dccfd9 100644 --- a/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/checkpoint/AzureCheckpointer.java +++ b/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/checkpoint/AzureCheckpointer.java @@ -12,6 +12,7 @@ /** * Azure implementation for check point callback. */ +@SuppressWarnings("deprecation") public class AzureCheckpointer implements Checkpointer { private final Supplier> success; diff --git a/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/config/AbstractAzureListenerEndpoint.java b/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/config/AbstractAzureListenerEndpoint.java index 62ec9f88ed8f..dc1286e4b2f4 100644 --- a/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/config/AbstractAzureListenerEndpoint.java +++ b/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/config/AbstractAzureListenerEndpoint.java @@ -13,6 +13,7 @@ * Base model for a Azure listener endpoint. * */ +@SuppressWarnings("deprecation") public abstract class AbstractAzureListenerEndpoint implements AzureListenerEndpoint { protected String id = ""; diff --git a/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/config/AzureListenerEndpointRegistrar.java b/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/config/AzureListenerEndpointRegistrar.java index a3e38ee19bfb..a326b22428ac 100644 --- a/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/config/AzureListenerEndpointRegistrar.java +++ b/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/config/AzureListenerEndpointRegistrar.java @@ -19,6 +19,7 @@ * Helper bean for registering {@link AzureListenerEndpoint} with a {@link AzureListenerEndpointRegistry}. * */ +@SuppressWarnings("deprecation") public class AzureListenerEndpointRegistrar implements BeanFactoryAware, InitializingBean { private final List endpointDescriptors = new ArrayList<>(); diff --git a/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/config/AzureListenerEndpointRegistry.java b/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/config/AzureListenerEndpointRegistry.java index 6c841e0d6347..7a7c05e99578 100644 --- a/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/config/AzureListenerEndpointRegistry.java +++ b/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/config/AzureListenerEndpointRegistry.java @@ -40,6 +40,7 @@ * @see MessageListenerContainer * @see MessageListenerContainerFactory */ +@SuppressWarnings("deprecation") public class AzureListenerEndpointRegistry implements DisposableBean, SmartLifecycle, ApplicationContextAware, ApplicationListener { diff --git a/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/config/MethodAzureListenerEndpoint.java b/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/config/MethodAzureListenerEndpoint.java index 23821a6e2184..1a3d7783db07 100644 --- a/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/config/MethodAzureListenerEndpoint.java +++ b/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/config/MethodAzureListenerEndpoint.java @@ -16,6 +16,7 @@ * Model for a method Azure listener endpoint. * */ +@SuppressWarnings("deprecation") public interface MethodAzureListenerEndpoint extends BeanFactoryAware, AzureListenerEndpoint { /** diff --git a/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/converter/AbstractJacksonAzureMessageConverter.java b/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/converter/AbstractJacksonAzureMessageConverter.java index f4fcb36fa7f1..6e0d806f3442 100644 --- a/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/converter/AbstractJacksonAzureMessageConverter.java +++ b/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/converter/AbstractJacksonAzureMessageConverter.java @@ -23,6 +23,7 @@ * Abstract class handles common conversion logic between <T> and {@link Message} * */ +@SuppressWarnings("deprecation") public abstract class AbstractJacksonAzureMessageConverter implements AzureMessageConverter { /** diff --git a/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/listener/adapter/MessagingMessageListenerAdapter.java b/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/listener/adapter/MessagingMessageListenerAdapter.java index 2f76f3214a69..1fa503e56634 100644 --- a/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/listener/adapter/MessagingMessageListenerAdapter.java +++ b/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/listener/adapter/MessagingMessageListenerAdapter.java @@ -17,6 +17,7 @@ * Azure message headers using a configurable {@link com.azure.spring.messaging.converter.AzureMessageConverter}. * */ +@SuppressWarnings("deprecation") public abstract class MessagingMessageListenerAdapter { @Nullable diff --git a/sdk/spring/spring-messaging-azure/src/test/java/com/azure/spring/messaging/implementation/endpoint/MethodAzureListenerTestEndpoint.java b/sdk/spring/spring-messaging-azure/src/test/java/com/azure/spring/messaging/implementation/endpoint/MethodAzureListenerTestEndpoint.java index b18fbd9ecc75..dff75a9e46e0 100644 --- a/sdk/spring/spring-messaging-azure/src/test/java/com/azure/spring/messaging/implementation/endpoint/MethodAzureListenerTestEndpoint.java +++ b/sdk/spring/spring-messaging-azure/src/test/java/com/azure/spring/messaging/implementation/endpoint/MethodAzureListenerTestEndpoint.java @@ -20,6 +20,7 @@ import java.lang.reflect.Method; +@SuppressWarnings("deprecation") public class MethodAzureListenerTestEndpoint extends AbstractAzureListenerEndpoint implements MethodAzureListenerEndpoint {