From 16e44169fc29cd9ad82fa3b7feda255ea583f8f0 Mon Sep 17 00:00:00 2001 From: Shili Chen Date: Mon, 29 Aug 2022 18:25:03 +0800 Subject: [PATCH 01/15] Sync code from main --- eng/jacoco-test-coverage/pom.xml | 78 +- eng/scripts/generate_from_source_pom.py | 19 +- eng/versioning/external_dependencies.txt | 188 +-- eng/versioning/version_client.txt | 90 +- .../pom.xml | 16 +- .../pom.xml | 32 +- .../pom.xml | 10 +- .../pom.xml | 14 +- .../pom.xml | 30 +- sdk/appconfiguration/ci.yml | 114 +- sdk/appconfiguration/pom.xml | 6 +- sdk/appconfiguration/tests.yml | 34 +- .../azure-security-attestation/pom.xml | 12 +- .../spring-cloud-azure-dependencies/pom.xml | 63 +- .../azure-communication-callingserver/pom.xml | 2 +- .../azure-communication-identity/pom.xml | 2 +- .../pom.xml | 2 +- .../azure-communication-phonenumbers/pom.xml | 2 +- .../pom.xml | 2 +- sdk/core/azure-core-amqp/pom.xml | 2 +- .../azure-core-http-jdk-httpclient/pom.xml | 2 +- sdk/core/azure-core-http-netty/pom.xml | 2 +- sdk/core/azure-core-http-okhttp/pom.xml | 2 +- sdk/core/azure-core-http-vertx/pom.xml | 2 +- sdk/core/azure-core-jackson-tests/pom.xml | 2 +- sdk/core/azure-core-management/pom.xml | 2 +- .../azure-core-metrics-opentelemetry/pom.xml | 28 +- .../azure-core-serializer-json-gson/pom.xml | 2 +- .../pom.xml | 2 +- sdk/core/azure-core-test/pom.xml | 2 +- .../azure-core-tracing-opentelemetry/pom.xml | 26 +- sdk/core/azure-core/pom.xml | 2 +- sdk/cosmos/azure-cosmos-benchmark/pom.xml | 22 +- .../azure-cosmos-dotnet-benchmark/pom.xml | 18 +- sdk/cosmos/azure-cosmos-encryption/pom.xml | 10 +- sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml | 4 +- sdk/cosmos/azure-cosmos/pom.xml | 18 +- .../azure-spring-data-cosmos-test/pom.xml | 26 +- sdk/cosmos/azure-spring-data-cosmos/pom.xml | 34 +- sdk/cosmos/ci.yml | 28 +- sdk/cosmos/pom.xml | 4 +- sdk/cosmos/tests.yml | 50 +- .../azure-resourcemanager-dashboard/pom.xml | 2 +- .../pom.xml | 2 +- .../azure-digitaltwins-core/pom.xml | 2 +- .../azure-messaging-eventgrid/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 6 +- .../azure-messaging-eventhubs/docs/pom.xml | 6 +- .../azure-messaging-eventhubs/pom.xml | 2 +- .../pom.xml | 4 +- .../microsoft-azure-eventhubs/pom.xml | 2 +- sdk/identity/azure-identity/pom.xml | 8 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../azure-security-keyvault-jca/pom.xml | 2 +- .../azure-security-keyvault-keys/pom.xml | 2 +- .../azure-security-keyvault-secrets/pom.xml | 2 +- .../azure-security-test-keyvault-jca/pom.xml | 2 +- .../azure-iot-modelsrepository/pom.xml | 2 +- .../pom.xml | 10 +- sdk/parents/azure-client-sdk-parent/pom.xml | 16 + .../pom.xml | 2 +- .../azure-resourcemanager-resources/pom.xml | 2 +- .../azure-resourcemanager-samples/pom.xml | 4 +- .../azure-resourcemanager/pom.xml | 2 +- .../pom.xml | 2 +- .../azure-data-schemaregistry/pom.xml | 2 +- sdk/search/azure-search-documents/pom.xml | 2 +- .../azure-messaging-servicebus/pom.xml | 2 +- sdk/spring-experimental/ci.yml | 2 +- .../pom.xml | 12 +- sdk/spring/ci.yml | 26 +- sdk/spring/compatibility-tests.yml | 2 + sdk/spring/pom.xml | 8 +- ...3.0.0-M4_managed_external_dependencies.txt | 1377 +++++++++++++++++ .../pom.xml | 37 +- .../spring-cloud-azure-actuator/pom.xml | 31 +- .../spring-cloud-azure-autoconfigure/pom.xml | 196 +-- ...AadOAuth2AuthorizationRequestResolver.java | 4 +- .../aad/AadWebSecurityConfigurerAdapter.java | 5 +- ...dAppRoleStatelessAuthenticationFilter.java | 8 +- .../aad/filter/AadAuthenticationFilter.java | 10 +- .../implementation/jackson/StdConverters.java | 9 +- ...ssionOAuth2AuthorizedClientRepository.java | 6 +- .../AadOboOAuth2AuthorizedClientProvider.java | 2 +- ...legatedOAuth2AuthorizedClientProvider.java | 2 +- .../webapp/AadOAuth2UserService.java | 2 +- .../AadB2cAuthorizationRequestResolver.java | 2 +- .../aadb2c/AadB2cLogoutSuccessHandler.java | 6 +- .../AadB2cOAuth2ClientConfiguration.java | 4 +- .../AzureCompatibilityVerifierProperties.java | 2 +- .../cosmos/CosmosDataAutoConfiguration.java | 106 +- ...ReactiveRepositoriesAutoConfiguration.java | 62 +- ...iveRepositoriesAutoConfigureRegistrar.java | 72 +- .../CosmosRepositoriesAutoConfiguration.java | 62 +- ...mosRepositoriesAutoConfigureRegistrar.java | 72 +- .../data/cosmos/package-info.java | 10 +- .../AzureSpringBootVersionVerifier.java | 10 +- .../jms/ServiceBusJmsAutoConfiguration.java | 2 +- ...eBusJmsConnectionFactoryConfiguration.java | 2 +- .../ServiceBusJmsContainerConfiguration.java | 3 +- .../main/resources/META-INF/spring.factories | 3 - .../AadAppRoleAuthenticationFilterTests.java | 8 +- .../filter/AadAuthenticationFilterTests.java | 8 +- .../WebApplicationContextRunnerUtils.java | 3 +- .../UserPrincipalMicrosoftGraphTests.java | 5 +- ...2ClientAuthenticationJwkResolverTests.java | 2 +- .../AadOAuth2ClientConfigurationTests.java | 106 -- .../AadAuthenticationPropertiesTests.java | 26 +- ...dB2cAuthorizationRequestResolverTests.java | 2 +- .../CosmosDataAutoConfigurationTests.java | 150 +- ...iveRepositoriesAutoConfigurationTests.java | 230 +-- ...mosRepositoriesAutoConfigurationTests.java | 234 +-- .../cosmos/TestAutoConfigurationPackage.java | 42 +- ...TestAutoConfigurationPackageRegistrar.java | 48 +- .../data/cosmos/domain/PersonRepository.java | 14 +- .../domain/ReactivePersonRepository.java | 14 +- .../AzureEventHubsAutoConfigurationTests.java | 4 +- .../AzureSpringBootVersionVerifierTest.java | 107 +- .../ServiceBusJmsAutoConfigurationTests.java | 4 +- sdk/spring/spring-cloud-azure-core/pom.xml | 33 +- .../pom.xml | 55 +- .../cloud/integration/tests/cosmos/User.java | 2 - .../cosmos/springdata/SpringDataCosmosIT.java | 68 +- .../cosmos/springdata/UserRepository.java | 18 +- .../pom.xml | 31 +- sdk/spring/spring-cloud-azure-service/pom.xml | 35 +- .../pom.xml | 32 +- .../pom.xml | 28 +- .../pom.xml | 30 +- .../pom.xml | 28 +- .../spring-cloud-azure-starter-cosmos/pom.xml | 26 +- .../pom.xml | 26 +- .../pom.xml | 24 +- .../pom.xml | 28 +- .../pom.xml | 38 +- .../pom.xml | 30 +- .../pom.xml | 26 +- .../pom.xml | 26 +- .../pom.xml | 28 +- .../pom.xml | 32 +- .../pom.xml | 26 +- .../pom.xml | 26 +- .../pom.xml | 26 +- .../pom.xml | 36 +- .../pom.xml | 30 +- .../pom.xml | 24 +- .../pom.xml | 24 +- sdk/spring/spring-cloud-azure-starter/pom.xml | 28 +- .../pom.xml | 105 +- .../pom.xml | 39 +- .../pom.xml | 103 +- .../pom.xml | 39 +- .../spring-cloud-azure-supported-spring.json | 16 +- .../spring-cloud-azure-trace-sleuth/pom.xml | 27 +- .../spring-integration-azure-core/pom.xml | 35 +- .../pom.xml | 35 +- .../pom.xml | 37 +- .../pom.xml | 29 +- .../spring-messaging-azure-eventhubs/pom.xml | 46 +- .../spring-messaging-azure-servicebus/pom.xml | 42 +- .../pom.xml | 31 +- sdk/spring/spring-messaging-azure/pom.xml | 43 +- sdk/spring/supported-version-matrix.json | 2 +- sdk/spring/tests.yml | 2 + sdk/storage/azure-storage-blob-batch/pom.xml | 6 +- .../azure-storage-blob-changefeed/pom.xml | 8 +- .../azure-storage-blob-cryptography/pom.xml | 8 +- sdk/storage/azure-storage-blob-nio/pom.xml | 8 +- sdk/storage/azure-storage-blob/pom.xml | 6 +- sdk/storage/azure-storage-common/pom.xml | 6 +- .../azure-storage-file-datalake/pom.xml | 6 +- sdk/storage/azure-storage-file-share/pom.xml | 6 +- .../azure-storage-internal-avro/pom.xml | 6 +- sdk/storage/azure-storage-queue/pom.xml | 6 +- sdk/tables/azure-data-tables/pom.xml | 2 +- .../azure-ai-textanalytics/pom.xml | 2 +- 178 files changed, 3658 insertions(+), 2173 deletions(-) create mode 100644 sdk/spring/scripts/spring_boot_3.0.0-M4_managed_external_dependencies.txt diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml index 5ea3d5bde717..67526ab390fd 100644 --- a/eng/jacoco-test-coverage/pom.xml +++ b/eng/jacoco-test-coverage/pom.xml @@ -465,178 +465,180 @@ com.azure.spring spring-cloud-azure-core - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-cloud-azure-resourcemanager - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-messaging-azure - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-messaging-azure-eventhubs - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-messaging-azure-servicebus - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-messaging-azure-storage-queue - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-integration-azure-core - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-integration-azure-eventhubs - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-integration-azure-servicebus - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-integration-azure-storage-queue - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-cloud-azure-autoconfigure - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-cloud-azure-starter - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-cloud-azure-starter-keyvault - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-cloud-azure-starter-keyvault-certificates - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-cloud-azure-starter-keyvault-secrets - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-cloud-azure-starter-servicebus-jms - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-cloud-azure-starter-appconfiguration - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-cloud-azure-starter-cosmos - 4.4.0-beta.1 + 6.0.0-beta.1 - + - + 6.0.0-beta.1 <!– {x-version-update;com.azure.spring:spring-cloud-azure-starter-data-cosmos;current} –> + --> com.azure.spring spring-cloud-azure-starter-storage - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-cloud-azure-starter-storage-blob - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-cloud-azure-starter-storage-file-share - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-cloud-azure-starter-storage-queue - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-cloud-azure-starter-eventhubs - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-cloud-azure-starter-servicebus - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-cloud-azure-starter-integration-eventhubs - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-cloud-azure-starter-integration-servicebus - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-cloud-azure-starter-integration-storage-queue - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-cloud-azure-stream-binder-servicebus-core - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-cloud-azure-stream-binder-servicebus - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-cloud-azure-starter-stream-servicebus - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-cloud-azure-stream-binder-eventhubs - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-cloud-azure-starter-stream-eventhubs - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-cloud-azure-stream-binder-eventhubs-core - 4.4.0-beta.1 + 6.0.0-beta.1 + - + 3.27.0-beta.1 <!– {x-version-update;com.azure:azure-spring-data-cosmos;current} –> + --> com.azure azure-digitaltwins-core diff --git a/eng/scripts/generate_from_source_pom.py b/eng/scripts/generate_from_source_pom.py index 0d39e4d9123c..bef9cd26bc48 100644 --- a/eng/scripts/generate_from_source_pom.py +++ b/eng/scripts/generate_from_source_pom.py @@ -52,6 +52,18 @@ sdk_string = "/sdk/" +# Exclude artifacts list when build from source.These artifacts may be not compatible with current dependencies. +exclude_artifacts_list = [ + 'azure-spring-cloud-appconfiguration-config', + 'azure-spring-cloud-appconfiguration-config-web', + 'azure-spring-cloud-feature-management-web', + 'azure-spring-cloud-starter-appconfiguration-config', + 'azure-spring-cloud-test-appconfiguration-config', + 'azure-spring-data-cosmos', + 'azure-spring-data-cosmos-test', + 'spring-cloud-azure-starter-data-cosmos' +] + # Function that creates the aggregate POM. def create_from_source_pom(project_list: str, set_skip_linting_projects: str, match_any_version: bool): project_list_identifiers = project_list.split(',') @@ -195,9 +207,14 @@ def create_projects(project_list_identifiers: list, artifact_identifier_to_versi for file_name in files: file_path = root + os.sep + file_name - # Only parse files that are pom.xml files. if (file_name.startswith('pom') and file_name.endswith('.xml')): + pom_file_path_list = file_path.split(os.sep) + if 'sdk' in pom_file_path_list and len(pom_file_path_list[pom_file_path_list.index('sdk'):]) == 4: + artifact_id = pom_file_path_list[pom_file_path_list.index('sdk') + 2] + if artifact_id in exclude_artifacts_list: + print('Exclude artifact:', artifact_id) + continue project = create_project_for_pom(file_path, project_list_identifiers, artifact_identifier_to_version, match_any_version) if project is not None: projects[project.identifier] = project diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index 2b278a5511c8..9129e546ad55 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -1,6 +1,6 @@ # To avoid dependency conflicts between SDK and Spring, when modifying or adding dependencies, -# make sure the version is same to sdk/spring/scripts/spring_boot_2.7.3_managed_external_dependencies.txt -# If your version is different from sdk/spring/scripts/spring_boot_2.7.3_managed_external_dependencies.txt, +# make sure the version is same to sdk/spring/scripts/spring_boot_2.7.2_managed_external_dependencies.txt +# If your version is different from sdk/spring/scripts/spring_boot_2.7.2_managed_external_dependencies.txt, # please discuss with Spring Integration team members: # @chenrujun (rujche), @saragluna (xiada), @yiliuTo (yiliu6), @backwind1233 (zhihaoguo). # Thanks. @@ -20,7 +20,7 @@ com.fasterxml.jackson.module:jackson-module-scala_2.12;2.13.3 com.github.spotbugs:spotbugs;4.2.2 com.github.spotbugs:spotbugs-annotations;4.2.2 com.github.spotbugs:spotbugs-maven-plugin;4.2.2 -com.google.code.gson:gson;2.9.1 +com.google.code.gson:gson;2.9.0 com.google.guava:guava;30.1.1-jre com.h3xstream.findsecbugs:findsecbugs-plugin;1.9.0 com.microsoft.azure:azure-annotations;1.7.0 @@ -41,16 +41,16 @@ com.microsoft.sqlserver:mssql-jdbc;10.2.1.jre8 com.microsoft.azure:spring-data-cosmosdb;2.3.0 com.squareup.okhttp3:mockwebserver;4.10.0 com.squareup.okhttp3:okhttp;4.10.0 -com.zaxxer:HikariCP;4.0.3 +com.zaxxer:HikariCP;5.0.1 commons-codec:commons-codec;1.15 commons-net:commons-net;3.6 io.cloudevents:cloudevents-api;2.2.0 io.cloudevents:cloudevents-core;2.2.0 -io.fabric8:kubernetes-client;5.10.2 +io.fabric8:kubernetes-client;5.12.1 io.github.bonigarcia:webdrivermanager;4.3.1 -io.micrometer:micrometer-core;1.9.3 -io.micrometer:micrometer-registry-azure-monitor;1.9.3 -io.micrometer:micrometer-registry-graphite;1.9.3 +io.micrometer:micrometer-core;1.10.0-M3 +io.micrometer:micrometer-registry-azure-monitor;1.10.0-M3 +io.micrometer:micrometer-registry-graphite;1.10.0-M3 io.netty:netty-buffer;4.1.79.Final io.netty:netty-common;4.1.79.Final io.netty:netty-codec-http;4.1.79.Final @@ -63,121 +63,122 @@ io.netty:netty-tcnative-boringssl-static;2.0.53.Final io.netty:netty-transport-native-epoll;4.1.79.Final io.netty:netty-transport-native-unix-common;4.1.79.Final io.netty:netty-transport-native-kqueue;4.1.79.Final -io.projectreactor.netty:reactor-netty;1.0.22 -io.projectreactor.netty:reactor-netty-http;1.0.22 -io.projectreactor:reactor-core;3.4.22 +io.projectreactor.netty:reactor-netty;1.0.21 +io.projectreactor.netty:reactor-netty-http;1.0.21 +io.projectreactor:reactor-core;3.4.21 io.reactivex:rxjava;1.3.8 io.vertx:vertx-codegen;4.2.7 io.vertx:vertx-core;4.2.7 -jakarta.validation:jakarta.validation-api;2.0.2 -jakarta.xml.bind:jakarta.xml.bind-api;2.3.3 +jakarta.servlet:jakarta.servlet-api;5.0.0 +jakarta.validation:jakarta.validation-api;3.0.2 +jakarta.xml.bind:jakarta.xml.bind-api;3.0.1 javax.annotation:javax.annotation-api;1.3.2 javax.json:javax.json-api;1.1.4 javax.servlet:javax.servlet-api;4.0.1 javax.validation:validation-api;2.0.1.Final javax.websocket:javax.websocket-api;1.1 -mysql:mysql-connector-java;8.0.30 +mysql:mysql-connector-java;8.0.29 org.apache.ant:ant;1.9.4 org.apache.avro:avro;1.11.0 org.apache.avro:avro-maven-plugin;1.11.0 org.apache.commons:commons-compress;1.21 org.apache.commons:commons-lang3;3.12.0 org.apache.httpcomponents:httpclient;4.5.13 -org.apache.kafka:kafka-clients;3.1.1 -org.apache.logging.log4j:log4j-api;2.17.2 -org.apache.logging.log4j:log4j-core;2.17.2 -org.apache.logging.log4j:log4j-slf4j-impl;2.17.2 +org.apache.kafka:kafka-clients;3.2.0 +org.apache.logging.log4j:log4j-api;2.18.0 +org.apache.logging.log4j:log4j-core;2.18.0 +org.apache.logging.log4j:log4j-slf4j-impl;2.18.0 org.apache.maven:maven-core;3.5.4 org.apache.maven.archetype:archetype-packaging;3.2.0 org.apache.maven.archetype:maven-archetype-plugin;3.2.0 org.apache.qpid:proton-j;0.33.8 -org.apache.qpid:qpid-jms-client;0.53.0 +org.apache.qpid:qpid-jms-client;2.0.0 org.apache.tinkerpop:gremlin-driver;3.2.4 org.asynchttpclient:async-http-client;2.12.1 org.codehaus.gmavenplus:gmavenplus-plugin;1.13.1 org.codehaus.groovy:groovy-eclipse-batch;2.5.8-01 org.codehaus.groovy:groovy-eclipse-compiler;3.4.0-01 -org.codehaus.groovy:groovy-jsr223;3.0.12 +org.codehaus.groovy:groovy-jsr223;3.0.11 org.codehaus.janino:janino;3.1.7 org.conscrypt:conscrypt-openjdk-uber;2.2.1 org.glassfish.tyrus:tyrus-client;1.16 -org.hibernate.validator:hibernate-validator;6.2.4.Final +org.hibernate.validator:hibernate-validator;7.0.4.Final org.javatuples:javatuples;1.2 org.linguafranca.pwdb:KeePassJava2;2.1.4 org.graalvm.buildtools:junit-platform-native;0.9.10 org.graalvm.buildtools:native-maven-plugin;0.9.10 org.graalvm.sdk:graal-sdk;22.0.0.2 org.graalvm.nativeimage:svm;22.0.0.2 -org.messaginghub:pooled-jms;1.2.4 +org.messaginghub:pooled-jms;3.0.0 org.powermock:powermock-api-mockito2;2.0.9 org.powermock:powermock-module-junit4;2.0.9 -org.postgresql:postgresql;42.3.6 +org.postgresql:postgresql;42.4.0 org.slf4j:slf4j-api;1.7.36 org.slf4j:slf4j-nop;1.7.36 org.slf4j:slf4j-simple;1.7.36 redis.clients:jedis;4.2.3 io.lettuce:lettuce-core;6.2.0.RELEASE org.redisson:redisson;3.17.0 -net.bytebuddy:byte-buddy;1.12.13 +net.bytebuddy:byte-buddy;1.12.12 ## Spring boot dependency versions -org.springframework.boot:spring-boot-dependencies;2.7.3 -org.springframework.boot:spring-boot-actuator;2.7.3 -org.springframework.boot:spring-boot-actuator-autoconfigure;2.7.3 -org.springframework.boot:spring-boot-autoconfigure-processor;2.7.3 -org.springframework.boot:spring-boot-autoconfigure;2.7.3 -org.springframework.boot:spring-boot-configuration-metadata;2.7.3 -org.springframework.boot:spring-boot-configuration-processor;2.7.3 -org.springframework.boot:spring-boot-starter-actuator;2.7.3 -org.springframework.boot:spring-boot-starter-aop;2.7.3 -org.springframework.boot:spring-boot-starter-cache;2.7.3 -org.springframework.boot:spring-boot-starter-data-redis;2.7.3 -org.springframework.boot:spring-boot-starter-integration;2.7.3 -org.springframework.boot:spring-boot-starter-logging;2.7.3 -org.springframework.boot:spring-boot-starter-test;2.7.3 -org.springframework.boot:spring-boot-starter-validation;2.7.3 -org.springframework.boot:spring-boot-starter-web;2.7.3 -org.springframework.boot:spring-boot-starter;2.7.3 -org.springframework.boot:spring-boot-test;2.7.3 -org.springframework.boot:spring-boot;2.7.3 -org.springframework.data:spring-data-commons;2.7.2 -org.springframework.data:spring-data-mongodb;3.4.2 -org.springframework.data:spring-data-redis;2.7.2 +org.springframework.boot:spring-boot-dependencies;3.0.0-M4 +org.springframework.boot:spring-boot-actuator;3.0.0-M4 +org.springframework.boot:spring-boot-actuator-autoconfigure;3.0.0-M4 +org.springframework.boot:spring-boot-autoconfigure-processor;3.0.0-M4 +org.springframework.boot:spring-boot-autoconfigure;3.0.0-M4 +org.springframework.boot:spring-boot-configuration-metadata;3.0.0-M4 +org.springframework.boot:spring-boot-configuration-processor;3.0.0-M4 +org.springframework.boot:spring-boot-starter-actuator;3.0.0-M4 +org.springframework.boot:spring-boot-starter-aop;3.0.0-M4 +org.springframework.boot:spring-boot-starter-cache;3.0.0-M4 +org.springframework.boot:spring-boot-starter-data-redis;3.0.0-M4 +org.springframework.boot:spring-boot-starter-integration;3.0.0-M4 +org.springframework.boot:spring-boot-starter-logging;3.0.0-M4 +org.springframework.boot:spring-boot-starter-test;3.0.0-M4 +org.springframework.boot:spring-boot-starter-validation;3.0.0-M4 +org.springframework.boot:spring-boot-starter-web;3.0.0-M4 +org.springframework.boot:spring-boot-starter;3.0.0-M4 +org.springframework.boot:spring-boot-test;3.0.0-M4 +org.springframework.boot:spring-boot;3.0.0-M4 +org.springframework.data:spring-data-commons;3.0.0-M5 +org.springframework.data:spring-data-mongodb;4.0.0-M5 +org.springframework.data:spring-data-redis;3.0.0-M5 org.springframework.experimental:spring-aot;0.11.4 -org.springframework.integration:spring-integration-core;5.5.14 -org.springframework.kafka:spring-kafka;2.8.8 -org.springframework.security:spring-security-config;5.7.3 -org.springframework.security:spring-security-core;5.7.3 -org.springframework.security:spring-security-oauth2-client;5.7.3 -org.springframework.security:spring-security-oauth2-resource-server;5.7.3 -org.springframework.security:spring-security-oauth2-core;5.7.3 -org.springframework.security:spring-security-oauth2-jose;5.7.3 -org.springframework.security:spring-security-web;5.7.3 -org.springframework:spring-beans;5.3.22 -org.springframework:spring-context-support;5.3.22 -org.springframework:spring-context;5.3.22 -org.springframework:spring-core;5.3.22 -org.springframework:spring-expression;5.3.22 -org.springframework:spring-jdbc;5.3.22 -org.springframework:spring-jms;5.3.22 -org.springframework:spring-messaging;5.3.22 -org.springframework:spring-tx;5.3.22 -org.springframework:spring-web;5.3.22 -org.springframework:spring-webmvc;5.3.22 -org.springframework:spring-test;5.3.22 +org.springframework.integration:spring-integration-core;6.0.0-M4 +org.springframework.kafka:spring-kafka;3.0.0-M5 +org.springframework.security:spring-security-config;6.0.0-M6 +org.springframework.security:spring-security-core;6.0.0-M6 +org.springframework.security:spring-security-oauth2-client;6.0.0-M6 +org.springframework.security:spring-security-oauth2-resource-server;6.0.0-M6 +org.springframework.security:spring-security-oauth2-core;6.0.0-M6 +org.springframework.security:spring-security-oauth2-jose;6.0.0-M6 +org.springframework.security:spring-security-web;6.0.0-M6 +org.springframework:spring-beans;6.0.0-M5 +org.springframework:spring-context-support;6.0.0-M5 +org.springframework:spring-context;6.0.0-M5 +org.springframework:spring-core;6.0.0-M5 +org.springframework:spring-expression;6.0.0-M5 +org.springframework:spring-jdbc;6.0.0-M5 +org.springframework:spring-jms;6.0.0-M5 +org.springframework:spring-messaging;6.0.0-M5 +org.springframework:spring-tx;6.0.0-M5 +org.springframework:spring-web;6.0.0-M5 +org.springframework:spring-webmvc;6.0.0-M5 +org.springframework:spring-test;6.0.0-M5 org.springframework.retry:spring-retry;1.3.3 -org.springframework.boot:spring-boot-starter-parent;2.7.3 +org.springframework.boot:spring-boot-starter-parent;3.0.0-M4 ## Spring cloud dependency versions -org.springframework.cloud:spring-cloud-dependencies;2021.0.3 -org.springframework.cloud:spring-cloud-starter-bootstrap;3.1.3 -org.springframework.cloud:spring-cloud-bus;3.1.2 -org.springframework.cloud:spring-cloud-context;3.1.3 +org.springframework.cloud:spring-cloud-dependencies;2022.0.0-M4 +org.springframework.cloud:spring-cloud-starter-bootstrap;4.0.0-M4 +org.springframework.cloud:spring-cloud-bus;4.0.0-M4 +org.springframework.cloud:spring-cloud-context;4.0.0-M4 org.springframework.cloud:spring-cloud-sleuth-api;3.1.3 org.springframework.cloud:spring-cloud-starter-sleuth;3.1.3 -org.springframework.cloud:spring-cloud-starter-stream-kafka;3.2.4 -org.springframework.cloud:spring-cloud-stream-binder-test;3.2.4 -org.springframework.cloud:spring-cloud-stream;3.2.4 +org.springframework.cloud:spring-cloud-starter-stream-kafka;4.0.0-M4 +org.springframework.cloud:spring-cloud-stream-binder-test;4.0.0-M4 +org.springframework.cloud:spring-cloud-stream;4.0.0-M4 pl.pragmatists:JUnitParams;1.1.1 @@ -201,30 +202,30 @@ com.microsoft.azure:azure-mgmt-storage;1.3.0 com.microsoft.azure:azure-storage;8.0.0 com.microsoft.azure:msal4j;1.13.0 com.microsoft.azure:msal4j-persistence-extension;1.1.0 -com.sun.activation:jakarta.activation;1.2.2 -io.opentelemetry:opentelemetry-api;1.14.0 -io.opentelemetry:opentelemetry-sdk;1.14.0 -io.opentelemetry:opentelemetry-exporter-logging;1.14.0 -io.opentelemetry:opentelemetry-exporter-jaeger;1.14.0 -io.opentelemetry:opentelemetry-exporter-otlp;1.14.0 -io.opentelemetry:opentelemetry-sdk-testing;1.14.0 -io.opentelemetry:opentelemetry-sdk-extension-autoconfigure;1.14.0-alpha -io.projectreactor:reactor-test;3.4.22 +com.sun.activation:jakarta.activation;2.0.1 +io.opentelemetry:opentelemetry-api;1.16.0 +io.opentelemetry:opentelemetry-sdk;1.16.0 +io.opentelemetry:opentelemetry-exporter-logging;1.16.0 +io.opentelemetry:opentelemetry-exporter-jaeger;1.16.0 +io.opentelemetry:opentelemetry-exporter-otlp;1.16.0 +io.opentelemetry:opentelemetry-sdk-testing;1.16.0 +io.opentelemetry:opentelemetry-sdk-extension-autoconfigure;1.15.0-alpha +io.projectreactor:reactor-test;3.4.21 junit:junit;4.13.2 commons-cli:commons-cli;1.3 org.apache.maven:maven-compat;3.6.2 org.apache.maven:maven-embedder;3.6.2 org.apache.maven.wagon:wagon-http;3.3.4 org.apache.maven.wagon:wagon-provider-api;3.3.4 -org.assertj:assertj-core;3.22.0 +org.assertj:assertj-core;3.23.1 org.bouncycastle:bcprov-jdk15on;1.68 org.eclipse.aether:aether-connector-basic;1.1.0 org.eclipse.aether:aether-transport-wagon;1.1.0 -org.eclipse.jetty:jetty-http;9.4.48.v20220622 -org.eclipse.jetty:jetty-server;9.4.48.v20220622 +org.eclipse.jetty:jetty-http;11.0.11 +org.eclipse.jetty:jetty-server;11.0.11 org.eclipse.jgit:org.eclipse.jgit;4.5.7.201904151645-r org.glassfish:javax.json;1.1.4 -org.glassfish:jakarta.el;3.0.4 +org.glassfish:jakarta.el;4.0.2 org.hamcrest:hamcrest;2.2 org.hamcrest:hamcrest-all;1.3 org.hamcrest:hamcrest-library;2.2 @@ -261,9 +262,9 @@ com.nimbusds:nimbus-jose-jwt;9.22 com.puppycrawl.tools:checkstyle;9.2 commons-io:commons-io;2.11.0 commons-validator:commons-validator;1.6 -io.dropwizard.metrics:metrics-core;4.2.11 -io.dropwizard.metrics:metrics-graphite;4.2.11 -io.dropwizard.metrics:metrics-jvm;4.2.11 +io.dropwizard.metrics:metrics-core;4.2.10 +io.dropwizard.metrics:metrics-graphite;4.2.10 +io.dropwizard.metrics:metrics-jvm;4.2.10 io.reactivex.rxjava2:rxjava;2.2.21 net.java.dev.jna:jna-platform;5.6.0 net.oneandone.reflections8:reflections8;0.11.7 @@ -306,8 +307,8 @@ org.eclipse.m2e:lifecycle-mapping;1.0.0 org.hdrhistogram:HdrHistogram;2.1.12 org.jacoco:jacoco-maven-plugin;0.8.8 org.jacoco:org.jacoco.agent;0.8.8 -org.mockito:mockito-core;4.5.1 -org.mockito:mockito-inline;4.5.1 +org.mockito:mockito-core;4.6.1 +org.mockito:mockito-inline;4.6.1 org.moditect:moditect-maven-plugin;1.0.0.RC1 org.ow2.asm:asm;9.3 org.revapi:revapi;0.14.4 @@ -397,3 +398,4 @@ storage_com.microsoft.azure:azure-storage;8.4.0 # sdk\appconfiguration\azure-spring-cloud-test-appconfiguration-config\pom.xml spring_com.microsoft.azure:azure;1.34.0 + diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index e51a6090745a..d48bd99d22f9 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -172,48 +172,48 @@ com.azure.spring:azure-spring-cloud-appconfiguration-config;2.8.0;2.9.0-beta.1 com.azure.spring:azure-spring-cloud-feature-management-web;2.7.0;2.8.0-beta.1 com.azure.spring:azure-spring-cloud-feature-management;2.7.0;2.8.0-beta.1 com.azure.spring:azure-spring-cloud-starter-appconfiguration-config;2.8.0;2.9.0-beta.1 -com.azure.spring:spring-cloud-azure-dependencies;4.3.0;4.4.0-beta.1 -com.azure.spring:spring-messaging-azure;4.3.0;4.4.0-beta.1 -com.azure.spring:spring-messaging-azure-eventhubs;4.3.0;4.4.0-beta.1 -com.azure.spring:spring-messaging-azure-servicebus;4.3.0;4.4.0-beta.1 -com.azure.spring:spring-messaging-azure-storage-queue;4.3.0;4.4.0-beta.1 -com.azure.spring:spring-integration-azure-core;4.3.0;4.4.0-beta.1 -com.azure.spring:spring-integration-azure-eventhubs;4.3.0;4.4.0-beta.1 -com.azure.spring:spring-integration-azure-servicebus;4.3.0;4.4.0-beta.1 -com.azure.spring:spring-integration-azure-storage-queue;4.3.0;4.4.0-beta.1 -com.azure.spring:spring-cloud-azure-core;4.3.0;4.4.0-beta.1 -com.azure.spring:spring-cloud-azure-actuator-autoconfigure;4.3.0;4.4.0-beta.1 -com.azure.spring:spring-cloud-azure-actuator;4.3.0;4.4.0-beta.1 -com.azure.spring:spring-cloud-azure-autoconfigure;4.3.0;4.4.0-beta.1 -com.azure.spring:spring-cloud-azure-resourcemanager;4.3.0;4.4.0-beta.1 -com.azure.spring:spring-cloud-azure-service;4.3.0;4.4.0-beta.1 -com.azure.spring:spring-cloud-azure-starter-active-directory;4.3.0;4.4.0-beta.1 -com.azure.spring:spring-cloud-azure-starter-active-directory-b2c;4.3.0;4.4.0-beta.1 -com.azure.spring:spring-cloud-azure-starter-actuator;4.3.0;4.4.0-beta.1 -com.azure.spring:spring-cloud-azure-starter-appconfiguration;4.3.0;4.4.0-beta.1 -com.azure.spring:spring-cloud-azure-starter-cosmos;4.3.0;4.4.0-beta.1 -com.azure.spring:spring-cloud-azure-starter-data-cosmos;4.3.0;4.4.0-beta.1 -com.azure.spring:spring-cloud-azure-starter-eventhubs;4.3.0;4.4.0-beta.1 -com.azure.spring:spring-cloud-azure-starter-keyvault;4.3.0;4.4.0-beta.1 -com.azure.spring:spring-cloud-azure-starter-keyvault-certificates;4.3.0;4.4.0-beta.1 -com.azure.spring:spring-cloud-azure-starter-keyvault-secrets;4.3.0;4.4.0-beta.1 -com.azure.spring:spring-cloud-azure-starter-servicebus-jms;4.3.0;4.4.0-beta.1 -com.azure.spring:spring-cloud-azure-starter-servicebus;4.3.0;4.4.0-beta.1 -com.azure.spring:spring-cloud-azure-starter-storage;4.3.0;4.4.0-beta.1 -com.azure.spring:spring-cloud-azure-starter-storage-blob;4.3.0;4.4.0-beta.1 -com.azure.spring:spring-cloud-azure-starter-storage-file-share;4.3.0;4.4.0-beta.1 -com.azure.spring:spring-cloud-azure-starter-storage-queue;4.3.0;4.4.0-beta.1 -com.azure.spring:spring-cloud-azure-starter-integration-eventhubs;4.3.0;4.4.0-beta.1 -com.azure.spring:spring-cloud-azure-starter-integration-servicebus;4.3.0;4.4.0-beta.1 -com.azure.spring:spring-cloud-azure-starter-integration-storage-queue;4.3.0;4.4.0-beta.1 -com.azure.spring:spring-cloud-azure-starter-stream-eventhubs;4.3.0;4.4.0-beta.1 -com.azure.spring:spring-cloud-azure-starter-stream-servicebus;4.3.0;4.4.0-beta.1 -com.azure.spring:spring-cloud-azure-starter;4.3.0;4.4.0-beta.1 -com.azure.spring:spring-cloud-azure-stream-binder-eventhubs-core;4.3.0;4.4.0-beta.1 -com.azure.spring:spring-cloud-azure-stream-binder-eventhubs;4.3.0;4.4.0-beta.1 -com.azure.spring:spring-cloud-azure-stream-binder-servicebus-core;4.3.0;4.4.0-beta.1 -com.azure.spring:spring-cloud-azure-stream-binder-servicebus;4.3.0;4.4.0-beta.1 -com.azure.spring:spring-cloud-azure-trace-sleuth;4.3.0;4.4.0-beta.1 +com.azure.spring:spring-cloud-azure-dependencies;6.0.0-beta.1;6.0.0-beta.1 +com.azure.spring:spring-messaging-azure;6.0.0-beta.1;6.0.0-beta.1 +com.azure.spring:spring-messaging-azure-eventhubs;6.0.0-beta.1;6.0.0-beta.1 +com.azure.spring:spring-messaging-azure-servicebus;6.0.0-beta.1;6.0.0-beta.1 +com.azure.spring:spring-messaging-azure-storage-queue;6.0.0-beta.1;6.0.0-beta.1 +com.azure.spring:spring-integration-azure-core;6.0.0-beta.1;6.0.0-beta.1 +com.azure.spring:spring-integration-azure-eventhubs;6.0.0-beta.1;6.0.0-beta.1 +com.azure.spring:spring-integration-azure-servicebus;6.0.0-beta.1;6.0.0-beta.1 +com.azure.spring:spring-integration-azure-storage-queue;6.0.0-beta.1;6.0.0-beta.1 +com.azure.spring:spring-cloud-azure-core;6.0.0-beta.1;6.0.0-beta.1 +com.azure.spring:spring-cloud-azure-actuator-autoconfigure;6.0.0-beta.1;6.0.0-beta.1 +com.azure.spring:spring-cloud-azure-actuator;6.0.0-beta.1;6.0.0-beta.1 +com.azure.spring:spring-cloud-azure-autoconfigure;6.0.0-beta.1;6.0.0-beta.1 +com.azure.spring:spring-cloud-azure-resourcemanager;6.0.0-beta.1;6.0.0-beta.1 +com.azure.spring:spring-cloud-azure-service;6.0.0-beta.1;6.0.0-beta.1 +com.azure.spring:spring-cloud-azure-starter-active-directory;6.0.0-beta.1;6.0.0-beta.1 +com.azure.spring:spring-cloud-azure-starter-active-directory-b2c;6.0.0-beta.1;6.0.0-beta.1 +com.azure.spring:spring-cloud-azure-starter-actuator;6.0.0-beta.1;6.0.0-beta.1 +com.azure.spring:spring-cloud-azure-starter-appconfiguration;6.0.0-beta.1;6.0.0-beta.1 +com.azure.spring:spring-cloud-azure-starter-cosmos;6.0.0-beta.1;6.0.0-beta.1 +com.azure.spring:spring-cloud-azure-starter-data-cosmos;6.0.0-beta.1;6.0.0-beta.1 +com.azure.spring:spring-cloud-azure-starter-eventhubs;6.0.0-beta.1;6.0.0-beta.1 +com.azure.spring:spring-cloud-azure-starter-keyvault;6.0.0-beta.1;6.0.0-beta.1 +com.azure.spring:spring-cloud-azure-starter-keyvault-certificates;6.0.0-beta.1;6.0.0-beta.1 +com.azure.spring:spring-cloud-azure-starter-keyvault-secrets;6.0.0-beta.1;6.0.0-beta.1 +com.azure.spring:spring-cloud-azure-starter-servicebus-jms;6.0.0-beta.1;6.0.0-beta.1 +com.azure.spring:spring-cloud-azure-starter-servicebus;6.0.0-beta.1;6.0.0-beta.1 +com.azure.spring:spring-cloud-azure-starter-storage;6.0.0-beta.1;6.0.0-beta.1 +com.azure.spring:spring-cloud-azure-starter-storage-blob;6.0.0-beta.1;6.0.0-beta.1 +com.azure.spring:spring-cloud-azure-starter-storage-file-share;6.0.0-beta.1;6.0.0-beta.1 +com.azure.spring:spring-cloud-azure-starter-storage-queue;6.0.0-beta.1;6.0.0-beta.1 +com.azure.spring:spring-cloud-azure-starter-integration-eventhubs;6.0.0-beta.1;6.0.0-beta.1 +com.azure.spring:spring-cloud-azure-starter-integration-servicebus;6.0.0-beta.1;6.0.0-beta.1 +com.azure.spring:spring-cloud-azure-starter-integration-storage-queue;6.0.0-beta.1;6.0.0-beta.1 +com.azure.spring:spring-cloud-azure-starter-stream-eventhubs;6.0.0-beta.1;6.0.0-beta.1 +com.azure.spring:spring-cloud-azure-starter-stream-servicebus;6.0.0-beta.1;6.0.0-beta.1 +com.azure.spring:spring-cloud-azure-starter;6.0.0-beta.1;6.0.0-beta.1 +com.azure.spring:spring-cloud-azure-stream-binder-eventhubs-core;6.0.0-beta.1;6.0.0-beta.1 +com.azure.spring:spring-cloud-azure-stream-binder-eventhubs;6.0.0-beta.1;6.0.0-beta.1 +com.azure.spring:spring-cloud-azure-stream-binder-servicebus-core;6.0.0-beta.1;6.0.0-beta.1 +com.azure.spring:spring-cloud-azure-stream-binder-servicebus;6.0.0-beta.1;6.0.0-beta.1 +com.azure.spring:spring-cloud-azure-trace-sleuth;6.0.0-beta.1;6.0.0-beta.1 com.azure.spring:spring-cloud-azure-native-configuration;4.0.0-beta.1;4.0.0-beta.2 com.azure.resourcemanager:azure-resourcemanager;2.18.0;2.19.0-beta.1 com.azure.resourcemanager:azure-resourcemanager-appplatform;2.18.0;2.19.0-beta.1 @@ -390,3 +390,9 @@ unreleased_com.azure:azure-ai-formrecognizer;4.0.0-beta.7 # beta_:;dependency-version # note: Released beta versions will not be manipulated with the automatic PR creation code. beta_com.azure:azure-communication-common;1.3.0-beta.1 + +# Unreleased artifacts for Spring Cloud Azure 6.x +unreleased_com.azure.spring:spring-cloud-azure-resourcemanager;6.0.0-beta.1 +unreleased_com.azure.spring:spring-cloud-azure-autoconfigure;6.0.0-beta.1 +unreleased_com.azure.spring:spring-integration-azure-storage-queue;6.0.0-beta.1 +unreleased_com.azure.spring:spring-integration-azure-eventhubs;6.0.0-beta.1 diff --git a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/pom.xml b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/pom.xml index 201cf5d4d67e..d05cc8011c1e 100644 --- a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/pom.xml +++ b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/pom.xml @@ -31,18 +31,18 @@ org.springframework.boot spring-boot-starter-web - 2.7.3 + 3.0.0-M4 org.springframework.boot spring-boot-starter-actuator - 2.7.3 + 3.0.0-M4 true org.springframework.cloud spring-cloud-bus - 3.1.2 + 4.0.0-M4 true @@ -66,13 +66,13 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test org.springframework.boot spring-boot-starter-test - 2.7.3 + 3.0.0-M4 test @@ -87,9 +87,9 @@ - org.springframework.boot:spring-boot-starter-actuator:[2.7.3] - org.springframework.boot:spring-boot-starter-web:[2.7.3] - org.springframework.cloud:spring-cloud-bus:[3.1.2] + org.springframework.boot:spring-boot-starter-actuator:[3.0.0-M4] + org.springframework.boot:spring-boot-starter-web:[3.0.0-M4] + org.springframework.cloud:spring-cloud-bus:[4.0.0-M4] diff --git a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml index 6e7feba0ef33..eed8fdd4d9e3 100644 --- a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml +++ b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml @@ -26,28 +26,28 @@ org.springframework.boot spring-boot-autoconfigure-processor - 2.7.3 + 3.0.0-M4 org.springframework.boot spring-boot-autoconfigure - 2.7.3 + 3.0.0-M4 org.springframework.boot spring-boot-configuration-processor - 2.7.3 + 3.0.0-M4 true org.springframework.cloud spring-cloud-starter-bootstrap - 3.1.3 + 4.0.0-M4 org.springframework.cloud spring-cloud-context - 3.1.3 + 4.0.0-M4 com.fasterxml.jackson.core @@ -88,19 +88,19 @@ org.hibernate.validator hibernate-validator - 6.2.4.Final + 7.0.4.Final org.springframework.boot spring-boot-actuator-autoconfigure - 2.7.3 + 3.0.0-M4 org.springframework.boot spring-boot-starter-test - 2.7.3 + 3.0.0-M4 test @@ -137,14 +137,14 @@ javax.annotation:javax.annotation-api:[1.3.2] org.apache.commons:commons-lang3:[3.12.0] org.apache.httpcomponents:httpclient:[4.5.13] - org.hibernate.validator:hibernate-validator:[6.2.4.Final] - org.springframework.boot:spring-boot-autoconfigure-processor:[2.7.3] - org.springframework.boot:spring-boot-autoconfigure:[2.7.3] - org.springframework.boot:spring-boot-actuator-autoconfigure:[2.7.3] - org.springframework.boot:spring-boot-configuration-processor:[2.7.3] - org.springframework.cloud:spring-cloud-context:[3.1.3] - org.springframework.cloud:spring-cloud-starter-bootstrap:[3.1.3] - org.springframework:spring-web:[5.3.22] + org.hibernate.validator:hibernate-validator:[7.0.4.Final] + org.springframework.boot:spring-boot-autoconfigure-processor:[3.0.0-M4] + org.springframework.boot:spring-boot-autoconfigure:[3.0.0-M4] + org.springframework.boot:spring-boot-actuator-autoconfigure:[3.0.0-M4] + org.springframework.boot:spring-boot-configuration-processor:[3.0.0-M4] + org.springframework.cloud:spring-cloud-context:[4.0.0-M4] + org.springframework.cloud:spring-cloud-starter-bootstrap:[4.0.0-M4] + org.springframework:spring-web:[6.0.0-M5] diff --git a/sdk/appconfiguration/azure-spring-cloud-feature-management-web/pom.xml b/sdk/appconfiguration/azure-spring-cloud-feature-management-web/pom.xml index 4bc73afee5c9..bea7abbc3137 100644 --- a/sdk/appconfiguration/azure-spring-cloud-feature-management-web/pom.xml +++ b/sdk/appconfiguration/azure-spring-cloud-feature-management-web/pom.xml @@ -23,18 +23,18 @@ org.springframework.boot spring-boot-starter-test - 2.7.3 + 3.0.0-M4 test org.springframework spring-web - 5.3.22 + 6.0.0-M5 org.springframework spring-webmvc - 5.3.22 + 6.0.0-M5 javax.servlet @@ -75,8 +75,8 @@ com.azure.spring:azure-spring-cloud-feature-management:[2.8.0-beta.1] javax.servlet:javax.servlet-api:[4.0.1] - org.springframework:spring-web:[5.3.22] - org.springframework:spring-webmvc:[5.3.22] + org.springframework:spring-web:[6.0.0-M5] + org.springframework:spring-webmvc:[6.0.0-M5] diff --git a/sdk/appconfiguration/azure-spring-cloud-feature-management/pom.xml b/sdk/appconfiguration/azure-spring-cloud-feature-management/pom.xml index 0318144f14d5..d4f0001390f6 100644 --- a/sdk/appconfiguration/azure-spring-cloud-feature-management/pom.xml +++ b/sdk/appconfiguration/azure-spring-cloud-feature-management/pom.xml @@ -23,12 +23,12 @@ org.springframework spring-context - 5.3.22 + 6.0.0-M5 org.springframework.boot spring-boot-starter - 2.7.3 + 3.0.0-M4 com.fasterxml.jackson.core @@ -43,12 +43,12 @@ io.projectreactor.netty reactor-netty - 1.0.22 + 1.0.21 org.springframework.boot spring-boot-starter-test - 2.7.3 + 3.0.0-M4 test @@ -64,9 +64,9 @@ com.fasterxml.jackson.core:jackson-annotations:[2.13.3] com.fasterxml.jackson.core:jackson-databind:[2.13.3] - io.projectreactor.netty:reactor-netty:[1.0.22] - org.springframework.boot:spring-boot-starter:[2.7.3] - org.springframework:spring-context:[5.3.22] + io.projectreactor.netty:reactor-netty:[1.0.21] + org.springframework.boot:spring-boot-starter:[3.0.0-M4] + org.springframework:spring-context:[6.0.0-M5] diff --git a/sdk/appconfiguration/azure-spring-cloud-test-appconfiguration-config/pom.xml b/sdk/appconfiguration/azure-spring-cloud-test-appconfiguration-config/pom.xml index b1c2805ece7b..dd800fe45a13 100644 --- a/sdk/appconfiguration/azure-spring-cloud-test-appconfiguration-config/pom.xml +++ b/sdk/appconfiguration/azure-spring-cloud-test-appconfiguration-config/pom.xml @@ -8,7 +8,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.3 + 3.0.0-M4 @@ -20,7 +20,31 @@ true - + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + com.azure.spring azure-spring-cloud-starter-appconfiguration-config @@ -38,7 +62,7 @@ org.springframework.boot spring-boot-starter-test - 2.7.3 + 3.0.0-M4 test diff --git a/sdk/appconfiguration/ci.yml b/sdk/appconfiguration/ci.yml index b4af603483bd..0c74eca6220d 100644 --- a/sdk/appconfiguration/ci.yml +++ b/sdk/appconfiguration/ci.yml @@ -12,23 +12,23 @@ trigger: - sdk/appconfiguration/azure-data-appconfiguration/ - sdk/appconfiguration/azure-data-appconfiguration-perf/ - sdk/appconfiguration/azure-resourcemanager-appconfiguration/ - - sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/ - - sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/ +# - sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/ +# - sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/ - sdk/appconfiguration/azure-spring-cloud-feature-management/ - - sdk/appconfiguration/azure-spring-cloud-feature-management-web/ - - sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/ - - sdk/appconfiguration/azure-spring-cloud-test-appconfiguration-config/ +# - sdk/appconfiguration/azure-spring-cloud-feature-management-web/ +# - sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/ +# - sdk/appconfiguration/azure-spring-cloud-test-appconfiguration-config/ exclude: - sdk/appconfiguration/pom.xml - sdk/appconfiguration/azure-data-appconfiguration/pom.xml - sdk/appconfiguration/azure-data-appconfiguration-perf/pom.xml - sdk/appconfiguration/azure-resourcemanager-appconfiguration/pom.xml - - sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml - - sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/pom.xml +# - sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml +# - sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/pom.xml - sdk/appconfiguration/azure-spring-cloud-feature-management/pom.xml - - sdk/appconfiguration/azure-spring-cloud-feature-management-web/pom.xml - - sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/pom.xml - - sdk/appconfiguration/azure-spring-cloud-test-appconfiguration-config/pom.xml +# - sdk/appconfiguration/azure-spring-cloud-feature-management-web/pom.xml +# - sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/pom.xml +# - sdk/appconfiguration/azure-spring-cloud-test-appconfiguration-config/pom.xml pr: branches: @@ -43,49 +43,49 @@ pr: - sdk/appconfiguration/azure-data-appconfiguration/ - sdk/appconfiguration/azure-data-appconfiguration-perf/ - sdk/appconfiguration/azure-resourcemanager-appconfiguration/ - - sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/ - - sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/ +# - sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/ +# - sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/ - sdk/appconfiguration/azure-spring-cloud-feature-management/ - - sdk/appconfiguration/azure-spring-cloud-feature-management-web/ - - sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/ - - sdk/appconfiguration/azure-spring-cloud-test-appconfiguration-config/ +# - sdk/appconfiguration/azure-spring-cloud-feature-management-web/ +# - sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/ +# - sdk/appconfiguration/azure-spring-cloud-test-appconfiguration-config/ exclude: - sdk/appconfiguration/pom.xml - sdk/appconfiguration/azure-data-appconfiguration/pom.xml - sdk/appconfiguration/azure-data-appconfiguration-perf/pom.xml - sdk/appconfiguration/azure-resourcemanager-appconfiguration/pom.xml - - sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml - - sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/pom.xml +# - sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml +# - sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/pom.xml - sdk/appconfiguration/azure-spring-cloud-feature-management/pom.xml - - sdk/appconfiguration/azure-spring-cloud-feature-management-web/pom.xml - - sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/pom.xml - - sdk/appconfiguration/azure-spring-cloud-test-appconfiguration-config/pom.xml +# - sdk/appconfiguration/azure-spring-cloud-feature-management-web/pom.xml +# - sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/pom.xml +# - sdk/appconfiguration/azure-spring-cloud-test-appconfiguration-config/pom.xml parameters: - name: release_azuredataappconfiguration displayName: 'azure-data-appconfiguration' type: boolean default: true -- name: release_azurespringcloudappconfigurationconfig - displayName: 'azure-spring-cloud-appconfiguration-config' - type: boolean - default: true -- name: release_azurespringcloudappconfigurationconfigweb - displayName: 'azure-spring-cloud-appconfiguration-config-web' - type: boolean - default: true +#- name: release_azurespringcloudappconfigurationconfig +# displayName: 'azure-spring-cloud-appconfiguration-config' +# type: boolean +# default: true +#- name: release_azurespringcloudappconfigurationconfigweb +# displayName: 'azure-spring-cloud-appconfiguration-config-web' +# type: boolean +# default: true - name: release_azurespringcloudfeaturemanagement displayName: 'azure-spring-cloud-feature-management' type: boolean default: true -- name: release_azurespringcloudfeaturemanagementweb - displayName: 'azure-spring-cloud-feature-management-web' - type: boolean - default: true -- name: release_azurespringcloudstarterappconfigurationconfig - displayName: 'azure-spring-cloud-starter-appconfiguration-config' - type: boolean - default: true +#- name: release_azurespringcloudfeaturemanagementweb +# displayName: 'azure-spring-cloud-feature-management-web' +# type: boolean +# default: true +#- name: release_azurespringcloudstarterappconfigurationconfig +# displayName: 'azure-spring-cloud-starter-appconfiguration-config' +# type: boolean +# default: true - name: release_azureresourcemanagerappconfiguration displayName: 'azure-resourcemanager-appconfiguration' type: boolean @@ -101,31 +101,33 @@ extends: groupId: com.azure safeName: azuredataappconfiguration releaseInBatch: ${{ parameters.release_azuredataappconfiguration }} - - name: azure-spring-cloud-appconfiguration-config - groupId: com.azure.spring - safeName: azurespringcloudappconfigurationconfig - releaseInBatch: ${{ parameters.release_azurespringcloudappconfigurationconfig }} - - name: azure-spring-cloud-appconfiguration-config-web - groupId: com.azure.spring - safeName: azurespringcloudappconfigurationconfigweb - releaseInBatch: ${{ parameters.release_azurespringcloudappconfigurationconfigweb }} +# - name: azure-spring-cloud-appconfiguration-config +# groupId: com.azure.spring +# safeName: azurespringcloudappconfigurationconfig +# releaseInBatch: ${{ parameters.release_azurespringcloudappconfigurationconfig }} +# - name: azure-spring-cloud-appconfiguration-config-web +# groupId: com.azure.spring +# safeName: azurespringcloudappconfigurationconfigweb +# releaseInBatch: ${{ parameters.release_azurespringcloudappconfigurationconfigweb }} - name: azure-spring-cloud-feature-management groupId: com.azure.spring safeName: azurespringcloudfeaturemanagement releaseInBatch: ${{ parameters.release_azurespringcloudfeaturemanagement }} - - name: azure-spring-cloud-feature-management-web - groupId: com.azure.spring - safeName: azurespringcloudfeaturemanagementweb - releaseInBatch: ${{ parameters.release_azurespringcloudfeaturemanagementweb }} - - name: azure-spring-cloud-starter-appconfiguration-config - groupId: com.azure.spring - safeName: azurespringcloudstarterappconfigurationconfig - releaseInBatch: ${{ parameters.release_azurespringcloudstarterappconfigurationconfig }} +# - name: azure-spring-cloud-feature-management-web +# groupId: com.azure.spring +# safeName: azurespringcloudfeaturemanagementweb +# releaseInBatch: ${{ parameters.release_azurespringcloudfeaturemanagementweb }} +# - name: azure-spring-cloud-starter-appconfiguration-config +# groupId: com.azure.spring +# safeName: azurespringcloudstarterappconfigurationconfig +# releaseInBatch: ${{ parameters.release_azurespringcloudstarterappconfigurationconfig }} - name: azure-resourcemanager-appconfiguration groupId: com.azure.resourcemanager safeName: azureresourcemanagerappconfiguration releaseInBatch: ${{ parameters.release_azureresourcemanagerappconfiguration }} - AdditionalModules: - - name: azure-spring-cloud-test-appconfiguration-config - groupId: com.azure.spring - safeName: azurespringcloudtestappconfigurationconfig \ No newline at end of file +# AdditionalModules: +# - name: azure-spring-cloud-test-appconfiguration-config +# groupId: com.azure.spring +# safeName: azurespringcloudtestappconfigurationconfig + MatrixFilters: + - JavaTestVersion=^(?!1.8|1.11).* \ No newline at end of file diff --git a/sdk/appconfiguration/pom.xml b/sdk/appconfiguration/pom.xml index 8e88ca6ca599..314502b5d6eb 100644 --- a/sdk/appconfiguration/pom.xml +++ b/sdk/appconfiguration/pom.xml @@ -12,11 +12,15 @@ azure-data-appconfiguration azure-data-appconfiguration-perf azure-resourcemanager-appconfiguration + azure-spring-cloud-feature-management + diff --git a/sdk/appconfiguration/tests.yml b/sdk/appconfiguration/tests.yml index 085217d310b0..6e6adca28e1f 100644 --- a/sdk/appconfiguration/tests.yml +++ b/sdk/appconfiguration/tests.yml @@ -1,19 +1,19 @@ trigger: none -stages: - - template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml - parameters: - ServiceDirectory: appconfiguration - Artifacts: - - name: azure-spring-cloud-test-appconfiguration-config - groupId: com.azure.spring - safeName: azurespringcloudtestappconfigurationconfig - TimeoutInMinutes: 90 - SupportedClouds: 'Public,UsGov,China' - EnvVars: - AZURE_APPCONFIG_CONNECTION_STRING: $(AZURE_APPCONFIG_CONNECTION_STRING) - AZURE_CLIENT_ID: $(aad-azure-sdk-test-client-id) - AZURE_CLIENT_SECRET: $(aad-azure-sdk-test-client-secret) - AZURE_TENANT_ID: $(aad-azure-sdk-test-tenant-id) - TestGoals: 'verify' - TestOptions: '-DskipSpringITs=false' +#stages: +# - template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml +# parameters: +# ServiceDirectory: appconfiguration +# Artifacts: +# - name: azure-spring-cloud-test-appconfiguration-config +# groupId: com.azure.spring +# safeName: azurespringcloudtestappconfigurationconfig +# TimeoutInMinutes: 90 +# SupportedClouds: 'Public,UsGov,China' +# EnvVars: +# AZURE_APPCONFIG_CONNECTION_STRING: $(AZURE_APPCONFIG_CONNECTION_STRING) +# AZURE_CLIENT_ID: $(aad-azure-sdk-test-client-id) +# AZURE_CLIENT_SECRET: $(aad-azure-sdk-test-client-secret) +# AZURE_TENANT_ID: $(aad-azure-sdk-test-tenant-id) +# TestGoals: 'verify' +# TestOptions: '-DskipSpringITs=false' diff --git a/sdk/attestation/azure-security-attestation/pom.xml b/sdk/attestation/azure-security-attestation/pom.xml index c0285ad4b23a..9b8b419abd21 100644 --- a/sdk/attestation/azure-security-attestation/pom.xml +++ b/sdk/attestation/azure-security-attestation/pom.xml @@ -77,19 +77,19 @@ io.opentelemetry opentelemetry-api - 1.14.0 + 1.16.0 test io.opentelemetry opentelemetry-exporter-logging - 1.14.0 + 1.16.0 test io.opentelemetry opentelemetry-sdk - 1.14.0 + 1.16.0 test @@ -149,9 +149,9 @@ com.nimbusds:nimbus-jose-jwt:[9.22] - io.opentelemetry:opentelemetry-api:[1.14.0] - io.opentelemetry:opentelemetry-sdk:[1.14.0] - io.opentelemetry:opentelemetry-exporter-logging:[1.14.0] + io.opentelemetry:opentelemetry-api:[1.16.0] + io.opentelemetry:opentelemetry-sdk:[1.16.0] + io.opentelemetry:opentelemetry-exporter-logging:[1.16.0] diff --git a/sdk/boms/spring-cloud-azure-dependencies/pom.xml b/sdk/boms/spring-cloud-azure-dependencies/pom.xml index 7046cb930a59..97c6aaa130b0 100644 --- a/sdk/boms/spring-cloud-azure-dependencies/pom.xml +++ b/sdk/boms/spring-cloud-azure-dependencies/pom.xml @@ -6,7 +6,7 @@ com.azure.spring spring-cloud-azure-dependencies - 4.4.0-beta.1 + 6.0.0-beta.1 pom Spring Cloud Azure Dependencies @@ -51,15 +51,66 @@ com.azure azure-sdk-bom - 1.2.3 + 1.2.4 pom import com.azure - azure-spring-data-cosmos - 3.26.0 + azure-core + 1.31.0 + + + com.azure + azure-cosmos + 4.35.0 + + + com.azure + azure-data-appconfiguration + 1.3.6 + + + com.azure + azure-messaging-servicebus + 7.10.1 + + + com.azure + azure-messaging-eventhubs + 5.13.0 + + + com.azure + azure-security-keyvault-certificates + 4.3.5 + + com.azure + azure-security-keyvault-secrets + 4.4.6 + + + com.azure + azure-storage-blob + 12.19.0 + + + com.azure + azure-storage-file-share + 12.15.0 + + + com.azure + azure-storage-queue + 12.14.1 + + + com.azure.resourcemanager azure-resourcemanager @@ -127,11 +178,13 @@ spring-cloud-azure-starter-cosmos ${project.version} + com.azure.spring spring-cloud-azure-starter-eventhubs diff --git a/sdk/communication/azure-communication-callingserver/pom.xml b/sdk/communication/azure-communication-callingserver/pom.xml index 735fe87e642f..f5bf05871b95 100644 --- a/sdk/communication/azure-communication-callingserver/pom.xml +++ b/sdk/communication/azure-communication-callingserver/pom.xml @@ -106,7 +106,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test diff --git a/sdk/communication/azure-communication-identity/pom.xml b/sdk/communication/azure-communication-identity/pom.xml index 5f2517543bd5..9fde84a5a65c 100644 --- a/sdk/communication/azure-communication-identity/pom.xml +++ b/sdk/communication/azure-communication-identity/pom.xml @@ -110,7 +110,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test diff --git a/sdk/communication/azure-communication-networktraversal/pom.xml b/sdk/communication/azure-communication-networktraversal/pom.xml index 8a7e393c016e..e46f8466a4dd 100644 --- a/sdk/communication/azure-communication-networktraversal/pom.xml +++ b/sdk/communication/azure-communication-networktraversal/pom.xml @@ -100,7 +100,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test diff --git a/sdk/communication/azure-communication-phonenumbers/pom.xml b/sdk/communication/azure-communication-phonenumbers/pom.xml index 13cda549846f..ef86cdb10b7a 100644 --- a/sdk/communication/azure-communication-phonenumbers/pom.xml +++ b/sdk/communication/azure-communication-phonenumbers/pom.xml @@ -108,7 +108,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test diff --git a/sdk/containerregistry/azure-containers-containerregistry/pom.xml b/sdk/containerregistry/azure-containers-containerregistry/pom.xml index 546e86f7876e..2e6cf0e3dbf5 100644 --- a/sdk/containerregistry/azure-containers-containerregistry/pom.xml +++ b/sdk/containerregistry/azure-containers-containerregistry/pom.xml @@ -75,7 +75,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test diff --git a/sdk/core/azure-core-amqp/pom.xml b/sdk/core/azure-core-amqp/pom.xml index 0457cf15f150..0dd895d12581 100644 --- a/sdk/core/azure-core-amqp/pom.xml +++ b/sdk/core/azure-core-amqp/pom.xml @@ -108,7 +108,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test diff --git a/sdk/core/azure-core-http-jdk-httpclient/pom.xml b/sdk/core/azure-core-http-jdk-httpclient/pom.xml index fe2c8c7171dc..e01fa873b10f 100644 --- a/sdk/core/azure-core-http-jdk-httpclient/pom.xml +++ b/sdk/core/azure-core-http-jdk-httpclient/pom.xml @@ -130,7 +130,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test diff --git a/sdk/core/azure-core-http-netty/pom.xml b/sdk/core/azure-core-http-netty/pom.xml index e6b6a81f2664..51616338b12b 100644 --- a/sdk/core/azure-core-http-netty/pom.xml +++ b/sdk/core/azure-core-http-netty/pom.xml @@ -184,7 +184,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test diff --git a/sdk/core/azure-core-http-okhttp/pom.xml b/sdk/core/azure-core-http-okhttp/pom.xml index c2d29e60f4a0..1296bf10a06b 100644 --- a/sdk/core/azure-core-http-okhttp/pom.xml +++ b/sdk/core/azure-core-http-okhttp/pom.xml @@ -132,7 +132,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test diff --git a/sdk/core/azure-core-http-vertx/pom.xml b/sdk/core/azure-core-http-vertx/pom.xml index 30b40f9bf924..36e0420dc0f3 100644 --- a/sdk/core/azure-core-http-vertx/pom.xml +++ b/sdk/core/azure-core-http-vertx/pom.xml @@ -140,7 +140,7 @@ org.mockito mockito-inline - 4.5.1 + 4.6.1 test diff --git a/sdk/core/azure-core-jackson-tests/pom.xml b/sdk/core/azure-core-jackson-tests/pom.xml index 4327a8f61da5..2b1b0b856c39 100644 --- a/sdk/core/azure-core-jackson-tests/pom.xml +++ b/sdk/core/azure-core-jackson-tests/pom.xml @@ -134,7 +134,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test diff --git a/sdk/core/azure-core-management/pom.xml b/sdk/core/azure-core-management/pom.xml index 2ac1b492101c..f67cb6738b38 100644 --- a/sdk/core/azure-core-management/pom.xml +++ b/sdk/core/azure-core-management/pom.xml @@ -96,7 +96,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test diff --git a/sdk/core/azure-core-metrics-opentelemetry/pom.xml b/sdk/core/azure-core-metrics-opentelemetry/pom.xml index 8957fca6d97e..233fdb4f3849 100644 --- a/sdk/core/azure-core-metrics-opentelemetry/pom.xml +++ b/sdk/core/azure-core-metrics-opentelemetry/pom.xml @@ -35,7 +35,7 @@ io.opentelemetry opentelemetry-api - 1.14.0 + 1.16.0 com.azure @@ -53,14 +53,14 @@ io.opentelemetry opentelemetry-sdk - 1.14.0 + 1.16.0 test io.opentelemetry opentelemetry-sdk-testing - 1.14.0 + 1.16.0 test @@ -91,7 +91,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test @@ -109,19 +109,19 @@ org.assertj assertj-core - 3.22.0 + 3.23.1 test io.opentelemetry opentelemetry-exporter-otlp - 1.14.0 + 1.16.0 test io.opentelemetry opentelemetry-sdk-extension-autoconfigure - 1.14.0-alpha + 1.15.0-alpha test @@ -136,13 +136,13 @@ - io.opentelemetry:opentelemetry-api:[1.14.0] - io.opentelemetry:opentelemetry-sdk:[1.14.0] - io.opentelemetry:opentelemetry-sdk-testing:[1.14.0] - io.opentelemetry:opentelemetry-exporter-logging:[1.14.0] - io.opentelemetry:opentelemetry-exporter-otlp:[1.14.0] - io.opentelemetry:opentelemetry-exporter-jaeger:[1.14.0] - io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:[1.14.0-alpha] + io.opentelemetry:opentelemetry-api:[1.16.0] + io.opentelemetry:opentelemetry-sdk:[1.16.0] + io.opentelemetry:opentelemetry-sdk-testing:[1.16.0] + io.opentelemetry:opentelemetry-exporter-logging:[1.16.0] + io.opentelemetry:opentelemetry-exporter-otlp:[1.16.0] + io.opentelemetry:opentelemetry-exporter-jaeger:[1.16.0] + io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:[1.15.0-alpha] diff --git a/sdk/core/azure-core-serializer-json-gson/pom.xml b/sdk/core/azure-core-serializer-json-gson/pom.xml index efc178fd0ef8..a839ba7f4557 100644 --- a/sdk/core/azure-core-serializer-json-gson/pom.xml +++ b/sdk/core/azure-core-serializer-json-gson/pom.xml @@ -95,7 +95,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test diff --git a/sdk/core/azure-core-serializer-json-jackson/pom.xml b/sdk/core/azure-core-serializer-json-jackson/pom.xml index 038b6d7f08e4..741b4378b553 100644 --- a/sdk/core/azure-core-serializer-json-jackson/pom.xml +++ b/sdk/core/azure-core-serializer-json-jackson/pom.xml @@ -90,7 +90,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test diff --git a/sdk/core/azure-core-test/pom.xml b/sdk/core/azure-core-test/pom.xml index 4ece63584f39..b2a3a8eb71ab 100644 --- a/sdk/core/azure-core-test/pom.xml +++ b/sdk/core/azure-core-test/pom.xml @@ -89,7 +89,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test diff --git a/sdk/core/azure-core-tracing-opentelemetry/pom.xml b/sdk/core/azure-core-tracing-opentelemetry/pom.xml index 9aea806264d9..67006e26e023 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/pom.xml +++ b/sdk/core/azure-core-tracing-opentelemetry/pom.xml @@ -45,7 +45,7 @@ io.opentelemetry opentelemetry-api - 1.14.0 + 1.16.0 com.azure @@ -63,7 +63,7 @@ io.opentelemetry opentelemetry-sdk - 1.14.0 + 1.16.0 test @@ -93,14 +93,14 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test io.opentelemetry opentelemetry-sdk-testing test - 1.14.0 + 1.16.0 @@ -113,13 +113,13 @@ io.opentelemetry opentelemetry-exporter-logging - 1.14.0 + 1.16.0 test io.opentelemetry opentelemetry-exporter-jaeger - 1.14.0 + 1.16.0 test @@ -143,7 +143,7 @@ io.opentelemetry opentelemetry-sdk-extension-autoconfigure - 1.14.0-alpha + 1.15.0-alpha @@ -157,12 +157,12 @@ - io.opentelemetry:opentelemetry-api:[1.14.0] - io.opentelemetry:opentelemetry-sdk:[1.14.0] - io.opentelemetry:opentelemetry-exporter-logging:[1.14.0] - io.opentelemetry:opentelemetry-exporter-jaeger:[1.14.0] - io.opentelemetry:opentelemetry-sdk-testing:[1.14.0] - io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:[1.14.0-alpha] + io.opentelemetry:opentelemetry-api:[1.16.0] + io.opentelemetry:opentelemetry-sdk:[1.16.0] + io.opentelemetry:opentelemetry-exporter-logging:[1.16.0] + io.opentelemetry:opentelemetry-exporter-jaeger:[1.16.0] + io.opentelemetry:opentelemetry-sdk-testing:[1.16.0] + io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:[1.15.0-alpha] diff --git a/sdk/core/azure-core/pom.xml b/sdk/core/azure-core/pom.xml index 1029a9a43094..ae7f554ca24f 100644 --- a/sdk/core/azure-core/pom.xml +++ b/sdk/core/azure-core/pom.xml @@ -170,7 +170,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test diff --git a/sdk/cosmos/azure-cosmos-benchmark/pom.xml b/sdk/cosmos/azure-cosmos-benchmark/pom.xml index 5abfb925ed1b..9ba9c24b37fe 100644 --- a/sdk/cosmos/azure-cosmos-benchmark/pom.xml +++ b/sdk/cosmos/azure-cosmos-benchmark/pom.xml @@ -109,25 +109,25 @@ Licensed under the MIT License. io.micrometer micrometer-registry-azure-monitor - 1.9.3 + 1.10.0-M3 io.micrometer micrometer-registry-graphite - 1.9.3 + 1.10.0-M3 org.apache.logging.log4j log4j-api - 2.17.2 + 2.18.0 org.apache.logging.log4j log4j-core - 2.17.2 + 2.18.0 @@ -139,7 +139,7 @@ Licensed under the MIT License. org.apache.logging.log4j log4j-slf4j-impl - 2.17.2 + 2.18.0 @@ -151,7 +151,7 @@ Licensed under the MIT License. org.assertj assertj-core - 3.22.0 + 3.23.1 test @@ -255,12 +255,12 @@ Licensed under the MIT License. com.google.guava:guava:[25.0-jre] io.dropwizard.metrics:metrics-graphite:[4.1.0] io.dropwizard.metrics:metrics-jvm:[4.1.0] - io.micrometer:micrometer-registry-azure-monitor:[1.9.3] - io.micrometer:micrometer-registry-graphite:[1.9.3] + io.micrometer:micrometer-registry-azure-monitor:[1.10.0-M3] + io.micrometer:micrometer-registry-graphite:[1.10.0-M3] org.apache.commons:commons-lang3:[3.12.0] - org.apache.logging.log4j:log4j-api:[2.17.2] - org.apache.logging.log4j:log4j-core:[2.17.2] - org.apache.logging.log4j:log4j-slf4j-impl:[2.17.2] + org.apache.logging.log4j:log4j-api:[2.18.0] + org.apache.logging.log4j:log4j-core:[2.18.0] + org.apache.logging.log4j:log4j-slf4j-impl:[2.18.0] org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir:[1.1.0] diff --git a/sdk/cosmos/azure-cosmos-dotnet-benchmark/pom.xml b/sdk/cosmos/azure-cosmos-dotnet-benchmark/pom.xml index 88236cfde44b..494bef5b012d 100644 --- a/sdk/cosmos/azure-cosmos-dotnet-benchmark/pom.xml +++ b/sdk/cosmos/azure-cosmos-dotnet-benchmark/pom.xml @@ -62,13 +62,13 @@ Licensed under the MIT License. org.apache.logging.log4j log4j-api - 2.17.2 + 2.18.0 org.apache.logging.log4j log4j-core - 2.17.2 + 2.18.0 @@ -80,7 +80,7 @@ Licensed under the MIT License. org.apache.logging.log4j log4j-slf4j-impl - 2.17.2 + 2.18.0 junit @@ -97,7 +97,7 @@ Licensed under the MIT License. org.assertj assertj-core - 3.22.0 + 3.23.1 test @@ -180,12 +180,12 @@ Licensed under the MIT License. com.google.guava:guava:[25.0-jre] io.dropwizard.metrics:metrics-graphite:[4.1.0] io.dropwizard.metrics:metrics-jvm:[4.1.0] - io.micrometer:micrometer-registry-azure-monitor:[1.9.3] - io.micrometer:micrometer-registry-graphite:[1.9.3] + io.micrometer:micrometer-registry-azure-monitor:[1.10.0-M3] + io.micrometer:micrometer-registry-graphite:[1.10.0-M3] org.apache.commons:commons-lang3:[3.12.0] - org.apache.logging.log4j:log4j-api:[2.17.2] - org.apache.logging.log4j:log4j-core:[2.17.2] - org.apache.logging.log4j:log4j-slf4j-impl:[2.17.2] + org.apache.logging.log4j:log4j-api:[2.18.0] + org.apache.logging.log4j:log4j-core:[2.18.0] + org.apache.logging.log4j:log4j-slf4j-impl:[2.18.0] diff --git a/sdk/cosmos/azure-cosmos-encryption/pom.xml b/sdk/cosmos/azure-cosmos-encryption/pom.xml index 01f9882534c1..b3d96c750f68 100644 --- a/sdk/cosmos/azure-cosmos-encryption/pom.xml +++ b/sdk/cosmos/azure-cosmos-encryption/pom.xml @@ -134,28 +134,28 @@ Licensed under the MIT License. org.assertj assertj-core - 3.22.0 + 3.23.1 test org.apache.logging.log4j log4j-slf4j-impl - 2.17.2 + 2.18.0 test org.apache.logging.log4j log4j-api - 2.17.2 + 2.18.0 test org.apache.logging.log4j log4j-core - 2.17.2 + 2.18.0 test @@ -183,7 +183,7 @@ Licensed under the MIT License. org.mockito mockito-core - 4.5.1 + 4.6.1 test diff --git a/sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml b/sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml index 86c69bd3b868..f7a010e8db35 100644 --- a/sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml +++ b/sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml @@ -86,7 +86,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test @@ -104,7 +104,7 @@ org.assertj assertj-core - 3.22.0 + 3.23.1 test diff --git a/sdk/cosmos/azure-cosmos/pom.xml b/sdk/cosmos/azure-cosmos/pom.xml index 799e27a453b4..25631bed20b0 100644 --- a/sdk/cosmos/azure-cosmos/pom.xml +++ b/sdk/cosmos/azure-cosmos/pom.xml @@ -183,28 +183,28 @@ Licensed under the MIT License. org.assertj assertj-core - 3.22.0 + 3.23.1 test org.apache.logging.log4j log4j-slf4j-impl - 2.17.2 + 2.18.0 test org.apache.logging.log4j log4j-api - 2.17.2 + 2.18.0 test org.apache.logging.log4j log4j-core - 2.17.2 + 2.18.0 test @@ -224,13 +224,13 @@ Licensed under the MIT License. io.micrometer micrometer-core - 1.9.3 + 1.10.0-M3 io.projectreactor reactor-test - 3.4.22 + 3.4.21 test @@ -244,13 +244,13 @@ Licensed under the MIT License. org.mockito mockito-core - 4.5.1 + 4.6.1 test org.mockito mockito-inline - 4.5.1 + 4.6.1 test @@ -290,7 +290,7 @@ Licensed under the MIT License. com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.13.3] com.fasterxml.jackson.module:jackson-module-afterburner:[2.13.3] io.dropwizard.metrics:metrics-core:[4.1.0] - io.micrometer:micrometer-core:[1.9.3] + io.micrometer:micrometer-core:[1.10.0-M3] org.slf4j:slf4j-api:[1.7.36] org.hdrhistogram:HdrHistogram:[2.1.12] diff --git a/sdk/cosmos/azure-spring-data-cosmos-test/pom.xml b/sdk/cosmos/azure-spring-data-cosmos-test/pom.xml index 8fec73be55dd..03e7ed762f26 100644 --- a/sdk/cosmos/azure-spring-data-cosmos-test/pom.xml +++ b/sdk/cosmos/azure-spring-data-cosmos-test/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.3 + 3.0.0-M4 @@ -26,6 +26,30 @@ false + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + com.azure diff --git a/sdk/cosmos/azure-spring-data-cosmos/pom.xml b/sdk/cosmos/azure-spring-data-cosmos/pom.xml index 3cdb06353c1f..6939da2b8fb6 100644 --- a/sdk/cosmos/azure-spring-data-cosmos/pom.xml +++ b/sdk/cosmos/azure-spring-data-cosmos/pom.xml @@ -41,7 +41,7 @@ org.springframework spring-core - 5.3.22 + 6.0.0-M5 commons-logging @@ -52,27 +52,27 @@ org.springframework spring-web - 5.3.22 + 6.0.0-M5 org.springframework spring-beans - 5.3.22 + 6.0.0-M5 org.springframework spring-context - 5.3.22 + 6.0.0-M5 org.springframework spring-tx - 5.3.22 + 6.0.0-M5 org.springframework.data spring-data-commons - 2.7.2 + 3.0.0-M5 org.slf4j @@ -83,7 +83,7 @@ org.springframework spring-expression - 5.3.22 + 6.0.0-M5 com.azure @@ -125,7 +125,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test @@ -137,7 +137,7 @@ org.springframework.boot spring-boot-starter-test - 2.7.3 + 3.0.0-M4 test @@ -149,7 +149,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test @@ -188,13 +188,13 @@ - org.springframework:spring-beans:[5.3.22] - org.springframework:spring-web:[5.3.22] - org.springframework:spring-tx:[5.3.22] - org.springframework:spring-expression:[5.3.22] - org.springframework:spring-core:[5.3.22] - org.springframework:spring-context:[5.3.22] - org.springframework.data:spring-data-commons:[2.7.2] + org.springframework:spring-beans:[6.0.0-M5] + org.springframework:spring-web:[6.0.0-M5] + org.springframework:spring-tx:[6.0.0-M5] + org.springframework:spring-expression:[6.0.0-M5] + org.springframework:spring-core:[6.0.0-M5] + org.springframework:spring-context:[6.0.0-M5] + org.springframework.data:spring-data-commons:[3.0.0-M5] org.javatuples:javatuples:[1.2] com.fasterxml.jackson.datatype:jackson-datatype-jdk8:[2.13.3] com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.13.3] diff --git a/sdk/cosmos/ci.yml b/sdk/cosmos/ci.yml index dc5bbc839346..4dc0167cda09 100644 --- a/sdk/cosmos/ci.yml +++ b/sdk/cosmos/ci.yml @@ -17,8 +17,8 @@ trigger: - sdk/cosmos/azure-cosmos-spark_3_2-12/ - sdk/cosmos/azure-cosmos-spark_3-1_2-12/ - sdk/cosmos/azure-cosmos-spark_3-2_2-12/ - - sdk/cosmos/azure-spring-data-cosmos/ - - sdk/cosmos/azure-spring-data-cosmos-test/ +# - sdk/cosmos/azure-spring-data-cosmos/ +# - sdk/cosmos/azure-spring-data-cosmos-test/ - sdk/cosmos/faq/ exclude: - sdk/cosmos/pom.xml @@ -29,8 +29,8 @@ trigger: - sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml - sdk/cosmos/azure-cosmos-spark_3-1_2-12/pom.xml - sdk/cosmos/azure-cosmos-spark_3-2_2-12/pom.xml - - sdk/cosmos/azure-spring-data-cosmos/pom.xml - - sdk/cosmos/azure-spring-data-cosmos-test/pom.xml +# - sdk/cosmos/azure-spring-data-cosmos/pom.xml +# - sdk/cosmos/azure-spring-data-cosmos-test/pom.xml pr: branches: @@ -51,8 +51,8 @@ pr: - sdk/cosmos/azure-cosmos-spark_3_2-12/ - sdk/cosmos/azure-cosmos-spark_3-1_2-12/ - sdk/cosmos/azure-cosmos-spark_3-2_2-12/ - - sdk/cosmos/azure-spring-data-cosmos/ - - sdk/cosmos/azure-spring-data-cosmos-test/ +# - sdk/cosmos/azure-spring-data-cosmos/ +# - sdk/cosmos/azure-spring-data-cosmos-test/ - sdk/cosmos/faq/ exclude: - sdk/cosmos/pom.xml @@ -63,8 +63,8 @@ pr: - sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml - sdk/cosmos/azure-cosmos-spark_3-1_2-12/pom.xml - sdk/cosmos/azure-cosmos-spark_3-2_2-12/pom.xml - - sdk/cosmos/azure-spring-data-cosmos/pom.xml - - sdk/cosmos/azure-spring-data-cosmos-test/pom.xml +# - sdk/cosmos/azure-spring-data-cosmos/pom.xml +# - sdk/cosmos/azure-spring-data-cosmos-test/pom.xml parameters: - name: release_azurecosmos @@ -99,10 +99,10 @@ extends: groupId: com.azure safeName: azurecosmos releaseInBatch: ${{ parameters.release_azurecosmos }} - - name: azure-spring-data-cosmos - groupId: com.azure - safeName: azurespringdatacosmos - releaseInBatch: ${{ parameters.release_azurespringdatacosmos }} +# - name: azure-spring-data-cosmos +# groupId: com.azure +# safeName: azurespringdatacosmos +# releaseInBatch: ${{ parameters.release_azurespringdatacosmos }} - name: azure-cosmos-encryption groupId: com.azure safeName: azurecosmosencryption @@ -124,7 +124,7 @@ extends: AdditionalModules: - name: azure-cosmos-benchmark groupId: com.azure - - name: azure-spring-data-cosmos-test - groupId: com.azure +# - name: azure-spring-data-cosmos-test +# groupId: com.azure - name: azure-cosmos-spark_3_2-12 groupId: com.azure.cosmos.spark diff --git a/sdk/cosmos/pom.xml b/sdk/cosmos/pom.xml index 8a2d575db8ac..94a2d60a9d20 100644 --- a/sdk/cosmos/pom.xml +++ b/sdk/cosmos/pom.xml @@ -14,8 +14,10 @@ azure-cosmos-benchmark azure-cosmos-dotnet-benchmark azure-cosmos-encryption + azure-cosmos-spark_3_2-12 azure-cosmos-spark_3-1_2-12 azure-cosmos-spark_3-2_2-12 diff --git a/sdk/cosmos/tests.yml b/sdk/cosmos/tests.yml index 25653de37e21..0286e4f21763 100644 --- a/sdk/cosmos/tests.yml +++ b/sdk/cosmos/tests.yml @@ -37,28 +37,28 @@ stages: TestOptions: '$(ProfileFlag) $(AdditionalArgs)' TestResultsFiles: '**/junitreports/TEST-*.xml' - - template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml - parameters: - TestName: 'Integration' - CloudConfig: - Public: - SubscriptionConfigurations: - - $(sub-config-azure-cloud-test-resources) - - $(sub-config-cosmos-azure-cloud-test-resources) - MatrixConfigs: - - Name: Cosmos_live_test_integration - Path: sdk/cosmos/integration-matrix.json - Selection: all - GenerateVMJobs: true - MatrixReplace: - - JavaTestVersion=(.*1)\.17(.*)/$1.11$2 - ServiceDirectory: cosmos - Artifacts: - - name: azure-spring-data-cosmos-test - groupId: com.azure - safeName: azurespringdatacosmostest - TimeoutInMinutes: 90 - PreSteps: - - template: /eng/pipelines/templates/steps/install-reporting-tools.yml - TestGoals: 'clean verify' - TestOptions: '$(ProfileFlag)' +# - template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml +# parameters: +# TestName: 'Integration' +# CloudConfig: +# Public: +# SubscriptionConfigurations: +# - $(sub-config-azure-cloud-test-resources) +# - $(sub-config-cosmos-azure-cloud-test-resources) +# MatrixConfigs: +# - Name: Cosmos_live_test_integration +# Path: sdk/cosmos/integration-matrix.json +# Selection: all +# GenerateVMJobs: true +# MatrixReplace: +# - JavaTestVersion=(.*1)\.17(.*)/$1.11$2 +# ServiceDirectory: cosmos +# Artifacts: +# - name: azure-spring-data-cosmos-test +# groupId: com.azure +# safeName: azurespringdatacosmostest +# TimeoutInMinutes: 90 +# PreSteps: +# - template: /eng/pipelines/templates/steps/install-reporting-tools.yml +# TestGoals: 'clean verify' +# TestOptions: '$(ProfileFlag)' diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/pom.xml b/sdk/dashboard/azure-resourcemanager-dashboard/pom.xml index 81f569acf07d..fd85b6f12ddf 100644 --- a/sdk/dashboard/azure-resourcemanager-dashboard/pom.xml +++ b/sdk/dashboard/azure-resourcemanager-dashboard/pom.xml @@ -72,7 +72,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test diff --git a/sdk/deviceupdate/azure-resourcemanager-deviceupdate/pom.xml b/sdk/deviceupdate/azure-resourcemanager-deviceupdate/pom.xml index e3883fa18b3e..d86036d97c0b 100644 --- a/sdk/deviceupdate/azure-resourcemanager-deviceupdate/pom.xml +++ b/sdk/deviceupdate/azure-resourcemanager-deviceupdate/pom.xml @@ -72,7 +72,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test diff --git a/sdk/digitaltwins/azure-digitaltwins-core/pom.xml b/sdk/digitaltwins/azure-digitaltwins-core/pom.xml index 0e4f0c546bc9..21432fe27a05 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/pom.xml +++ b/sdk/digitaltwins/azure-digitaltwins-core/pom.xml @@ -106,7 +106,7 @@ org.assertj assertj-core - 3.22.0 + 3.23.1 test diff --git a/sdk/eventgrid/azure-messaging-eventgrid/pom.xml b/sdk/eventgrid/azure-messaging-eventgrid/pom.xml index 196b8ebe1a4b..0115959b3b56 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/pom.xml +++ b/sdk/eventgrid/azure-messaging-eventgrid/pom.xml @@ -124,7 +124,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test diff --git a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml index f0a3cf0c5728..2816ed7e6f67 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml +++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml @@ -91,7 +91,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test diff --git a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-jedis/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-jedis/pom.xml index 59cceaea5cfd..ffdb0df554a8 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-jedis/pom.xml +++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-jedis/pom.xml @@ -71,13 +71,13 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test org.mockito mockito-inline - 4.5.1 + 4.6.1 test @@ -93,7 +93,7 @@ redis.clients:jedis:[4.2.3] - org.mockito:mockito-inline:[4.5.1] + org.mockito:mockito-inline:[4.6.1] diff --git a/sdk/eventhubs/azure-messaging-eventhubs/docs/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs/docs/pom.xml index eecf4acbe46c..0021b1266724 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/docs/pom.xml +++ b/sdk/eventhubs/azure-messaging-eventhubs/docs/pom.xml @@ -32,17 +32,17 @@ org.apache.logging.log4j log4j-api - 2.17.2 + 2.18.0 org.apache.logging.log4j log4j-core - 2.17.2 + 2.18.0 org.apache.logging.log4j log4j-slf4j-impl - 2.17.2 + 2.18.0 org.codehaus.groovy diff --git a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml index ae286e4f3331..474c6b4da221 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml +++ b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml @@ -86,7 +86,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test diff --git a/sdk/eventhubs/microsoft-azure-eventhubs-extensions/pom.xml b/sdk/eventhubs/microsoft-azure-eventhubs-extensions/pom.xml index 51f36e90bfec..f48b7e8c612e 100644 --- a/sdk/eventhubs/microsoft-azure-eventhubs-extensions/pom.xml +++ b/sdk/eventhubs/microsoft-azure-eventhubs-extensions/pom.xml @@ -45,12 +45,12 @@ org.apache.logging.log4j log4j-api - 2.17.2 + 2.18.0 org.apache.logging.log4j log4j-core - 2.17.2 + 2.18.0 diff --git a/sdk/eventhubs/microsoft-azure-eventhubs/pom.xml b/sdk/eventhubs/microsoft-azure-eventhubs/pom.xml index 54b903680e3b..fb0ab02252c7 100644 --- a/sdk/eventhubs/microsoft-azure-eventhubs/pom.xml +++ b/sdk/eventhubs/microsoft-azure-eventhubs/pom.xml @@ -89,7 +89,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test diff --git a/sdk/identity/azure-identity/pom.xml b/sdk/identity/azure-identity/pom.xml index 4c6922750747..dece90be27a9 100644 --- a/sdk/identity/azure-identity/pom.xml +++ b/sdk/identity/azure-identity/pom.xml @@ -64,14 +64,14 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test com.google.code.gson gson - 2.9.1 + 2.9.0 test @@ -95,7 +95,7 @@ net.bytebuddy byte-buddy - 1.12.13 + 1.12.12 test @@ -107,7 +107,7 @@ org.mockito mockito-inline - 4.5.1 + 4.6.1 test diff --git a/sdk/keyvault/azure-security-keyvault-administration/pom.xml b/sdk/keyvault/azure-security-keyvault-administration/pom.xml index 08a9fee86d20..17002a6e4825 100644 --- a/sdk/keyvault/azure-security-keyvault-administration/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-administration/pom.xml @@ -116,7 +116,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test diff --git a/sdk/keyvault/azure-security-keyvault-certificates/pom.xml b/sdk/keyvault/azure-security-keyvault-certificates/pom.xml index c4df52137ce1..d5435cc889d6 100644 --- a/sdk/keyvault/azure-security-keyvault-certificates/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-certificates/pom.xml @@ -114,7 +114,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test diff --git a/sdk/keyvault/azure-security-keyvault-jca/pom.xml b/sdk/keyvault/azure-security-keyvault-jca/pom.xml index 1c42becabd5e..7f4554e4e24e 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-jca/pom.xml @@ -59,7 +59,7 @@ org.mockito mockito-inline - 4.5.1 + 4.6.1 test diff --git a/sdk/keyvault/azure-security-keyvault-keys/pom.xml b/sdk/keyvault/azure-security-keyvault-keys/pom.xml index f200a7fcc62e..1e14390ab9f2 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-keys/pom.xml @@ -123,7 +123,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test diff --git a/sdk/keyvault/azure-security-keyvault-secrets/pom.xml b/sdk/keyvault/azure-security-keyvault-secrets/pom.xml index b01e5acf61df..9cc998e6c286 100644 --- a/sdk/keyvault/azure-security-keyvault-secrets/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-secrets/pom.xml @@ -123,7 +123,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test diff --git a/sdk/keyvault/azure-security-test-keyvault-jca/pom.xml b/sdk/keyvault/azure-security-test-keyvault-jca/pom.xml index 74ee7197bb17..72e6669c6067 100644 --- a/sdk/keyvault/azure-security-test-keyvault-jca/pom.xml +++ b/sdk/keyvault/azure-security-test-keyvault-jca/pom.xml @@ -76,7 +76,7 @@ org.springframework spring-core - 5.3.22 + 6.0.0-M5 test diff --git a/sdk/modelsrepository/azure-iot-modelsrepository/pom.xml b/sdk/modelsrepository/azure-iot-modelsrepository/pom.xml index 63cc0c354b24..889e51a83531 100644 --- a/sdk/modelsrepository/azure-iot-modelsrepository/pom.xml +++ b/sdk/modelsrepository/azure-iot-modelsrepository/pom.xml @@ -94,7 +94,7 @@ org.assertj assertj-core - 3.22.0 + 3.23.1 test diff --git a/sdk/monitor/azure-monitor-opentelemetry-exporter/pom.xml b/sdk/monitor/azure-monitor-opentelemetry-exporter/pom.xml index 8ebebd7b7d60..b9fad60f6463 100644 --- a/sdk/monitor/azure-monitor-opentelemetry-exporter/pom.xml +++ b/sdk/monitor/azure-monitor-opentelemetry-exporter/pom.xml @@ -54,12 +54,12 @@ io.opentelemetry opentelemetry-api - 1.14.0 + 1.16.0 io.opentelemetry opentelemetry-sdk - 1.14.0 + 1.16.0 @@ -90,7 +90,7 @@ org.assertj assertj-core - 3.22.0 + 3.23.1 test @@ -145,8 +145,8 @@ - io.opentelemetry:opentelemetry-api:[1.14.0] - io.opentelemetry:opentelemetry-sdk:[1.14.0] + io.opentelemetry:opentelemetry-api:[1.16.0] + io.opentelemetry:opentelemetry-sdk:[1.16.0] diff --git a/sdk/parents/azure-client-sdk-parent/pom.xml b/sdk/parents/azure-client-sdk-parent/pom.xml index 1a0d772d1fcc..4ca8d2a9aef0 100644 --- a/sdk/parents/azure-client-sdk-parent/pom.xml +++ b/sdk/parents/azure-client-sdk-parent/pom.xml @@ -41,6 +41,14 @@ + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + ossrh Sonatype Snapshots @@ -54,6 +62,14 @@ + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + ossrh Sonatype Snapshots diff --git a/sdk/resourcemanager/azure-resourcemanager-authorization/pom.xml b/sdk/resourcemanager/azure-resourcemanager-authorization/pom.xml index 890781366ea4..535be0ff3dc6 100644 --- a/sdk/resourcemanager/azure-resourcemanager-authorization/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-authorization/pom.xml @@ -86,7 +86,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/pom.xml b/sdk/resourcemanager/azure-resourcemanager-resources/pom.xml index 87c5189d93e7..20f68f01a9d8 100644 --- a/sdk/resourcemanager/azure-resourcemanager-resources/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-resources/pom.xml @@ -100,7 +100,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/pom.xml b/sdk/resourcemanager/azure-resourcemanager-samples/pom.xml index 3b7d6f1a0ffa..a6855fddc614 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-samples/pom.xml @@ -121,7 +121,7 @@ io.fabric8 kubernetes-client - 5.10.2 + 5.12.1 com.microsoft.sqlserver @@ -186,7 +186,7 @@ org.apache.httpcomponents:httpclient:[4.5.13] - io.fabric8:kubernetes-client:[5.10.2] + io.fabric8:kubernetes-client:[5.12.1] com.jcraft:jsch:[0.1.55] org.slf4j:slf4j-simple:[1.7.36] com.google.guava:guava:[30.1.1-jre] diff --git a/sdk/resourcemanager/azure-resourcemanager/pom.xml b/sdk/resourcemanager/azure-resourcemanager/pom.xml index fe40a39a0fd7..69a606cbbee1 100644 --- a/sdk/resourcemanager/azure-resourcemanager/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager/pom.xml @@ -215,7 +215,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test diff --git a/sdk/schemaregistry/azure-data-schemaregistry-apacheavro/pom.xml b/sdk/schemaregistry/azure-data-schemaregistry-apacheavro/pom.xml index 36b537f33998..7914552cb5c5 100644 --- a/sdk/schemaregistry/azure-data-schemaregistry-apacheavro/pom.xml +++ b/sdk/schemaregistry/azure-data-schemaregistry-apacheavro/pom.xml @@ -119,7 +119,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test diff --git a/sdk/schemaregistry/azure-data-schemaregistry/pom.xml b/sdk/schemaregistry/azure-data-schemaregistry/pom.xml index 26cfd07a51d8..e8338b2efa66 100644 --- a/sdk/schemaregistry/azure-data-schemaregistry/pom.xml +++ b/sdk/schemaregistry/azure-data-schemaregistry/pom.xml @@ -85,7 +85,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test diff --git a/sdk/search/azure-search-documents/pom.xml b/sdk/search/azure-search-documents/pom.xml index 06c28663e95b..de284a68364d 100644 --- a/sdk/search/azure-search-documents/pom.xml +++ b/sdk/search/azure-search-documents/pom.xml @@ -106,7 +106,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test diff --git a/sdk/servicebus/azure-messaging-servicebus/pom.xml b/sdk/servicebus/azure-messaging-servicebus/pom.xml index 266ded434bd0..56a28a228f65 100644 --- a/sdk/servicebus/azure-messaging-servicebus/pom.xml +++ b/sdk/servicebus/azure-messaging-servicebus/pom.xml @@ -109,7 +109,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test diff --git a/sdk/spring-experimental/ci.yml b/sdk/spring-experimental/ci.yml index e5062d8e1b07..dc0796959e8e 100644 --- a/sdk/spring-experimental/ci.yml +++ b/sdk/spring-experimental/ci.yml @@ -31,4 +31,4 @@ extends: safeName: springcloudazurenativeconfiguration skipPublishDocMs: true MatrixFilters: - - JavaTestVersion=^(?!1.8).* + - JavaTestVersion=^(?!1.8|1.11).* diff --git a/sdk/spring-experimental/spring-cloud-azure-native-configuration/pom.xml b/sdk/spring-experimental/spring-cloud-azure-native-configuration/pom.xml index c843cf69393e..4dc7f2fe1acd 100644 --- a/sdk/spring-experimental/spring-cloud-azure-native-configuration/pom.xml +++ b/sdk/spring-experimental/spring-cloud-azure-native-configuration/pom.xml @@ -49,32 +49,32 @@ org.springframework.boot spring-boot-actuator-autoconfigure - 2.7.3 + 3.0.0-M4 provided com.azure.spring spring-cloud-azure-resourcemanager - 4.3.0 + 6.0.0-beta.1 provided com.azure.spring spring-cloud-azure-autoconfigure - 4.3.0 + 6.0.0-beta.1 provided com.azure.spring spring-integration-azure-storage-queue - 4.3.0 + 6.0.0-beta.1 provided com.azure.spring spring-integration-azure-eventhubs - 4.3.0 + 6.0.0-beta.1 provided @@ -137,7 +137,7 @@ - org.springframework.boot:spring-boot-actuator-autoconfigure:[2.7.3] + org.springframework.boot:spring-boot-actuator-autoconfigure:[3.0.0-M4] org.springframework.experimental:spring-aot:[0.11.4] diff --git a/sdk/spring/ci.yml b/sdk/spring/ci.yml index 91e625c86fea..8f921c18a4c4 100644 --- a/sdk/spring/ci.yml +++ b/sdk/spring/ci.yml @@ -111,10 +111,10 @@ parameters: displayName: 'spring-cloud-azure-starter-cosmos' type: boolean default: true -- name: release_springcloudazurestarterdatacosmos - displayName: 'spring-cloud-azure-starter-data-cosmos' - type: boolean - default: true +#- name: release_springcloudazurestarterdatacosmos +# displayName: 'spring-cloud-azure-starter-data-cosmos' +# type: boolean +# default: true - name: release_springcloudazurestartereventhubs displayName: 'spring-cloud-azure-starter-eventhubs' type: boolean @@ -337,14 +337,14 @@ extends: skipUpdatePackageJson: true skipVerifyChangelog: true releaseInBatch: ${{ parameters.release_springcloudazurestartercosmos }} - - name: spring-cloud-azure-starter-data-cosmos - groupId: com.azure.spring - safeName: springcloudazurestarterdatacosmos - skipPublishDocGithubIo: true - skipPublishDocMs: true - skipUpdatePackageJson: true - skipVerifyChangelog: true - releaseInBatch: ${{ parameters.release_springcloudazurestarterdatacosmos }} +# - name: spring-cloud-azure-starter-data-cosmos +# groupId: com.azure.spring +# safeName: springcloudazurestarterdatacosmos +# skipPublishDocGithubIo: true +# skipPublishDocMs: true +# skipUpdatePackageJson: true +# skipVerifyChangelog: true +# releaseInBatch: ${{ parameters.release_springcloudazurestarterdatacosmos }} - name: spring-cloud-azure-starter-eventhubs groupId: com.azure.spring safeName: springcloudazurestartereventhubs @@ -489,3 +489,5 @@ extends: skipUpdatePackageJson: true skipVerifyChangelog: true releaseInBatch: ${{ parameters.release_springcloudazurestarterstreamservicebus }} + MatrixFilters: + - JavaTestVersion=^(?!1.8|1.11).* diff --git a/sdk/spring/compatibility-tests.yml b/sdk/spring/compatibility-tests.yml index d02ed1a1f580..9025c5fb95f4 100644 --- a/sdk/spring/compatibility-tests.yml +++ b/sdk/spring/compatibility-tests.yml @@ -27,3 +27,5 @@ stages: - script: | python ./sdk/spring/scripts/compatibility_update_supported_version_matrix_json.py displayName: 'update test version' + MatrixFilters: + - JavaTestVersion=^(?!1.8|1.11).* \ No newline at end of file diff --git a/sdk/spring/pom.xml b/sdk/spring/pom.xml index f01eb931a068..e7e59f916fcf 100644 --- a/sdk/spring/pom.xml +++ b/sdk/spring/pom.xml @@ -34,7 +34,9 @@ spring-cloud-azure-starter-actuator spring-cloud-azure-starter-appconfiguration spring-cloud-azure-starter-cosmos - spring-cloud-azure-starter-data-cosmos + spring-cloud-azure-starter-eventhubs spring-cloud-azure-starter-keyvault spring-cloud-azure-starter-keyvault-certificates @@ -84,7 +86,9 @@ spring-cloud-azure-starter-actuator spring-cloud-azure-starter-appconfiguration spring-cloud-azure-starter-cosmos - spring-cloud-azure-starter-data-cosmos + spring-cloud-azure-starter-eventhubs spring-cloud-azure-starter-keyvault spring-cloud-azure-starter-keyvault-certificates diff --git a/sdk/spring/scripts/spring_boot_3.0.0-M4_managed_external_dependencies.txt b/sdk/spring/scripts/spring_boot_3.0.0-M4_managed_external_dependencies.txt new file mode 100644 index 000000000000..f6886da00b41 --- /dev/null +++ b/sdk/spring/scripts/spring_boot_3.0.0-M4_managed_external_dependencies.txt @@ -0,0 +1,1377 @@ +antlr:antlr;2.7.7 +ch.qos.logback:logback-access;1.2.11 +ch.qos.logback:logback-classic;1.2.11 +ch.qos.logback:logback-core;1.2.11 +co.elastic.clients:elasticsearch-java;8.3.2 +com.couchbase.client:java-client;3.3.2 +com.datastax.oss:java-driver-bom;4.14.1 +com.datastax.oss:java-driver-core;4.14.1 +com.datastax.oss:java-driver-core-shaded;4.14.1 +com.datastax.oss:java-driver-mapper-processor;4.14.1 +com.datastax.oss:java-driver-mapper-runtime;4.14.1 +com.datastax.oss:java-driver-metrics-micrometer;4.14.1 +com.datastax.oss:java-driver-metrics-microprofile;4.14.1 +com.datastax.oss:java-driver-query-builder;4.14.1 +com.datastax.oss:java-driver-shaded-guava;25.1-jre-graal-sub-1 +com.datastax.oss:java-driver-test-infra;4.14.1 +com.datastax.oss:native-protocol;1.5.1 +com.ecwid.consul:consul-api;1.4.5 +com.fasterxml.jackson.core:jackson-annotations;2.13.3 +com.fasterxml.jackson.core:jackson-core;2.13.3 +com.fasterxml.jackson.core:jackson-databind;2.13.3 +com.fasterxml.jackson.dataformat:jackson-dataformat-avro;2.13.3 +com.fasterxml.jackson.dataformat:jackson-dataformat-cbor;2.13.3 +com.fasterxml.jackson.dataformat:jackson-dataformat-csv;2.13.3 +com.fasterxml.jackson.dataformat:jackson-dataformat-ion;2.13.3 +com.fasterxml.jackson.dataformat:jackson-dataformat-properties;2.13.3 +com.fasterxml.jackson.dataformat:jackson-dataformat-protobuf;2.13.3 +com.fasterxml.jackson.dataformat:jackson-dataformat-smile;2.13.3 +com.fasterxml.jackson.dataformat:jackson-dataformat-toml;2.13.3 +com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.13.3 +com.fasterxml.jackson.dataformat:jackson-dataformat-yaml;2.13.3 +com.fasterxml.jackson.datatype:jackson-datatype-eclipse-collections;2.13.3 +com.fasterxml.jackson.datatype:jackson-datatype-guava;2.13.3 +com.fasterxml.jackson.datatype:jackson-datatype-hibernate4;2.13.3 +com.fasterxml.jackson.datatype:jackson-datatype-hibernate5;2.13.3 +com.fasterxml.jackson.datatype:jackson-datatype-hibernate5-jakarta;2.13.3 +com.fasterxml.jackson.datatype:jackson-datatype-hppc;2.13.3 +com.fasterxml.jackson.datatype:jackson-datatype-jakarta-jsonp;2.13.3 +com.fasterxml.jackson.datatype:jackson-datatype-jaxrs;2.13.3 +com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.13.3 +com.fasterxml.jackson.datatype:jackson-datatype-joda;2.13.3 +com.fasterxml.jackson.datatype:jackson-datatype-joda-money;2.13.3 +com.fasterxml.jackson.datatype:jackson-datatype-json-org;2.13.3 +com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.13.3 +com.fasterxml.jackson.datatype:jackson-datatype-jsr353;2.13.3 +com.fasterxml.jackson.datatype:jackson-datatype-pcollections;2.13.3 +com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-base;2.13.3 +com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-cbor-provider;2.13.3 +com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-json-provider;2.13.3 +com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-smile-provider;2.13.3 +com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-xml-provider;2.13.3 +com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-yaml-provider;2.13.3 +com.fasterxml.jackson.jaxrs:jackson-jaxrs-base;2.13.3 +com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider;2.13.3 +com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider;2.13.3 +com.fasterxml.jackson.jaxrs:jackson-jaxrs-smile-provider;2.13.3 +com.fasterxml.jackson.jaxrs:jackson-jaxrs-xml-provider;2.13.3 +com.fasterxml.jackson.jaxrs:jackson-jaxrs-yaml-provider;2.13.3 +com.fasterxml.jackson.jr:jackson-jr-all;2.13.3 +com.fasterxml.jackson.jr:jackson-jr-annotation-support;2.13.3 +com.fasterxml.jackson.jr:jackson-jr-objects;2.13.3 +com.fasterxml.jackson.jr:jackson-jr-retrofit2;2.13.3 +com.fasterxml.jackson.jr:jackson-jr-stree;2.13.3 +com.fasterxml.jackson.module:jackson-module-afterburner;2.13.3 +com.fasterxml.jackson.module:jackson-module-blackbird;2.13.3 +com.fasterxml.jackson.module:jackson-module-guice;2.13.3 +com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations;2.13.3 +com.fasterxml.jackson.module:jackson-module-jaxb-annotations;2.13.3 +com.fasterxml.jackson.module:jackson-module-jsonSchema;2.13.3 +com.fasterxml.jackson.module:jackson-module-kotlin;2.13.3 +com.fasterxml.jackson.module:jackson-module-mrbean;2.13.3 +com.fasterxml.jackson.module:jackson-module-no-ctor-deser;2.13.3 +com.fasterxml.jackson.module:jackson-module-osgi;2.13.3 +com.fasterxml.jackson.module:jackson-module-parameter-names;2.13.3 +com.fasterxml.jackson.module:jackson-module-paranamer;2.13.3 +com.fasterxml.jackson.module:jackson-module-scala_2.11;2.13.3 +com.fasterxml.jackson.module:jackson-module-scala_2.12;2.13.3 +com.fasterxml.jackson.module:jackson-module-scala_2.13;2.13.3 +com.fasterxml.jackson.module:jackson-module-scala_3;2.13.3 +com.fasterxml.jackson:jackson-bom;2.13.3 +com.fasterxml:classmate;1.5.1 +com.github.ben-manes.caffeine:caffeine;3.1.1 +com.github.ben-manes.caffeine:guava;3.1.1 +com.github.ben-manes.caffeine:jcache;3.1.1 +com.github.ben-manes.caffeine:simulator;3.1.1 +com.github.mxab.thymeleaf.extras:thymeleaf-extras-data-attribute;2.0.1 +com.github.tomakehurst:wiremock-jre8-standalone;2.33.2 +com.google.code.gson:gson;2.9.0 +com.h2database:h2;2.1.214 +com.hazelcast:hazelcast;5.1.2 +com.hazelcast:hazelcast-hibernate52;2.2.1 +com.hazelcast:hazelcast-hibernate53;2.2.1 +com.hazelcast:hazelcast-spring;5.1.2 +com.ibm.db2:jcc;11.5.7.0 +com.jayway.jsonpath:json-path;2.7.0 +com.jayway.jsonpath:json-path-assert;2.7.0 +com.microsoft.sqlserver:mssql-jdbc;10.2.1.jre17 +com.oracle.database.ha:ons;21.6.0.0.1 +com.oracle.database.ha:simplefan;21.6.0.0.1 +com.oracle.database.jdbc.debug:ojdbc11-debug;21.6.0.0.1 +com.oracle.database.jdbc.debug:ojdbc11-observability-debug;21.6.0.0.1 +com.oracle.database.jdbc.debug:ojdbc11_g;21.6.0.0.1 +com.oracle.database.jdbc.debug:ojdbc11dms_g;21.6.0.0.1 +com.oracle.database.jdbc.debug:ojdbc8-debug;21.6.0.0.1 +com.oracle.database.jdbc.debug:ojdbc8-observability-debug;21.6.0.0.1 +com.oracle.database.jdbc.debug:ojdbc8_g;21.6.0.0.1 +com.oracle.database.jdbc.debug:ojdbc8dms_g;21.6.0.0.1 +com.oracle.database.jdbc:ojdbc-bom;21.6.0.0.1 +com.oracle.database.jdbc:ojdbc11;21.6.0.0.1 +com.oracle.database.jdbc:ojdbc11-production;21.6.0.0.1 +com.oracle.database.jdbc:ojdbc8;21.6.0.0.1 +com.oracle.database.jdbc:ojdbc8-production;21.6.0.0.1 +com.oracle.database.jdbc:rsi;21.6.0.0.1 +com.oracle.database.jdbc:ucp;21.6.0.0.1 +com.oracle.database.jdbc:ucp11;21.6.0.0.1 +com.oracle.database.nls:orai18n;21.6.0.0.1 +com.oracle.database.observability:dms;21.6.0.0.1 +com.oracle.database.observability:ojdbc11-observability;21.6.0.0.1 +com.oracle.database.observability:ojdbc11dms;21.6.0.0.1 +com.oracle.database.observability:ojdbc8-observability;21.6.0.0.1 +com.oracle.database.observability:ojdbc8dms;21.6.0.0.1 +com.oracle.database.r2dbc:oracle-r2dbc;1.0.0 +com.oracle.database.security:oraclepki;21.6.0.0.1 +com.oracle.database.security:osdt_cert;21.6.0.0.1 +com.oracle.database.security:osdt_core;21.6.0.0.1 +com.oracle.database.xml:xdb;21.6.0.0.1 +com.oracle.database.xml:xmlparserv2;21.6.0.0.1 +com.querydsl:querydsl-apt;5.0.0 +com.querydsl:querydsl-bom;5.0.0 +com.querydsl:querydsl-codegen;5.0.0 +com.querydsl:querydsl-codegen-utils;5.0.0 +com.querydsl:querydsl-collections;5.0.0 +com.querydsl:querydsl-core;5.0.0 +com.querydsl:querydsl-guava;5.0.0 +com.querydsl:querydsl-hibernate-search;5.0.0 +com.querydsl:querydsl-jdo;5.0.0 +com.querydsl:querydsl-jpa;5.0.0 +com.querydsl:querydsl-jpa-codegen;5.0.0 +com.querydsl:querydsl-kotlin;5.0.0 +com.querydsl:querydsl-kotlin-codegen;5.0.0 +com.querydsl:querydsl-lucene3;5.0.0 +com.querydsl:querydsl-lucene4;5.0.0 +com.querydsl:querydsl-lucene5;5.0.0 +com.querydsl:querydsl-mongodb;5.0.0 +com.querydsl:querydsl-scala;5.0.0 +com.querydsl:querydsl-spatial;5.0.0 +com.querydsl:querydsl-sql;5.0.0 +com.querydsl:querydsl-sql-codegen;5.0.0 +com.querydsl:querydsl-sql-spatial;5.0.0 +com.querydsl:querydsl-sql-spring;5.0.0 +com.rabbitmq:amqp-client;5.15.0 +com.rabbitmq:stream-client;0.5.0 +com.samskivert:jmustache;1.15 +com.sendgrid:sendgrid-java;4.9.3 +com.squareup.okhttp3:logging-interceptor;4.10.0 +com.squareup.okhttp3:mockwebserver;4.10.0 +com.squareup.okhttp3:okcurl;4.10.0 +com.squareup.okhttp3:okhttp;4.10.0 +com.squareup.okhttp3:okhttp-bom;4.10.0 +com.squareup.okhttp3:okhttp-brotli;4.10.0 +com.squareup.okhttp3:okhttp-dnsoverhttps;4.10.0 +com.squareup.okhttp3:okhttp-sse;4.10.0 +com.squareup.okhttp3:okhttp-tls;4.10.0 +com.squareup.okhttp3:okhttp-urlconnection;4.10.0 +com.sun.activation:jakarta.activation;2.0.1 +com.sun.mail:jakarta.mail;2.0.1 +com.sun.xml.messaging.saaj:saaj-impl;2.0.1 +com.toomuchcoding.jsonassert:jsonassert;0.6.2 +com.toomuchcoding.jsonassert:jsonassert-shade;0.6.2 +com.unboundid:unboundid-ldapsdk;6.0.5 +com.zaxxer:HikariCP;5.0.1 +commons-codec:commons-codec;1.15 +commons-pool:commons-pool;1.6 +io.dropwizard.metrics:metrics-annotation;4.2.10 +io.dropwizard.metrics:metrics-bom;4.2.10 +io.dropwizard.metrics:metrics-caffeine;4.2.10 +io.dropwizard.metrics:metrics-caffeine3;4.2.10 +io.dropwizard.metrics:metrics-collectd;4.2.10 +io.dropwizard.metrics:metrics-core;4.2.10 +io.dropwizard.metrics:metrics-ehcache;4.2.10 +io.dropwizard.metrics:metrics-graphite;4.2.10 +io.dropwizard.metrics:metrics-healthchecks;4.2.10 +io.dropwizard.metrics:metrics-httpasyncclient;4.2.10 +io.dropwizard.metrics:metrics-httpclient;4.2.10 +io.dropwizard.metrics:metrics-httpclient5;4.2.10 +io.dropwizard.metrics:metrics-jakarta-servlet;4.2.10 +io.dropwizard.metrics:metrics-jakarta-servlets;4.2.10 +io.dropwizard.metrics:metrics-jcache;4.2.10 +io.dropwizard.metrics:metrics-jdbi;4.2.10 +io.dropwizard.metrics:metrics-jdbi3;4.2.10 +io.dropwizard.metrics:metrics-jersey2;4.2.10 +io.dropwizard.metrics:metrics-jersey3;4.2.10 +io.dropwizard.metrics:metrics-jetty10;4.2.10 +io.dropwizard.metrics:metrics-jetty11;4.2.10 +io.dropwizard.metrics:metrics-jetty9;4.2.10 +io.dropwizard.metrics:metrics-jmx;4.2.10 +io.dropwizard.metrics:metrics-json;4.2.10 +io.dropwizard.metrics:metrics-jvm;4.2.10 +io.dropwizard.metrics:metrics-log4j2;4.2.10 +io.dropwizard.metrics:metrics-logback;4.2.10 +io.dropwizard.metrics:metrics-servlet;4.2.10 +io.dropwizard.metrics:metrics-servlets;4.2.10 +io.fabric8.kubernetes:kubernetes-karaf;5.12.1 +io.fabric8.kubernetes:kubernetes-karaf-itests;5.12.1 +io.fabric8:camel-k-client;5.12.1 +io.fabric8:camel-k-mock;5.12.1 +io.fabric8:camel-k-model-v1;5.12.1 +io.fabric8:camel-k-model-v1alpha1;5.12.1 +io.fabric8:camel-k-tests;5.12.1 +io.fabric8:certmanager-client;5.12.1 +io.fabric8:certmanager-examples;5.12.1 +io.fabric8:certmanager-model-v1;5.12.1 +io.fabric8:certmanager-model-v1alpha2;5.12.1 +io.fabric8:certmanager-model-v1alpha3;5.12.1 +io.fabric8:certmanager-model-v1beta1;5.12.1 +io.fabric8:certmanager-server-mock;5.12.1 +io.fabric8:certmanager-tests;5.12.1 +io.fabric8:chaosmesh-client;5.12.1 +io.fabric8:chaosmesh-examples;5.12.1 +io.fabric8:chaosmesh-model;5.12.1 +io.fabric8:chaosmesh-server-mock;5.12.1 +io.fabric8:chaosmesh-tests;5.12.1 +io.fabric8:crd-generator-api;5.12.1 +io.fabric8:crd-generator-apt;5.12.1 +io.fabric8:istio-client;5.12.1 +io.fabric8:istio-examples;5.12.1 +io.fabric8:istio-model-v1alpha3;5.12.1 +io.fabric8:istio-model-v1beta1;5.12.1 +io.fabric8:istio-server-mock;5.12.1 +io.fabric8:istio-tests;5.12.1 +io.fabric8:knative-client;5.12.1 +io.fabric8:knative-examples;5.12.1 +io.fabric8:knative-mock;5.12.1 +io.fabric8:knative-model;5.12.1 +io.fabric8:knative-tests;5.12.1 +io.fabric8:kubernetes-client;5.12.1 +io.fabric8:kubernetes-client-bom;5.12.1 +io.fabric8:kubernetes-examples;5.12.1 +io.fabric8:kubernetes-model;5.12.1 +io.fabric8:kubernetes-model-admissionregistration;5.12.1 +io.fabric8:kubernetes-model-apiextensions;5.12.1 +io.fabric8:kubernetes-model-apps;5.12.1 +io.fabric8:kubernetes-model-autoscaling;5.12.1 +io.fabric8:kubernetes-model-batch;5.12.1 +io.fabric8:kubernetes-model-certificates;5.12.1 +io.fabric8:kubernetes-model-common;5.12.1 +io.fabric8:kubernetes-model-coordination;5.12.1 +io.fabric8:kubernetes-model-core;5.12.1 +io.fabric8:kubernetes-model-discovery;5.12.1 +io.fabric8:kubernetes-model-events;5.12.1 +io.fabric8:kubernetes-model-extensions;5.12.1 +io.fabric8:kubernetes-model-flowcontrol;5.12.1 +io.fabric8:kubernetes-model-jsonschema2pojo;5.12.1 +io.fabric8:kubernetes-model-metrics;5.12.1 +io.fabric8:kubernetes-model-networking;5.12.1 +io.fabric8:kubernetes-model-node;5.12.1 +io.fabric8:kubernetes-model-policy;5.12.1 +io.fabric8:kubernetes-model-rbac;5.12.1 +io.fabric8:kubernetes-model-scheduling;5.12.1 +io.fabric8:kubernetes-model-storageclass;5.12.1 +io.fabric8:kubernetes-openshift-uberjar;5.12.1 +io.fabric8:kubernetes-server-mock;5.12.1 +io.fabric8:kubernetes-test;5.12.1 +io.fabric8:model-annotator;5.12.1 +io.fabric8:open-cluster-management-agent-model;5.12.1 +io.fabric8:open-cluster-management-apps-model;5.12.1 +io.fabric8:open-cluster-management-client;5.12.1 +io.fabric8:open-cluster-management-cluster-model;5.12.1 +io.fabric8:open-cluster-management-discovery-model;5.12.1 +io.fabric8:open-cluster-management-observability-model;5.12.1 +io.fabric8:open-cluster-management-operator-model;5.12.1 +io.fabric8:open-cluster-management-placementruleapps-model;5.12.1 +io.fabric8:open-cluster-management-policy-model;5.12.1 +io.fabric8:open-cluster-management-search-model;5.12.1 +io.fabric8:open-cluster-management-server-mock;5.12.1 +io.fabric8:open-cluster-management-tests;5.12.1 +io.fabric8:openclustermanagement-examples;5.12.1 +io.fabric8:openshift-client;5.12.1 +io.fabric8:openshift-model;5.12.1 +io.fabric8:openshift-model-clusterautoscaling;5.12.1 +io.fabric8:openshift-model-console;5.12.1 +io.fabric8:openshift-model-hive;5.12.1 +io.fabric8:openshift-model-installer;5.12.1 +io.fabric8:openshift-model-machine;5.12.1 +io.fabric8:openshift-model-machineconfig;5.12.1 +io.fabric8:openshift-model-miscellaneous;5.12.1 +io.fabric8:openshift-model-monitoring;5.12.1 +io.fabric8:openshift-model-operator;5.12.1 +io.fabric8:openshift-model-operatorhub;5.12.1 +io.fabric8:openshift-model-storageversionmigrator;5.12.1 +io.fabric8:openshift-model-tuned;5.12.1 +io.fabric8:openshift-model-whereabouts;5.12.1 +io.fabric8:openshift-server-mock;5.12.1 +io.fabric8:service-catalog-examples;5.12.1 +io.fabric8:servicecatalog-client;5.12.1 +io.fabric8:servicecatalog-model;5.12.1 +io.fabric8:servicecatalog-server-mock;5.12.1 +io.fabric8:servicecatalog-tests;5.12.1 +io.fabric8:tekton-client;5.12.1 +io.fabric8:tekton-examples;5.12.1 +io.fabric8:tekton-mock;5.12.1 +io.fabric8:tekton-model-triggers;5.12.1 +io.fabric8:tekton-model-v1alpha1;5.12.1 +io.fabric8:tekton-model-v1beta1;5.12.1 +io.fabric8:tekton-tests;5.12.1 +io.fabric8:verticalpodautoscaler-client;5.12.1 +io.fabric8:verticalpodautoscaler-examples;5.12.1 +io.fabric8:verticalpodautoscaler-model-v1;5.12.1 +io.fabric8:verticalpodautoscaler-server-mock;5.12.1 +io.fabric8:verticalpodautoscaler-tests;5.12.1 +io.fabric8:volcano-client;5.12.1 +io.fabric8:volcano-examples;5.12.1 +io.fabric8:volcano-model-v1beta1;5.12.1 +io.fabric8:volcano-server-mock;5.12.1 +io.fabric8:volcano-tests;5.12.1 +io.fabric8:volumesnapshot-client;5.12.1 +io.fabric8:volumesnapshot-examples;5.12.1 +io.fabric8:volumesnapshot-model;5.12.1 +io.fabric8:volumesnapshot-server-mock;5.12.1 +io.fabric8:volumesnapshot-tests;5.12.1 +io.github.openfeign.form:feign-form-spring;3.8.0 +io.github.openfeign:feign-annotation-error-decoder;11.8 +io.github.openfeign:feign-bom;11.8 +io.github.openfeign:feign-core;11.8 +io.github.openfeign:feign-dropwizard-metrics4;11.8 +io.github.openfeign:feign-dropwizard-metrics5;11.8 +io.github.openfeign:feign-googlehttpclient;11.8 +io.github.openfeign:feign-gson;11.8 +io.github.openfeign:feign-hc5;11.8 +io.github.openfeign:feign-httpclient;11.8 +io.github.openfeign:feign-hystrix;11.8 +io.github.openfeign:feign-jackson;11.8 +io.github.openfeign:feign-jackson-jaxb;11.8 +io.github.openfeign:feign-jackson-jr;11.8 +io.github.openfeign:feign-jaxb;11.8 +io.github.openfeign:feign-jaxrs;11.8 +io.github.openfeign:feign-jaxrs2;11.8 +io.github.openfeign:feign-json;11.8 +io.github.openfeign:feign-micrometer;11.8 +io.github.openfeign:feign-mock;11.8 +io.github.openfeign:feign-okhttp;11.8 +io.github.openfeign:feign-reactive-wrappers;11.8 +io.github.openfeign:feign-ribbon;11.8 +io.github.openfeign:feign-sax;11.8 +io.github.openfeign:feign-slf4j;11.8 +io.github.openfeign:feign-soap;11.8 +io.github.openfeign:feign-spring4;11.8 +io.github.resilience4j:resilience4j-all;1.7.0 +io.github.resilience4j:resilience4j-annotations;1.7.0 +io.github.resilience4j:resilience4j-bom;1.7.0 +io.github.resilience4j:resilience4j-bulkhead;1.7.0 +io.github.resilience4j:resilience4j-cache;1.7.0 +io.github.resilience4j:resilience4j-circuitbreaker;1.7.0 +io.github.resilience4j:resilience4j-circularbuffer;1.7.0 +io.github.resilience4j:resilience4j-consumer;1.7.0 +io.github.resilience4j:resilience4j-core;1.7.0 +io.github.resilience4j:resilience4j-feign;1.7.0 +io.github.resilience4j:resilience4j-kotlin;1.7.0 +io.github.resilience4j:resilience4j-metrics;1.7.0 +io.github.resilience4j:resilience4j-micrometer;1.7.0 +io.github.resilience4j:resilience4j-prometheus;1.7.0 +io.github.resilience4j:resilience4j-ratelimiter;1.7.0 +io.github.resilience4j:resilience4j-ratpack;1.7.0 +io.github.resilience4j:resilience4j-reactor;1.7.0 +io.github.resilience4j:resilience4j-retrofit;1.7.0 +io.github.resilience4j:resilience4j-retry;1.7.0 +io.github.resilience4j:resilience4j-rxjava2;1.7.0 +io.github.resilience4j:resilience4j-rxjava3;1.7.0 +io.github.resilience4j:resilience4j-spring;1.7.0 +io.github.resilience4j:resilience4j-spring-boot2;1.7.0 +io.github.resilience4j:resilience4j-spring-cloud2;1.7.0 +io.github.resilience4j:resilience4j-timelimiter;1.7.0 +io.github.resilience4j:resilience4j-vertx;1.7.0 +io.kubernetes:client-java;13.0.2 +io.kubernetes:client-java-extended;13.0.2 +io.kubernetes:client-java-spring-integration;13.0.2 +io.lettuce:lettuce-core;6.2.0.RELEASE +io.micrometer:micrometer-bom;1.10.0-M3 +io.micrometer:micrometer-commons;1.10.0-M3 +io.micrometer:micrometer-core;1.10.0-M3 +io.micrometer:micrometer-observation;1.10.0-M3 +io.micrometer:micrometer-observation-test;1.10.0-M3 +io.micrometer:micrometer-registry-appoptics;1.10.0-M3 +io.micrometer:micrometer-registry-atlas;1.10.0-M3 +io.micrometer:micrometer-registry-azure-monitor;1.10.0-M3 +io.micrometer:micrometer-registry-cloudwatch;1.10.0-M3 +io.micrometer:micrometer-registry-cloudwatch2;1.10.0-M3 +io.micrometer:micrometer-registry-datadog;1.10.0-M3 +io.micrometer:micrometer-registry-dynatrace;1.10.0-M3 +io.micrometer:micrometer-registry-elastic;1.10.0-M3 +io.micrometer:micrometer-registry-ganglia;1.10.0-M3 +io.micrometer:micrometer-registry-graphite;1.10.0-M3 +io.micrometer:micrometer-registry-health;1.10.0-M3 +io.micrometer:micrometer-registry-humio;1.10.0-M3 +io.micrometer:micrometer-registry-influx;1.10.0-M3 +io.micrometer:micrometer-registry-jmx;1.10.0-M3 +io.micrometer:micrometer-registry-kairos;1.10.0-M3 +io.micrometer:micrometer-registry-new-relic;1.10.0-M3 +io.micrometer:micrometer-registry-opentsdb;1.10.0-M3 +io.micrometer:micrometer-registry-otlp;1.10.0-M3 +io.micrometer:micrometer-registry-prometheus;1.10.0-M3 +io.micrometer:micrometer-registry-signalfx;1.10.0-M3 +io.micrometer:micrometer-registry-stackdriver;1.10.0-M3 +io.micrometer:micrometer-registry-statsd;1.10.0-M3 +io.micrometer:micrometer-registry-wavefront;1.10.0-M3 +io.micrometer:micrometer-test;1.10.0-M3 +io.micrometer:micrometer-tracing;1.0.0-M6 +io.micrometer:micrometer-tracing-bom;1.0.0-M6 +io.micrometer:micrometer-tracing-bridge-brave;1.0.0-M6 +io.micrometer:micrometer-tracing-bridge-otel;1.0.0-M6 +io.micrometer:micrometer-tracing-integration-test;1.0.0-M6 +io.micrometer:micrometer-tracing-reporter-wavefront;1.0.0-M6 +io.micrometer:micrometer-tracing-test;1.0.0-M6 +io.netty:netty-all;4.1.79.Final +io.netty:netty-bom;4.1.79.Final +io.netty:netty-buffer;4.1.79.Final +io.netty:netty-codec;4.1.79.Final +io.netty:netty-codec-dns;4.1.79.Final +io.netty:netty-codec-haproxy;4.1.79.Final +io.netty:netty-codec-http;4.1.79.Final +io.netty:netty-codec-http2;4.1.79.Final +io.netty:netty-codec-memcache;4.1.79.Final +io.netty:netty-codec-mqtt;4.1.79.Final +io.netty:netty-codec-redis;4.1.79.Final +io.netty:netty-codec-smtp;4.1.79.Final +io.netty:netty-codec-socks;4.1.79.Final +io.netty:netty-codec-stomp;4.1.79.Final +io.netty:netty-codec-xml;4.1.79.Final +io.netty:netty-common;4.1.79.Final +io.netty:netty-dev-tools;4.1.79.Final +io.netty:netty-example;4.1.79.Final +io.netty:netty-handler;4.1.79.Final +io.netty:netty-handler-proxy;4.1.79.Final +io.netty:netty-resolver;4.1.79.Final +io.netty:netty-resolver-dns;4.1.79.Final +io.netty:netty-resolver-dns-classes-macos;4.1.79.Final +io.netty:netty-resolver-dns-native-macos;4.1.79.Final +io.netty:netty-tcnative;2.0.53.Final +io.netty:netty-tcnative-boringssl-static;2.0.53.Final +io.netty:netty-tcnative-classes;2.0.53.Final +io.netty:netty-transport;4.1.79.Final +io.netty:netty-transport-classes-epoll;4.1.79.Final +io.netty:netty-transport-classes-kqueue;4.1.79.Final +io.netty:netty-transport-native-epoll;4.1.79.Final +io.netty:netty-transport-native-kqueue;4.1.79.Final +io.netty:netty-transport-native-unix-common;4.1.79.Final +io.netty:netty-transport-rxtx;4.1.79.Final +io.netty:netty-transport-sctp;4.1.79.Final +io.netty:netty-transport-udt;4.1.79.Final +io.opentelemetry:opentelemetry-api;1.16.0 +io.opentelemetry:opentelemetry-bom;1.16.0 +io.opentelemetry:opentelemetry-bom-alpha;1.15.0-alpha +io.opentelemetry:opentelemetry-context;1.16.0 +io.opentelemetry:opentelemetry-exporter-jaeger;1.16.0 +io.opentelemetry:opentelemetry-exporter-jaeger-proto;1.16.0 +io.opentelemetry:opentelemetry-exporter-jaeger-thrift;1.16.0 +io.opentelemetry:opentelemetry-exporter-logging;1.16.0 +io.opentelemetry:opentelemetry-exporter-logging-otlp;1.16.0 +io.opentelemetry:opentelemetry-exporter-otlp;1.16.0 +io.opentelemetry:opentelemetry-exporter-otlp-common;1.16.0 +io.opentelemetry:opentelemetry-exporter-otlp-logs;1.15.0-alpha +io.opentelemetry:opentelemetry-exporter-prometheus;1.15.0-alpha +io.opentelemetry:opentelemetry-exporter-zipkin;1.16.0 +io.opentelemetry:opentelemetry-extension-annotations;1.16.0 +io.opentelemetry:opentelemetry-extension-aws;1.16.0 +io.opentelemetry:opentelemetry-extension-incubator;1.15.0-alpha +io.opentelemetry:opentelemetry-extension-kotlin;1.16.0 +io.opentelemetry:opentelemetry-extension-noop-api;1.15.0-alpha +io.opentelemetry:opentelemetry-extension-trace-propagators;1.16.0 +io.opentelemetry:opentelemetry-micrometer1-shim;1.15.0-alpha +io.opentelemetry:opentelemetry-opencensus-shim;1.15.0-alpha +io.opentelemetry:opentelemetry-opentracing-shim;1.15.0-alpha +io.opentelemetry:opentelemetry-sdk;1.16.0 +io.opentelemetry:opentelemetry-sdk-common;1.16.0 +io.opentelemetry:opentelemetry-sdk-extension-autoconfigure;1.15.0-alpha +io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi;1.16.0 +io.opentelemetry:opentelemetry-sdk-extension-aws;1.16.0 +io.opentelemetry:opentelemetry-sdk-extension-jaeger-remote-sampler;1.16.0 +io.opentelemetry:opentelemetry-sdk-extension-jfr-events;1.15.0-alpha +io.opentelemetry:opentelemetry-sdk-extension-metric-incubator;1.15.0-alpha +io.opentelemetry:opentelemetry-sdk-extension-resources;1.16.0 +io.opentelemetry:opentelemetry-sdk-extension-tracing-incubator;1.15.0-alpha +io.opentelemetry:opentelemetry-sdk-extension-zpages;1.15.0-alpha +io.opentelemetry:opentelemetry-sdk-logs;1.15.0-alpha +io.opentelemetry:opentelemetry-sdk-logs-testing;1.15.0-alpha +io.opentelemetry:opentelemetry-sdk-metrics;1.16.0 +io.opentelemetry:opentelemetry-sdk-testing;1.16.0 +io.opentelemetry:opentelemetry-sdk-trace;1.16.0 +io.opentelemetry:opentelemetry-semconv;1.15.0-alpha +io.projectreactor:reactor-bom;2022.0.0-M4 +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.RC1 +io.r2dbc:r2dbc-pool;1.0.0.RC1 +io.r2dbc:r2dbc-proxy;1.0.0.RELEASE +io.r2dbc:r2dbc-spi;1.0.0.RELEASE +io.reactivex.rxjava3:rxjava;3.1.5 +io.rest-assured:json-path;5.1.1 +io.rest-assured:json-schema-validator;5.1.1 +io.rest-assured:rest-assured;5.1.1 +io.rest-assured:scala-support;5.1.1 +io.rest-assured:spring-mock-mvc;5.1.1 +io.rest-assured:spring-web-test-client;5.1.1 +io.rest-assured:xml-path;5.1.1 +io.rsocket:rsocket-bom;1.1.2 +io.rsocket:rsocket-core;1.1.2 +io.rsocket:rsocket-load-balancer;1.1.2 +io.rsocket:rsocket-micrometer;1.1.2 +io.rsocket:rsocket-test;1.1.2 +io.rsocket:rsocket-transport-local;1.1.2 +io.rsocket:rsocket-transport-netty;1.1.2 +io.specto:hoverfly-java;0.13.0 +io.specto:hoverfly-java-junit5;0.13.0 +io.spring.gradle:dependency-management-plugin;1.0.12.RELEASE +io.undertow:undertow-core;2.2.18.Final +io.undertow:undertow-servlet-jakarta;2.2.18.Final +io.undertow:undertow-websockets-jsr-jakarta;2.2.18.Final +io.zipkin.brave:brave;5.13.10 +io.zipkin.brave:brave-bom;5.13.10 +io.zipkin.brave:brave-context-jfr;5.13.10 +io.zipkin.brave:brave-context-log4j12;5.13.10 +io.zipkin.brave:brave-context-log4j2;5.13.10 +io.zipkin.brave:brave-context-rxjava2;5.13.10 +io.zipkin.brave:brave-context-slf4j;5.13.10 +io.zipkin.brave:brave-instrumentation-dubbo;5.13.10 +io.zipkin.brave:brave-instrumentation-dubbo-rpc;5.13.10 +io.zipkin.brave:brave-instrumentation-grpc;5.13.10 +io.zipkin.brave:brave-instrumentation-http;5.13.10 +io.zipkin.brave:brave-instrumentation-http-tests;5.13.10 +io.zipkin.brave:brave-instrumentation-httpasyncclient;5.13.10 +io.zipkin.brave:brave-instrumentation-httpclient;5.13.10 +io.zipkin.brave:brave-instrumentation-jaxrs2;5.13.10 +io.zipkin.brave:brave-instrumentation-jersey-server;5.13.10 +io.zipkin.brave:brave-instrumentation-jms;5.13.10 +io.zipkin.brave:brave-instrumentation-kafka-clients;5.13.10 +io.zipkin.brave:brave-instrumentation-kafka-streams;5.13.10 +io.zipkin.brave:brave-instrumentation-messaging;5.13.10 +io.zipkin.brave:brave-instrumentation-mongodb;5.13.10 +io.zipkin.brave:brave-instrumentation-mysql;5.13.10 +io.zipkin.brave:brave-instrumentation-mysql6;5.13.10 +io.zipkin.brave:brave-instrumentation-mysql8;5.13.10 +io.zipkin.brave:brave-instrumentation-netty-codec-http;5.13.10 +io.zipkin.brave:brave-instrumentation-okhttp3;5.13.10 +io.zipkin.brave:brave-instrumentation-p6spy;5.13.10 +io.zipkin.brave:brave-instrumentation-rpc;5.13.10 +io.zipkin.brave:brave-instrumentation-servlet;5.13.10 +io.zipkin.brave:brave-instrumentation-sparkjava;5.13.10 +io.zipkin.brave:brave-instrumentation-spring-rabbit;5.13.10 +io.zipkin.brave:brave-instrumentation-spring-web;5.13.10 +io.zipkin.brave:brave-instrumentation-spring-webmvc;5.13.10 +io.zipkin.brave:brave-instrumentation-vertx-web;5.13.10 +io.zipkin.brave:brave-spring-beans;5.13.10 +io.zipkin.brave:brave-tests;5.13.10 +io.zipkin.proto3:zipkin-proto3;1.0.0 +io.zipkin.reporter2:zipkin-reporter;2.16.3 +io.zipkin.reporter2:zipkin-reporter-bom;2.16.3 +io.zipkin.reporter2:zipkin-reporter-brave;2.16.3 +io.zipkin.reporter2:zipkin-reporter-metrics-micrometer;2.16.3 +io.zipkin.reporter2:zipkin-reporter-spring-beans;2.16.3 +io.zipkin.reporter2:zipkin-sender-activemq-client;2.16.3 +io.zipkin.reporter2:zipkin-sender-amqp-client;2.16.3 +io.zipkin.reporter2:zipkin-sender-kafka;2.16.3 +io.zipkin.reporter2:zipkin-sender-kafka08;2.16.3 +io.zipkin.reporter2:zipkin-sender-libthrift;2.16.3 +io.zipkin.reporter2:zipkin-sender-okhttp3;2.16.3 +io.zipkin.reporter2:zipkin-sender-urlconnection;2.16.3 +io.zipkin.zipkin2:zipkin;2.23.2 +jakarta.activation:jakarta.activation-api;2.0.1 +jakarta.annotation:jakarta.annotation-api;2.0.0 +jakarta.jms:jakarta.jms-api;3.0.0 +jakarta.json.bind:jakarta.json.bind-api;2.0.0 +jakarta.json:jakarta.json-api;2.0.2 +jakarta.mail:jakarta.mail-api;2.0.1 +jakarta.management.j2ee:jakarta.management.j2ee-api;1.1.4 +jakarta.persistence:jakarta.persistence-api;3.0.0 +jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api;2.0.0 +jakarta.servlet:jakarta.servlet-api;5.0.0 +jakarta.transaction:jakarta.transaction-api;2.0.1 +jakarta.validation:jakarta.validation-api;3.0.2 +jakarta.websocket:jakarta.websocket-api;2.0.0 +jakarta.ws.rs:jakarta.ws.rs-api;3.0.0 +jakarta.xml.bind:jakarta.xml.bind-api;3.0.1 +jakarta.xml.soap:jakarta.xml.soap-api;2.0.1 +jakarta.xml.ws:jakarta.xml.ws-api;3.0.1 +javax.cache:cache-api;1.1.1 +javax.money:money-api;1.1 +javax.servlet:javax.servlet-api;4.0.1 +javax.servlet:jstl;1.2 +jaxen:jaxen;1.2.0 +junit:junit;4.13.2 +me.snowdrop:istio-client;1.7.7.1 +mysql:mysql-connector-java;8.0.29 +net.bytebuddy:byte-buddy;1.12.12 +net.bytebuddy:byte-buddy-agent;1.12.12 +net.minidev:json-smart;2.4.8 +net.sourceforge.htmlunit:htmlunit;2.63.0 +net.sourceforge.jtds:jtds;1.3.1 +net.sourceforge.nekohtml:nekohtml;1.9.22 +nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect;3.1.0 +org.apache.activemq:artemis-amqp-protocol;2.23.1 +org.apache.activemq:artemis-commons;2.23.1 +org.apache.activemq:artemis-core-client;2.23.1 +org.apache.activemq:artemis-jakarta-client;2.23.1 +org.apache.activemq:artemis-jakarta-server;2.23.1 +org.apache.activemq:artemis-jakarta-service-extensions;2.23.1 +org.apache.activemq:artemis-jdbc-store;2.23.1 +org.apache.activemq:artemis-journal;2.23.1 +org.apache.activemq:artemis-quorum-api;2.23.1 +org.apache.activemq:artemis-selector;2.23.1 +org.apache.activemq:artemis-server;2.23.1 +org.apache.activemq:artemis-service-extensions;2.23.1 +org.apache.commons:commons-collections4;4.4 +org.apache.commons:commons-dbcp2;2.9.0 +org.apache.commons:commons-lang3;3.12.0 +org.apache.commons:commons-pool2;2.11.1 +org.apache.curator:curator-framework;5.1.0 +org.apache.curator:curator-recipes;5.1.0 +org.apache.curator:curator-test;5.1.0 +org.apache.curator:curator-x-discovery;5.1.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.3 +org.apache.groovy:groovy-ant;4.0.3 +org.apache.groovy:groovy-astbuilder;4.0.3 +org.apache.groovy:groovy-bom;4.0.3 +org.apache.groovy:groovy-cli-commons;4.0.3 +org.apache.groovy:groovy-cli-picocli;4.0.3 +org.apache.groovy:groovy-console;4.0.3 +org.apache.groovy:groovy-contracts;4.0.3 +org.apache.groovy:groovy-datetime;4.0.3 +org.apache.groovy:groovy-dateutil;4.0.3 +org.apache.groovy:groovy-docgenerator;4.0.3 +org.apache.groovy:groovy-ginq;4.0.3 +org.apache.groovy:groovy-groovydoc;4.0.3 +org.apache.groovy:groovy-groovysh;4.0.3 +org.apache.groovy:groovy-jmx;4.0.3 +org.apache.groovy:groovy-json;4.0.3 +org.apache.groovy:groovy-jsr223;4.0.3 +org.apache.groovy:groovy-macro;4.0.3 +org.apache.groovy:groovy-macro-library;4.0.3 +org.apache.groovy:groovy-nio;4.0.3 +org.apache.groovy:groovy-servlet;4.0.3 +org.apache.groovy:groovy-sql;4.0.3 +org.apache.groovy:groovy-swing;4.0.3 +org.apache.groovy:groovy-templates;4.0.3 +org.apache.groovy:groovy-test;4.0.3 +org.apache.groovy:groovy-test-junit5;4.0.3 +org.apache.groovy:groovy-testng;4.0.3 +org.apache.groovy:groovy-toml;4.0.3 +org.apache.groovy:groovy-typecheckers;4.0.3 +org.apache.groovy:groovy-xml;4.0.3 +org.apache.groovy:groovy-yaml;4.0.3 +org.apache.httpcomponents.client5:httpclient5;5.1.3 +org.apache.httpcomponents.client5:httpclient5-cache;5.1.3 +org.apache.httpcomponents.client5:httpclient5-fluent;5.1.3 +org.apache.httpcomponents.client5:httpclient5-win;5.1.3 +org.apache.httpcomponents.core5:httpcore5;5.1.4 +org.apache.httpcomponents.core5:httpcore5-h2;5.1.4 +org.apache.httpcomponents.core5:httpcore5-reactive;5.1.4 +org.apache.httpcomponents:fluent-hc;4.5.13 +org.apache.httpcomponents:httpasyncclient;4.1.5 +org.apache.httpcomponents:httpclient;4.5.13 +org.apache.httpcomponents:httpclient-cache;4.5.13 +org.apache.httpcomponents:httpclient-osgi;4.5.13 +org.apache.httpcomponents:httpclient-win;4.5.13 +org.apache.httpcomponents:httpcore;4.4.15 +org.apache.httpcomponents:httpcore-nio;4.4.15 +org.apache.httpcomponents:httpmime;4.5.13 +org.apache.kafka:connect;3.2.0 +org.apache.kafka:connect-api;3.2.0 +org.apache.kafka:connect-basic-auth-extension;3.2.0 +org.apache.kafka:connect-file;3.2.0 +org.apache.kafka:connect-json;3.2.0 +org.apache.kafka:connect-mirror;3.2.0 +org.apache.kafka:connect-mirror-client;3.2.0 +org.apache.kafka:connect-runtime;3.2.0 +org.apache.kafka:connect-transforms;3.2.0 +org.apache.kafka:generator;3.2.0 +org.apache.kafka:kafka-clients;3.2.0 +org.apache.kafka:kafka-log4j-appender;3.2.0 +org.apache.kafka:kafka-metadata;3.2.0 +org.apache.kafka:kafka-raft;3.2.0 +org.apache.kafka:kafka-server-common;3.2.0 +org.apache.kafka:kafka-shell;3.2.0 +org.apache.kafka:kafka-storage;3.2.0 +org.apache.kafka:kafka-storage-api;3.2.0 +org.apache.kafka:kafka-streams;3.2.0 +org.apache.kafka:kafka-streams-scala_2.12;3.2.0 +org.apache.kafka:kafka-streams-scala_2.13;3.2.0 +org.apache.kafka:kafka-streams-test-utils;3.2.0 +org.apache.kafka:kafka-tools;3.2.0 +org.apache.kafka:kafka_2.12;3.2.0 +org.apache.kafka:kafka_2.13;3.2.0 +org.apache.kafka:trogdor;3.2.0 +org.apache.logging.log4j:log4j-1.2-api;2.18.0 +org.apache.logging.log4j:log4j-api;2.18.0 +org.apache.logging.log4j:log4j-appserver;2.18.0 +org.apache.logging.log4j:log4j-bom;2.18.0 +org.apache.logging.log4j:log4j-cassandra;2.18.0 +org.apache.logging.log4j:log4j-core;2.18.0 +org.apache.logging.log4j:log4j-couchdb;2.18.0 +org.apache.logging.log4j:log4j-docker;2.18.0 +org.apache.logging.log4j:log4j-flume-ng;2.18.0 +org.apache.logging.log4j:log4j-iostreams;2.18.0 +org.apache.logging.log4j:log4j-jcl;2.18.0 +org.apache.logging.log4j:log4j-jmx-gui;2.18.0 +org.apache.logging.log4j:log4j-jpa;2.18.0 +org.apache.logging.log4j:log4j-jpl;2.18.0 +org.apache.logging.log4j:log4j-jul;2.18.0 +org.apache.logging.log4j:log4j-kubernetes;2.18.0 +org.apache.logging.log4j:log4j-layout-template-json;2.18.0 +org.apache.logging.log4j:log4j-liquibase;2.18.0 +org.apache.logging.log4j:log4j-mongodb3;2.18.0 +org.apache.logging.log4j:log4j-mongodb4;2.18.0 +org.apache.logging.log4j:log4j-slf4j-impl;2.18.0 +org.apache.logging.log4j:log4j-slf4j18-impl;2.18.0 +org.apache.logging.log4j:log4j-spring-boot;2.18.0 +org.apache.logging.log4j:log4j-spring-cloud-config-client;2.18.0 +org.apache.logging.log4j:log4j-taglib;2.18.0 +org.apache.logging.log4j:log4j-to-slf4j;2.18.0 +org.apache.logging.log4j:log4j-web;2.18.0 +org.apache.tomcat.embed:tomcat-embed-core;10.0.22 +org.apache.tomcat.embed:tomcat-embed-el;10.0.22 +org.apache.tomcat.embed:tomcat-embed-jasper;10.0.22 +org.apache.tomcat.embed:tomcat-embed-websocket;10.0.22 +org.apache.tomcat:tomcat-annotations-api;10.0.22 +org.apache.tomcat:tomcat-jdbc;10.0.22 +org.apache.tomcat:tomcat-jsp-api;10.0.22 +org.arquillian.cube:arquillian-cube-kubernetes;1.15.2 +org.arquillian.cube:arquillian-cube-openshift;1.15.2 +org.arquillian.cube:arquillian-cube-requirement;1.15.2 +org.aspectj:aspectjrt;1.9.9.1 +org.aspectj:aspectjtools;1.9.9.1 +org.aspectj:aspectjweaver;1.9.9.1 +org.assertj:assertj-core;3.23.1 +org.awaitility:awaitility;4.2.0 +org.awaitility:awaitility-groovy;4.2.0 +org.awaitility:awaitility-kotlin;4.2.0 +org.awaitility:awaitility-scala;4.2.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.7 +org.codehaus.janino:commons-compiler-jdk;3.1.7 +org.codehaus.janino:janino;3.1.7 +org.eclipse.jetty.fcgi:fcgi-client;11.0.11 +org.eclipse.jetty.fcgi:fcgi-server;11.0.11 +org.eclipse.jetty.gcloud:jetty-gcloud-session-manager;11.0.11 +org.eclipse.jetty.http2:http2-client;11.0.11 +org.eclipse.jetty.http2:http2-common;11.0.11 +org.eclipse.jetty.http2:http2-hpack;11.0.11 +org.eclipse.jetty.http2:http2-http-client-transport;11.0.11 +org.eclipse.jetty.http2:http2-server;11.0.11 +org.eclipse.jetty.http3:http3-client;11.0.11 +org.eclipse.jetty.http3:http3-common;11.0.11 +org.eclipse.jetty.http3:http3-http-client-transport;11.0.11 +org.eclipse.jetty.http3:http3-qpack;11.0.11 +org.eclipse.jetty.http3:http3-server;11.0.11 +org.eclipse.jetty.memcached:jetty-memcached-sessions;11.0.11 +org.eclipse.jetty.osgi:jetty-httpservice;11.0.11 +org.eclipse.jetty.osgi:jetty-osgi-alpn;10.0.8-SNAPSHOT +org.eclipse.jetty.osgi:jetty-osgi-boot;11.0.11 +org.eclipse.jetty.osgi:jetty-osgi-boot-jsp;11.0.11 +org.eclipse.jetty.osgi:jetty-osgi-boot-warurl;11.0.11 +org.eclipse.jetty.quic:quic-client;11.0.11 +org.eclipse.jetty.quic:quic-common;11.0.11 +org.eclipse.jetty.quic:quic-quiche-common;11.0.11 +org.eclipse.jetty.quic:quic-quiche-jna;11.0.11 +org.eclipse.jetty.quic:quic-server;11.0.11 +org.eclipse.jetty.websocket:websocket-core-client;11.0.11 +org.eclipse.jetty.websocket:websocket-core-common;11.0.11 +org.eclipse.jetty.websocket:websocket-core-server;11.0.11 +org.eclipse.jetty.websocket:websocket-jakarta-client;11.0.11 +org.eclipse.jetty.websocket:websocket-jakarta-common;11.0.11 +org.eclipse.jetty.websocket:websocket-jakarta-server;11.0.11 +org.eclipse.jetty.websocket:websocket-jetty-api;11.0.11 +org.eclipse.jetty.websocket:websocket-jetty-client;11.0.11 +org.eclipse.jetty.websocket:websocket-jetty-common;11.0.11 +org.eclipse.jetty.websocket:websocket-jetty-server;11.0.11 +org.eclipse.jetty.websocket:websocket-servlet;11.0.11 +org.eclipse.jetty:apache-jsp;11.0.11 +org.eclipse.jetty:glassfish-jstl;11.0.11 +org.eclipse.jetty:infinispan-common;11.0.11 +org.eclipse.jetty:infinispan-embedded;10.0.8-SNAPSHOT +org.eclipse.jetty:infinispan-embedded-query;11.0.11 +org.eclipse.jetty:infinispan-remote;10.0.8-SNAPSHOT +org.eclipse.jetty:infinispan-remote-query;11.0.11 +org.eclipse.jetty:jetty-alpn-client;11.0.11 +org.eclipse.jetty:jetty-alpn-conscrypt-client;11.0.11 +org.eclipse.jetty:jetty-alpn-conscrypt-server;11.0.11 +org.eclipse.jetty:jetty-alpn-java-client;11.0.11 +org.eclipse.jetty:jetty-alpn-java-server;11.0.11 +org.eclipse.jetty:jetty-alpn-server;11.0.11 +org.eclipse.jetty:jetty-annotations;11.0.11 +org.eclipse.jetty:jetty-ant;11.0.11 +org.eclipse.jetty:jetty-bom;11.0.11 +org.eclipse.jetty:jetty-cdi;11.0.11 +org.eclipse.jetty:jetty-client;11.0.11 +org.eclipse.jetty:jetty-deploy;11.0.11 +org.eclipse.jetty:jetty-hazelcast;11.0.11 +org.eclipse.jetty:jetty-home;11.0.11 +org.eclipse.jetty:jetty-http;11.0.11 +org.eclipse.jetty:jetty-http-spi;11.0.11 +org.eclipse.jetty:jetty-io;11.0.11 +org.eclipse.jetty:jetty-jaas;11.0.11 +org.eclipse.jetty:jetty-jaspi;11.0.11 +org.eclipse.jetty:jetty-jmx;11.0.11 +org.eclipse.jetty:jetty-jndi;11.0.11 +org.eclipse.jetty:jetty-keystore;10.0.8-SNAPSHOT +org.eclipse.jetty:jetty-nosql;11.0.11 +org.eclipse.jetty:jetty-openid;11.0.11 +org.eclipse.jetty:jetty-plus;11.0.11 +org.eclipse.jetty:jetty-proxy;11.0.11 +org.eclipse.jetty:jetty-quickstart;11.0.11 +org.eclipse.jetty:jetty-reactive-httpclient;3.0.6 +org.eclipse.jetty:jetty-rewrite;11.0.11 +org.eclipse.jetty:jetty-security;11.0.11 +org.eclipse.jetty:jetty-server;11.0.11 +org.eclipse.jetty:jetty-servlet;11.0.11 +org.eclipse.jetty:jetty-servlets;11.0.11 +org.eclipse.jetty:jetty-slf4j-impl;10.0.8-SNAPSHOT +org.eclipse.jetty:jetty-unixdomain-server;11.0.11 +org.eclipse.jetty:jetty-unixsocket-client;11.0.11 +org.eclipse.jetty:jetty-unixsocket-common;11.0.11 +org.eclipse.jetty:jetty-unixsocket-server;11.0.11 +org.eclipse.jetty:jetty-util;11.0.11 +org.eclipse.jetty:jetty-util-ajax;11.0.11 +org.eclipse.jetty:jetty-webapp;11.0.11 +org.eclipse.jetty:jetty-xml;11.0.11 +org.eclipse.jgit:org.eclipse.jgit;6.2.0.202206071550-r +org.eclipse.jgit:org.eclipse.jgit.http.apache;6.2.0.202206071550-r +org.eclipse.jgit:org.eclipse.jgit.junit.http;6.2.0.202206071550-r +org.eclipse.jgit:org.eclipse.jgit.ssh.apache;6.2.0.202206071550-r +org.eclipse:yasson;2.0.4 +org.ehcache:ehcache;3.10.0 +org.ehcache:ehcache-clustered;3.10.0 +org.ehcache:ehcache-transactions;3.10.0 +org.elasticsearch.client:elasticsearch-rest-client;8.3.2 +org.elasticsearch.client:elasticsearch-rest-client-sniffer;8.3.2 +org.firebirdsql.jdbc:jaybird;4.0.6.java8 +org.firebirdsql.jdbc:jaybird-jdk18;4.0.6.java8 +org.flywaydb:flyway-core;9.0.1 +org.flywaydb:flyway-firebird;9.0.1 +org.flywaydb:flyway-mysql;9.0.1 +org.flywaydb:flyway-sqlserver;9.0.1 +org.freemarker:freemarker;2.3.31 +org.glassfish.jaxb:codemodel;3.0.2 +org.glassfish.jaxb:codemodel-annotation-compiler;3.0.2 +org.glassfish.jaxb:jaxb-jxc;3.0.2 +org.glassfish.jaxb:jaxb-runtime;3.0.2 +org.glassfish.jaxb:jaxb-xjc;3.0.2 +org.glassfish.jaxb:txw2;3.0.2 +org.glassfish.jaxb:txwc2;3.0.2 +org.glassfish.jaxb:xsom;3.0.2 +org.glassfish.web:jakarta.servlet.jsp.jstl;2.0.0 +org.glassfish:jakarta.el;4.0.2 +org.hamcrest:hamcrest;2.2 +org.hamcrest:hamcrest-core;2.2 +org.hamcrest:hamcrest-library;2.2 +org.hibernate.orm:hibernate-agroal;6.1.1.Final +org.hibernate.orm:hibernate-ant;6.1.1.Final +org.hibernate.orm:hibernate-c3p0;6.1.1.Final +org.hibernate.orm:hibernate-community-dialects;6.1.1.Final +org.hibernate.orm:hibernate-core;6.1.1.Final +org.hibernate.orm:hibernate-envers;6.1.1.Final +org.hibernate.orm:hibernate-graalvm;6.1.1.Final +org.hibernate.orm:hibernate-hikaricp;6.1.1.Final +org.hibernate.orm:hibernate-jcache;6.1.1.Final +org.hibernate.orm:hibernate-jpamodelgen;6.1.1.Final +org.hibernate.orm:hibernate-micrometer;6.1.1.Final +org.hibernate.orm:hibernate-proxool;6.1.1.Final +org.hibernate.orm:hibernate-spatial;6.1.1.Final +org.hibernate.orm:hibernate-testing;6.1.1.Final +org.hibernate.orm:hibernate-vibur;6.1.1.Final +org.hibernate.validator:hibernate-validator;7.0.4.Final +org.hibernate.validator:hibernate-validator-annotation-processor;7.0.4.Final +org.hsqldb:hsqldb;2.6.1 +org.influxdb:influxdb-java;2.23 +org.jboss.arquillian.junit:arquillian-junit-standalone;1.6.0.Final +org.jboss.logging:jboss-logging;3.5.0.Final +org.jdom:jdom2;2.0.6.1 +org.jetbrains.kotlin:kotlin-bom;1.7.10 +org.jetbrains.kotlin:kotlin-compiler;1.7.10 +org.jetbrains.kotlin:kotlin-compiler-embeddable;1.7.10 +org.jetbrains.kotlin:kotlin-daemon-client;1.7.10 +org.jetbrains.kotlin:kotlin-main-kts;1.7.10 +org.jetbrains.kotlin:kotlin-osgi-bundle;1.7.10 +org.jetbrains.kotlin:kotlin-reflect;1.7.10 +org.jetbrains.kotlin:kotlin-script-runtime;1.7.10 +org.jetbrains.kotlin:kotlin-script-util;1.7.10 +org.jetbrains.kotlin:kotlin-scripting-common;1.7.10 +org.jetbrains.kotlin:kotlin-scripting-ide-services;1.7.10 +org.jetbrains.kotlin:kotlin-scripting-jvm;1.7.10 +org.jetbrains.kotlin:kotlin-scripting-jvm-host;1.7.10 +org.jetbrains.kotlin:kotlin-stdlib;1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-common;1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk7;1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk8;1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-js;1.7.10 +org.jetbrains.kotlin:kotlin-test;1.7.10 +org.jetbrains.kotlin:kotlin-test-annotations-common;1.7.10 +org.jetbrains.kotlin:kotlin-test-common;1.7.10 +org.jetbrains.kotlin:kotlin-test-js;1.7.10 +org.jetbrains.kotlin:kotlin-test-junit;1.7.10 +org.jetbrains.kotlin:kotlin-test-junit5;1.7.10 +org.jetbrains.kotlin:kotlin-test-testng;1.7.10 +org.jetbrains.kotlinx:kotlinx-coroutines-android;1.6.4 +org.jetbrains.kotlinx:kotlinx-coroutines-bom;1.6.4 +org.jetbrains.kotlinx:kotlinx-coroutines-core;1.6.4 +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm;1.6.4 +org.jetbrains.kotlinx:kotlinx-coroutines-debug;1.6.4 +org.jetbrains.kotlinx:kotlinx-coroutines-guava;1.6.4 +org.jetbrains.kotlinx:kotlinx-coroutines-javafx;1.6.4 +org.jetbrains.kotlinx:kotlinx-coroutines-jdk8;1.6.4 +org.jetbrains.kotlinx:kotlinx-coroutines-jdk9;1.6.4 +org.jetbrains.kotlinx:kotlinx-coroutines-play-services;1.6.4 +org.jetbrains.kotlinx:kotlinx-coroutines-reactive;1.6.4 +org.jetbrains.kotlinx:kotlinx-coroutines-reactor;1.6.4 +org.jetbrains.kotlinx:kotlinx-coroutines-rx2;1.6.4 +org.jetbrains.kotlinx:kotlinx-coroutines-rx3;1.6.4 +org.jetbrains.kotlinx:kotlinx-coroutines-slf4j;1.6.4 +org.jetbrains.kotlinx:kotlinx-coroutines-swing;1.6.4 +org.jetbrains.kotlinx:kotlinx-coroutines-test;1.6.4 +org.jetbrains.kotlinx:kotlinx-coroutines-test-jvm;1.6.4 +org.jooq:jooq;3.17.2 +org.jooq:jooq-codegen;3.17.2 +org.jooq:jooq-kotlin;3.17.2 +org.jooq:jooq-meta;3.17.2 +org.junit.jupiter:junit-jupiter;5.8.2 +org.junit.jupiter:junit-jupiter-api;5.8.2 +org.junit.jupiter:junit-jupiter-engine;5.8.2 +org.junit.jupiter:junit-jupiter-migrationsupport;5.8.2 +org.junit.jupiter:junit-jupiter-params;5.8.2 +org.junit.platform:junit-platform-commons;1.8.2 +org.junit.platform:junit-platform-console;1.8.2 +org.junit.platform:junit-platform-engine;1.8.2 +org.junit.platform:junit-platform-jfr;1.8.2 +org.junit.platform:junit-platform-launcher;1.8.2 +org.junit.platform:junit-platform-reporting;1.8.2 +org.junit.platform:junit-platform-runner;1.8.2 +org.junit.platform:junit-platform-suite;1.8.2 +org.junit.platform:junit-platform-suite-api;1.8.2 +org.junit.platform:junit-platform-suite-commons;1.8.2 +org.junit.platform:junit-platform-suite-engine;1.8.2 +org.junit.platform:junit-platform-testkit;1.8.2 +org.junit.vintage:junit-vintage-engine;5.8.2 +org.junit:junit-bom;5.8.2 +org.liquibase:liquibase-cdi;4.13.0 +org.liquibase:liquibase-core;4.13.0 +org.mariadb.jdbc:mariadb-java-client;3.0.6 +org.messaginghub:pooled-jms;3.0.0 +org.mockito:mockito-android;4.6.1 +org.mockito:mockito-bom;4.6.1 +org.mockito:mockito-core;4.6.1 +org.mockito:mockito-errorprone;4.6.1 +org.mockito:mockito-inline;4.6.1 +org.mockito:mockito-junit-jupiter;4.6.1 +org.mockito:mockito-proxy;4.6.1 +org.mongodb:bson;4.7.0-beta0 +org.mongodb:mongodb-driver-core;4.7.0-beta0 +org.mongodb:mongodb-driver-legacy;4.7.0-beta0 +org.mongodb:mongodb-driver-reactivestreams;4.7.0-beta0 +org.mongodb:mongodb-driver-sync;4.7.0-beta0 +org.mortbay.jasper:apache-el;10.0.14 +org.neo4j.driver:neo4j-java-driver;4.4.9 +org.postgresql:postgresql;42.4.0 +org.postgresql:r2dbc-postgresql;1.0.0.RC1 +org.projectlombok:lombok;1.18.24 +org.quartz-scheduler:quartz;2.3.2 +org.quartz-scheduler:quartz-jobs;2.3.2 +org.reactivestreams:reactive-streams;1.0.4 +org.seleniumhq.selenium:htmlunit-driver;3.62.0 +org.seleniumhq.selenium:selenium-api;4.2.2 +org.seleniumhq.selenium:selenium-chrome-driver;4.2.2 +org.seleniumhq.selenium:selenium-edge-driver;4.2.2 +org.seleniumhq.selenium:selenium-firefox-driver;4.2.2 +org.seleniumhq.selenium:selenium-ie-driver;4.2.2 +org.seleniumhq.selenium:selenium-java;4.2.2 +org.seleniumhq.selenium:selenium-opera-driver;4.2.2 +org.seleniumhq.selenium:selenium-remote-driver;4.2.2 +org.seleniumhq.selenium:selenium-safari-driver;4.2.2 +org.seleniumhq.selenium:selenium-support;4.2.2 +org.skyscreamer:jsonassert;1.5.1 +org.slf4j:jcl-over-slf4j;1.7.36 +org.slf4j:jul-to-slf4j;1.7.36 +org.slf4j:log4j-over-slf4j;1.7.36 +org.slf4j:slf4j-api;1.7.36 +org.slf4j:slf4j-ext;1.7.36 +org.slf4j:slf4j-jcl;1.7.36 +org.slf4j:slf4j-jdk14;1.7.36 +org.slf4j:slf4j-log4j12;1.7.36 +org.slf4j:slf4j-nop;1.7.36 +org.slf4j:slf4j-simple;1.7.36 +org.springframework.amqp:spring-amqp;3.0.0-M3 +org.springframework.amqp:spring-rabbit;3.0.0-M3 +org.springframework.amqp:spring-rabbit-junit;3.0.0-M3 +org.springframework.amqp:spring-rabbit-stream;3.0.0-M3 +org.springframework.amqp:spring-rabbit-test;3.0.0-M3 +org.springframework.batch:spring-batch-bom;5.0.0-M4 +org.springframework.batch:spring-batch-core;5.0.0-M4 +org.springframework.batch:spring-batch-infrastructure;5.0.0-M4 +org.springframework.batch:spring-batch-integration;5.0.0-M4 +org.springframework.batch:spring-batch-test;5.0.0-M4 +org.springframework.boot:spring-boot;3.0.0-M4 +org.springframework.boot:spring-boot-actuator;3.0.0-M4 +org.springframework.boot:spring-boot-actuator-autoconfigure;3.0.0-M4 +org.springframework.boot:spring-boot-autoconfigure;3.0.0-M4 +org.springframework.boot:spring-boot-autoconfigure-processor;3.0.0-M4 +org.springframework.boot:spring-boot-buildpack-platform;3.0.0-M4 +org.springframework.boot:spring-boot-configuration-metadata;3.0.0-M4 +org.springframework.boot:spring-boot-configuration-processor;3.0.0-M4 +org.springframework.boot:spring-boot-dependencies;3.0.0-M4 +org.springframework.boot:spring-boot-devtools;3.0.0-M4 +org.springframework.boot:spring-boot-jarmode-layertools;3.0.0-M4 +org.springframework.boot:spring-boot-loader;3.0.0-M4 +org.springframework.boot:spring-boot-loader-tools;3.0.0-M4 +org.springframework.boot:spring-boot-properties-migrator;3.0.0-M4 +org.springframework.boot:spring-boot-starter;3.0.0-M4 +org.springframework.boot:spring-boot-starter-actuator;3.0.0-M4 +org.springframework.boot:spring-boot-starter-amqp;3.0.0-M4 +org.springframework.boot:spring-boot-starter-aop;3.0.0-M4 +org.springframework.boot:spring-boot-starter-artemis;3.0.0-M4 +org.springframework.boot:spring-boot-starter-batch;3.0.0-M4 +org.springframework.boot:spring-boot-starter-cache;3.0.0-M4 +org.springframework.boot:spring-boot-starter-data-cassandra;3.0.0-M4 +org.springframework.boot:spring-boot-starter-data-cassandra-reactive;3.0.0-M4 +org.springframework.boot:spring-boot-starter-data-couchbase;3.0.0-M4 +org.springframework.boot:spring-boot-starter-data-couchbase-reactive;3.0.0-M4 +org.springframework.boot:spring-boot-starter-data-elasticsearch;3.0.0-M4 +org.springframework.boot:spring-boot-starter-data-jdbc;3.0.0-M4 +org.springframework.boot:spring-boot-starter-data-jpa;3.0.0-M4 +org.springframework.boot:spring-boot-starter-data-ldap;3.0.0-M4 +org.springframework.boot:spring-boot-starter-data-mongodb;3.0.0-M4 +org.springframework.boot:spring-boot-starter-data-mongodb-reactive;3.0.0-M4 +org.springframework.boot:spring-boot-starter-data-neo4j;3.0.0-M4 +org.springframework.boot:spring-boot-starter-data-r2dbc;3.0.0-M4 +org.springframework.boot:spring-boot-starter-data-redis;3.0.0-M4 +org.springframework.boot:spring-boot-starter-data-redis-reactive;3.0.0-M4 +org.springframework.boot:spring-boot-starter-data-rest;3.0.0-M4 +org.springframework.boot:spring-boot-starter-freemarker;3.0.0-M4 +org.springframework.boot:spring-boot-starter-groovy-templates;3.0.0-M4 +org.springframework.boot:spring-boot-starter-hateoas;3.0.0-M4 +org.springframework.boot:spring-boot-starter-integration;3.0.0-M4 +org.springframework.boot:spring-boot-starter-jdbc;3.0.0-M4 +org.springframework.boot:spring-boot-starter-jetty;3.0.0-M4 +org.springframework.boot:spring-boot-starter-jooq;3.0.0-M4 +org.springframework.boot:spring-boot-starter-json;3.0.0-M4 +org.springframework.boot:spring-boot-starter-log4j2;3.0.0-M4 +org.springframework.boot:spring-boot-starter-logging;3.0.0-M4 +org.springframework.boot:spring-boot-starter-mail;3.0.0-M4 +org.springframework.boot:spring-boot-starter-mustache;3.0.0-M4 +org.springframework.boot:spring-boot-starter-oauth2-client;3.0.0-M4 +org.springframework.boot:spring-boot-starter-oauth2-resource-server;3.0.0-M4 +org.springframework.boot:spring-boot-starter-parent;3.0.0-M4 +org.springframework.boot:spring-boot-starter-quartz;3.0.0-M4 +org.springframework.boot:spring-boot-starter-reactor-netty;3.0.0-M4 +org.springframework.boot:spring-boot-starter-rsocket;3.0.0-M4 +org.springframework.boot:spring-boot-starter-security;3.0.0-M4 +org.springframework.boot:spring-boot-starter-test;3.0.0-M4 +org.springframework.boot:spring-boot-starter-thymeleaf;3.0.0-M4 +org.springframework.boot:spring-boot-starter-tomcat;3.0.0-M4 +org.springframework.boot:spring-boot-starter-undertow;3.0.0-M4 +org.springframework.boot:spring-boot-starter-validation;3.0.0-M4 +org.springframework.boot:spring-boot-starter-web;3.0.0-M4 +org.springframework.boot:spring-boot-starter-web-services;3.0.0-M4 +org.springframework.boot:spring-boot-starter-webflux;3.0.0-M4 +org.springframework.boot:spring-boot-starter-websocket;3.0.0-M4 +org.springframework.boot:spring-boot-test;3.0.0-M4 +org.springframework.boot:spring-boot-test-autoconfigure;3.0.0-M4 +org.springframework.cloud:spring-cloud-bus;4.0.0-M4 +org.springframework.cloud:spring-cloud-bus-dependencies;4.0.0-M4 +org.springframework.cloud:spring-cloud-bus-rsocket;4.0.0-M4 +org.springframework.cloud:spring-cloud-circuitbreaker-dependencies;3.0.0-M4 +org.springframework.cloud:spring-cloud-circuitbreaker-resilience4j;3.0.0-M4 +org.springframework.cloud:spring-cloud-circuitbreaker-spring-retry;3.0.0-M4 +org.springframework.cloud:spring-cloud-commons;4.0.0-M4 +org.springframework.cloud:spring-cloud-commons-dependencies;4.0.0-M4 +org.springframework.cloud:spring-cloud-config-client;4.0.0-M4 +org.springframework.cloud:spring-cloud-config-dependencies;4.0.0-M4 +org.springframework.cloud:spring-cloud-config-monitor;4.0.0-M4 +org.springframework.cloud:spring-cloud-config-server;4.0.0-M4 +org.springframework.cloud:spring-cloud-consul-binder;4.0.0-M4 +org.springframework.cloud:spring-cloud-consul-config;4.0.0-M4 +org.springframework.cloud:spring-cloud-consul-core;4.0.0-M4 +org.springframework.cloud:spring-cloud-consul-dependencies;4.0.0-M4 +org.springframework.cloud:spring-cloud-consul-discovery;4.0.0-M4 +org.springframework.cloud:spring-cloud-context;4.0.0-M4 +org.springframework.cloud:spring-cloud-contract-converters;4.0.0-M4 +org.springframework.cloud:spring-cloud-contract-dependencies;4.0.0-M4 +org.springframework.cloud:spring-cloud-contract-gradle-plugin;4.0.0-M4 +org.springframework.cloud:spring-cloud-contract-maven-plugin;4.0.0-M4 +org.springframework.cloud:spring-cloud-contract-pact;4.0.0-M4 +org.springframework.cloud:spring-cloud-contract-shade;4.0.0-M4 +org.springframework.cloud:spring-cloud-contract-spec;4.0.0-M4 +org.springframework.cloud:spring-cloud-contract-spec-groovy;4.0.0-M4 +org.springframework.cloud:spring-cloud-contract-spec-java;4.0.0-M4 +org.springframework.cloud:spring-cloud-contract-spec-kotlin;4.0.0-M4 +org.springframework.cloud:spring-cloud-contract-stub-runner;4.0.0-M4 +org.springframework.cloud:spring-cloud-contract-stub-runner-boot;4.0.0-M4 +org.springframework.cloud:spring-cloud-contract-verifier;4.0.0-M4 +org.springframework.cloud:spring-cloud-contract-wiremock;4.0.0-M4 +org.springframework.cloud:spring-cloud-dependencies;2022.0.0-M4 +org.springframework.cloud:spring-cloud-function-adapter-aws;4.0.0-M4 +org.springframework.cloud:spring-cloud-function-adapter-azure;4.0.0-M4 +org.springframework.cloud:spring-cloud-function-adapter-gcp;4.0.0-M4 +org.springframework.cloud:spring-cloud-function-adapter-openwhisk;4.0.0-M4 +org.springframework.cloud:spring-cloud-function-context;4.0.0-M4 +org.springframework.cloud:spring-cloud-function-core;4.0.0-M4 +org.springframework.cloud:spring-cloud-function-dependencies;4.0.0-M4 +org.springframework.cloud:spring-cloud-function-deployer;4.0.0-M4 +org.springframework.cloud:spring-cloud-function-grpc;4.0.0-M4 +org.springframework.cloud:spring-cloud-function-grpc-cloudevent-ext;4.0.0-M4 +org.springframework.cloud:spring-cloud-function-kotlin;4.0.0-M4 +org.springframework.cloud:spring-cloud-function-rsocket;4.0.0-M4 +org.springframework.cloud:spring-cloud-function-web;4.0.0-M4 +org.springframework.cloud:spring-cloud-gateway-dependencies;4.0.0-M4 +org.springframework.cloud:spring-cloud-gateway-mvc;4.0.0-M4 +org.springframework.cloud:spring-cloud-gateway-server;4.0.0-M4 +org.springframework.cloud:spring-cloud-gateway-webflux;4.0.0-M4 +org.springframework.cloud:spring-cloud-kubernetes-client-autoconfig;3.0.0-M4 +org.springframework.cloud:spring-cloud-kubernetes-client-config;3.0.0-M4 +org.springframework.cloud:spring-cloud-kubernetes-client-discovery;3.0.0-M4 +org.springframework.cloud:spring-cloud-kubernetes-client-loadbalancer;3.0.0-M4 +org.springframework.cloud:spring-cloud-kubernetes-commons;3.0.0-M4 +org.springframework.cloud:spring-cloud-kubernetes-dependencies;3.0.0-M4 +org.springframework.cloud:spring-cloud-kubernetes-discovery;3.0.0-M4 +org.springframework.cloud:spring-cloud-kubernetes-fabric8-autoconfig;3.0.0-M4 +org.springframework.cloud:spring-cloud-kubernetes-fabric8-config;3.0.0-M4 +org.springframework.cloud:spring-cloud-kubernetes-fabric8-discovery;3.0.0-M4 +org.springframework.cloud:spring-cloud-kubernetes-fabric8-istio;3.0.0-M4 +org.springframework.cloud:spring-cloud-kubernetes-fabric8-leader;3.0.0-M4 +org.springframework.cloud:spring-cloud-kubernetes-fabric8-loadbalancer;3.0.0-M4 +org.springframework.cloud:spring-cloud-kubernetes-test-support;3.0.0-M4 +org.springframework.cloud:spring-cloud-loadbalancer;4.0.0-M4 +org.springframework.cloud:spring-cloud-openfeign-core;4.0.0-M4 +org.springframework.cloud:spring-cloud-openfeign-dependencies;4.0.0-M4 +org.springframework.cloud:spring-cloud-starter;4.0.0-M4 +org.springframework.cloud:spring-cloud-starter-bootstrap;4.0.0-M4 +org.springframework.cloud:spring-cloud-starter-bus-amqp;4.0.0-M4 +org.springframework.cloud:spring-cloud-starter-bus-kafka;4.0.0-M4 +org.springframework.cloud:spring-cloud-starter-bus-stream;4.0.0-M4 +org.springframework.cloud:spring-cloud-starter-circuitbreaker-reactor-resilience4j;3.0.0-M4 +org.springframework.cloud:spring-cloud-starter-circuitbreaker-resilience4j;3.0.0-M4 +org.springframework.cloud:spring-cloud-starter-circuitbreaker-spring-retry;3.0.0-M4 +org.springframework.cloud:spring-cloud-starter-config;4.0.0-M4 +org.springframework.cloud:spring-cloud-starter-consul;4.0.0-M4 +org.springframework.cloud:spring-cloud-starter-consul-all;4.0.0-M4 +org.springframework.cloud:spring-cloud-starter-consul-bus;4.0.0-M4 +org.springframework.cloud:spring-cloud-starter-consul-config;4.0.0-M4 +org.springframework.cloud:spring-cloud-starter-consul-discovery;4.0.0-M4 +org.springframework.cloud:spring-cloud-starter-contract-stub-runner;4.0.0-M4 +org.springframework.cloud:spring-cloud-starter-contract-stub-runner-jetty;4.0.0-M4 +org.springframework.cloud:spring-cloud-starter-contract-verifier;4.0.0-M4 +org.springframework.cloud:spring-cloud-starter-function-web;4.0.0-M4 +org.springframework.cloud:spring-cloud-starter-function-webflux;4.0.0-M4 +org.springframework.cloud:spring-cloud-starter-gateway;4.0.0-M4 +org.springframework.cloud:spring-cloud-starter-kubernetes-client;3.0.0-M4 +org.springframework.cloud:spring-cloud-starter-kubernetes-client-all;3.0.0-M4 +org.springframework.cloud:spring-cloud-starter-kubernetes-client-config;3.0.0-M4 +org.springframework.cloud:spring-cloud-starter-kubernetes-client-loadbalancer;3.0.0-M4 +org.springframework.cloud:spring-cloud-starter-kubernetes-discoveryclient;3.0.0-M4 +org.springframework.cloud:spring-cloud-starter-kubernetes-fabric8;3.0.0-M4 +org.springframework.cloud:spring-cloud-starter-kubernetes-fabric8-all;3.0.0-M4 +org.springframework.cloud:spring-cloud-starter-kubernetes-fabric8-config;3.0.0-M4 +org.springframework.cloud:spring-cloud-starter-kubernetes-fabric8-loadbalancer;3.0.0-M4 +org.springframework.cloud:spring-cloud-starter-loadbalancer;4.0.0-M4 +org.springframework.cloud:spring-cloud-starter-openfeign;4.0.0-M4 +org.springframework.cloud:spring-cloud-starter-stream-kafka;4.0.0-M4 +org.springframework.cloud:spring-cloud-starter-stream-rabbit;4.0.0-M4 +org.springframework.cloud:spring-cloud-starter-task;3.0.0-M4 +org.springframework.cloud:spring-cloud-starter-vault-config;4.0.0-M4 +org.springframework.cloud:spring-cloud-starter-zookeeper;4.0.0-M4 +org.springframework.cloud:spring-cloud-starter-zookeeper-all;4.0.0-M4 +org.springframework.cloud:spring-cloud-starter-zookeeper-config;4.0.0-M4 +org.springframework.cloud:spring-cloud-starter-zookeeper-discovery;4.0.0-M4 +org.springframework.cloud:spring-cloud-stream;4.0.0-M4 +org.springframework.cloud:spring-cloud-stream-binder-kafka;4.0.0-M4 +org.springframework.cloud:spring-cloud-stream-binder-kafka-core;4.0.0-M4 +org.springframework.cloud:spring-cloud-stream-binder-kafka-reactive;4.0.0-M4 +org.springframework.cloud:spring-cloud-stream-binder-kafka-streams;4.0.0-M4 +org.springframework.cloud:spring-cloud-stream-binder-rabbit;4.0.0-M4 +org.springframework.cloud:spring-cloud-stream-binder-rabbit-core;4.0.0-M4 +org.springframework.cloud:spring-cloud-stream-binder-rabbit-test-support;4.0.0-M4 +org.springframework.cloud:spring-cloud-stream-binder-test;4.0.0-M4 +org.springframework.cloud:spring-cloud-stream-dependencies;4.0.0-M4 +org.springframework.cloud:spring-cloud-stream-test-support;4.0.0-M4 +org.springframework.cloud:spring-cloud-task-batch;3.0.0-M4 +org.springframework.cloud:spring-cloud-task-core;3.0.0-M4 +org.springframework.cloud:spring-cloud-task-dependencies;3.0.0-M4 +org.springframework.cloud:spring-cloud-task-stream;3.0.0-M4 +org.springframework.cloud:spring-cloud-test-support;4.0.0-M4 +org.springframework.cloud:spring-cloud-vault-config;4.0.0-M4 +org.springframework.cloud:spring-cloud-vault-config-aws;4.0.0-M4 +org.springframework.cloud:spring-cloud-vault-config-consul;4.0.0-M4 +org.springframework.cloud:spring-cloud-vault-config-databases;4.0.0-M4 +org.springframework.cloud:spring-cloud-vault-config-rabbitmq;4.0.0-M4 +org.springframework.cloud:spring-cloud-vault-dependencies;4.0.0-M4 +org.springframework.cloud:spring-cloud-zookeeper-config;4.0.0-M4 +org.springframework.cloud:spring-cloud-zookeeper-core;4.0.0-M4 +org.springframework.cloud:spring-cloud-zookeeper-dependencies;4.0.0-M4 +org.springframework.cloud:spring-cloud-zookeeper-discovery;4.0.0-M4 +org.springframework.credhub:spring-credhub-core;2.1.1.RELEASE +org.springframework.data:spring-data-bom;2022.0.0-M5 +org.springframework.data:spring-data-cassandra;4.0.0-M5 +org.springframework.data:spring-data-commons;3.0.0-M5 +org.springframework.data:spring-data-couchbase;5.0.0-M5 +org.springframework.data:spring-data-elasticsearch;5.0.0-M5 +org.springframework.data:spring-data-envers;3.0.0-M5 +org.springframework.data:spring-data-geode;3.0.0-M5 +org.springframework.data:spring-data-jdbc;3.0.0-M5 +org.springframework.data:spring-data-jpa;3.0.0-M5 +org.springframework.data:spring-data-keyvalue;3.0.0-M5 +org.springframework.data:spring-data-ldap;3.0.0-M5 +org.springframework.data:spring-data-mongodb;4.0.0-M5 +org.springframework.data:spring-data-neo4j;7.0.0-M5 +org.springframework.data:spring-data-r2dbc;3.0.0-M5 +org.springframework.data:spring-data-redis;3.0.0-M5 +org.springframework.data:spring-data-relational;3.0.0-M5 +org.springframework.data:spring-data-rest-core;4.0.0-M5 +org.springframework.data:spring-data-rest-hal-explorer;4.0.0-M5 +org.springframework.data:spring-data-rest-webmvc;4.0.0-M5 +org.springframework.hateoas:spring-hateoas;2.0.0-M5 +org.springframework.integration:spring-integration-amqp;6.0.0-M4 +org.springframework.integration:spring-integration-bom;6.0.0-M4 +org.springframework.integration:spring-integration-core;6.0.0-M4 +org.springframework.integration:spring-integration-event;6.0.0-M4 +org.springframework.integration:spring-integration-feed;6.0.0-M4 +org.springframework.integration:spring-integration-file;6.0.0-M4 +org.springframework.integration:spring-integration-ftp;6.0.0-M4 +org.springframework.integration:spring-integration-gemfire;6.0.0-M4 +org.springframework.integration:spring-integration-graphql;6.0.0-M4 +org.springframework.integration:spring-integration-groovy;6.0.0-M4 +org.springframework.integration:spring-integration-hazelcast;6.0.0-M4 +org.springframework.integration:spring-integration-http;6.0.0-M4 +org.springframework.integration:spring-integration-ip;6.0.0-M4 +org.springframework.integration:spring-integration-jdbc;6.0.0-M4 +org.springframework.integration:spring-integration-jms;6.0.0-M4 +org.springframework.integration:spring-integration-jmx;6.0.0-M4 +org.springframework.integration:spring-integration-jpa;6.0.0-M4 +org.springframework.integration:spring-integration-kafka;6.0.0-M4 +org.springframework.integration:spring-integration-mail;6.0.0-M4 +org.springframework.integration:spring-integration-mongodb;6.0.0-M4 +org.springframework.integration:spring-integration-mqtt;6.0.0-M4 +org.springframework.integration:spring-integration-r2dbc;6.0.0-M4 +org.springframework.integration:spring-integration-redis;6.0.0-M4 +org.springframework.integration:spring-integration-rsocket;6.0.0-M4 +org.springframework.integration:spring-integration-scripting;6.0.0-M4 +org.springframework.integration:spring-integration-security;6.0.0-M4 +org.springframework.integration:spring-integration-sftp;6.0.0-M4 +org.springframework.integration:spring-integration-smb;6.0.0-M4 +org.springframework.integration:spring-integration-stomp;6.0.0-M4 +org.springframework.integration:spring-integration-stream;6.0.0-M4 +org.springframework.integration:spring-integration-syslog;6.0.0-M4 +org.springframework.integration:spring-integration-test;6.0.0-M4 +org.springframework.integration:spring-integration-test-support;6.0.0-M4 +org.springframework.integration:spring-integration-webflux;6.0.0-M4 +org.springframework.integration:spring-integration-websocket;6.0.0-M4 +org.springframework.integration:spring-integration-ws;6.0.0-M4 +org.springframework.integration:spring-integration-xml;6.0.0-M4 +org.springframework.integration:spring-integration-xmpp;6.0.0-M4 +org.springframework.integration:spring-integration-zeromq;6.0.0-M4 +org.springframework.integration:spring-integration-zookeeper;6.0.0-M4 +org.springframework.kafka:spring-kafka;3.0.0-M5 +org.springframework.kafka:spring-kafka-test;3.0.0-M5 +org.springframework.ldap:spring-ldap-core;3.0.0-M2 +org.springframework.ldap:spring-ldap-core-tiger;3.0.0-M2 +org.springframework.ldap:spring-ldap-ldif-core;3.0.0-M2 +org.springframework.ldap:spring-ldap-odm;3.0.0-M2 +org.springframework.ldap:spring-ldap-test;3.0.0-M2 +org.springframework.restdocs:spring-restdocs-asciidoctor;3.0.0-M4 +org.springframework.restdocs:spring-restdocs-bom;3.0.0-M4 +org.springframework.restdocs:spring-restdocs-core;3.0.0-M4 +org.springframework.restdocs:spring-restdocs-mockmvc;3.0.0-M4 +org.springframework.restdocs:spring-restdocs-restassured;3.0.0-M4 +org.springframework.restdocs:spring-restdocs-webtestclient;3.0.0-M4 +org.springframework.retry:spring-retry;1.3.3 +org.springframework.security.oauth.boot:spring-security-oauth2-autoconfigure;2.5.2 +org.springframework.security:spring-security-acl;6.0.0-M6 +org.springframework.security:spring-security-aspects;6.0.0-M6 +org.springframework.security:spring-security-bom;6.0.0-M6 +org.springframework.security:spring-security-config;6.0.0-M6 +org.springframework.security:spring-security-core;6.0.0-M6 +org.springframework.security:spring-security-crypto;6.0.0-M6 +org.springframework.security:spring-security-data;6.0.0-M6 +org.springframework.security:spring-security-ldap;6.0.0-M6 +org.springframework.security:spring-security-messaging;6.0.0-M6 +org.springframework.security:spring-security-oauth2-client;6.0.0-M6 +org.springframework.security:spring-security-oauth2-core;6.0.0-M6 +org.springframework.security:spring-security-oauth2-jose;6.0.0-M6 +org.springframework.security:spring-security-oauth2-resource-server;6.0.0-M6 +org.springframework.security:spring-security-rsa;1.0.11.RELEASE +org.springframework.security:spring-security-rsocket;6.0.0-M6 +org.springframework.security:spring-security-saml2-service-provider;6.0.0-M6 +org.springframework.security:spring-security-taglibs;6.0.0-M6 +org.springframework.security:spring-security-test;6.0.0-M6 +org.springframework.security:spring-security-web;6.0.0-M6 +org.springframework.session:spring-session-bom;2022.0.0-M2 +org.springframework.session:spring-session-core;3.0.0-M3 +org.springframework.session:spring-session-data-geode;3.0.0-M3 +org.springframework.session:spring-session-data-mongodb;3.0.0-M3 +org.springframework.session:spring-session-data-redis;3.0.0-M3 +org.springframework.session:spring-session-hazelcast;3.0.0-M3 +org.springframework.session:spring-session-jdbc;3.0.0-M3 +org.springframework.vault:spring-vault-core;3.0.0-M2 +org.springframework.ws:spring-ws-core;4.0.0-M2 +org.springframework.ws:spring-ws-security;4.0.0-M2 +org.springframework.ws:spring-ws-support;4.0.0-M2 +org.springframework.ws:spring-ws-test;4.0.0-M2 +org.springframework.ws:spring-xml;4.0.0-M2 +org.springframework:spring-aop;6.0.0-M5 +org.springframework:spring-aspects;6.0.0-M5 +org.springframework:spring-beans;6.0.0-M5 +org.springframework:spring-context;6.0.0-M5 +org.springframework:spring-context-indexer;6.0.0-M5 +org.springframework:spring-context-support;6.0.0-M5 +org.springframework:spring-core;6.0.0-M5 +org.springframework:spring-core-test;6.0.0-M5 +org.springframework:spring-expression;6.0.0-M5 +org.springframework:spring-framework-bom;6.0.0-M5 +org.springframework:spring-instrument;6.0.0-M5 +org.springframework:spring-jcl;6.0.0-M5 +org.springframework:spring-jdbc;6.0.0-M5 +org.springframework:spring-jms;6.0.0-M5 +org.springframework:spring-messaging;6.0.0-M5 +org.springframework:spring-orm;6.0.0-M5 +org.springframework:spring-oxm;6.0.0-M5 +org.springframework:spring-r2dbc;6.0.0-M5 +org.springframework:spring-test;6.0.0-M5 +org.springframework:spring-tx;6.0.0-M5 +org.springframework:spring-web;6.0.0-M5 +org.springframework:spring-webflux;6.0.0-M5 +org.springframework:spring-webmvc;6.0.0-M5 +org.springframework:spring-websocket;6.0.0-M5 +org.thymeleaf.extras:thymeleaf-extras-java8time;3.0.4.RELEASE +org.thymeleaf.extras:thymeleaf-extras-springsecurity6;3.1.0.M1 +org.thymeleaf:thymeleaf;3.1.0.M2 +org.thymeleaf:thymeleaf-spring6;3.1.0.M2 +org.tmatesoft.svnkit:svnkit;1.10.1 +org.webjars:webjars-locator-core;0.52 +org.xerial:sqlite-jdbc;3.36.0.3 +org.xmlunit:xmlunit-assertj;2.9.0 +org.xmlunit:xmlunit-core;2.9.0 +org.xmlunit:xmlunit-legacy;2.9.0 +org.xmlunit:xmlunit-matchers;2.9.0 +org.xmlunit:xmlunit-placeholders;2.9.0 +org.yaml:snakeyaml;1.30 +redis.clients:jedis;4.2.3 +wsdl4j:wsdl4j;1.6.3 diff --git a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/pom.xml b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/pom.xml index 661e2d14b3f7..f9ad7dfa294b 100644 --- a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/pom.xml +++ b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/pom.xml @@ -12,7 +12,7 @@ com.azure.spring spring-cloud-azure-actuator-autoconfigure - 4.4.0-beta.1 + 6.0.0-beta.1 Spring Cloud Azure Actuator AutoConfigure Spring Cloud Azure Starter Actuator AutoConfigure @@ -33,22 +33,45 @@ https://github.com/Azure/azure-sdk-for-java/issues + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + org.springframework.boot spring-boot-actuator-autoconfigure - 2.7.3 + 3.0.0-M4 compile com.azure.spring spring-cloud-azure-actuator - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-cloud-azure-autoconfigure - 4.4.0-beta.1 + 6.0.0-beta.1 @@ -113,7 +136,7 @@ org.springframework.boot spring-boot-starter-test - 2.7.3 + 3.0.0-M4 test @@ -128,8 +151,8 @@ - org.springframework.boot:spring-boot-actuator:[2.7.3] - org.springframework.boot:spring-boot-actuator-autoconfigure:[2.7.3] + org.springframework.boot:spring-boot-actuator:[3.0.0-M4] + org.springframework.boot:spring-boot-actuator-autoconfigure:[3.0.0-M4] diff --git a/sdk/spring/spring-cloud-azure-actuator/pom.xml b/sdk/spring/spring-cloud-azure-actuator/pom.xml index 60314ff47398..8ee27377fa39 100644 --- a/sdk/spring/spring-cloud-azure-actuator/pom.xml +++ b/sdk/spring/spring-cloud-azure-actuator/pom.xml @@ -17,7 +17,7 @@ com.azure.spring spring-cloud-azure-actuator - 4.4.0-beta.1 + 6.0.0-beta.1 Spring Cloud Azure Actuator https://microsoft.github.io/spring-cloud-azure @@ -37,11 +37,34 @@ https://github.com/Azure/azure-sdk-for-java/issues + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + org.springframework.boot spring-boot-actuator - 2.7.3 + 3.0.0-M4 compile @@ -106,7 +129,7 @@ org.springframework.boot spring-boot-starter-test - 2.7.3 + 3.0.0-M4 test @@ -121,7 +144,7 @@ - org.springframework.boot:spring-boot-actuator:[2.7.3] + org.springframework.boot:spring-boot-actuator:[3.0.0-M4] diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml index 43922e29e77f..6576342640a5 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml +++ b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml @@ -12,7 +12,7 @@ com.azure.spring spring-cloud-azure-autoconfigure - 4.4.0-beta.1 + 6.0.0-beta.1 Spring Cloud Azure AutoConfigure Spring Cloud Azure AutoConfigure @@ -33,24 +33,47 @@ https://github.com/Azure/azure-sdk-for-java/issues + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + com.azure.spring spring-cloud-azure-service - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-cloud-azure-resourcemanager - 4.4.0-beta.1 + 6.0.0-beta.1 true com.azure.spring spring-cloud-azure-trace-sleuth - 4.4.0-beta.1 + 6.0.0-beta.1 true @@ -59,7 +82,7 @@ com.azure.spring spring-integration-azure-eventhubs - 4.4.0-beta.1 + 6.0.0-beta.1 true @@ -73,7 +96,7 @@ com.azure.spring spring-integration-azure-servicebus - 4.4.0-beta.1 + 6.0.0-beta.1 true @@ -81,7 +104,7 @@ com.azure.spring spring-integration-azure-storage-queue - 4.4.0-beta.1 + 6.0.0-beta.1 true @@ -89,13 +112,13 @@ org.springframework.kafka spring-kafka - 2.8.8 + 3.0.0-M5 true org.springframework.cloud spring-cloud-starter-stream-kafka - 3.2.4 + 4.0.0-M4 true @@ -103,14 +126,20 @@ org.springframework.data spring-data-redis - 2.7.2 + 3.0.0-M5 true - + + 3.26.0 <!– {x-version-update;com.azure:azure-spring-data-cosmos;dependency} –> + true + --> + + org.springframework + spring-tx + 6.0.0-M5 true @@ -118,19 +147,19 @@ org.springframework spring-jms - 5.3.22 + 6.0.0-M5 true org.apache.qpid qpid-jms-client - 0.53.0 + 2.0.0 true org.messaginghub pooled-jms - 1.2.4 + 3.0.0 true @@ -202,25 +231,25 @@ org.springframework.boot spring-boot-autoconfigure - 2.7.3 + 3.0.0-M4 org.springframework spring-context-support - 5.3.22 + 6.0.0-M5 true org.springframework.boot spring-boot-actuator-autoconfigure - 2.7.3 + 3.0.0-M4 true org.springframework.boot spring-boot-configuration-processor - 2.7.3 + 3.0.0-M4 true @@ -228,25 +257,25 @@ org.springframework.security spring-security-oauth2-client - 5.7.3 + 6.0.0-M6 true org.springframework.security spring-security-oauth2-resource-server - 5.7.3 + 6.0.0-M6 true org.springframework.security spring-security-oauth2-jose - 5.7.3 + 6.0.0-M6 true org.springframework.security spring-security-config - 5.7.3 + 6.0.0-M6 true @@ -260,35 +289,35 @@ provided - javax.servlet - javax.servlet-api - 4.0.1 + jakarta.servlet + jakarta.servlet-api + 5.0.0 true org.hibernate.validator hibernate-validator - 6.2.4.Final + 7.0.4.Final true jakarta.validation jakarta.validation-api - 2.0.2 + 3.0.2 org.springframework.boot spring-boot-starter-test - 2.7.3 + 3.0.0-M4 test org.springframework.boot spring-boot-configuration-metadata - 2.7.3 + 3.0.0-M4 test @@ -296,11 +325,17 @@ wiremock-jre8 2.33.2 test + + + javax.servlet + javax.servlet-api + + org.glassfish jakarta.el - 3.0.4 + 4.0.2 test @@ -330,26 +365,25 @@ - com.nimbusds:nimbus-jose-jwt:[9.22] - org.messaginghub:pooled-jms:[1.2.4] - org.apache.qpid:qpid-jms-client:[0.53.0] - jakarta.validation:jakarta.validation-api:[2.0.2] - javax.servlet:javax.servlet-api:[4.0.1] - org.hibernate.validator:hibernate-validator:[6.2.4.Final] - org.springframework.boot:spring-boot-actuator-autoconfigure:[2.7.3] - org.springframework.boot:spring-boot-autoconfigure-processor:[2.7.3] - org.springframework.boot:spring-boot-autoconfigure:[2.7.3] - org.springframework.boot:spring-boot-configuration-processor:[2.7.3] - org.springframework.data:spring-data-mongodb:[3.4.2] - org.springframework.data:spring-data-redis:[2.7.2] - org.springframework.kafka:spring-kafka:[2.8.8] - org.springframework.cloud:spring-cloud-starter-stream-kafka:[3.2.4] - org.springframework:spring-context-support:[5.3.22] - org.springframework.security:spring-security-oauth2-client:[5.7.3] - org.springframework.security:spring-security-oauth2-resource-server:[5.7.3] - org.springframework.security:spring-security-oauth2-jose:[5.7.3] - org.springframework.security:spring-security-config:[5.7.3] - org.springframework:spring-jms:[5.3.22] + org.messaginghub:pooled-jms:[3.0.0] + org.apache.qpid:qpid-jms-client:[2.0.0] + jakarta.servlet:jakarta.servlet-api:[5.0.0] + jakarta.validation:jakarta.validation-api:[3.0.2] + org.hibernate.validator:hibernate-validator:[7.0.4.Final] + org.springframework.boot:spring-boot-actuator-autoconfigure:[3.0.0-M4] + org.springframework.boot:spring-boot-autoconfigure-processor:[3.0.0-M4] + org.springframework.boot:spring-boot-autoconfigure:[3.0.0-M4] + org.springframework.boot:spring-boot-configuration-processor:[3.0.0-M4] + org.springframework.data:spring-data-redis:[3.0.0-M5] + org.springframework.kafka:spring-kafka:[3.0.0-M5] + org.springframework.cloud:spring-cloud-starter-stream-kafka:[4.0.0-M4] + org.springframework:spring-context-support:[6.0.0-M5] + org.springframework.security:spring-security-oauth2-client:[6.0.0-M6] + org.springframework.security:spring-security-oauth2-resource-server:[6.0.0-M6] + org.springframework.security:spring-security-oauth2-jose:[6.0.0-M6] + org.springframework.security:spring-security-config:[6.0.0-M6] + org.springframework:spring-jms:[6.0.0-M5] + org.springframework:spring-tx:[6.0.0-M5] @@ -370,64 +404,4 @@ - - - - annotation-process-for-java-8 - - [1.8,9) - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - - annotation-process-for-java-8 - - compile - - - - -proc:only - - - - - - - - - - annotation-process-for-java-11 - - [11,) - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - - annotation-process-for-java-11 - - compile - - - - -proc:only - - 11 - - - - - - - - diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/AadOAuth2AuthorizationRequestResolver.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/AadOAuth2AuthorizationRequestResolver.java index 750167f82ec7..1a7cba67272f 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/AadOAuth2AuthorizationRequestResolver.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/AadOAuth2AuthorizationRequestResolver.java @@ -5,14 +5,14 @@ import com.azure.spring.cloud.autoconfigure.aad.implementation.constants.Constants; import com.azure.spring.cloud.autoconfigure.aad.properties.AadAuthenticationProperties; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository; import org.springframework.security.oauth2.client.web.DefaultOAuth2AuthorizationRequestResolver; import org.springframework.security.oauth2.client.web.OAuth2AuthorizationRequestRedirectFilter; import org.springframework.security.oauth2.client.web.OAuth2AuthorizationRequestResolver; import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationRequest; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; import java.util.HashMap; import java.util.Map; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/AadWebSecurityConfigurerAdapter.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/AadWebSecurityConfigurerAdapter.java index cdf27706b786..1ff989ac8d6b 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/AadWebSecurityConfigurerAdapter.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/AadWebSecurityConfigurerAdapter.java @@ -7,6 +7,7 @@ import com.azure.spring.cloud.autoconfigure.aad.implementation.oauth2.OAuth2ClientAuthenticationJwkResolver; import com.azure.spring.cloud.autoconfigure.aad.implementation.webapp.AadOAuth2AuthorizationCodeGrantRequestEntityConverter; import com.azure.spring.cloud.autoconfigure.aad.properties.AadAuthenticationProperties; +import jakarta.servlet.Filter; import org.springframework.beans.factory.ObjectProvider; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.config.annotation.web.builders.HttpSecurity; @@ -24,8 +25,6 @@ import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; import org.springframework.util.StringUtils; -import javax.servlet.Filter; - /** * Abstract configuration class, used to make AzureClientRegistrationRepository and AuthzCodeGrantRequestEntityConverter * take effect. @@ -85,7 +84,7 @@ protected void configure(HttpSecurity http) throws Exception { Filter conditionalAccessFilter = conditionalAccessFilter(); if (conditionalAccessFilter != null) { - http.addFilterAfter(conditionalAccessFilter, OAuth2AuthorizationRequestRedirectFilter.class); + http.addFilterAfter(conditionalAccessFilter, (Class) OAuth2AuthorizationRequestRedirectFilter.class); } } diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/filter/AadAppRoleStatelessAuthenticationFilter.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/filter/AadAppRoleStatelessAuthenticationFilter.java index f807cb28ba9c..ea000991ed64 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/filter/AadAppRoleStatelessAuthenticationFilter.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/filter/AadAppRoleStatelessAuthenticationFilter.java @@ -8,6 +8,10 @@ import com.nimbusds.jose.JOSEException; import com.nimbusds.jose.proc.BadJOSEException; import com.nimbusds.jwt.proc.BadJWTException; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpHeaders; @@ -20,10 +24,6 @@ import org.springframework.util.StringUtils; import org.springframework.web.filter.OncePerRequestFilter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.text.ParseException; import java.util.Collection; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/filter/AadAuthenticationFilter.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/filter/AadAuthenticationFilter.java index 4d50c760ef44..9b9f1ffd4d4f 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/filter/AadAuthenticationFilter.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/filter/AadAuthenticationFilter.java @@ -13,6 +13,11 @@ import com.nimbusds.jose.proc.BadJOSEException; import com.nimbusds.jose.util.ResourceRetriever; import com.nimbusds.jwt.proc.BadJWTException; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpHeaders; @@ -24,11 +29,6 @@ import org.springframework.web.filter.OncePerRequestFilter; import javax.naming.ServiceUnavailableException; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import java.io.IOException; import java.net.MalformedURLException; import java.text.ParseException; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/implementation/jackson/StdConverters.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/implementation/jackson/StdConverters.java index c78b6604b25c..324a464a6f82 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/implementation/jackson/StdConverters.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/implementation/jackson/StdConverters.java @@ -22,12 +22,10 @@ static final class ClientAuthenticationMethodConverter extends StdConverter compatibleBootVersions = Arrays.asList("2.5.x", "2.6.x", "2.7.x"); + private List compatibleBootVersions = Arrays.asList("3.0.0"); /** * Whether to enable the Spring Cloud Azure compatibility verifier. diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosDataAutoConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosDataAutoConfiguration.java index 635a3b6f959d..5639bf5fb73d 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosDataAutoConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosDataAutoConfiguration.java @@ -1,55 +1,55 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. - -package com.azure.spring.cloud.autoconfigure.data.cosmos; - -import com.azure.spring.cloud.autoconfigure.implementation.cosmos.properties.AzureCosmosProperties; -import com.azure.spring.data.cosmos.config.AbstractCosmosConfiguration; -import com.azure.spring.data.cosmos.config.CosmosConfig; -import com.azure.spring.data.cosmos.core.CosmosTemplate; -import com.azure.spring.data.cosmos.core.ResponseDiagnosticsProcessor; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.context.annotation.Configuration; - -/** - * {@link EnableAutoConfiguration Auto-configuration} for Spring Data Cosmos support. - * - * @since 4.0.0 - */ -@Configuration(proxyBeanMethods = false) -@ConditionalOnClass({ CosmosTemplate.class }) -@ConditionalOnExpression("${spring.cloud.azure.cosmos.enabled:true}") -@ConditionalOnProperty(prefix = "spring.cloud.azure.cosmos", name = { "endpoint", "database" }) -public class CosmosDataAutoConfiguration extends AbstractCosmosConfiguration { - - private final AzureCosmosProperties cosmosProperties; - private final ResponseDiagnosticsProcessor responseDiagnosticsProcessor; - - CosmosDataAutoConfiguration(AzureCosmosProperties cosmosProperties, - @Autowired(required = false) ResponseDiagnosticsProcessor responseDiagnosticsProcessor) { - this.cosmosProperties = cosmosProperties; - this.responseDiagnosticsProcessor = responseDiagnosticsProcessor; - } - - @Override - protected String getDatabaseName() { - return cosmosProperties.getDatabase(); - } - - @Override - public CosmosConfig cosmosConfig() { - final CosmosConfig.CosmosConfigBuilder builder = CosmosConfig.builder(); - builder.enableQueryMetrics(cosmosProperties.isPopulateQueryMetrics()); - - if (responseDiagnosticsProcessor != null) { - builder.responseDiagnosticsProcessor(responseDiagnosticsProcessor); - } - - return builder.build(); - } - -} +// +//package com.azure.spring.cloud.autoconfigure.data.cosmos; +// +//import com.azure.spring.cloud.autoconfigure.implementation.cosmos.properties.AzureCosmosProperties; +//import com.azure.spring.data.cosmos.config.AbstractCosmosConfiguration; +//import com.azure.spring.data.cosmos.config.CosmosConfig; +//import com.azure.spring.data.cosmos.core.CosmosTemplate; +//import com.azure.spring.data.cosmos.core.ResponseDiagnosticsProcessor; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +//import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +//import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; +//import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +//import org.springframework.context.annotation.Configuration; +// +///** +// * {@link EnableAutoConfiguration Auto-configuration} for Spring Data Cosmos support. +// * +// * @since 4.0.0 +// */ +//@Configuration(proxyBeanMethods = false) +//@ConditionalOnClass({ CosmosTemplate.class }) +//@ConditionalOnExpression("${spring.cloud.azure.cosmos.enabled:true}") +//@ConditionalOnProperty(prefix = "spring.cloud.azure.cosmos", name = { "endpoint", "database" }) +//public class CosmosDataAutoConfiguration extends AbstractCosmosConfiguration { +// +// private final AzureCosmosProperties cosmosProperties; +// private final ResponseDiagnosticsProcessor responseDiagnosticsProcessor; +// +// CosmosDataAutoConfiguration(AzureCosmosProperties cosmosProperties, +// @Autowired(required = false) ResponseDiagnosticsProcessor responseDiagnosticsProcessor) { +// this.cosmosProperties = cosmosProperties; +// this.responseDiagnosticsProcessor = responseDiagnosticsProcessor; +// } +// +// @Override +// protected String getDatabaseName() { +// return cosmosProperties.getDatabase(); +// } +// +// @Override +// public CosmosConfig cosmosConfig() { +// final CosmosConfig.CosmosConfigBuilder builder = CosmosConfig.builder(); +// builder.enableQueryMetrics(cosmosProperties.isPopulateQueryMetrics()); +// +// if (responseDiagnosticsProcessor != null) { +// builder.responseDiagnosticsProcessor(responseDiagnosticsProcessor); +// } +// +// return builder.build(); +// } +// +//} diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosReactiveRepositoriesAutoConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosReactiveRepositoriesAutoConfiguration.java index ced0e7c6e17f..44fbfb5df550 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosReactiveRepositoriesAutoConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosReactiveRepositoriesAutoConfiguration.java @@ -1,33 +1,33 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. - -package com.azure.spring.cloud.autoconfigure.data.cosmos; - -import com.azure.spring.data.cosmos.core.ReactiveCosmosTemplate; -import com.azure.spring.data.cosmos.repository.ReactiveCosmosRepository; -import com.azure.spring.data.cosmos.repository.config.ReactiveCosmosRepositoryConfigurationExtension; -import com.azure.spring.data.cosmos.repository.support.ReactiveCosmosRepositoryFactoryBean; -import org.springframework.boot.autoconfigure.AutoConfigureAfter; -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.condition.ConditionalOnProperty; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; - -/** - * Import {@link CosmosReactiveRepositoriesAutoConfigureRegistrar} class as a Bean in Spring. - */ -@Configuration(proxyBeanMethods = false) -@ConditionalOnClass({ ReactiveCosmosRepository.class }) -@ConditionalOnMissingBean({ ReactiveCosmosRepositoryFactoryBean.class, - ReactiveCosmosRepositoryConfigurationExtension.class }) -@AutoConfigureAfter(CosmosDataAutoConfiguration.class) -@ConditionalOnBean(ReactiveCosmosTemplate.class) -@ConditionalOnProperty(prefix = "spring.cloud.azure.cosmos.repositories", - name = "enabled", - havingValue = "true", - matchIfMissing = true) -@Import(CosmosReactiveRepositoriesAutoConfigureRegistrar.class) -public class CosmosReactiveRepositoriesAutoConfiguration { -} +// +//package com.azure.spring.cloud.autoconfigure.data.cosmos; +// +//import com.azure.spring.data.cosmos.core.ReactiveCosmosTemplate; +//import com.azure.spring.data.cosmos.repository.ReactiveCosmosRepository; +//import com.azure.spring.data.cosmos.repository.config.ReactiveCosmosRepositoryConfigurationExtension; +//import com.azure.spring.data.cosmos.repository.support.ReactiveCosmosRepositoryFactoryBean; +//import org.springframework.boot.autoconfigure.AutoConfigureAfter; +//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.condition.ConditionalOnProperty; +//import org.springframework.context.annotation.Configuration; +//import org.springframework.context.annotation.Import; +// +///** +// * Import {@link CosmosReactiveRepositoriesAutoConfigureRegistrar} class as a Bean in Spring. +// */ +//@Configuration(proxyBeanMethods = false) +//@ConditionalOnClass({ ReactiveCosmosRepository.class }) +//@ConditionalOnMissingBean({ ReactiveCosmosRepositoryFactoryBean.class, +// ReactiveCosmosRepositoryConfigurationExtension.class }) +//@AutoConfigureAfter(CosmosDataAutoConfiguration.class) +//@ConditionalOnBean(ReactiveCosmosTemplate.class) +//@ConditionalOnProperty(prefix = "spring.cloud.azure.cosmos.repositories", +// name = "enabled", +// havingValue = "true", +// matchIfMissing = true) +//@Import(CosmosReactiveRepositoriesAutoConfigureRegistrar.class) +//public class CosmosReactiveRepositoriesAutoConfiguration { +//} diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosReactiveRepositoriesAutoConfigureRegistrar.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosReactiveRepositoriesAutoConfigureRegistrar.java index cdaa92a74da4..f873d1a503d2 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosReactiveRepositoriesAutoConfigureRegistrar.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosReactiveRepositoriesAutoConfigureRegistrar.java @@ -1,38 +1,38 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. - -package com.azure.spring.cloud.autoconfigure.data.cosmos; - -import com.azure.spring.data.cosmos.repository.config.EnableReactiveCosmosRepositories; -import com.azure.spring.data.cosmos.repository.config.ReactiveCosmosRepositoryConfigurationExtension; -import org.springframework.boot.autoconfigure.data.AbstractRepositoryConfigurationSourceSupport; -import org.springframework.data.repository.config.RepositoryConfigurationExtension; - -import java.lang.annotation.Annotation; - -/** - * Declare {@link EnableReactiveCosmosRepositories} annotation and {@link EnableCosmosReactiveRepositoriesConfiguration} - * configuration for default async auto-configuration. - */ -public class CosmosReactiveRepositoriesAutoConfigureRegistrar extends AbstractRepositoryConfigurationSourceSupport { - @Override - protected Class getAnnotation() { - return EnableReactiveCosmosRepositories.class; - } - - @Override - protected Class getConfiguration() { - return EnableCosmosReactiveRepositoriesConfiguration.class; - } - - @Override - protected RepositoryConfigurationExtension getRepositoryConfigurationExtension() { - return new ReactiveCosmosRepositoryConfigurationExtension(); - } - - @EnableReactiveCosmosRepositories - private static class EnableCosmosReactiveRepositoriesConfiguration { - - } - -} +// +//package com.azure.spring.cloud.autoconfigure.data.cosmos; +// +//import com.azure.spring.data.cosmos.repository.config.EnableReactiveCosmosRepositories; +//import com.azure.spring.data.cosmos.repository.config.ReactiveCosmosRepositoryConfigurationExtension; +//import org.springframework.boot.autoconfigure.data.AbstractRepositoryConfigurationSourceSupport; +//import org.springframework.data.repository.config.RepositoryConfigurationExtension; +// +//import java.lang.annotation.Annotation; +// +///** +// * Declare {@link EnableReactiveCosmosRepositories} annotation and {@link EnableCosmosReactiveRepositoriesConfiguration} +// * configuration for default async auto-configuration. +// */ +//public class CosmosReactiveRepositoriesAutoConfigureRegistrar extends AbstractRepositoryConfigurationSourceSupport { +// @Override +// protected Class getAnnotation() { +// return EnableReactiveCosmosRepositories.class; +// } +// +// @Override +// protected Class getConfiguration() { +// return EnableCosmosReactiveRepositoriesConfiguration.class; +// } +// +// @Override +// protected RepositoryConfigurationExtension getRepositoryConfigurationExtension() { +// return new ReactiveCosmosRepositoryConfigurationExtension(); +// } +// +// @EnableReactiveCosmosRepositories +// private static class EnableCosmosReactiveRepositoriesConfiguration { +// +// } +// +//} diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosRepositoriesAutoConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosRepositoriesAutoConfiguration.java index 0de7cad62615..93db668cced8 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosRepositoriesAutoConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosRepositoriesAutoConfiguration.java @@ -1,33 +1,33 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. - -package com.azure.spring.cloud.autoconfigure.data.cosmos; - -import com.azure.spring.data.cosmos.core.CosmosTemplate; -import com.azure.spring.data.cosmos.repository.CosmosRepository; -import com.azure.spring.data.cosmos.repository.config.CosmosRepositoryConfigurationExtension; -import com.azure.spring.data.cosmos.repository.support.CosmosRepositoryFactoryBean; -import org.springframework.boot.autoconfigure.AutoConfigureAfter; -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.condition.ConditionalOnProperty; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; - -/** - * Import {@link CosmosRepositoriesAutoConfigureRegistrar} class as a Bean in Spring. - */ -@Configuration(proxyBeanMethods = false) -@ConditionalOnClass({ CosmosRepository.class }) -@ConditionalOnMissingBean({ CosmosRepositoryFactoryBean.class, - CosmosRepositoryConfigurationExtension.class }) -@AutoConfigureAfter(CosmosDataAutoConfiguration.class) -@ConditionalOnBean(CosmosTemplate.class) -@ConditionalOnProperty(prefix = "spring.cloud.azure.cosmos.repositories", - name = "enabled", - havingValue = "true", - matchIfMissing = true) -@Import(CosmosRepositoriesAutoConfigureRegistrar.class) -public class CosmosRepositoriesAutoConfiguration { -} +// +//package com.azure.spring.cloud.autoconfigure.data.cosmos; +// +//import com.azure.spring.data.cosmos.core.CosmosTemplate; +//import com.azure.spring.data.cosmos.repository.CosmosRepository; +//import com.azure.spring.data.cosmos.repository.config.CosmosRepositoryConfigurationExtension; +//import com.azure.spring.data.cosmos.repository.support.CosmosRepositoryFactoryBean; +//import org.springframework.boot.autoconfigure.AutoConfigureAfter; +//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.condition.ConditionalOnProperty; +//import org.springframework.context.annotation.Configuration; +//import org.springframework.context.annotation.Import; +// +///** +// * Import {@link CosmosRepositoriesAutoConfigureRegistrar} class as a Bean in Spring. +// */ +//@Configuration(proxyBeanMethods = false) +//@ConditionalOnClass({ CosmosRepository.class }) +//@ConditionalOnMissingBean({ CosmosRepositoryFactoryBean.class, +// CosmosRepositoryConfigurationExtension.class }) +//@AutoConfigureAfter(CosmosDataAutoConfiguration.class) +//@ConditionalOnBean(CosmosTemplate.class) +//@ConditionalOnProperty(prefix = "spring.cloud.azure.cosmos.repositories", +// name = "enabled", +// havingValue = "true", +// matchIfMissing = true) +//@Import(CosmosRepositoriesAutoConfigureRegistrar.class) +//public class CosmosRepositoriesAutoConfiguration { +//} diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosRepositoriesAutoConfigureRegistrar.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosRepositoriesAutoConfigureRegistrar.java index 35756905926f..8e36cf1b2642 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosRepositoriesAutoConfigureRegistrar.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosRepositoriesAutoConfigureRegistrar.java @@ -1,38 +1,38 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. - -package com.azure.spring.cloud.autoconfigure.data.cosmos; - -import com.azure.spring.data.cosmos.repository.config.CosmosRepositoryConfigurationExtension; -import com.azure.spring.data.cosmos.repository.config.EnableCosmosRepositories; -import org.springframework.boot.autoconfigure.data.AbstractRepositoryConfigurationSourceSupport; -import org.springframework.data.repository.config.RepositoryConfigurationExtension; - -import java.lang.annotation.Annotation; - -/** - * Declare {@link EnableCosmosRepositories} annotation and {@link EnableCosmosRepositoriesConfiguration} configuration - * for default non-async auto-configuration. - */ -public class CosmosRepositoriesAutoConfigureRegistrar extends AbstractRepositoryConfigurationSourceSupport { - @Override - protected Class getAnnotation() { - return EnableCosmosRepositories.class; - } - - @Override - protected Class getConfiguration() { - return EnableCosmosRepositoriesConfiguration.class; - } - - @Override - protected RepositoryConfigurationExtension getRepositoryConfigurationExtension() { - return new CosmosRepositoryConfigurationExtension(); - } - - @EnableCosmosRepositories - private static class EnableCosmosRepositoriesConfiguration { - - } - -} +// +//package com.azure.spring.cloud.autoconfigure.data.cosmos; +// +//import com.azure.spring.data.cosmos.repository.config.CosmosRepositoryConfigurationExtension; +//import com.azure.spring.data.cosmos.repository.config.EnableCosmosRepositories; +//import org.springframework.boot.autoconfigure.data.AbstractRepositoryConfigurationSourceSupport; +//import org.springframework.data.repository.config.RepositoryConfigurationExtension; +// +//import java.lang.annotation.Annotation; +// +///** +// * Declare {@link EnableCosmosRepositories} annotation and {@link EnableCosmosRepositoriesConfiguration} configuration +// * for default non-async auto-configuration. +// */ +//public class CosmosRepositoriesAutoConfigureRegistrar extends AbstractRepositoryConfigurationSourceSupport { +// @Override +// protected Class getAnnotation() { +// return EnableCosmosRepositories.class; +// } +// +// @Override +// protected Class getConfiguration() { +// return EnableCosmosRepositoriesConfiguration.class; +// } +// +// @Override +// protected RepositoryConfigurationExtension getRepositoryConfigurationExtension() { +// return new CosmosRepositoryConfigurationExtension(); +// } +// +// @EnableCosmosRepositories +// private static class EnableCosmosRepositoriesConfiguration { +// +// } +// +//} diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/package-info.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/package-info.java index f047b97347d5..b3fa7e87c46f 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/package-info.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/package-info.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. - -/** - * Spring Cloud Azure's auto-configuration for Spring Data Cosmos. - */ -package com.azure.spring.cloud.autoconfigure.data.cosmos; +// +///** +// * Spring Cloud Azure's auto-configuration for Spring Data Cosmos. +// */ +//package com.azure.spring.cloud.autoconfigure.data.cosmos; 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 5e8a88553285..ce7747be42d9 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,11 +18,7 @@ public class AzureSpringBootVersionVerifier { private static final Logger LOGGER = LoggerFactory.getLogger(AzureSpringBootVersionVerifier.class); - static final String SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_2_5 = "org.springframework.boot.context.properties.bind.Bindable.BindRestriction"; - - static final String SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_2_6 = "org.springframework.boot.autoconfigure.data.redis.ClientResourcesBuilderCustomizer"; - - static final String SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_2_7 = "org.springframework.boot.autoconfigure.amqp.RabbitStreamTemplateConfigurer"; + static final String SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_3_0 = "org.springframework.boot.autoconfigure.validation.ValidationConfigurationCustomizer"; /** * Versions supported by Spring Cloud Azure, for present is [2.5, 2.6]. Update this value if needed. */ @@ -46,9 +42,7 @@ public AzureSpringBootVersionVerifier(List acceptedVersions, ClassNameRe * Init default supported Spring Boot Version compatibility check meta data. */ private void initDefaultSupportedBootVersionCheckMeta() { - supportedVersions.put("2.5", SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_2_5); - supportedVersions.put("2.6", SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_2_6); - supportedVersions.put("2.7", SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_2_7); + supportedVersions.put("3.0", SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_3_0); } /** diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/jms/ServiceBusJmsAutoConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/jms/ServiceBusJmsAutoConfiguration.java index 412ebcc113fe..067f9cec200a 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/jms/ServiceBusJmsAutoConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/jms/ServiceBusJmsAutoConfiguration.java @@ -8,6 +8,7 @@ import com.azure.spring.cloud.autoconfigure.resourcemanager.AzureServiceBusResourceManagerAutoConfiguration; import com.azure.spring.cloud.core.provider.connectionstring.ServiceConnectionStringProvider; import com.azure.spring.cloud.core.service.AzureServiceType; +import jakarta.jms.ConnectionFactory; import org.apache.qpid.jms.JmsConnectionExtensions; import org.apache.qpid.jms.JmsConnectionFactory; import org.springframework.beans.factory.ObjectProvider; @@ -27,7 +28,6 @@ import org.springframework.context.annotation.Import; import org.springframework.jms.core.JmsTemplate; -import javax.jms.ConnectionFactory; import java.util.HashMap; import java.util.Map; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/jms/ServiceBusJmsConnectionFactoryConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/jms/ServiceBusJmsConnectionFactoryConfiguration.java index 68209ee38bc4..e5d8223df9f8 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/jms/ServiceBusJmsConnectionFactoryConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/jms/ServiceBusJmsConnectionFactoryConfiguration.java @@ -4,6 +4,7 @@ package com.azure.spring.cloud.autoconfigure.jms; import com.azure.spring.cloud.autoconfigure.jms.properties.AzureServiceBusJmsProperties; +import jakarta.jms.ConnectionFactory; import org.apache.commons.pool2.PooledObject; import org.messaginghub.pooled.jms.JmsPoolConnectionFactory; import org.springframework.beans.factory.ObjectProvider; @@ -16,7 +17,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.jms.connection.CachingConnectionFactory; -import javax.jms.ConnectionFactory; import java.util.stream.Collectors; /** diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/jms/ServiceBusJmsContainerConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/jms/ServiceBusJmsContainerConfiguration.java index b3d654892293..f219af4286bc 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/jms/ServiceBusJmsContainerConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/jms/ServiceBusJmsContainerConfiguration.java @@ -4,6 +4,7 @@ package com.azure.spring.cloud.autoconfigure.jms; import com.azure.spring.cloud.autoconfigure.jms.properties.AzureServiceBusJmsProperties; +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; @@ -13,8 +14,6 @@ import org.springframework.jms.config.DefaultJmsListenerContainerFactory; import org.springframework.jms.config.JmsListenerContainerFactory; -import javax.jms.ConnectionFactory; - /** * Abstract autoconfiguration class of ServiceBusJMS for JmsListenerContainerFactory. */ 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 24293e0c2b0b..2409aa50332a 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 @@ -13,9 +13,6 @@ com.azure.spring.cloud.autoconfigure.context.AzureGlobalPropertiesAutoConfigurat com.azure.spring.cloud.autoconfigure.context.AzureTokenCredentialAutoConfiguration,\ com.azure.spring.cloud.autoconfigure.appconfiguration.AzureAppConfigurationAutoConfiguration,\ com.azure.spring.cloud.autoconfigure.cosmos.AzureCosmosAutoConfiguration,\ -com.azure.spring.cloud.autoconfigure.data.cosmos.CosmosDataAutoConfiguration,\ -com.azure.spring.cloud.autoconfigure.data.cosmos.CosmosRepositoriesAutoConfiguration,\ -com.azure.spring.cloud.autoconfigure.data.cosmos.CosmosReactiveRepositoriesAutoConfiguration,\ com.azure.spring.cloud.autoconfigure.eventhubs.AzureEventHubsAutoConfiguration,\ com.azure.spring.cloud.autoconfigure.eventhubs.AzureEventHubsMessagingAutoConfiguration,\ com.azure.spring.cloud.autoconfigure.eventhubs.kafka.AzureEventHubsKafkaAutoConfiguration,\ diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/filter/AadAppRoleAuthenticationFilterTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/filter/AadAppRoleAuthenticationFilterTests.java index f737e4df6430..3f0d7435c4f4 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/filter/AadAppRoleAuthenticationFilterTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/filter/AadAppRoleAuthenticationFilterTests.java @@ -11,6 +11,10 @@ import com.nimbusds.jose.proc.BadJOSEException; import com.nimbusds.jwt.JWTClaimsSet; import com.nimbusds.jwt.proc.BadJWTException; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import net.minidev.json.JSONArray; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; @@ -22,10 +26,6 @@ import org.springframework.security.core.context.SecurityContext; import org.springframework.security.core.context.SecurityContextHolder; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.text.ParseException; import java.util.Collection; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/filter/AadAuthenticationFilterTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/filter/AadAuthenticationFilterTests.java index bd5eabf18d3c..7e594a58931c 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/filter/AadAuthenticationFilterTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/filter/AadAuthenticationFilterTests.java @@ -11,6 +11,10 @@ import com.azure.spring.cloud.autoconfigure.context.AzureGlobalPropertiesAutoConfiguration; import com.nimbusds.jose.JOSEException; import com.nimbusds.jose.proc.BadJOSEException; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; @@ -20,10 +24,6 @@ import org.springframework.security.core.context.SecurityContext; import org.springframework.security.core.context.SecurityContextHolder; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.text.ParseException; import java.util.Map; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/WebApplicationContextRunnerUtils.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/WebApplicationContextRunnerUtils.java index a9136bcff64b..e72ff75e531e 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/WebApplicationContextRunnerUtils.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/WebApplicationContextRunnerUtils.java @@ -6,7 +6,6 @@ import com.azure.spring.cloud.autoconfigure.aad.AadAutoConfiguration; import com.azure.spring.cloud.autoconfigure.context.AzureGlobalPropertiesAutoConfiguration; import org.springframework.boot.autoconfigure.logging.ConditionEvaluationReportLoggingListener; -import org.springframework.boot.logging.LogLevel; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.runner.WebApplicationContextRunner; import org.springframework.http.HttpEntity; @@ -22,7 +21,7 @@ public class WebApplicationContextRunnerUtils { public static WebApplicationContextRunner oauthClientAndResourceServerRunner() { return new WebApplicationContextRunner() .withUserConfiguration(AzureGlobalPropertiesAutoConfiguration.class, AadAutoConfiguration.class) - .withInitializer(new ConditionEvaluationReportLoggingListener(LogLevel.INFO)); + .withInitializer(new ConditionEvaluationReportLoggingListener()); } public static WebApplicationContextRunner oauthClientRunner() { diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/graph/UserPrincipalMicrosoftGraphTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/graph/UserPrincipalMicrosoftGraphTests.java index 7c7f1b7d3149..c066de007c3b 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/graph/UserPrincipalMicrosoftGraphTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/graph/UserPrincipalMicrosoftGraphTests.java @@ -8,10 +8,10 @@ import com.azure.spring.cloud.autoconfigure.aad.properties.AadAuthorizationServerEndpoints; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import com.github.tomakehurst.wiremock.junit5.WireMockTest; import com.nimbusds.jose.JWSObject; import com.nimbusds.jwt.JWTClaimsSet; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.springframework.util.StringUtils; @@ -45,8 +45,9 @@ import static org.springframework.http.HttpHeaders.CONTENT_TYPE; import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; +@Disabled("No available jakarta version for 'com.github.tomakehurst:wiremock-jre8'") @TestInstance(TestInstance.Lifecycle.PER_CLASS) -@WireMockTest(httpPort = 8080) +//@WireMockTest(httpPort = 8080) class UserPrincipalMicrosoftGraphTests { private String clientId; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/oauth2/AadOAuth2ClientAuthenticationJwkResolverTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/oauth2/AadOAuth2ClientAuthenticationJwkResolverTests.java index 10b1f001c281..fb125b88cd3f 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/oauth2/AadOAuth2ClientAuthenticationJwkResolverTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/oauth2/AadOAuth2ClientAuthenticationJwkResolverTests.java @@ -7,12 +7,12 @@ import com.nimbusds.jose.jwk.JWK; import com.nimbusds.jose.jwk.KeyType; import com.nimbusds.jose.jwk.RSAKey; +import jakarta.xml.bind.DatatypeConverter; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.security.oauth2.client.registration.ClientRegistration; -import javax.xml.bind.DatatypeConverter; import java.util.function.Function; import static com.azure.spring.cloud.autoconfigure.aad.implementation.TestClientRegistrations.clientRegistration; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/oauth2/AadOAuth2ClientConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/oauth2/AadOAuth2ClientConfigurationTests.java index 05120cea9bc4..da33c38cc03a 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/oauth2/AadOAuth2ClientConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/oauth2/AadOAuth2ClientConfigurationTests.java @@ -5,29 +5,13 @@ import com.azure.spring.cloud.autoconfigure.aad.AadClientRegistrationRepository; import com.azure.spring.cloud.autoconfigure.aad.configuration.AadOAuth2ClientConfiguration; -import com.azure.spring.cloud.autoconfigure.aad.implementation.TestJwks; -import com.azure.spring.cloud.autoconfigure.aad.implementation.webapi.AadJwtBearerGrantRequestEntityConverter; import com.azure.spring.cloud.autoconfigure.aad.properties.AadAuthenticationProperties; -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.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.registration.ClientRegistration; import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository; import org.springframework.security.oauth2.client.web.OAuth2AuthorizedClientRepository; -import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames; -import org.springframework.security.oauth2.jwt.Jwt; -import org.springframework.test.util.ReflectionTestUtils; -import org.springframework.util.MultiValueMap; -import java.util.Arrays; import java.util.Set; import static com.azure.spring.cloud.autoconfigure.aad.implementation.WebApplicationContextRunnerUtils.oauthClientAndResourceServerRunner; @@ -36,11 +20,6 @@ import static com.azure.spring.cloud.autoconfigure.aad.implementation.WebApplicationContextRunnerUtils.webApplicationContextRunner; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.BDDMockito.given; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; class AadOAuth2ClientConfigurationTests { @@ -162,89 +141,4 @@ void testResourceServerWithOboExistCustomAndGraphClient() { assertThat(customScopes).containsOnly("api://52261059-e515-488e-84fd-a09a3f372814/File.Read"); }); } - - @Test - void defaultConverterInJwtBearerOAuth2AuthorizedClientProviderWhenNotUsingPrivateKeyJwtMethod() { - resourceServerWithOboContextRunner() - .withUserConfiguration(AadOAuth2ClientConfiguration.class) - .withPropertyValues( - "spring.cloud.azure.active-directory.enabled=true", - "spring.cloud.azure.active-directory.authorization-clients.graph.scopes=https://graph.microsoft.com/User.Read", - "spring.cloud.azure.active-directory.authorization-clients.graph.authorization-grant-type=on_behalf_of", - "spring.cloud.azure.active-directory.authorization-clients.graph.scopes=api://52261059-e515-488e-84fd-a09a3f372814/File.Read" - ) - .run(context -> { - assertThat(context).doesNotHaveBean(OAuth2ClientAuthenticationJwkResolver.class); - final JwtBearerOAuth2AuthorizedClientProvider jwtBearerProvider = context.getBean( - JwtBearerOAuth2AuthorizedClientProvider.class); - final ClientRegistrationRepository clientRepository = context.getBean( - ClientRegistrationRepository.class); - MultiValueMap parameters = convertParameters(jwtBearerProvider, clientRepository); - assertThat(parameters).containsEntry("requested_token_use", Arrays.asList("on_behalf_of")); - }); - } - - @Test - void customConverterInJwtBearerOAuth2AuthorizedClientProviderWhenUsingPrivateKeyJwtMethod() { - RSAKey rsaJwk = spy(TestJwks.DEFAULT_RSA_JWK); - OAuth2ClientAuthenticationJwkResolver jwkResolver = spy(new TestOAuth2ClientAuthenticationJwkResolver(rsaJwk)); - given(jwkResolver.resolve(any())).willReturn(rsaJwk); - given(rsaJwk.getX509CertThumbprint()).willReturn(new Base64URL("dGVzdA")); - - resourceServerWithOboContextRunner() - .withBean(OAuth2ClientAuthenticationJwkResolver.class, () -> jwkResolver) - .withUserConfiguration(AadOAuth2ClientConfiguration.class) - .withPropertyValues( - "spring.cloud.azure.active-directory.enabled=true", - "spring.cloud.azure.active-directory.credential.client-certificate-path=/test/test.pfx", - "spring.cloud.azure.active-directory.credential.client-certificate-password=test", - "spring.cloud.azure.active-directory.authorization-clients.graph.scopes=https://graph.microsoft.com/User.Read", - "spring.cloud.azure.active-directory.authorization-clients.graph.authorization-grant-type=urn:ietf:params:oauth:grant-type:jwt-bearer", - "spring.cloud.azure.active-directory.authorization-clients.graph.scopes=api://52261059-e515-488e-84fd-a09a3f372814/File.Read", - "spring.cloud.azure.active-directory.authorization-clients.graph.client-authentication-method=private_key_jwt" - ) - .run(context -> { - assertThat(context).hasSingleBean(OAuth2ClientAuthenticationJwkResolver.class); - final JwtBearerOAuth2AuthorizedClientProvider jwtBearerProvider = context.getBean( - JwtBearerOAuth2AuthorizedClientProvider.class); - final ClientRegistrationRepository clientRepository = context.getBean( - ClientRegistrationRepository.class); - - MultiValueMap parameters = convertParameters(jwtBearerProvider, clientRepository); - assertThat(parameters).containsEntry("requested_token_use", Arrays.asList("on_behalf_of")); - assertThat(parameters).containsKey(OAuth2ParameterNames.CLIENT_ASSERTION_TYPE); - verify(jwkResolver).resolve(clientRepository.findByRegistrationId("graph")); - }); - } - - @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()); - - Converter> parametersConverter = - (Converter>) ReflectionTestUtils.getField(requestEntityConverter, "parametersConverter"); - JwtBearerGrantRequest request = new JwtBearerGrantRequest(clientRepository.findByRegistrationId("graph"), mock(Jwt.class)); - return parametersConverter.convert(request); - } - - class TestOAuth2ClientAuthenticationJwkResolver implements OAuth2ClientAuthenticationJwkResolver { - - private final JWK jwk; - - TestOAuth2ClientAuthenticationJwkResolver(JWK jwk) { - this.jwk = jwk; - } - - @Override - public JWK resolve(ClientRegistration clientRegistration) { - return this.jwk; - } - } } diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/properties/AadAuthenticationPropertiesTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/properties/AadAuthenticationPropertiesTests.java index 97512850021a..862c9306c976 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/properties/AadAuthenticationPropertiesTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/properties/AadAuthenticationPropertiesTests.java @@ -380,24 +380,24 @@ void applicationTypeWithWebApplicationAndResourceServer() { @Test void applicationTypeWithWebApplicationAndResourceServerWithWrongAuthorizationGrantTypeConfigured() { resourceServerWithOboContextRunner() - .withPropertyValues( - "spring.cloud.azure.active-directory.application-type=web_application_and_resource_server", - "spring.cloud.azure.active-directory.authorization-clients.azure.authorization-grant-type=client_credential" - ) - .run(context -> assertThrows(IllegalStateException.class, () -> context.getBean(AadAuthenticationProperties.class))); + .withPropertyValues( + "spring.cloud.azure.active-directory.application-type=web_application_and_resource_server", + "spring.cloud.azure.active-directory.authorization-clients.azure.authorization-grant-type=client_credential" + ) + .run(context -> assertThrows(IllegalStateException.class, () -> context.getBean(AadAuthenticationProperties.class))); } @Test void applicationTypeWithWebApplicationAndResourceServerWithRightAuthorizationGrantTypeConfigured() { resourceServerWithOboContextRunner() - .withPropertyValues( - "spring.cloud.azure.active-directory.application-type=web_application_and_resource_server", - "spring.cloud.azure.active-directory.authorization-clients.azure.authorization-grant-type=authorization_code" - ) - .run(context -> { - AadAuthenticationProperties properties = context.getBean(AadAuthenticationProperties.class); - assertEquals(properties.getApplicationType(), AadApplicationType.WEB_APPLICATION_AND_RESOURCE_SERVER); - }); + .withPropertyValues( + "spring.cloud.azure.active-directory.application-type=web_application_and_resource_server", + "spring.cloud.azure.active-directory.authorization-clients.azure.authorization-grant-type=authorization_code" + ) + .run(context -> { + AadAuthenticationProperties properties = context.getBean(AadAuthenticationProperties.class); + assertEquals(properties.getApplicationType(), AadApplicationType.WEB_APPLICATION_AND_RESOURCE_SERVER); + }); } @Test diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aadb2c/implementation/AadB2cAuthorizationRequestResolverTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aadb2c/implementation/AadB2cAuthorizationRequestResolverTests.java index 9699d8d262af..72c3bad6d4c7 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aadb2c/implementation/AadB2cAuthorizationRequestResolverTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aadb2c/implementation/AadB2cAuthorizationRequestResolverTests.java @@ -5,6 +5,7 @@ import com.azure.spring.cloud.autoconfigure.aadb2c.AadB2cAuthorizationRequestResolver; import com.azure.spring.cloud.autoconfigure.aadb2c.AadB2cAutoConfiguration; import com.azure.spring.cloud.autoconfigure.context.AzureGlobalPropertiesAutoConfiguration; +import jakarta.servlet.http.HttpServletRequest; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; @@ -16,7 +17,6 @@ import org.springframework.security.oauth2.server.resource.BearerTokenAuthenticationToken; import org.springframework.util.Assert; -import javax.servlet.http.HttpServletRequest; import java.util.Arrays; class AadB2cAuthorizationRequestResolverTests { diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosDataAutoConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosDataAutoConfigurationTests.java index 966ac108abdd..e5e29330502e 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosDataAutoConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosDataAutoConfigurationTests.java @@ -1,77 +1,77 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. - -package com.azure.spring.cloud.autoconfigure.data.cosmos; - -import com.azure.cosmos.CosmosAsyncClient; -import com.azure.cosmos.CosmosClient; -import com.azure.cosmos.CosmosClientBuilder; -import com.azure.spring.cloud.autoconfigure.context.AzureGlobalPropertiesAutoConfiguration; -import com.azure.spring.cloud.autoconfigure.cosmos.AzureCosmosAutoConfiguration; -import com.azure.spring.data.cosmos.CosmosFactory; -import com.azure.spring.data.cosmos.config.CosmosConfig; -import com.azure.spring.data.cosmos.core.CosmosTemplate; -import com.azure.spring.data.cosmos.core.ReactiveCosmosTemplate; -import org.junit.jupiter.api.Test; -import org.mockito.MockedStatic; -import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.test.context.FilteredClassLoader; -import org.springframework.boot.test.context.runner.ApplicationContextRunner; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; -import static org.mockito.Mockito.mockStatic; -import static org.mockito.Mockito.RETURNS_MOCKS; - -class CosmosDataAutoConfigurationTests { - - private static final String ENDPOINT = "https://test.documents.azure.com:443/"; - private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() - .withConfiguration(AutoConfigurations.of( - AzureGlobalPropertiesAutoConfiguration.class, - AzureCosmosAutoConfiguration.class, - CosmosDataAutoConfiguration.class)); - - @Test - void configureWithoutCosmosTemplate() { - this.contextRunner - .withClassLoader(new FilteredClassLoader(CosmosTemplate.class)) - .run((context) -> assertThat(context).doesNotHaveBean(CosmosConfig.class)); - } - - @Test - void configureWithCosmosDisabled() { - this.contextRunner - .withPropertyValues("spring.cloud.azure.cosmos.enabled=false") - .run(context -> assertThat(context).doesNotHaveBean(CosmosConfig.class)); - } - - @Test - void configureWithoutEndpoint() { - this.contextRunner - .withPropertyValues("spring.cloud.azure.cosmos.enabled=true") - .run(context -> assertThat(context).doesNotHaveBean(CosmosConfig.class)); - } - - @Test - void cosmosTemplateExistsAndUsesIt() { - try (MockedStatic mockedStatic = mockStatic(CosmosFactory.class, RETURNS_MOCKS)) { - CosmosClientBuilder cosmosClientBuilder = mock(CosmosClientBuilder.class); - CosmosAsyncClient cosmosAsyncClient = mock(CosmosAsyncClient.class); - when(cosmosClientBuilder.buildAsyncClient()).thenReturn(cosmosAsyncClient); - mockedStatic.when(() -> CosmosFactory.createCosmosAsyncClient(cosmosClientBuilder)) - .thenReturn(cosmosAsyncClient); - this.contextRunner - .withBean(CosmosClientBuilder.class, () -> cosmosClientBuilder) - .withBean(CosmosClient.class, () -> mock(CosmosClient.class)) - .withPropertyValues( - "spring.cloud.azure.cosmos.endpoint=" + ENDPOINT, - "spring.cloud.azure.cosmos.database=test") - .run(context -> { - assertThat(context).hasSingleBean(CosmosTemplate.class); - assertThat(context).hasSingleBean(ReactiveCosmosTemplate.class); - }); - } - } -} +// +//package com.azure.spring.cloud.autoconfigure.data.cosmos; +// +//import com.azure.cosmos.CosmosAsyncClient; +//import com.azure.cosmos.CosmosClient; +//import com.azure.cosmos.CosmosClientBuilder; +//import com.azure.spring.cloud.autoconfigure.context.AzureGlobalPropertiesAutoConfiguration; +//import com.azure.spring.cloud.autoconfigure.cosmos.AzureCosmosAutoConfiguration; +//import com.azure.spring.data.cosmos.CosmosFactory; +//import com.azure.spring.data.cosmos.config.CosmosConfig; +//import com.azure.spring.data.cosmos.core.CosmosTemplate; +//import com.azure.spring.data.cosmos.core.ReactiveCosmosTemplate; +//import org.junit.jupiter.api.Test; +//import org.mockito.MockedStatic; +//import org.springframework.boot.autoconfigure.AutoConfigurations; +//import org.springframework.boot.test.context.FilteredClassLoader; +//import org.springframework.boot.test.context.runner.ApplicationContextRunner; +// +//import static org.assertj.core.api.Assertions.assertThat; +//import static org.mockito.Mockito.mock; +//import static org.mockito.Mockito.when; +//import static org.mockito.Mockito.mockStatic; +//import static org.mockito.Mockito.RETURNS_MOCKS; +// +//class CosmosDataAutoConfigurationTests { +// +// private static final String ENDPOINT = "https://test.documents.azure.com:443/"; +// private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() +// .withConfiguration(AutoConfigurations.of( +// AzureGlobalPropertiesAutoConfiguration.class, +// AzureCosmosAutoConfiguration.class, +// CosmosDataAutoConfiguration.class)); +// +// @Test +// void configureWithoutCosmosTemplate() { +// this.contextRunner +// .withClassLoader(new FilteredClassLoader(CosmosTemplate.class)) +// .run((context) -> assertThat(context).doesNotHaveBean(CosmosConfig.class)); +// } +// +// @Test +// void configureWithCosmosDisabled() { +// this.contextRunner +// .withPropertyValues("spring.cloud.azure.cosmos.enabled=false") +// .run(context -> assertThat(context).doesNotHaveBean(CosmosConfig.class)); +// } +// +// @Test +// void configureWithoutEndpoint() { +// this.contextRunner +// .withPropertyValues("spring.cloud.azure.cosmos.enabled=true") +// .run(context -> assertThat(context).doesNotHaveBean(CosmosConfig.class)); +// } +// +// @Test +// void cosmosTemplateExistsAndUsesIt() { +// try (MockedStatic mockedStatic = mockStatic(CosmosFactory.class, RETURNS_MOCKS)) { +// CosmosClientBuilder cosmosClientBuilder = mock(CosmosClientBuilder.class); +// CosmosAsyncClient cosmosAsyncClient = mock(CosmosAsyncClient.class); +// when(cosmosClientBuilder.buildAsyncClient()).thenReturn(cosmosAsyncClient); +// mockedStatic.when(() -> CosmosFactory.createCosmosAsyncClient(cosmosClientBuilder)) +// .thenReturn(cosmosAsyncClient); +// this.contextRunner +// .withBean(CosmosClientBuilder.class, () -> cosmosClientBuilder) +// .withBean(CosmosClient.class, () -> mock(CosmosClient.class)) +// .withPropertyValues( +// "spring.cloud.azure.cosmos.endpoint=" + ENDPOINT, +// "spring.cloud.azure.cosmos.database=test") +// .run(context -> { +// assertThat(context).hasSingleBean(CosmosTemplate.class); +// assertThat(context).hasSingleBean(ReactiveCosmosTemplate.class); +// }); +// } +// } +//} diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosReactiveRepositoriesAutoConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosReactiveRepositoriesAutoConfigurationTests.java index 333b2836bf5c..b29b19d98839 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosReactiveRepositoriesAutoConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosReactiveRepositoriesAutoConfigurationTests.java @@ -1,117 +1,117 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. - -package com.azure.spring.cloud.autoconfigure.data.cosmos; - -import com.azure.cosmos.models.CosmosContainerProperties; -import com.azure.cosmos.models.CosmosContainerResponse; -import com.azure.spring.cloud.autoconfigure.data.cosmos.domain.Person; -import com.azure.spring.cloud.autoconfigure.data.cosmos.domain.ReactivePersonRepository; -import com.azure.spring.data.cosmos.core.ReactiveCosmosTemplate; -import com.azure.spring.data.cosmos.core.convert.MappingCosmosConverter; -import com.azure.spring.data.cosmos.core.mapping.CosmosMappingContext; -import com.azure.spring.data.cosmos.repository.ReactiveCosmosRepository; -import com.azure.spring.data.cosmos.repository.config.EnableReactiveCosmosRepositories; -import com.azure.spring.data.cosmos.repository.config.ReactiveCosmosRepositoryConfigurationExtension; -import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; -import com.azure.spring.data.cosmos.repository.support.ReactiveCosmosRepositoryFactoryBean; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.test.context.FilteredClassLoader; -import org.springframework.boot.test.context.runner.ApplicationContextRunner; -import org.springframework.context.annotation.Configuration; -import reactor.core.publisher.Mono; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -public class CosmosReactiveRepositoriesAutoConfigurationTests { - - private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() - .withConfiguration(AutoConfigurations.of(CosmosReactiveRepositoriesAutoConfiguration.class)); - private ReactiveCosmosTemplate reactiveCosmosTemplate; - - @BeforeEach - void beforeEach() { - reactiveCosmosTemplate = mock(ReactiveCosmosTemplate.class); - CosmosMappingContext mappingContext = new CosmosMappingContext(); - MappingCosmosConverter cosmosConverter = new MappingCosmosConverter(mappingContext, new ObjectMapper()); - when(reactiveCosmosTemplate.createContainerIfNotExists(any(CosmosEntityInformation.class))) - .thenReturn(Mono.just(mock(CosmosContainerResponse.class))); - when(reactiveCosmosTemplate.getContainerProperties(any())) - .thenReturn(Mono.just(mock(CosmosContainerProperties.class))); - when(reactiveCosmosTemplate.getConverter()).thenReturn(cosmosConverter); - } - - @Test - void enabledDefaultRepositoryConfiguration() { - this.contextRunner - .withBean(ReactiveCosmosTemplate.class, () -> reactiveCosmosTemplate) - .withUserConfiguration(CosmosReactiveRepositoriesAutoConfigurationTests.TestConfiguration.class) - .run((context) -> assertThat(context).hasSingleBean(ReactivePersonRepository.class)); - } - - @Test - void disabledWhenReactiveCosmosRepositoryMissing() { - this.contextRunner - .withClassLoader(new FilteredClassLoader(ReactiveCosmosRepository.class)) - .withBean(ReactiveCosmosTemplate.class, () -> reactiveCosmosTemplate) - .withUserConfiguration(CosmosReactiveRepositoriesAutoConfigurationTests.TestConfiguration.class) - .run(context -> assertThat(context).doesNotHaveBean(ReactivePersonRepository.class)); - } - - @Test - void disabledWhenSpecialBeanExist() { - this.contextRunner - .withBean(ReactiveCosmosRepositoryFactoryBean.class, () -> mock(ReactiveCosmosRepositoryFactoryBean.class)) - .withBean(ReactiveCosmosTemplate.class, () -> reactiveCosmosTemplate) - .withUserConfiguration(CosmosReactiveRepositoriesAutoConfigurationTests.TestConfiguration.class) - .run(context -> assertThat(context).doesNotHaveBean(ReactivePersonRepository.class)); - - this.contextRunner - .withBean(ReactiveCosmosRepositoryConfigurationExtension.class, () -> mock(ReactiveCosmosRepositoryConfigurationExtension.class)) - .withBean(ReactiveCosmosTemplate.class, () -> reactiveCosmosTemplate) - .withUserConfiguration(CosmosReactiveRepositoriesAutoConfigurationTests.TestConfiguration.class) - .run(context -> assertThat(context).doesNotHaveBean(ReactivePersonRepository.class)); - } - - @Test - void disabledWhenReactiveCosmosTemplateMissing() { - this.contextRunner - .withUserConfiguration(CosmosReactiveRepositoriesAutoConfigurationTests.TestConfiguration.class) - .run(context -> assertThat(context).doesNotHaveBean(ReactivePersonRepository.class)); - } - - @Test - void disabledWhenPropertiesDisabled() { - this.contextRunner - .withBean(ReactiveCosmosTemplate.class, () -> reactiveCosmosTemplate) - .withPropertyValues("spring.cloud.azure.cosmos.repositories.enabled=false") - .withUserConfiguration(CosmosReactiveRepositoriesAutoConfigurationTests.TestConfiguration.class) - .run(context -> assertThat(context).doesNotHaveBean(ReactivePersonRepository.class)); - } - - @Test - void autoConfigNotKickInIfManualConfigDidNotCreateRepositories() { - this.contextRunner - .withBean(ReactiveCosmosTemplate.class, () -> reactiveCosmosTemplate) - .withUserConfiguration(CosmosReactiveRepositoriesAutoConfigurationTests.InvalidCustomConfiguration.class) - .run(context -> assertThat(context).doesNotHaveBean(ReactivePersonRepository.class)); - } - - @Configuration - @TestAutoConfigurationPackage(Person.class) - static class TestConfiguration { - } - - @Configuration - @EnableReactiveCosmosRepositories("foo.bar") - @TestAutoConfigurationPackage(CosmosReactiveRepositoriesAutoConfigurationTests.class) - static class InvalidCustomConfiguration { - - } -} +// +//package com.azure.spring.cloud.autoconfigure.data.cosmos; +// +//import com.azure.cosmos.models.CosmosContainerProperties; +//import com.azure.cosmos.models.CosmosContainerResponse; +//import com.azure.spring.cloud.autoconfigure.data.cosmos.domain.Person; +//import com.azure.spring.cloud.autoconfigure.data.cosmos.domain.ReactivePersonRepository; +//import com.azure.spring.data.cosmos.core.ReactiveCosmosTemplate; +//import com.azure.spring.data.cosmos.core.convert.MappingCosmosConverter; +//import com.azure.spring.data.cosmos.core.mapping.CosmosMappingContext; +//import com.azure.spring.data.cosmos.repository.ReactiveCosmosRepository; +//import com.azure.spring.data.cosmos.repository.config.EnableReactiveCosmosRepositories; +//import com.azure.spring.data.cosmos.repository.config.ReactiveCosmosRepositoryConfigurationExtension; +//import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; +//import com.azure.spring.data.cosmos.repository.support.ReactiveCosmosRepositoryFactoryBean; +//import com.fasterxml.jackson.databind.ObjectMapper; +//import org.junit.jupiter.api.BeforeEach; +//import org.junit.jupiter.api.Test; +//import org.springframework.boot.autoconfigure.AutoConfigurations; +//import org.springframework.boot.test.context.FilteredClassLoader; +//import org.springframework.boot.test.context.runner.ApplicationContextRunner; +//import org.springframework.context.annotation.Configuration; +//import reactor.core.publisher.Mono; +// +//import static org.assertj.core.api.Assertions.assertThat; +//import static org.mockito.ArgumentMatchers.any; +//import static org.mockito.Mockito.mock; +//import static org.mockito.Mockito.when; +// +//public class CosmosReactiveRepositoriesAutoConfigurationTests { +// +// private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() +// .withConfiguration(AutoConfigurations.of(CosmosReactiveRepositoriesAutoConfiguration.class)); +// private ReactiveCosmosTemplate reactiveCosmosTemplate; +// +// @BeforeEach +// void beforeEach() { +// reactiveCosmosTemplate = mock(ReactiveCosmosTemplate.class); +// CosmosMappingContext mappingContext = new CosmosMappingContext(); +// MappingCosmosConverter cosmosConverter = new MappingCosmosConverter(mappingContext, new ObjectMapper()); +// when(reactiveCosmosTemplate.createContainerIfNotExists(any(CosmosEntityInformation.class))) +// .thenReturn(Mono.just(mock(CosmosContainerResponse.class))); +// when(reactiveCosmosTemplate.getContainerProperties(any())) +// .thenReturn(Mono.just(mock(CosmosContainerProperties.class))); +// when(reactiveCosmosTemplate.getConverter()).thenReturn(cosmosConverter); +// } +// +// @Test +// void enabledDefaultRepositoryConfiguration() { +// this.contextRunner +// .withBean(ReactiveCosmosTemplate.class, () -> reactiveCosmosTemplate) +// .withUserConfiguration(CosmosReactiveRepositoriesAutoConfigurationTests.TestConfiguration.class) +// .run((context) -> assertThat(context).hasSingleBean(ReactivePersonRepository.class)); +// } +// +// @Test +// void disabledWhenReactiveCosmosRepositoryMissing() { +// this.contextRunner +// .withClassLoader(new FilteredClassLoader(ReactiveCosmosRepository.class)) +// .withBean(ReactiveCosmosTemplate.class, () -> reactiveCosmosTemplate) +// .withUserConfiguration(CosmosReactiveRepositoriesAutoConfigurationTests.TestConfiguration.class) +// .run(context -> assertThat(context).doesNotHaveBean(ReactivePersonRepository.class)); +// } +// +// @Test +// void disabledWhenSpecialBeanExist() { +// this.contextRunner +// .withBean(ReactiveCosmosRepositoryFactoryBean.class, () -> mock(ReactiveCosmosRepositoryFactoryBean.class)) +// .withBean(ReactiveCosmosTemplate.class, () -> reactiveCosmosTemplate) +// .withUserConfiguration(CosmosReactiveRepositoriesAutoConfigurationTests.TestConfiguration.class) +// .run(context -> assertThat(context).doesNotHaveBean(ReactivePersonRepository.class)); +// +// this.contextRunner +// .withBean(ReactiveCosmosRepositoryConfigurationExtension.class, () -> mock(ReactiveCosmosRepositoryConfigurationExtension.class)) +// .withBean(ReactiveCosmosTemplate.class, () -> reactiveCosmosTemplate) +// .withUserConfiguration(CosmosReactiveRepositoriesAutoConfigurationTests.TestConfiguration.class) +// .run(context -> assertThat(context).doesNotHaveBean(ReactivePersonRepository.class)); +// } +// +// @Test +// void disabledWhenReactiveCosmosTemplateMissing() { +// this.contextRunner +// .withUserConfiguration(CosmosReactiveRepositoriesAutoConfigurationTests.TestConfiguration.class) +// .run(context -> assertThat(context).doesNotHaveBean(ReactivePersonRepository.class)); +// } +// +// @Test +// void disabledWhenPropertiesDisabled() { +// this.contextRunner +// .withBean(ReactiveCosmosTemplate.class, () -> reactiveCosmosTemplate) +// .withPropertyValues("spring.cloud.azure.cosmos.repositories.enabled=false") +// .withUserConfiguration(CosmosReactiveRepositoriesAutoConfigurationTests.TestConfiguration.class) +// .run(context -> assertThat(context).doesNotHaveBean(ReactivePersonRepository.class)); +// } +// +// @Test +// void autoConfigNotKickInIfManualConfigDidNotCreateRepositories() { +// this.contextRunner +// .withBean(ReactiveCosmosTemplate.class, () -> reactiveCosmosTemplate) +// .withUserConfiguration(CosmosReactiveRepositoriesAutoConfigurationTests.InvalidCustomConfiguration.class) +// .run(context -> assertThat(context).doesNotHaveBean(ReactivePersonRepository.class)); +// } +// +// @Configuration +// @TestAutoConfigurationPackage(Person.class) +// static class TestConfiguration { +// } +// +// @Configuration +// @EnableReactiveCosmosRepositories("foo.bar") +// @TestAutoConfigurationPackage(CosmosReactiveRepositoriesAutoConfigurationTests.class) +// static class InvalidCustomConfiguration { +// +// } +//} diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosRepositoriesAutoConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosRepositoriesAutoConfigurationTests.java index 2a42d7044b1b..50f621299db2 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosRepositoriesAutoConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosRepositoriesAutoConfigurationTests.java @@ -1,119 +1,119 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. - -package com.azure.spring.cloud.autoconfigure.data.cosmos; - -import com.azure.cosmos.models.CosmosContainerProperties; -import com.azure.spring.cloud.autoconfigure.data.cosmos.domain.Person; -import com.azure.spring.cloud.autoconfigure.data.cosmos.domain.PersonRepository; -import com.azure.spring.data.cosmos.core.CosmosTemplate; -import com.azure.spring.data.cosmos.core.convert.MappingCosmosConverter; -import com.azure.spring.data.cosmos.core.mapping.CosmosMappingContext; -import com.azure.spring.data.cosmos.repository.CosmosRepository; -import com.azure.spring.data.cosmos.repository.config.CosmosRepositoryConfigurationExtension; -import com.azure.spring.data.cosmos.repository.config.EnableCosmosRepositories; -import com.azure.spring.data.cosmos.repository.support.CosmosRepositoryFactoryBean; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.test.context.FilteredClassLoader; -import org.springframework.boot.test.context.runner.ApplicationContextRunner; -import org.springframework.context.annotation.Configuration; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -class CosmosRepositoriesAutoConfigurationTests { - - private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() - .withConfiguration(AutoConfigurations.of(CosmosRepositoriesAutoConfiguration.class)); - - private CosmosTemplate cosmosTemplate; - - @BeforeEach - void beforeEach() { - cosmosTemplate = mock(CosmosTemplate.class); - CosmosMappingContext mappingContext = new CosmosMappingContext(); - MappingCosmosConverter cosmosConverter = new MappingCosmosConverter(mappingContext, new ObjectMapper()); - - when(cosmosTemplate.getContainerProperties(any())).thenReturn(mock(CosmosContainerProperties.class)); - when(cosmosTemplate.getConverter()).thenReturn(cosmosConverter); - } - - @Test - void enabledDefaultRepositoryConfiguration() { - this.contextRunner - .withBean(CosmosTemplate.class, () -> cosmosTemplate) - .withUserConfiguration(TestConfiguration.class) - .run(context -> assertThat(context).hasSingleBean(PersonRepository.class)); - } - - @Test - void disabledWhenCosmosRepositoryMissing() { - this.contextRunner - .withClassLoader(new FilteredClassLoader(CosmosRepository.class)) - .withBean(CosmosTemplate.class, () -> cosmosTemplate) - .withUserConfiguration(TestConfiguration.class) - .run(context -> assertThat(context).doesNotHaveBean(PersonRepository.class)); - } - - @Test - void disabledWhenCosmosRepositoryFactoryBeanExists() { - this.contextRunner - .withBean(CosmosTemplate.class, () -> cosmosTemplate) - .withBean(CosmosRepositoryFactoryBean.class, () -> mock(CosmosRepositoryFactoryBean.class)) - .withUserConfiguration(TestConfiguration.class) - .run(context -> assertThat(context).doesNotHaveBean(PersonRepository.class)); - } - - @Test - void disabledWhenCosmosRepositoryConfigurationExtensionBeanExists() { - this.contextRunner - .withBean(CosmosTemplate.class, () -> cosmosTemplate) - .withBean(CosmosRepositoryConfigurationExtension.class, () -> mock(CosmosRepositoryConfigurationExtension.class)) - .withUserConfiguration(TestConfiguration.class) - .run(context -> assertThat(context).doesNotHaveBean(PersonRepository.class)); - } - - @Test - void disabledWhenPropertiesDisabled() { - this.contextRunner - .withBean(CosmosTemplate.class, () -> cosmosTemplate) - .withPropertyValues("spring.cloud.azure.cosmos.repositories.enabled=false") - .withUserConfiguration(TestConfiguration.class) - .run(context -> assertThat(context).doesNotHaveBean(PersonRepository.class)); - } - - @Test - void disabledWhenCosmosTemplateBeanMissing() { - this.contextRunner - .withUserConfiguration(TestConfiguration.class) - .run(context -> assertThat(context).doesNotHaveBean(PersonRepository.class)); - } - - @Test - void autoConfigNotKickInIfManualConfigDidNotCreateRepositories() { - this.contextRunner - .withBean(CosmosTemplate.class, () -> cosmosTemplate) - .withUserConfiguration(InvalidCustomConfiguration.class) - .run(context -> assertThat(context).doesNotHaveBean(PersonRepository.class)); - } - - - @Configuration - @TestAutoConfigurationPackage(Person.class) - static class TestConfiguration { - } - - @Configuration - @EnableCosmosRepositories("foo.bar") - @TestAutoConfigurationPackage(CosmosRepositoriesAutoConfigurationTests.class) - static class InvalidCustomConfiguration { - - } - -} - +// +//package com.azure.spring.cloud.autoconfigure.data.cosmos; +// +//import com.azure.cosmos.models.CosmosContainerProperties; +//import com.azure.spring.cloud.autoconfigure.data.cosmos.domain.Person; +//import com.azure.spring.cloud.autoconfigure.data.cosmos.domain.PersonRepository; +//import com.azure.spring.data.cosmos.core.CosmosTemplate; +//import com.azure.spring.data.cosmos.core.convert.MappingCosmosConverter; +//import com.azure.spring.data.cosmos.core.mapping.CosmosMappingContext; +//import com.azure.spring.data.cosmos.repository.CosmosRepository; +//import com.azure.spring.data.cosmos.repository.config.CosmosRepositoryConfigurationExtension; +//import com.azure.spring.data.cosmos.repository.config.EnableCosmosRepositories; +//import com.azure.spring.data.cosmos.repository.support.CosmosRepositoryFactoryBean; +//import com.fasterxml.jackson.databind.ObjectMapper; +//import org.junit.jupiter.api.BeforeEach; +//import org.junit.jupiter.api.Test; +//import org.springframework.boot.autoconfigure.AutoConfigurations; +//import org.springframework.boot.test.context.FilteredClassLoader; +//import org.springframework.boot.test.context.runner.ApplicationContextRunner; +//import org.springframework.context.annotation.Configuration; +// +//import static org.assertj.core.api.Assertions.assertThat; +//import static org.mockito.ArgumentMatchers.any; +//import static org.mockito.Mockito.mock; +//import static org.mockito.Mockito.when; +// +//class CosmosRepositoriesAutoConfigurationTests { +// +// private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() +// .withConfiguration(AutoConfigurations.of(CosmosRepositoriesAutoConfiguration.class)); +// +// private CosmosTemplate cosmosTemplate; +// +// @BeforeEach +// void beforeEach() { +// cosmosTemplate = mock(CosmosTemplate.class); +// CosmosMappingContext mappingContext = new CosmosMappingContext(); +// MappingCosmosConverter cosmosConverter = new MappingCosmosConverter(mappingContext, new ObjectMapper()); +// +// when(cosmosTemplate.getContainerProperties(any())).thenReturn(mock(CosmosContainerProperties.class)); +// when(cosmosTemplate.getConverter()).thenReturn(cosmosConverter); +// } +// +// @Test +// void enabledDefaultRepositoryConfiguration() { +// this.contextRunner +// .withBean(CosmosTemplate.class, () -> cosmosTemplate) +// .withUserConfiguration(TestConfiguration.class) +// .run(context -> assertThat(context).hasSingleBean(PersonRepository.class)); +// } +// +// @Test +// void disabledWhenCosmosRepositoryMissing() { +// this.contextRunner +// .withClassLoader(new FilteredClassLoader(CosmosRepository.class)) +// .withBean(CosmosTemplate.class, () -> cosmosTemplate) +// .withUserConfiguration(TestConfiguration.class) +// .run(context -> assertThat(context).doesNotHaveBean(PersonRepository.class)); +// } +// +// @Test +// void disabledWhenCosmosRepositoryFactoryBeanExists() { +// this.contextRunner +// .withBean(CosmosTemplate.class, () -> cosmosTemplate) +// .withBean(CosmosRepositoryFactoryBean.class, () -> mock(CosmosRepositoryFactoryBean.class)) +// .withUserConfiguration(TestConfiguration.class) +// .run(context -> assertThat(context).doesNotHaveBean(PersonRepository.class)); +// } +// +// @Test +// void disabledWhenCosmosRepositoryConfigurationExtensionBeanExists() { +// this.contextRunner +// .withBean(CosmosTemplate.class, () -> cosmosTemplate) +// .withBean(CosmosRepositoryConfigurationExtension.class, () -> mock(CosmosRepositoryConfigurationExtension.class)) +// .withUserConfiguration(TestConfiguration.class) +// .run(context -> assertThat(context).doesNotHaveBean(PersonRepository.class)); +// } +// +// @Test +// void disabledWhenPropertiesDisabled() { +// this.contextRunner +// .withBean(CosmosTemplate.class, () -> cosmosTemplate) +// .withPropertyValues("spring.cloud.azure.cosmos.repositories.enabled=false") +// .withUserConfiguration(TestConfiguration.class) +// .run(context -> assertThat(context).doesNotHaveBean(PersonRepository.class)); +// } +// +// @Test +// void disabledWhenCosmosTemplateBeanMissing() { +// this.contextRunner +// .withUserConfiguration(TestConfiguration.class) +// .run(context -> assertThat(context).doesNotHaveBean(PersonRepository.class)); +// } +// +// @Test +// void autoConfigNotKickInIfManualConfigDidNotCreateRepositories() { +// this.contextRunner +// .withBean(CosmosTemplate.class, () -> cosmosTemplate) +// .withUserConfiguration(InvalidCustomConfiguration.class) +// .run(context -> assertThat(context).doesNotHaveBean(PersonRepository.class)); +// } +// +// +// @Configuration +// @TestAutoConfigurationPackage(Person.class) +// static class TestConfiguration { +// } +// +// @Configuration +// @EnableCosmosRepositories("foo.bar") +// @TestAutoConfigurationPackage(CosmosRepositoriesAutoConfigurationTests.class) +// static class InvalidCustomConfiguration { +// +// } +// +//} +// diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/TestAutoConfigurationPackage.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/TestAutoConfigurationPackage.java index e88f5095c34f..cae4eb939500 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/TestAutoConfigurationPackage.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/TestAutoConfigurationPackage.java @@ -1,23 +1,23 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. - -package com.azure.spring.cloud.autoconfigure.data.cosmos; - -import org.springframework.context.annotation.Import; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - - -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -@Documented -@Import(TestAutoConfigurationPackageRegistrar.class) -public @interface TestAutoConfigurationPackage { - - Class value(); - -} +// +//package com.azure.spring.cloud.autoconfigure.data.cosmos; +// +//import org.springframework.context.annotation.Import; +// +//import java.lang.annotation.Documented; +//import java.lang.annotation.ElementType; +//import java.lang.annotation.Retention; +//import java.lang.annotation.RetentionPolicy; +//import java.lang.annotation.Target; +// +// +//@Target(ElementType.TYPE) +//@Retention(RetentionPolicy.RUNTIME) +//@Documented +//@Import(TestAutoConfigurationPackageRegistrar.class) +//public @interface TestAutoConfigurationPackage { +// +// Class value(); +// +//} diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/TestAutoConfigurationPackageRegistrar.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/TestAutoConfigurationPackageRegistrar.java index b12b1f96aadd..70168eb9e956 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/TestAutoConfigurationPackageRegistrar.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/TestAutoConfigurationPackageRegistrar.java @@ -1,26 +1,26 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. - -package com.azure.spring.cloud.autoconfigure.data.cosmos; - -import org.springframework.beans.factory.support.BeanDefinitionRegistry; -import org.springframework.boot.autoconfigure.AutoConfigurationPackages; -import org.springframework.context.annotation.ImportBeanDefinitionRegistrar; -import org.springframework.core.annotation.AnnotationAttributes; -import org.springframework.core.type.AnnotationMetadata; -import org.springframework.util.ClassUtils; - -public class TestAutoConfigurationPackageRegistrar - implements ImportBeanDefinitionRegistrar { - - @Override - public void registerBeanDefinitions(AnnotationMetadata metadata, - BeanDefinitionRegistry registry) { - final AnnotationAttributes attributes = AnnotationAttributes - .fromMap(metadata.getAnnotationAttributes( - TestAutoConfigurationPackage.class.getName(), true)); - AutoConfigurationPackages.register(registry, - ClassUtils.getPackageName(attributes.getString("value"))); - } - -} +// +//package com.azure.spring.cloud.autoconfigure.data.cosmos; +// +//import org.springframework.beans.factory.support.BeanDefinitionRegistry; +//import org.springframework.boot.autoconfigure.AutoConfigurationPackages; +//import org.springframework.context.annotation.ImportBeanDefinitionRegistrar; +//import org.springframework.core.annotation.AnnotationAttributes; +//import org.springframework.core.type.AnnotationMetadata; +//import org.springframework.util.ClassUtils; +// +//public class TestAutoConfigurationPackageRegistrar +// implements ImportBeanDefinitionRegistrar { +// +// @Override +// public void registerBeanDefinitions(AnnotationMetadata metadata, +// BeanDefinitionRegistry registry) { +// final AnnotationAttributes attributes = AnnotationAttributes +// .fromMap(metadata.getAnnotationAttributes( +// TestAutoConfigurationPackage.class.getName(), true)); +// AutoConfigurationPackages.register(registry, +// ClassUtils.getPackageName(attributes.getString("value"))); +// } +// +//} diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/domain/PersonRepository.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/domain/PersonRepository.java index 165fcec29219..82a34fd8f9a6 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/domain/PersonRepository.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/domain/PersonRepository.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. - -package com.azure.spring.cloud.autoconfigure.data.cosmos.domain; - -import com.azure.spring.data.cosmos.repository.CosmosRepository; - -public interface PersonRepository extends CosmosRepository { -} +// +//package com.azure.spring.cloud.autoconfigure.data.cosmos.domain; +// +//import com.azure.spring.data.cosmos.repository.CosmosRepository; +// +//public interface PersonRepository extends CosmosRepository { +//} diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/domain/ReactivePersonRepository.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/domain/ReactivePersonRepository.java index 069e1a46f781..16d1a5e1ddf6 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/domain/ReactivePersonRepository.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/domain/ReactivePersonRepository.java @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. - -package com.azure.spring.cloud.autoconfigure.data.cosmos.domain; - -import com.azure.spring.data.cosmos.repository.ReactiveCosmosRepository; - -public interface ReactivePersonRepository extends ReactiveCosmosRepository { -} +// +//package com.azure.spring.cloud.autoconfigure.data.cosmos.domain; +// +//import com.azure.spring.data.cosmos.repository.ReactiveCosmosRepository; +// +//public interface ReactivePersonRepository extends ReactiveCosmosRepository { +//} diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/eventhubs/AzureEventHubsAutoConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/eventhubs/AzureEventHubsAutoConfigurationTests.java index a48dce5e27fa..043dc4ddd877 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/eventhubs/AzureEventHubsAutoConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/eventhubs/AzureEventHubsAutoConfigurationTests.java @@ -146,7 +146,7 @@ void configurationPropertiesShouldBind() { this.contextRunner .withPropertyValues( "spring.cloud.azure.eventhubs.credential.client-id=eventhubs-client-id", - + "spring.cloud.azure.eventhubs.shared-connection=true", "spring.cloud.azure.eventhubs.domain-name=fake-domain", "spring.cloud.azure.eventhubs.namespace=fake-namespace", @@ -191,7 +191,7 @@ void configurationPropertiesShouldBind() { .run(context -> { assertThat(context).hasSingleBean(AzureEventHubsProperties.class); AzureEventHubsProperties properties = context.getBean(AzureEventHubsProperties.class); - + assertTrue(properties.getSharedConnection()); assertEquals("fake-domain", properties.getDomainName()); assertEquals("fake-namespace", properties.getNamespace()); 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 a2215925cf51..07d2e39999a8 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 @@ -9,17 +9,14 @@ import java.util.Collections; import java.util.List; -import static com.azure.spring.cloud.autoconfigure.implementation.compatibility.AzureSpringBootVersionVerifier.SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_2_5; -import static com.azure.spring.cloud.autoconfigure.implementation.compatibility.AzureSpringBootVersionVerifier.SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_2_6; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; class AzureSpringBootVersionVerifierTest { @ParameterizedTest - @ValueSource(strings = { "2.6", "2.6.2", "2.6.x" }) + @ValueSource(strings = { "3.0.0" }) public void shouldMatchWhenManifestNumberAndAcceptedNumberSpecifiedCase1(String acceptedVersion) { List acceptedVersions = Collections.singletonList(acceptedVersion); ClassNameResolverPredicate mockResolver = mock(ClassNameResolverPredicate.class); @@ -27,7 +24,7 @@ public void shouldMatchWhenManifestNumberAndAcceptedNumberSpecifiedCase1(String mockResolver) { String getVersionFromManifest() { - return "2.6.2"; + return "3.0.0M3"; } }; VerificationResult verificationResult = versionVerifier.verify(); @@ -36,110 +33,14 @@ String getVersionFromManifest() { } @ParameterizedTest - @ValueSource(strings = { "2.6", "2.6.2", "2.6.x" }) + @ValueSource(strings = { "3.0.0" }) public void shouldNotMatchWhenManifestNumberAndAcceptedNumberSpecifiedCase1(String acceptedVersion) { List acceptedVersions = Collections.singletonList(acceptedVersion); ClassNameResolverPredicate mockResolver = mock(ClassNameResolverPredicate.class); AzureSpringBootVersionVerifier versionVerifier = new AzureSpringBootVersionVerifier(acceptedVersions, mockResolver) { String getVersionFromManifest() { - return "2.5.2"; - } - }; - - assertThrows(AzureCompatibilityNotMetException.class, versionVerifier::verify); - } - - - @ParameterizedTest - @ValueSource(strings = { "2.5", "2.5.x", "2.6", "2.6.x" }) - public void shouldMatchWhenManifestNumberNotPresentAndAcceptedNumberSpecifiedCase1(String acceptedVersion) { - List acceptedVersions = Collections.singletonList(acceptedVersion); - ClassNameResolverPredicate mockResolver = mock(ClassNameResolverPredicate.class); - when(mockResolver.resolve(SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_2_5)).thenReturn(true); - when(mockResolver.resolve(SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_2_6)).thenReturn(true); - - AzureSpringBootVersionVerifier versionVerifier = new AzureSpringBootVersionVerifier(acceptedVersions, - mockResolver) { - String getVersionFromManifest() { - return ""; - } - }; - - VerificationResult verificationResult = versionVerifier.verify(); - - assertEquals(verificationResult.getDescription(), ""); - assertEquals(verificationResult.getAction(), ""); - } - - - @ParameterizedTest - @ValueSource(strings = { "2.6", "2.6.x" }) - public void shouldNotMatchWhenManifestNumberNotPresentAndAcceptedNumberSpecifiedCase1(String acceptedVersion) { - List acceptedVersions = Collections.singletonList(acceptedVersion); - ClassNameResolverPredicate mockResolver = mock(ClassNameResolverPredicate.class); - when(mockResolver.resolve(SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_2_5)).thenReturn(true); - when(mockResolver.resolve(SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_2_6)).thenReturn(false); - - AzureSpringBootVersionVerifier versionVerifier = new AzureSpringBootVersionVerifier(acceptedVersions, - mockResolver) { - String getVersionFromManifest() { - return ""; - } - }; - - assertThrows(AzureCompatibilityNotMetException.class, versionVerifier::verify); - } - - @ParameterizedTest - @ValueSource(strings = { "2.6.2" }) - public void shouldNotMatchWhenManifestNumberNotPresentAndAcceptedNumberSpecifiedCase2() { - List acceptedVersions = Collections.singletonList("2.6.2"); - ClassNameResolverPredicate mockResolver = mock(ClassNameResolverPredicate.class); - when(mockResolver.resolve(SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_2_5)).thenReturn(true); - when(mockResolver.resolve(SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_2_6)).thenReturn(true); - - AzureSpringBootVersionVerifier versionVerifier = new AzureSpringBootVersionVerifier(acceptedVersions, - mockResolver) { - String getVersionFromManifest() { - return ""; - } - }; - - assertThrows(AzureCompatibilityNotMetException.class, versionVerifier::verify); - } - - @ParameterizedTest - @ValueSource(strings = { "2.5.2" }) - public void shouldNotMatchWhenManifestNumberNotPresentAndAcceptedNumberSpecifiedCase3() { - List acceptedVersions = Collections.singletonList("2.6.2"); - ClassNameResolverPredicate mockResolver = mock(ClassNameResolverPredicate.class); - when(mockResolver.resolve(SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_2_5)).thenReturn(true); - when(mockResolver.resolve(SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_2_6)).thenReturn(true); - - AzureSpringBootVersionVerifier versionVerifier = new AzureSpringBootVersionVerifier(acceptedVersions, - mockResolver) { - String getVersionFromManifest() { - return ""; - } - }; - - assertThrows(AzureCompatibilityNotMetException.class, versionVerifier::verify); - } - - - @ParameterizedTest - @ValueSource(strings = { "2.5", "2.5.x" }) - public void shouldNotMatchWhenManifestNumberNotPresentAndAcceptedNumberSpecifiedCase4() { - List acceptedVersions = Collections.singletonList("2.6.2"); - ClassNameResolverPredicate mockResolver = mock(ClassNameResolverPredicate.class); - when(mockResolver.resolve(SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_2_5)).thenReturn(false); - when(mockResolver.resolve(SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_2_6)).thenReturn(false); - - AzureSpringBootVersionVerifier versionVerifier = new AzureSpringBootVersionVerifier(acceptedVersions, - mockResolver) { - String getVersionFromManifest() { - return ""; + return "2.7.2"; } }; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/jms/ServiceBusJmsAutoConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/jms/ServiceBusJmsAutoConfigurationTests.java index 53857f90d851..88177e149adc 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/jms/ServiceBusJmsAutoConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/jms/ServiceBusJmsAutoConfigurationTests.java @@ -6,6 +6,8 @@ import com.azure.spring.cloud.autoconfigure.jms.properties.AzureServiceBusJmsProperties; import com.azure.spring.cloud.core.provider.connectionstring.StaticConnectionStringProvider; import com.azure.spring.cloud.core.service.AzureServiceType; +import jakarta.jms.ConnectionFactory; +import jakarta.jms.Session; import org.apache.qpid.jms.JmsConnectionFactory; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -26,8 +28,6 @@ import org.springframework.jms.core.JmsTemplate; import org.springframework.jms.listener.DefaultMessageListenerContainer; -import javax.jms.ConnectionFactory; -import javax.jms.Session; import java.time.Duration; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sdk/spring/spring-cloud-azure-core/pom.xml b/sdk/spring/spring-cloud-azure-core/pom.xml index e90f80a9a521..8da2375e3a5f 100644 --- a/sdk/spring/spring-cloud-azure-core/pom.xml +++ b/sdk/spring/spring-cloud-azure-core/pom.xml @@ -12,7 +12,7 @@ com.azure.spring spring-cloud-azure-core - 4.4.0-beta.1 + 6.0.0-beta.1 Spring Cloud Azure Core https://microsoft.github.io/spring-cloud-azure @@ -32,11 +32,34 @@ https://github.com/Azure/azure-sdk-for-java/issues + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + org.springframework spring-context - 5.3.22 + 6.0.0-M5 com.azure @@ -87,7 +110,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test @@ -99,7 +122,7 @@ org.springframework spring-test - 5.3.22 + 6.0.0-M5 test @@ -125,7 +148,7 @@ - org.springframework:spring-context:[5.3.22] + org.springframework:spring-context:[6.0.0-M5] diff --git a/sdk/spring/spring-cloud-azure-integration-tests/pom.xml b/sdk/spring/spring-cloud-azure-integration-tests/pom.xml index 6442cc760eb6..ffe778c77676 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 - 2.7.3 + 3.0.0-M4 @@ -33,69 +33,94 @@ + 17 true + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + com.azure.spring spring-cloud-azure-starter-servicebus - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-cloud-azure-starter-servicebus-jms - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-cloud-azure-starter-eventhubs - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-cloud-azure-starter-keyvault-secrets - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-cloud-azure-starter-storage-blob - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-cloud-azure-starter-storage-file-share - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-cloud-azure-starter-storage-queue - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-cloud-azure-starter-appconfiguration - 4.4.0-beta.1 + 6.0.0-beta.1 - + + - + 6.0.0-beta.1 <!– {x-version-update;com.azure.spring:spring-cloud-azure-starter-data-cosmos;current} –> + --> com.azure.spring spring-cloud-azure-starter-cosmos - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-cloud-azure-stream-binder-eventhubs - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-cloud-azure-stream-binder-servicebus - 4.4.0-beta.1 + 6.0.0-beta.1 org.springframework.boot diff --git a/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/cosmos/User.java b/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/cosmos/User.java index 4307df51e8e3..102cca5f3803 100644 --- a/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/cosmos/User.java +++ b/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/cosmos/User.java @@ -2,11 +2,9 @@ // Licensed under the MIT License. package com.azure.spring.cloud.integration.tests.cosmos; -import com.azure.spring.data.cosmos.core.mapping.Container; import java.util.Objects; -@Container(containerName = "Users") public class User { private String id; private String firstName; diff --git a/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/cosmos/springdata/SpringDataCosmosIT.java b/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/cosmos/springdata/SpringDataCosmosIT.java index 51cdbf84c02d..13c309ac1f7a 100644 --- a/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/cosmos/springdata/SpringDataCosmosIT.java +++ b/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/cosmos/springdata/SpringDataCosmosIT.java @@ -1,36 +1,36 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.spring.cloud.integration.tests.cosmos.springdata; - -import com.azure.spring.cloud.integration.tests.cosmos.User; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.ActiveProfiles; - -import java.util.Optional; - -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE) -@ActiveProfiles("cosmos-springdata") -public class SpringDataCosmosIT { - private static final Logger LOGGER = LoggerFactory.getLogger(SpringDataCosmosIT.class); - private static final String USER_ID = "testSpringDataCosmos"; - - @Autowired - private UserRepository userRepository; - - @Test - public void testSpringDataCosmosOperation() { - LOGGER.info("SpringDataCosmosIT begin."); - User testUser = new User(USER_ID, "testFirstName", "testLastName", "test address line one"); - userRepository.save(testUser); - Optional user = userRepository.findById(USER_ID); - Assertions.assertEquals(testUser, user.get()); - userRepository.delete(testUser); - Assertions.assertFalse(userRepository.findById(USER_ID).isPresent()); - LOGGER.info("SpringDataCosmosIT end."); - } -} +//package com.azure.spring.cloud.integration.tests.cosmos.springdata; +// +//import com.azure.spring.cloud.integration.tests.cosmos.User; +//import org.junit.jupiter.api.Assertions; +//import org.junit.jupiter.api.Test; +//import org.slf4j.Logger; +//import org.slf4j.LoggerFactory; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.boot.test.context.SpringBootTest; +//import org.springframework.test.context.ActiveProfiles; +// +//import java.util.Optional; +// +//@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE) +//@ActiveProfiles("cosmos-springdata") +//public class SpringDataCosmosIT { +// private static final Logger LOGGER = LoggerFactory.getLogger(SpringDataCosmosIT.class); +// private static final String USER_ID = "testSpringDataCosmos"; +// +// @Autowired +// private UserRepository userRepository; +// +// @Test +// public void testSpringDataCosmosOperation() { +// LOGGER.info("SpringDataCosmosIT begin."); +// User testUser = new User(USER_ID, "testFirstName", "testLastName", "test address line one"); +// userRepository.save(testUser); +// Optional user = userRepository.findById(USER_ID); +// Assertions.assertEquals(testUser, user.get()); +// userRepository.delete(testUser); +// Assertions.assertFalse(userRepository.findById(USER_ID).isPresent()); +// LOGGER.info("SpringDataCosmosIT end."); +// } +//} diff --git a/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/cosmos/springdata/UserRepository.java b/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/cosmos/springdata/UserRepository.java index 32d6f033fb53..e79f9f7f7c24 100644 --- a/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/cosmos/springdata/UserRepository.java +++ b/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/cosmos/springdata/UserRepository.java @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.spring.cloud.integration.tests.cosmos.springdata; - -import com.azure.spring.cloud.integration.tests.cosmos.User; -import com.azure.spring.data.cosmos.repository.CosmosRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface UserRepository extends CosmosRepository { -} +//package com.azure.spring.cloud.integration.tests.cosmos.springdata; +// +//import com.azure.spring.cloud.integration.tests.cosmos.User; +//import com.azure.spring.data.cosmos.repository.CosmosRepository; +//import org.springframework.stereotype.Repository; +// +//@Repository +//public interface UserRepository extends CosmosRepository { +//} diff --git a/sdk/spring/spring-cloud-azure-resourcemanager/pom.xml b/sdk/spring/spring-cloud-azure-resourcemanager/pom.xml index c3e1e1f053e7..c24688758ba5 100644 --- a/sdk/spring/spring-cloud-azure-resourcemanager/pom.xml +++ b/sdk/spring/spring-cloud-azure-resourcemanager/pom.xml @@ -12,7 +12,7 @@ com.azure.spring spring-cloud-azure-resourcemanager - 4.4.0-beta.1 + 6.0.0-beta.1 Spring Cloud Azure Resource Manager Spring Cloud Azure Resource Manager @@ -33,11 +33,34 @@ https://github.com/Azure/azure-sdk-for-java/issues + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + com.azure.spring spring-cloud-azure-core - 4.4.0-beta.1 + 6.0.0-beta.1 @@ -49,7 +72,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test @@ -61,7 +84,7 @@ org.springframework spring-test - 5.3.22 + 6.0.0-M5 test diff --git a/sdk/spring/spring-cloud-azure-service/pom.xml b/sdk/spring/spring-cloud-azure-service/pom.xml index 56d6934886bc..a13a3fe8ba8e 100644 --- a/sdk/spring/spring-cloud-azure-service/pom.xml +++ b/sdk/spring/spring-cloud-azure-service/pom.xml @@ -12,7 +12,7 @@ com.azure.spring spring-cloud-azure-service - 4.4.0-beta.1 + 6.0.0-beta.1 Spring Cloud Azure Service Spring Cloud Azure Service @@ -33,11 +33,34 @@ https://github.com/Azure/azure-sdk-for-java/issues + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + com.azure.spring spring-cloud-azure-core - 4.4.0-beta.1 + 6.0.0-beta.1 @@ -100,14 +123,14 @@ org.apache.kafka kafka-clients - 3.1.1 + 3.2.0 true org.mockito mockito-core - 4.5.1 + 4.6.1 test @@ -119,7 +142,7 @@ org.springframework spring-test - 5.3.22 + 6.0.0-M5 test @@ -145,7 +168,7 @@ - org.apache.kafka:kafka-clients:[3.1.1] + org.apache.kafka:kafka-clients:[3.2.0] 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 c5ed8abaec51..e99d6a3d5a39 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 @@ -7,7 +7,7 @@ com.azure.spring spring-cloud-azure-starter-active-directory-b2c - 4.4.0-beta.1 + 6.0.0-beta.1 Spring Cloud Azure Starter Active Directory B2C Spring Cloud Azure Starter Active Directory B2C @@ -45,26 +45,22 @@ - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - daily + false - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - always + false @@ -87,27 +83,27 @@ com.azure.spring spring-cloud-azure-starter - 4.4.0-beta.1 + 6.0.0-beta.1 org.springframework.security spring-security-config - 5.7.3 + 6.0.0-M6 org.springframework.security spring-security-oauth2-client - 5.7.3 + 6.0.0-M6 org.springframework.security spring-security-oauth2-jose - 5.7.3 + 6.0.0-M6 org.springframework.security spring-security-oauth2-resource-server - 5.7.3 + 6.0.0-M6 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 f7916f07d22f..71ac716c0c95 100644 --- a/sdk/spring/spring-cloud-azure-starter-active-directory/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-active-directory/pom.xml @@ -7,7 +7,7 @@ com.azure.spring spring-cloud-azure-starter-active-directory - 4.4.0-beta.1 + 6.0.0-beta.1 Spring Cloud Azure Starter Active Directory Spring Cloud Azure Starter Active Directory @@ -44,26 +44,22 @@ - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - daily + false - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - always + false @@ -86,17 +82,17 @@ com.azure.spring spring-cloud-azure-starter - 4.4.0-beta.1 + 6.0.0-beta.1 org.springframework.security spring-security-web - 5.7.3 + 6.0.0-M6 org.springframework.security spring-security-config - 5.7.3 + 6.0.0-M6 com.nimbusds diff --git a/sdk/spring/spring-cloud-azure-starter-actuator/pom.xml b/sdk/spring/spring-cloud-azure-starter-actuator/pom.xml index e86be340c3e9..51c3c2784fb2 100644 --- a/sdk/spring/spring-cloud-azure-starter-actuator/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-actuator/pom.xml @@ -6,7 +6,7 @@ com.azure.spring spring-cloud-azure-starter-actuator - 4.4.0-beta.1 + 6.0.0-beta.1 Spring Cloud Azure Starter Actuator Spring Cloud Azure Starter Actuator @@ -28,8 +28,6 @@ - 1.8 - 1.8 https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-java @@ -46,26 +44,22 @@ - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - daily + false - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - always + false @@ -88,17 +82,17 @@ com.azure.spring spring-cloud-azure-starter - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-cloud-azure-actuator-autoconfigure - 4.4.0-beta.1 + 6.0.0-beta.1 org.springframework.boot spring-boot-starter-actuator - 2.7.3 + 3.0.0-M4 diff --git a/sdk/spring/spring-cloud-azure-starter-appconfiguration/pom.xml b/sdk/spring/spring-cloud-azure-starter-appconfiguration/pom.xml index e0d5f472967c..6c854f52d5c2 100644 --- a/sdk/spring/spring-cloud-azure-starter-appconfiguration/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-appconfiguration/pom.xml @@ -6,7 +6,7 @@ com.azure.spring spring-cloud-azure-starter-appconfiguration - 4.4.0-beta.1 + 6.0.0-beta.1 Spring Cloud Azure Starter App Configuration Spring Cloud Azure Starter App Configuration @@ -28,8 +28,6 @@ - 1.8 - 1.8 https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-java @@ -46,26 +44,22 @@ - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - daily + false - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - always + false @@ -88,12 +82,12 @@ com.azure.spring spring-cloud-azure-starter - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure azure-data-appconfiguration - 1.3.6 + 1.3.5 diff --git a/sdk/spring/spring-cloud-azure-starter-cosmos/pom.xml b/sdk/spring/spring-cloud-azure-starter-cosmos/pom.xml index c491660633fb..f4d415dc3fa6 100644 --- a/sdk/spring/spring-cloud-azure-starter-cosmos/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-cosmos/pom.xml @@ -6,7 +6,7 @@ com.azure.spring spring-cloud-azure-starter-cosmos - 4.4.0-beta.1 + 6.0.0-beta.1 Spring Cloud Azure Starter Cosmos DB Spring Cloud Azure Starter Cosmos DB @@ -28,8 +28,6 @@ - 1.8 - 1.8 https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-java @@ -46,26 +44,22 @@ - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - daily + false - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - always + false @@ -88,7 +82,7 @@ com.azure.spring spring-cloud-azure-starter - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure 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 dfa26cf6e080..93be3769d1cc 100644 --- a/sdk/spring/spring-cloud-azure-starter-data-cosmos/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-data-cosmos/pom.xml @@ -6,7 +6,7 @@ com.azure.spring spring-cloud-azure-starter-data-cosmos - 4.4.0-beta.1 + 6.0.0-beta.1 Spring Cloud Azure Starter Data Cosmos DB Spring Cloud Azure Starter Data Cosmos DB @@ -28,8 +28,6 @@ - 1.8 - 1.8 https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-java @@ -46,26 +44,22 @@ - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - daily + false - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - always + false @@ -88,7 +82,7 @@ com.azure.spring spring-cloud-azure-starter - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure diff --git a/sdk/spring/spring-cloud-azure-starter-eventhubs/pom.xml b/sdk/spring/spring-cloud-azure-starter-eventhubs/pom.xml index 6b5adf66f131..14c715933e5e 100644 --- a/sdk/spring/spring-cloud-azure-starter-eventhubs/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-eventhubs/pom.xml @@ -7,7 +7,7 @@ com.azure.spring spring-cloud-azure-starter-eventhubs - 4.4.0-beta.1 + 6.0.0-beta.1 Spring Cloud Azure Starter Event Hubs Spring Cloud Azure Starter Event Hubs @@ -45,26 +45,22 @@ - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - daily + false - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - always + false @@ -87,7 +83,7 @@ com.azure.spring spring-cloud-azure-starter - 4.4.0-beta.1 + 6.0.0-beta.1 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 82a8b58e6549..6fc81ed3e94b 100644 --- a/sdk/spring/spring-cloud-azure-starter-integration-eventhubs/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-integration-eventhubs/pom.xml @@ -7,7 +7,7 @@ com.azure.spring spring-cloud-azure-starter-integration-eventhubs - 4.4.0-beta.1 + 6.0.0-beta.1 Spring Cloud Azure Starter Integration Event Hubs Spring Cloud Azure Starter Integration Event Hubs @@ -45,26 +45,22 @@ - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - daily + false - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - always + false @@ -87,17 +83,17 @@ com.azure.spring spring-cloud-azure-starter - 4.4.0-beta.1 + 6.0.0-beta.1 org.springframework.boot spring-boot-starter-integration - 2.7.3 + 3.0.0-M4 com.azure.spring spring-integration-azure-eventhubs - 4.4.0-beta.1 + 6.0.0-beta.1 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 df690d804af7..e855136ce3a1 100644 --- a/sdk/spring/spring-cloud-azure-starter-integration-servicebus/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-integration-servicebus/pom.xml @@ -7,7 +7,7 @@ com.azure.spring spring-cloud-azure-starter-integration-servicebus - 4.4.0-beta.1 + 6.0.0-beta.1 Spring Cloud Azure Starter Integration Service Bus Spring Cloud Azure Starter Integration Service Bus @@ -29,8 +29,6 @@ - 1.8 - 1.8 https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-java @@ -47,26 +45,22 @@ - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - daily + false - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - always + false @@ -89,22 +83,30 @@ com.azure.spring spring-cloud-azure-starter - 4.4.0-beta.1 + 6.0.0-beta.1 org.springframework.boot spring-boot-starter-integration - 2.7.3 + 3.0.0-M4 com.azure.spring spring-integration-azure-servicebus - 4.4.0-beta.1 + 6.0.0-beta.1 + + org.apache.maven.plugins + maven-compiler-plugin + 3.10.1 + + 17 + + org.apache.maven.plugins maven-jar-plugin 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 21484fa0d7c7..0c721966f12e 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 @@ -10,7 +10,7 @@ com.azure.spring spring-cloud-azure-starter-integration-storage-queue - 4.4.0-beta.1 + 6.0.0-beta.1 Spring Cloud Azure Starter Integration Storage Queue Spring Cloud Azure Starter Integration Storage Queue @@ -32,8 +32,6 @@ - 1.8 - 1.8 https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-java @@ -50,26 +48,22 @@ - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - daily + false - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - always + false @@ -92,17 +86,17 @@ com.azure.spring spring-cloud-azure-starter - 4.4.0-beta.1 + 6.0.0-beta.1 org.springframework.boot spring-boot-starter-integration - 2.7.3 + 3.0.0-M4 com.azure.spring spring-integration-azure-storage-queue - 4.4.0-beta.1 + 6.0.0-beta.1 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 c2e1b8cdb36a..5b3e0ede8baf 100644 --- a/sdk/spring/spring-cloud-azure-starter-keyvault-certificates/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-keyvault-certificates/pom.xml @@ -6,7 +6,7 @@ com.azure.spring spring-cloud-azure-starter-keyvault-certificates - 4.4.0-beta.1 + 6.0.0-beta.1 Spring Cloud Azure Starter Key Vault Certificates Spring Cloud Azure Starter Key Vault Certificates @@ -28,8 +28,6 @@ - 1.8 - 1.8 https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-java @@ -46,26 +44,22 @@ - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - daily + false - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - always + false @@ -88,7 +82,7 @@ com.azure.spring spring-cloud-azure-starter - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure 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 1b0d363d8dc1..5841b5f0f14e 100644 --- a/sdk/spring/spring-cloud-azure-starter-keyvault-secrets/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-keyvault-secrets/pom.xml @@ -6,7 +6,7 @@ com.azure.spring spring-cloud-azure-starter-keyvault-secrets - 4.4.0-beta.1 + 6.0.0-beta.1 Spring Cloud Azure Starter Key Vault Secrets Spring Cloud Azure Starter Key Vault Secrets @@ -28,8 +28,6 @@ - 1.8 - 1.8 https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-java @@ -46,26 +44,22 @@ - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - daily + false - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - always + false @@ -88,7 +82,7 @@ com.azure.spring spring-cloud-azure-starter - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure diff --git a/sdk/spring/spring-cloud-azure-starter-keyvault/pom.xml b/sdk/spring/spring-cloud-azure-starter-keyvault/pom.xml index 6ba7163b3e51..38e6bc39c8ca 100644 --- a/sdk/spring/spring-cloud-azure-starter-keyvault/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-keyvault/pom.xml @@ -6,7 +6,7 @@ com.azure.spring spring-cloud-azure-starter-keyvault - 4.4.0-beta.1 + 6.0.0-beta.1 Spring Cloud Azure Starter Key Vault Spring Cloud Azure Starter Key Vault @@ -28,8 +28,6 @@ - 1.8 - 1.8 https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-java @@ -46,26 +44,22 @@ - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - daily + false - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - always + false @@ -88,12 +82,12 @@ com.azure.spring spring-cloud-azure-starter-keyvault-secrets - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-cloud-azure-starter-keyvault-certificates - 4.4.0-beta.1 + 6.0.0-beta.1 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 bfc42795c1a9..689aa47540d9 100644 --- a/sdk/spring/spring-cloud-azure-starter-servicebus-jms/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-servicebus-jms/pom.xml @@ -6,7 +6,7 @@ com.azure.spring spring-cloud-azure-starter-servicebus-jms - 4.4.0-beta.1 + 6.0.0-beta.1 Spring Cloud Azure Starter Service Bus JMS Spring Cloud Azure Starter Service Bus JMS @@ -28,8 +28,6 @@ - 1.8 - 1.8 https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-java @@ -46,26 +44,22 @@ - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - daily + false - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - always + false @@ -88,24 +82,24 @@ com.azure.spring spring-cloud-azure-starter - 4.4.0-beta.1 + 6.0.0-beta.1 org.springframework spring-jms - 5.3.22 + 6.0.0-M5 org.apache.qpid qpid-jms-client - 0.53.0 + 2.0.0 org.messaginghub pooled-jms - 1.2.4 + 3.0.0 diff --git a/sdk/spring/spring-cloud-azure-starter-servicebus/pom.xml b/sdk/spring/spring-cloud-azure-starter-servicebus/pom.xml index 8b5fd8b33673..2a54d3a54ab5 100644 --- a/sdk/spring/spring-cloud-azure-starter-servicebus/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-servicebus/pom.xml @@ -7,7 +7,7 @@ com.azure.spring spring-cloud-azure-starter-servicebus - 4.4.0-beta.1 + 6.0.0-beta.1 Spring Cloud Azure Starter Service Bus Spring Cloud Azure Starter Service Bus @@ -29,8 +29,6 @@ - 1.8 - 1.8 https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-java @@ -47,26 +45,22 @@ - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - daily + false - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - always + false @@ -89,7 +83,7 @@ com.azure.spring spring-cloud-azure-starter - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure 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 96fea8c70bfd..d0a33fe92596 100644 --- a/sdk/spring/spring-cloud-azure-starter-storage-blob/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-storage-blob/pom.xml @@ -6,7 +6,7 @@ com.azure.spring spring-cloud-azure-starter-storage-blob - 4.4.0-beta.1 + 6.0.0-beta.1 Spring Cloud Azure Starter Storage Blob Spring Cloud Azure Starter Storage Blob @@ -28,8 +28,6 @@ - 1.8 - 1.8 https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-java @@ -46,26 +44,22 @@ - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - daily + false - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - always + false @@ -88,7 +82,7 @@ com.azure.spring spring-cloud-azure-starter - 4.4.0-beta.1 + 6.0.0-beta.1 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 82e3e6a67474..83549780f81e 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 @@ -6,7 +6,7 @@ com.azure.spring spring-cloud-azure-starter-storage-file-share - 4.4.0-beta.1 + 6.0.0-beta.1 Spring Cloud Azure Starter Storage File Share Spring Cloud Azure Starter Storage File Share @@ -28,8 +28,6 @@ - 1.8 - 1.8 https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-java @@ -46,26 +44,22 @@ - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - daily + false - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - always + false @@ -88,7 +82,7 @@ com.azure.spring spring-cloud-azure-starter - 4.4.0-beta.1 + 6.0.0-beta.1 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 f32951ebd17f..7f600d8ca01f 100644 --- a/sdk/spring/spring-cloud-azure-starter-storage-queue/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-storage-queue/pom.xml @@ -10,7 +10,7 @@ com.azure.spring spring-cloud-azure-starter-storage-queue - 4.4.0-beta.1 + 6.0.0-beta.1 Spring Cloud Azure Starter Storage Queue Spring Cloud Azure Starter Storage Queue @@ -32,8 +32,6 @@ - 1.8 - 1.8 https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-java @@ -50,26 +48,22 @@ - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - daily + false - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - always + false @@ -92,17 +86,25 @@ com.azure.spring spring-cloud-azure-starter - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure azure-storage-queue - 12.14.1 + 12.14.0 + + org.apache.maven.plugins + maven-compiler-plugin + 3.10.1 + + 17 + + org.apache.maven.plugins maven-jar-plugin diff --git a/sdk/spring/spring-cloud-azure-starter-storage/pom.xml b/sdk/spring/spring-cloud-azure-starter-storage/pom.xml index aa2af7ce0b10..e84de1e91399 100644 --- a/sdk/spring/spring-cloud-azure-starter-storage/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-storage/pom.xml @@ -6,7 +6,7 @@ com.azure.spring spring-cloud-azure-starter-storage - 4.4.0-beta.1 + 6.0.0-beta.1 Spring Cloud Azure Starter Storage Spring Cloud Azure Starter Storage @@ -28,8 +28,6 @@ - 1.8 - 1.8 https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-java @@ -46,26 +44,22 @@ - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - daily + false - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - always + false @@ -88,19 +82,19 @@ com.azure.spring spring-cloud-azure-starter-storage-blob - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-cloud-azure-starter-storage-file-share - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-cloud-azure-starter-storage-queue - 4.4.0-beta.1 + 6.0.0-beta.1 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 57c4cce29feb..2473fa80a06d 100644 --- a/sdk/spring/spring-cloud-azure-starter-stream-eventhubs/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-stream-eventhubs/pom.xml @@ -7,7 +7,7 @@ com.azure.spring spring-cloud-azure-starter-stream-eventhubs - 4.4.0-beta.1 + 6.0.0-beta.1 Spring Cloud Azure Starter Stream Event Hubs Spring Cloud Azure Starter Stream Event Hubs @@ -45,26 +45,22 @@ - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - daily + false - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - always + false @@ -87,7 +83,7 @@ com.azure.spring spring-cloud-azure-stream-binder-eventhubs - 4.4.0-beta.1 + 6.0.0-beta.1 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 e7cd05333c36..98fceb85cf57 100644 --- a/sdk/spring/spring-cloud-azure-starter-stream-servicebus/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-stream-servicebus/pom.xml @@ -7,7 +7,7 @@ com.azure.spring spring-cloud-azure-starter-stream-servicebus - 4.4.0-beta.1 + 6.0.0-beta.1 Spring Cloud Azure Starter Stream Service Bus Spring Cloud Azure Starter Stream Service Bus @@ -45,26 +45,22 @@ - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - daily + false - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - always + false @@ -87,7 +83,7 @@ com.azure.spring spring-cloud-azure-stream-binder-servicebus - 4.4.0-beta.1 + 6.0.0-beta.1 diff --git a/sdk/spring/spring-cloud-azure-starter/pom.xml b/sdk/spring/spring-cloud-azure-starter/pom.xml index 9ed6f3ad5185..6370061f48e4 100644 --- a/sdk/spring/spring-cloud-azure-starter/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter/pom.xml @@ -6,7 +6,7 @@ com.azure.spring spring-cloud-azure-starter - 4.4.0-beta.1 + 6.0.0-beta.1 Spring Cloud Azure Starter Core starter, including auto-configuration support @@ -28,8 +28,6 @@ - 1.8 - 1.8 https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-java @@ -46,26 +44,22 @@ - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - daily + false - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true - always + false @@ -88,12 +82,12 @@ org.springframework.boot spring-boot-starter - 2.7.3 + 3.0.0-M4 com.azure.spring spring-cloud-azure-autoconfigure - 4.4.0-beta.1 + 6.0.0-beta.1 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 d44b2469646e..36d3a913dbae 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 @@ -12,7 +12,7 @@ com.azure.spring spring-cloud-azure-stream-binder-eventhubs-core - 4.4.0-beta.1 + 6.0.0-beta.1 Spring Cloud Azure Stream Binder Event Hubs Core Spring Cloud Azure Stream Binder Event Hubs Core @@ -33,6 +33,30 @@ https://github.com/Azure/azure-sdk-for-java/issues + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + org.springframework.cloud @@ -43,26 +67,26 @@ spring-integration-core - 3.2.4 + 4.0.0-M4 com.azure.spring spring-integration-azure-eventhubs - 4.4.0-beta.1 + 6.0.0-beta.1 org.springframework.boot spring-boot-configuration-processor - 2.7.3 + 3.0.0-M4 true org.mockito mockito-core - 4.5.1 + 4.6.1 test @@ -74,7 +98,7 @@ org.springframework spring-test - 5.3.22 + 6.0.0-M5 test @@ -90,13 +114,13 @@ org.springframework.boot spring-boot-test - 2.7.3 + 3.0.0-M4 test org.assertj assertj-core - 3.22.0 + 3.23.1 test @@ -110,8 +134,8 @@ - org.springframework.boot:spring-boot-configuration-processor:[2.7.3] - org.springframework.cloud:spring-cloud-stream:[3.2.4] + org.springframework.boot:spring-boot-configuration-processor:[3.0.0-M4] + org.springframework.cloud:spring-cloud-stream:[4.0.0-M4] @@ -131,65 +155,4 @@ - - - - annotation-process-for-java-8 - - [1.8,9) - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - - annotation-process-for-java-8 - - compile - - - - -proc:only - - - - - - - - - - annotation-process-for-java-11 - - [11,) - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - - annotation-process-for-java-11 - - compile - - - - -proc:only - - 11 - - - - - - - - - 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 709c092cf640..29235fef615f 100644 --- a/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/pom.xml +++ b/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/pom.xml @@ -12,7 +12,7 @@ com.azure.spring spring-cloud-azure-stream-binder-eventhubs - 4.4.0-beta.1 + 6.0.0-beta.1 Spring Cloud Azure Stream Binder Event Hubs Spring Cloud Azure Stream Binder Event Hubs @@ -33,16 +33,39 @@ https://github.com/Azure/azure-sdk-for-java/issues + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + com.azure.spring spring-cloud-azure-autoconfigure - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-cloud-azure-stream-binder-eventhubs-core - 4.4.0-beta.1 + 6.0.0-beta.1 @@ -53,20 +76,20 @@ org.springframework.boot spring-boot-starter-actuator - 2.7.3 + 3.0.0-M4 true com.azure.spring spring-cloud-azure-resourcemanager - 4.4.0-beta.1 + 6.0.0-beta.1 org.springframework.cloud spring-cloud-stream-binder-test - 3.2.4 + 4.0.0-M4 test @@ -78,7 +101,7 @@ org.springframework.boot spring-boot-starter-test - 2.7.3 + 3.0.0-M4 test + org.springframework.boot:spring-boot-starter-actuator:[3.0.0-M4] 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 ebdbe50d3458..3023b717c5d7 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 @@ -12,7 +12,7 @@ com.azure.spring spring-cloud-azure-stream-binder-servicebus-core - 4.4.0-beta.1 + 6.0.0-beta.1 Spring Cloud Azure Stream Binder Service Bus Core Spring Cloud Azure Stream Binder Service Bus Core @@ -33,17 +33,40 @@ https://github.com/Azure/azure-sdk-for-java/issues + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + org.springframework.cloud spring-cloud-stream - 3.2.4 + 4.0.0-M4 com.azure.spring spring-integration-azure-servicebus - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure @@ -53,14 +76,14 @@ org.springframework.boot spring-boot-configuration-processor - 2.7.3 + 3.0.0-M4 true org.mockito mockito-core - 4.5.1 + 4.6.1 test @@ -72,7 +95,7 @@ org.springframework spring-test - 5.3.22 + 6.0.0-M5 test @@ -88,13 +111,13 @@ org.springframework.boot spring-boot-test - 2.7.3 + 3.0.0-M4 test org.assertj assertj-core - 3.22.0 + 3.23.1 test @@ -109,8 +132,8 @@ - org.springframework.boot:spring-boot-configuration-processor:[2.7.3] - org.springframework.cloud:spring-cloud-stream:[3.2.4] + org.springframework.boot:spring-boot-configuration-processor:[3.0.0-M4] + org.springframework.cloud:spring-cloud-stream:[4.0.0-M4] @@ -130,64 +153,4 @@ - - - - annotation-process-for-java-8 - - [1.8,9) - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - - annotation-process-for-java-8 - - compile - - - - -proc:only - - - - - - - - - - annotation-process-for-java-11 - - [11,) - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - - annotation-process-for-java-11 - - compile - - - - -proc:only - - 11 - - - - - - - - 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 b9de8ccab83b..1431c04fe0d1 100644 --- a/sdk/spring/spring-cloud-azure-stream-binder-servicebus/pom.xml +++ b/sdk/spring/spring-cloud-azure-stream-binder-servicebus/pom.xml @@ -12,7 +12,7 @@ com.azure.spring spring-cloud-azure-stream-binder-servicebus - 4.4.0-beta.1 + 6.0.0-beta.1 Spring Cloud Azure Stream Binder Service Bus Spring Cloud Azure Stream Binder Service Bus @@ -33,26 +33,49 @@ https://github.com/Azure/azure-sdk-for-java/issues + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + com.azure.spring spring-cloud-azure-stream-binder-servicebus-core - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-cloud-azure-autoconfigure - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-cloud-azure-resourcemanager - 4.4.0-beta.1 + 6.0.0-beta.1 org.springframework.boot spring-boot-starter-actuator - 2.7.3 + 3.0.0-M4 true + 4.0.0-M4 test @@ -80,7 +103,7 @@ org.springframework.boot spring-boot-starter-test - 2.7.3 + 3.0.0-M4 test @@ -95,7 +118,7 @@ - org.springframework.boot:spring-boot-starter-actuator:[2.7.3] + org.springframework.boot:spring-boot-starter-actuator:[3.0.0-M4] diff --git a/sdk/spring/spring-cloud-azure-supported-spring.json b/sdk/spring/spring-cloud-azure-supported-spring.json index 37463741f605..f64463131193 100644 --- a/sdk/spring/spring-cloud-azure-supported-spring.json +++ b/sdk/spring/spring-cloud-azure-supported-spring.json @@ -8,10 +8,10 @@ "spring-cloud-version" : "2022.0.0-M4" }, { - "current" : false, + "current" : true, "releaseStatus" : "PRERELEASE", "snapshot" : false, - "supportStatus" : "TODO", + "supportStatus" : "SUPPORTED", "spring-boot-version" : "3.0.0-M4", "spring-cloud-version" : "2022.0.0-M4" }, @@ -19,7 +19,7 @@ "current" : false, "releaseStatus" : "PRERELEASE", "snapshot" : false, - "supportStatus" : "END_OF_LIFE", + "supportStatus" : "SUPPORTED", "spring-boot-version" : "3.0.0-M3", "spring-cloud-version" : "2022.0.0-M3" }, @@ -27,15 +27,15 @@ "current" : false, "releaseStatus" : "SNAPSHOT", "snapshot" : true, - "supportStatus" : "TODO", + "supportStatus" : "END_OF_LIFE", "spring-boot-version" : "2.7.4-SNAPSHOT", "spring-cloud-version" : "2021.0.3" }, { - "current" : true, + "current" : false, "releaseStatus" : "GENERAL_AVAILABILITY", "snapshot" : false, - "supportStatus" : "SUPPORTED", + "supportStatus" : "END_OF_LIFE", "spring-boot-version" : "2.7.3", "spring-cloud-version" : "2021.0.3" }, @@ -99,7 +99,7 @@ "current" : false, "releaseStatus" : "GENERAL_AVAILABILITY", "snapshot" : false, - "supportStatus" : "SUPPORTED", + "supportStatus" : "END_OF_LIFE", "spring-boot-version" : "2.6.11", "spring-cloud-version" : "2021.0.3" }, @@ -155,7 +155,7 @@ "current" : false, "releaseStatus" : "GENERAL_AVAILABILITY", "snapshot" : false, - "supportStatus" : "SUPPORTED", + "supportStatus" : "END_OF_LIFE", "spring-boot-version" : "2.5.14", "spring-cloud-version" : "2020.0.6" }, diff --git a/sdk/spring/spring-cloud-azure-trace-sleuth/pom.xml b/sdk/spring/spring-cloud-azure-trace-sleuth/pom.xml index e8c54539749d..60737143e6d4 100644 --- a/sdk/spring/spring-cloud-azure-trace-sleuth/pom.xml +++ b/sdk/spring/spring-cloud-azure-trace-sleuth/pom.xml @@ -12,7 +12,7 @@ com.azure.spring spring-cloud-azure-trace-sleuth - 4.4.0-beta.1 + 6.0.0-beta.1 Spring Cloud Azure Trace on Sleuth https://microsoft.github.io/spring-cloud-azure @@ -31,12 +31,33 @@ GitHub https://github.com/Azure/azure-sdk-for-java/issues + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + com.azure.spring spring-cloud-azure-core - 4.4.0-beta.1 + 6.0.0-beta.1 org.springframework.cloud @@ -46,7 +67,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test diff --git a/sdk/spring/spring-integration-azure-core/pom.xml b/sdk/spring/spring-integration-azure-core/pom.xml index d81d8f0ee982..3b978f366fcd 100644 --- a/sdk/spring/spring-integration-azure-core/pom.xml +++ b/sdk/spring/spring-integration-azure-core/pom.xml @@ -12,7 +12,7 @@ com.azure.spring spring-integration-azure-core - 4.4.0-beta.1 + 6.0.0-beta.1 Spring Integration Azure Core Spring Integration Azure Core @@ -32,17 +32,38 @@ GitHub https://github.com/Azure/azure-sdk-for-java/issues + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + com.azure.spring spring-messaging-azure - 4.4.0-beta.1 + 6.0.0-beta.1 org.springframework.integration spring-integration-core - 5.5.14 + 6.0.0-M4 + 4.6.1 test org.springframework spring-test - 5.3.22 + 6.0.0-M5 test @@ -75,7 +96,7 @@ org.assertj assertj-core - 3.22.0 + 3.23.1 test @@ -90,7 +111,7 @@ - org.springframework.integration:spring-integration-core:[5.5.14] + org.springframework.integration:spring-integration-core:[6.0.0-M4] diff --git a/sdk/spring/spring-integration-azure-eventhubs/pom.xml b/sdk/spring/spring-integration-azure-eventhubs/pom.xml index 0759383466fa..048dafcbdb86 100644 --- a/sdk/spring/spring-integration-azure-eventhubs/pom.xml +++ b/sdk/spring/spring-integration-azure-eventhubs/pom.xml @@ -12,7 +12,7 @@ com.azure.spring spring-integration-azure-eventhubs - 4.4.0-beta.1 + 6.0.0-beta.1 Spring Integration Azure Event Hubs Spring Integration Azure Event Hubs @@ -32,24 +32,45 @@ GitHub https://github.com/Azure/azure-sdk-for-java/issues + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + com.azure.spring spring-integration-azure-core - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-integration-azure-core - 4.4.0-beta.1 + 6.0.0-beta.1 test-jar test com.azure.spring spring-messaging-azure-eventhubs - 4.4.0-beta.1 + 6.0.0-beta.1 @@ -70,19 +91,19 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test org.springframework spring-test - 5.3.22 + 6.0.0-M5 test org.assertj assertj-core - 3.22.0 + 3.23.1 test diff --git a/sdk/spring/spring-integration-azure-servicebus/pom.xml b/sdk/spring/spring-integration-azure-servicebus/pom.xml index a7313eab88d0..21b7513a4e1d 100644 --- a/sdk/spring/spring-integration-azure-servicebus/pom.xml +++ b/sdk/spring/spring-integration-azure-servicebus/pom.xml @@ -12,7 +12,7 @@ com.azure.spring spring-integration-azure-servicebus - 4.4.0-beta.1 + 6.0.0-beta.1 Spring Integration Azure Service Bus Spring Integration Azure Service Bus @@ -32,29 +32,50 @@ GitHub https://github.com/Azure/azure-sdk-for-java/issues + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + com.azure.spring spring-integration-azure-core - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-integration-azure-core - 4.4.0-beta.1 + 6.0.0-beta.1 test-jar test com.azure.spring spring-messaging-azure-servicebus - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-messaging-azure-servicebus - 4.4.0-beta.1 + 6.0.0-beta.1 test-jar test @@ -76,7 +97,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test @@ -88,13 +109,13 @@ org.springframework spring-test - 5.3.22 + 6.0.0-M5 test org.assertj assertj-core - 3.22.0 + 3.23.1 test diff --git a/sdk/spring/spring-integration-azure-storage-queue/pom.xml b/sdk/spring/spring-integration-azure-storage-queue/pom.xml index 772c31f055e2..14e757f46f5f 100644 --- a/sdk/spring/spring-integration-azure-storage-queue/pom.xml +++ b/sdk/spring/spring-integration-azure-storage-queue/pom.xml @@ -13,7 +13,7 @@ com.azure.spring spring-integration-azure-storage-queue - 4.4.0-beta.1 + 6.0.0-beta.1 Spring Integration Azure Storage Queue Spring Integration Azure Storage Queue @@ -33,17 +33,38 @@ GitHub https://github.com/Azure/azure-sdk-for-java/issues + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + com.azure.spring spring-integration-azure-core - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-messaging-azure-storage-queue - 4.4.0-beta.1 + 6.0.0-beta.1 + 4.6.1 test diff --git a/sdk/spring/spring-messaging-azure-eventhubs/pom.xml b/sdk/spring/spring-messaging-azure-eventhubs/pom.xml index 4787a24750b7..24d8116eef25 100644 --- a/sdk/spring/spring-messaging-azure-eventhubs/pom.xml +++ b/sdk/spring/spring-messaging-azure-eventhubs/pom.xml @@ -12,7 +12,7 @@ com.azure.spring spring-messaging-azure-eventhubs - 4.4.0-beta.1 + 6.0.0-beta.1 Spring Messaging Azure Event Hubs Spring Messaging Azure Event Hubs @@ -32,17 +32,38 @@ GitHub https://github.com/Azure/azure-sdk-for-java/issues + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + com.azure.spring spring-messaging-azure - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-messaging-azure - 4.4.0-beta.1 + 6.0.0-beta.1 test-jar test @@ -62,7 +83,7 @@ org.springframework spring-tx - 5.3.22 + 6.0.0-M5 true @@ -74,7 +95,7 @@ org.springframework.data spring-data-commons - 2.7.2 + 3.0.0-M5 org.slf4j @@ -86,7 +107,7 @@ io.micrometer micrometer-core - 1.9.3 + 1.10.0-M3 true @@ -100,13 +121,13 @@ org.springframework spring-test - 5.3.22 + 6.0.0-M5 test org.mockito mockito-core - 4.5.1 + 4.6.1 test @@ -118,7 +139,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test @@ -132,11 +153,10 @@ - org.springframework:spring-messaging:[5.3.22] - org.springframework:spring-tx:[5.3.22] + io.micrometer:micrometer-core:[1.10.0-M3] + org.springframework:spring-tx:[6.0.0-M5] org.springframework.retry:spring-retry:[1.3.3] - org.springframework.data:spring-data-commons:[2.7.2] - io.micrometer:micrometer-core:[1.9.3] + org.springframework.data:spring-data-commons:[3.0.0-M5] diff --git a/sdk/spring/spring-messaging-azure-servicebus/pom.xml b/sdk/spring/spring-messaging-azure-servicebus/pom.xml index 0110e5886425..e351a0506708 100644 --- a/sdk/spring/spring-messaging-azure-servicebus/pom.xml +++ b/sdk/spring/spring-messaging-azure-servicebus/pom.xml @@ -13,7 +13,7 @@ com.azure.spring spring-messaging-azure-servicebus - 4.4.0-beta.1 + 6.0.0-beta.1 Spring Messaging Azure Service Bus Spring Messaging Azure Service Bus @@ -33,17 +33,38 @@ GitHub https://github.com/Azure/azure-sdk-for-java/issues + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + com.azure.spring spring-messaging-azure - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-messaging-azure - 4.4.0-beta.1 + 6.0.0-beta.1 test-jar test @@ -55,7 +76,7 @@ org.springframework spring-tx - 5.3.22 + 6.0.0-M5 true @@ -67,7 +88,7 @@ org.springframework.data spring-data-commons - 2.7.2 + 3.0.0-M5 org.slf4j @@ -79,13 +100,13 @@ io.micrometer micrometer-core - 1.9.3 + 1.10.0-M3 true org.mockito mockito-core - 4.5.1 + 4.6.1 test @@ -117,11 +138,10 @@ - org.springframework:spring-messaging:[5.3.22] - org.springframework:spring-tx:[5.3.22] + io.micrometer:micrometer-core:[1.10.0-M3] + org.springframework:spring-tx:[6.0.0-M5] org.springframework.retry:spring-retry:[1.3.3] - org.springframework.data:spring-data-commons:[2.7.2] - io.micrometer:micrometer-core:[1.9.3] + org.springframework.data:spring-data-commons:[3.0.0-M5] diff --git a/sdk/spring/spring-messaging-azure-storage-queue/pom.xml b/sdk/spring/spring-messaging-azure-storage-queue/pom.xml index 9a4899bb383d..2361ee9b831f 100644 --- a/sdk/spring/spring-messaging-azure-storage-queue/pom.xml +++ b/sdk/spring/spring-messaging-azure-storage-queue/pom.xml @@ -12,7 +12,7 @@ com.azure.spring spring-messaging-azure-storage-queue - 4.4.0-beta.1 + 6.0.0-beta.1 Spring Messaging Azure Storage Queue Spring Messaging Azure Storage Queue @@ -32,17 +32,38 @@ GitHub https://github.com/Azure/azure-sdk-for-java/issues + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + com.azure.spring spring-messaging-azure - 4.4.0-beta.1 + 6.0.0-beta.1 com.azure.spring spring-messaging-azure - 4.4.0-beta.1 + 6.0.0-beta.1 test-jar test @@ -55,7 +76,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test @@ -67,7 +88,7 @@ org.springframework.boot spring-boot-starter-test - 2.7.3 + 3.0.0-M4 test diff --git a/sdk/spring/spring-messaging-azure/pom.xml b/sdk/spring/spring-messaging-azure/pom.xml index 732f3854cc44..e8187d919314 100644 --- a/sdk/spring/spring-messaging-azure/pom.xml +++ b/sdk/spring/spring-messaging-azure/pom.xml @@ -12,7 +12,7 @@ com.azure.spring spring-messaging-azure - 4.4.0-beta.1 + 6.0.0-beta.1 Spring Messaging Azure Spring Messaging Azure @@ -32,22 +32,43 @@ GitHub https://github.com/Azure/azure-sdk-for-java/issues + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + com.azure.spring spring-cloud-azure-service - 4.4.0-beta.1 + 6.0.0-beta.1 org.springframework spring-messaging - 5.3.22 + 6.0.0-M5 org.springframework spring-tx - 5.3.22 + 6.0.0-M5 true @@ -59,7 +80,7 @@ org.springframework.data spring-data-commons - 2.7.2 + 3.0.0-M5 org.slf4j @@ -71,7 +92,7 @@ io.micrometer micrometer-core - 1.9.3 + 1.10.0-M3 true + 3.0.0-M4 test @@ -103,11 +124,11 @@ - org.springframework:spring-messaging:[5.3.22] - org.springframework:spring-tx:[5.3.22] + io.micrometer:micrometer-core:[1.10.0-M3] + org.springframework.data:spring-data-commons:[3.0.0-M5] + org.springframework:spring-messaging:[6.0.0-M5] + org.springframework:spring-tx:[6.0.0-M5] org.springframework.retry:spring-retry:[1.3.3] - org.springframework.data:spring-data-commons:[2.7.2] - io.micrometer:micrometer-core:[1.9.3] diff --git a/sdk/spring/supported-version-matrix.json b/sdk/spring/supported-version-matrix.json index 8a58a68997fa..b7a5cdf9ca9e 100644 --- a/sdk/spring/supported-version-matrix.json +++ b/sdk/spring/supported-version-matrix.json @@ -6,7 +6,7 @@ "Agent": { "ubuntu-20.04": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" } }, - "JavaTestVersion": "1.11", + "JavaTestVersion": "1.17", "SPRING_CLOUD_AZURE_TEST_SUPPORTED_SPRING_BOOT_VERSION": [ ] diff --git a/sdk/spring/tests.yml b/sdk/spring/tests.yml index 84c10d770cc5..337e41908021 100644 --- a/sdk/spring/tests.yml +++ b/sdk/spring/tests.yml @@ -20,3 +20,5 @@ stages: TestName: IntegrationTestInAzureGlobal TestGoals: 'verify' TestOptions: '-DskipSpringITs=false' + MatrixFilters: + - JavaTestVersion=^(?!1.8|1.11).* diff --git a/sdk/storage/azure-storage-blob-batch/pom.xml b/sdk/storage/azure-storage-blob-batch/pom.xml index 8ec778ab394a..aa7c5f95ce85 100644 --- a/sdk/storage/azure-storage-blob-batch/pom.xml +++ b/sdk/storage/azure-storage-blob-batch/pom.xml @@ -133,19 +133,19 @@ org.apache.logging.log4j log4j-slf4j-impl - 2.17.2 + 2.18.0 test org.apache.logging.log4j log4j-api - 2.17.2 + 2.18.0 test org.apache.logging.log4j log4j-core - 2.17.2 + 2.18.0 test diff --git a/sdk/storage/azure-storage-blob-changefeed/pom.xml b/sdk/storage/azure-storage-blob-changefeed/pom.xml index e767e163bc6e..3130420fd188 100644 --- a/sdk/storage/azure-storage-blob-changefeed/pom.xml +++ b/sdk/storage/azure-storage-blob-changefeed/pom.xml @@ -139,25 +139,25 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test org.apache.logging.log4j log4j-slf4j-impl - 2.17.2 + 2.18.0 test org.apache.logging.log4j log4j-api - 2.17.2 + 2.18.0 test org.apache.logging.log4j log4j-core - 2.17.2 + 2.18.0 test diff --git a/sdk/storage/azure-storage-blob-cryptography/pom.xml b/sdk/storage/azure-storage-blob-cryptography/pom.xml index 4fb075e1e861..2a1e3a97e467 100644 --- a/sdk/storage/azure-storage-blob-cryptography/pom.xml +++ b/sdk/storage/azure-storage-blob-cryptography/pom.xml @@ -129,19 +129,19 @@ org.apache.logging.log4j log4j-slf4j-impl - 2.17.2 + 2.18.0 test org.apache.logging.log4j log4j-api - 2.17.2 + 2.18.0 test org.apache.logging.log4j log4j-core - 2.17.2 + 2.18.0 test @@ -153,7 +153,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test diff --git a/sdk/storage/azure-storage-blob-nio/pom.xml b/sdk/storage/azure-storage-blob-nio/pom.xml index 29c51bd9e6de..abf520f9e36a 100644 --- a/sdk/storage/azure-storage-blob-nio/pom.xml +++ b/sdk/storage/azure-storage-blob-nio/pom.xml @@ -110,19 +110,19 @@ org.apache.logging.log4j log4j-slf4j-impl - 2.17.2 + 2.18.0 test org.apache.logging.log4j log4j-api - 2.17.2 + 2.18.0 test org.apache.logging.log4j log4j-core - 2.17.2 + 2.18.0 test @@ -134,7 +134,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test diff --git a/sdk/storage/azure-storage-blob/pom.xml b/sdk/storage/azure-storage-blob/pom.xml index 5ee4ac4c5018..fa4fd2c9b055 100644 --- a/sdk/storage/azure-storage-blob/pom.xml +++ b/sdk/storage/azure-storage-blob/pom.xml @@ -144,19 +144,19 @@ org.apache.logging.log4j log4j-slf4j-impl - 2.17.2 + 2.18.0 test org.apache.logging.log4j log4j-api - 2.17.2 + 2.18.0 test org.apache.logging.log4j log4j-core - 2.17.2 + 2.18.0 test diff --git a/sdk/storage/azure-storage-common/pom.xml b/sdk/storage/azure-storage-common/pom.xml index fec4a1f5e194..403aa00940a0 100644 --- a/sdk/storage/azure-storage-common/pom.xml +++ b/sdk/storage/azure-storage-common/pom.xml @@ -103,19 +103,19 @@ org.apache.logging.log4j log4j-slf4j-impl - 2.17.2 + 2.18.0 test org.apache.logging.log4j log4j-api - 2.17.2 + 2.18.0 test org.apache.logging.log4j log4j-core - 2.17.2 + 2.18.0 test diff --git a/sdk/storage/azure-storage-file-datalake/pom.xml b/sdk/storage/azure-storage-file-datalake/pom.xml index 13da60236748..001d7472a5da 100644 --- a/sdk/storage/azure-storage-file-datalake/pom.xml +++ b/sdk/storage/azure-storage-file-datalake/pom.xml @@ -139,19 +139,19 @@ org.apache.logging.log4j log4j-slf4j-impl - 2.17.2 + 2.18.0 test org.apache.logging.log4j log4j-api - 2.17.2 + 2.18.0 test org.apache.logging.log4j log4j-core - 2.17.2 + 2.18.0 test diff --git a/sdk/storage/azure-storage-file-share/pom.xml b/sdk/storage/azure-storage-file-share/pom.xml index 9326f04c8371..68b0ba46f352 100644 --- a/sdk/storage/azure-storage-file-share/pom.xml +++ b/sdk/storage/azure-storage-file-share/pom.xml @@ -114,19 +114,19 @@ org.apache.logging.log4j log4j-slf4j-impl - 2.17.2 + 2.18.0 test org.apache.logging.log4j log4j-api - 2.17.2 + 2.18.0 test org.apache.logging.log4j log4j-core - 2.17.2 + 2.18.0 test diff --git a/sdk/storage/azure-storage-internal-avro/pom.xml b/sdk/storage/azure-storage-internal-avro/pom.xml index 75b86c0c5eb6..0125585f331a 100644 --- a/sdk/storage/azure-storage-internal-avro/pom.xml +++ b/sdk/storage/azure-storage-internal-avro/pom.xml @@ -76,19 +76,19 @@ org.apache.logging.log4j log4j-slf4j-impl - 2.17.2 + 2.18.0 test org.apache.logging.log4j log4j-api - 2.17.2 + 2.18.0 test org.apache.logging.log4j log4j-core - 2.17.2 + 2.18.0 test diff --git a/sdk/storage/azure-storage-queue/pom.xml b/sdk/storage/azure-storage-queue/pom.xml index 83635acc568d..9ee18fbef43f 100644 --- a/sdk/storage/azure-storage-queue/pom.xml +++ b/sdk/storage/azure-storage-queue/pom.xml @@ -94,19 +94,19 @@ org.apache.logging.log4j log4j-slf4j-impl - 2.17.2 + 2.18.0 test org.apache.logging.log4j log4j-api - 2.17.2 + 2.18.0 test org.apache.logging.log4j log4j-core - 2.17.2 + 2.18.0 test diff --git a/sdk/tables/azure-data-tables/pom.xml b/sdk/tables/azure-data-tables/pom.xml index 5d1f49415e56..eb110f6344bc 100644 --- a/sdk/tables/azure-data-tables/pom.xml +++ b/sdk/tables/azure-data-tables/pom.xml @@ -92,7 +92,7 @@ Licensed under the MIT License. org.mockito mockito-core - 4.5.1 + 4.6.1 test diff --git a/sdk/textanalytics/azure-ai-textanalytics/pom.xml b/sdk/textanalytics/azure-ai-textanalytics/pom.xml index 7d3addf77832..a6d8381014fc 100644 --- a/sdk/textanalytics/azure-ai-textanalytics/pom.xml +++ b/sdk/textanalytics/azure-ai-textanalytics/pom.xml @@ -104,7 +104,7 @@ org.mockito mockito-core - 4.5.1 + 4.6.1 test From 3897e1c777b7b9f9ead1d4dad090281ec2c9843a Mon Sep 17 00:00:00 2001 From: Shili Chen Date: Mon, 29 Aug 2022 18:32:26 +0800 Subject: [PATCH 02/15] Fix wrong version in Spring Boot 3 --- common/perf-test-core/pom.xml | 2 +- sdk/appconfiguration/azure-data-appconfiguration/pom.xml | 2 +- sdk/communication/azure-communication-callingserver/pom.xml | 2 +- sdk/communication/azure-communication-common/pom.xml | 2 +- sdk/communication/azure-communication-identity/pom.xml | 2 +- .../azure-communication-networktraversal/pom.xml | 2 +- sdk/communication/azure-communication-phonenumbers/pom.xml | 2 +- sdk/communication/azure-communication-rooms/pom.xml | 2 +- sdk/communication/azure-communication-sms/pom.xml | 2 +- .../azure-containers-containerregistry/pom.xml | 2 +- sdk/core/azure-core-amqp-experimental/pom.xml | 2 +- sdk/core/azure-core-amqp/pom.xml | 2 +- sdk/core/azure-core-experimental/pom.xml | 2 +- sdk/core/azure-core-http-jdk-httpclient/pom.xml | 2 +- sdk/core/azure-core-http-netty/pom.xml | 6 +++--- sdk/core/azure-core-http-okhttp/pom.xml | 2 +- sdk/core/azure-core-http-vertx/pom.xml | 2 +- sdk/core/azure-core-jackson-tests/pom.xml | 2 +- sdk/core/azure-core-management/pom.xml | 2 +- sdk/core/azure-core-perf/pom.xml | 2 +- sdk/core/azure-core-serializer-avro-apache/pom.xml | 2 +- sdk/core/azure-core-serializer-avro-jackson/pom.xml | 2 +- sdk/core/azure-core-serializer-json-gson/pom.xml | 6 +++--- sdk/core/azure-core-serializer-json-jackson/pom.xml | 2 +- sdk/core/azure-core-test/pom.xml | 4 ++-- sdk/core/azure-core/pom.xml | 6 +++--- sdk/core/azure-json-gson/pom.xml | 4 ++-- sdk/cosmos/azure-cosmos-encryption/pom.xml | 2 +- sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml | 2 +- sdk/e2e/pom.xml | 2 +- sdk/eventgrid/azure-messaging-eventgrid/pom.xml | 2 +- .../azure-messaging-eventhubs-checkpointstore-blob/pom.xml | 2 +- .../azure-messaging-eventhubs-checkpointstore-jedis/pom.xml | 2 +- sdk/eventhubs/azure-messaging-eventhubs/docs/pom.xml | 2 +- sdk/eventhubs/azure-messaging-eventhubs/pom.xml | 2 +- sdk/eventhubs/microsoft-azure-eventhubs-eph/pom.xml | 2 +- sdk/keyvault/azure-security-keyvault-administration/pom.xml | 2 +- sdk/keyvault/azure-security-keyvault-certificates/pom.xml | 2 +- sdk/keyvault/azure-security-keyvault-keys/pom.xml | 2 +- sdk/keyvault/azure-security-keyvault-secrets/pom.xml | 2 +- sdk/maps/azure-maps-render/pom.xml | 2 +- sdk/maps/azure-maps-route/pom.xml | 2 +- sdk/maps/azure-maps-search/pom.xml | 2 +- sdk/mixedreality/azure-mixedreality-authentication/pom.xml | 2 +- sdk/monitor/azure-monitor-ingestion/pom.xml | 2 +- .../azure-mixedreality-remoterendering/pom.xml | 2 +- sdk/resourcemanager/azure-resourcemanager-resources/pom.xml | 2 +- .../azure-resourcemanager-resources/pom.xml | 2 +- .../azure-data-schemaregistry-apacheavro/pom.xml | 2 +- sdk/schemaregistry/azure-data-schemaregistry/pom.xml | 2 +- sdk/search/azure-search-documents/pom.xml | 2 +- sdk/servicebus/azure-messaging-servicebus/pom.xml | 2 +- sdk/storage/azure-storage-blob-batch/pom.xml | 2 +- sdk/storage/azure-storage-blob-changefeed/pom.xml | 2 +- sdk/storage/azure-storage-blob-nio/pom.xml | 2 +- sdk/storage/azure-storage-blob/pom.xml | 2 +- sdk/storage/azure-storage-common/pom.xml | 2 +- sdk/storage/azure-storage-file-datalake/pom.xml | 2 +- sdk/storage/azure-storage-file-share/pom.xml | 2 +- sdk/storage/azure-storage-internal-avro/pom.xml | 2 +- sdk/storage/azure-storage-queue/pom.xml | 2 +- sdk/tables/azure-data-tables/pom.xml | 2 +- sdk/webpubsub/azure-messaging-webpubsub/pom.xml | 2 +- 63 files changed, 71 insertions(+), 71 deletions(-) diff --git a/common/perf-test-core/pom.xml b/common/perf-test-core/pom.xml index 4156538c225f..f2b0641bc181 100644 --- a/common/perf-test-core/pom.xml +++ b/common/perf-test-core/pom.xml @@ -51,7 +51,7 @@ com.beust:jcommander:[1.78] - io.projectreactor:reactor-core:[3.4.22] + io.projectreactor:reactor-core:[3.4.21] diff --git a/sdk/appconfiguration/azure-data-appconfiguration/pom.xml b/sdk/appconfiguration/azure-data-appconfiguration/pom.xml index 97d88613cddc..9bc54c983f47 100644 --- a/sdk/appconfiguration/azure-data-appconfiguration/pom.xml +++ b/sdk/appconfiguration/azure-data-appconfiguration/pom.xml @@ -93,7 +93,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/communication/azure-communication-callingserver/pom.xml b/sdk/communication/azure-communication-callingserver/pom.xml index f5bf05871b95..45733a2c6950 100644 --- a/sdk/communication/azure-communication-callingserver/pom.xml +++ b/sdk/communication/azure-communication-callingserver/pom.xml @@ -112,7 +112,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/communication/azure-communication-common/pom.xml b/sdk/communication/azure-communication-common/pom.xml index 1703cc96542e..b5111a01a8f2 100644 --- a/sdk/communication/azure-communication-common/pom.xml +++ b/sdk/communication/azure-communication-common/pom.xml @@ -81,7 +81,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/communication/azure-communication-identity/pom.xml b/sdk/communication/azure-communication-identity/pom.xml index 9fde84a5a65c..7846af616a25 100644 --- a/sdk/communication/azure-communication-identity/pom.xml +++ b/sdk/communication/azure-communication-identity/pom.xml @@ -92,7 +92,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/communication/azure-communication-networktraversal/pom.xml b/sdk/communication/azure-communication-networktraversal/pom.xml index e46f8466a4dd..91950c286230 100644 --- a/sdk/communication/azure-communication-networktraversal/pom.xml +++ b/sdk/communication/azure-communication-networktraversal/pom.xml @@ -88,7 +88,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/communication/azure-communication-phonenumbers/pom.xml b/sdk/communication/azure-communication-phonenumbers/pom.xml index ef86cdb10b7a..fda3ed7980fd 100644 --- a/sdk/communication/azure-communication-phonenumbers/pom.xml +++ b/sdk/communication/azure-communication-phonenumbers/pom.xml @@ -90,7 +90,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/communication/azure-communication-rooms/pom.xml b/sdk/communication/azure-communication-rooms/pom.xml index 115076112578..df4aea047a31 100644 --- a/sdk/communication/azure-communication-rooms/pom.xml +++ b/sdk/communication/azure-communication-rooms/pom.xml @@ -99,7 +99,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/communication/azure-communication-sms/pom.xml b/sdk/communication/azure-communication-sms/pom.xml index edbd2dbb9314..efcc7fb0ad1c 100644 --- a/sdk/communication/azure-communication-sms/pom.xml +++ b/sdk/communication/azure-communication-sms/pom.xml @@ -90,7 +90,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/containerregistry/azure-containers-containerregistry/pom.xml b/sdk/containerregistry/azure-containers-containerregistry/pom.xml index 2e6cf0e3dbf5..eff202c6902c 100644 --- a/sdk/containerregistry/azure-containers-containerregistry/pom.xml +++ b/sdk/containerregistry/azure-containers-containerregistry/pom.xml @@ -81,7 +81,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/core/azure-core-amqp-experimental/pom.xml b/sdk/core/azure-core-amqp-experimental/pom.xml index 1ce99d2d91d6..65abf758e1a8 100644 --- a/sdk/core/azure-core-amqp-experimental/pom.xml +++ b/sdk/core/azure-core-amqp-experimental/pom.xml @@ -85,7 +85,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/core/azure-core-amqp/pom.xml b/sdk/core/azure-core-amqp/pom.xml index 0dd895d12581..b29a1020a904 100644 --- a/sdk/core/azure-core-amqp/pom.xml +++ b/sdk/core/azure-core-amqp/pom.xml @@ -83,7 +83,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/core/azure-core-experimental/pom.xml b/sdk/core/azure-core-experimental/pom.xml index 76d4bf8f2803..a08854fcdb2e 100644 --- a/sdk/core/azure-core-experimental/pom.xml +++ b/sdk/core/azure-core-experimental/pom.xml @@ -91,7 +91,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/core/azure-core-http-jdk-httpclient/pom.xml b/sdk/core/azure-core-http-jdk-httpclient/pom.xml index e01fa873b10f..eccbe7e8caf9 100644 --- a/sdk/core/azure-core-http-jdk-httpclient/pom.xml +++ b/sdk/core/azure-core-http-jdk-httpclient/pom.xml @@ -98,7 +98,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/core/azure-core-http-netty/pom.xml b/sdk/core/azure-core-http-netty/pom.xml index 51616338b12b..867e65a6e0f7 100644 --- a/sdk/core/azure-core-http-netty/pom.xml +++ b/sdk/core/azure-core-http-netty/pom.xml @@ -125,7 +125,7 @@ io.projectreactor.netty reactor-netty-http - 1.0.22 + 1.0.21 @@ -152,7 +152,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test @@ -200,7 +200,7 @@ io.netty:netty-tcnative-boringssl-static:[2.0.53.Final] - io.projectreactor.netty:reactor-netty-http:[1.0.22] + io.projectreactor.netty:reactor-netty-http:[1.0.21] io.netty:netty-buffer:[4.1.79.Final] io.netty:netty-codec-http:[4.1.79.Final] io.netty:netty-codec-http2:[4.1.79.Final] diff --git a/sdk/core/azure-core-http-okhttp/pom.xml b/sdk/core/azure-core-http-okhttp/pom.xml index 1296bf10a06b..1bac8aff2137 100644 --- a/sdk/core/azure-core-http-okhttp/pom.xml +++ b/sdk/core/azure-core-http-okhttp/pom.xml @@ -100,7 +100,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/core/azure-core-http-vertx/pom.xml b/sdk/core/azure-core-http-vertx/pom.xml index 36e0420dc0f3..2dac9841a80b 100644 --- a/sdk/core/azure-core-http-vertx/pom.xml +++ b/sdk/core/azure-core-http-vertx/pom.xml @@ -108,7 +108,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/core/azure-core-jackson-tests/pom.xml b/sdk/core/azure-core-jackson-tests/pom.xml index 2b1b0b856c39..6540e18803e1 100644 --- a/sdk/core/azure-core-jackson-tests/pom.xml +++ b/sdk/core/azure-core-jackson-tests/pom.xml @@ -116,7 +116,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/core/azure-core-management/pom.xml b/sdk/core/azure-core-management/pom.xml index f67cb6738b38..e5853f7d7d99 100644 --- a/sdk/core/azure-core-management/pom.xml +++ b/sdk/core/azure-core-management/pom.xml @@ -83,7 +83,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/core/azure-core-perf/pom.xml b/sdk/core/azure-core-perf/pom.xml index 35bd7e91aadc..f413c5436c4c 100644 --- a/sdk/core/azure-core-perf/pom.xml +++ b/sdk/core/azure-core-perf/pom.xml @@ -64,7 +64,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/core/azure-core-serializer-avro-apache/pom.xml b/sdk/core/azure-core-serializer-avro-apache/pom.xml index 46d5192f8fae..b646cabe47cf 100644 --- a/sdk/core/azure-core-serializer-avro-apache/pom.xml +++ b/sdk/core/azure-core-serializer-avro-apache/pom.xml @@ -83,7 +83,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/core/azure-core-serializer-avro-jackson/pom.xml b/sdk/core/azure-core-serializer-avro-jackson/pom.xml index da34441ba538..a3c504570799 100644 --- a/sdk/core/azure-core-serializer-avro-jackson/pom.xml +++ b/sdk/core/azure-core-serializer-avro-jackson/pom.xml @@ -80,7 +80,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/core/azure-core-serializer-json-gson/pom.xml b/sdk/core/azure-core-serializer-json-gson/pom.xml index a839ba7f4557..75a2852eb6eb 100644 --- a/sdk/core/azure-core-serializer-json-gson/pom.xml +++ b/sdk/core/azure-core-serializer-json-gson/pom.xml @@ -71,7 +71,7 @@ com.google.code.gson gson - 2.9.1 + 2.9.0 @@ -101,7 +101,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test @@ -116,7 +116,7 @@ - com.google.code.gson:gson:[2.9.1] + com.google.code.gson:gson:[2.9.0] diff --git a/sdk/core/azure-core-serializer-json-jackson/pom.xml b/sdk/core/azure-core-serializer-json-jackson/pom.xml index 741b4378b553..bb014f3fd48e 100644 --- a/sdk/core/azure-core-serializer-json-jackson/pom.xml +++ b/sdk/core/azure-core-serializer-json-jackson/pom.xml @@ -96,7 +96,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/core/azure-core-test/pom.xml b/sdk/core/azure-core-test/pom.xml index b2a3a8eb71ab..f7b19b87b1f8 100644 --- a/sdk/core/azure-core-test/pom.xml +++ b/sdk/core/azure-core-test/pom.xml @@ -59,7 +59,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 @@ -120,7 +120,7 @@ - io.projectreactor:reactor-test:[3.4.22] + io.projectreactor:reactor-test:[3.4.21] org.junit.jupiter:junit-jupiter-api:[5.8.2] org.junit.jupiter:junit-jupiter-params:[5.8.2] diff --git a/sdk/core/azure-core/pom.xml b/sdk/core/azure-core/pom.xml index ae7f554ca24f..1a39de9bec07 100644 --- a/sdk/core/azure-core/pom.xml +++ b/sdk/core/azure-core/pom.xml @@ -135,12 +135,12 @@ io.projectreactor reactor-core - 3.4.22 + 3.4.21 io.projectreactor reactor-test - 3.4.22 + 3.4.21 test @@ -225,7 +225,7 @@ - io.projectreactor:reactor-core:[3.4.22] + io.projectreactor:reactor-core:[3.4.21] com.fasterxml.jackson.core:jackson-annotations:[2.13.3] com.fasterxml.jackson.core:jackson-core:[2.13.3] com.fasterxml.jackson.core:jackson-databind:[2.13.3] diff --git a/sdk/core/azure-json-gson/pom.xml b/sdk/core/azure-json-gson/pom.xml index d3bede133225..a7ef782e8611 100644 --- a/sdk/core/azure-json-gson/pom.xml +++ b/sdk/core/azure-json-gson/pom.xml @@ -67,7 +67,7 @@ com.google.code.gson gson - 2.9.1 + 2.9.0 @@ -108,7 +108,7 @@ - com.google.code.gson:gson:[2.9.1] + com.google.code.gson:gson:[2.9.0] diff --git a/sdk/cosmos/azure-cosmos-encryption/pom.xml b/sdk/cosmos/azure-cosmos-encryption/pom.xml index b3d96c750f68..2a3146ee2a07 100644 --- a/sdk/cosmos/azure-cosmos-encryption/pom.xml +++ b/sdk/cosmos/azure-cosmos-encryption/pom.xml @@ -169,7 +169,7 @@ Licensed under the MIT License. io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml b/sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml index f7a010e8db35..01fd31287676 100644 --- a/sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml +++ b/sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml @@ -92,7 +92,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/e2e/pom.xml b/sdk/e2e/pom.xml index b530f81560a3..447859972461 100644 --- a/sdk/e2e/pom.xml +++ b/sdk/e2e/pom.xml @@ -82,7 +82,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/eventgrid/azure-messaging-eventgrid/pom.xml b/sdk/eventgrid/azure-messaging-eventgrid/pom.xml index 0115959b3b56..7b77d3bd50ca 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/pom.xml +++ b/sdk/eventgrid/azure-messaging-eventgrid/pom.xml @@ -130,7 +130,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml index 2816ed7e6f67..8668631e89c2 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml +++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml @@ -85,7 +85,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-jedis/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-jedis/pom.xml index ffdb0df554a8..970c08972693 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-jedis/pom.xml +++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-jedis/pom.xml @@ -65,7 +65,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/eventhubs/azure-messaging-eventhubs/docs/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs/docs/pom.xml index 0021b1266724..8512e01d5fb5 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/docs/pom.xml +++ b/sdk/eventhubs/azure-messaging-eventhubs/docs/pom.xml @@ -25,7 +25,7 @@ io.projectreactor reactor-core - 3.4.22 + 3.4.21 diff --git a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml index 474c6b4da221..d4fc52d1a2a8 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml +++ b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml @@ -80,7 +80,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/eventhubs/microsoft-azure-eventhubs-eph/pom.xml b/sdk/eventhubs/microsoft-azure-eventhubs-eph/pom.xml index d8367c2adb10..c13ec3f9c2d2 100644 --- a/sdk/eventhubs/microsoft-azure-eventhubs-eph/pom.xml +++ b/sdk/eventhubs/microsoft-azure-eventhubs-eph/pom.xml @@ -46,7 +46,7 @@ com.google.code.gson gson - 2.9.1 + 2.9.0 diff --git a/sdk/keyvault/azure-security-keyvault-administration/pom.xml b/sdk/keyvault/azure-security-keyvault-administration/pom.xml index 17002a6e4825..86483ce207ae 100644 --- a/sdk/keyvault/azure-security-keyvault-administration/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-administration/pom.xml @@ -80,7 +80,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/keyvault/azure-security-keyvault-certificates/pom.xml b/sdk/keyvault/azure-security-keyvault-certificates/pom.xml index d5435cc889d6..c5a9b33a776f 100644 --- a/sdk/keyvault/azure-security-keyvault-certificates/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-certificates/pom.xml @@ -87,7 +87,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/keyvault/azure-security-keyvault-keys/pom.xml b/sdk/keyvault/azure-security-keyvault-keys/pom.xml index 1e14390ab9f2..d79739e5f043 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-keys/pom.xml @@ -99,7 +99,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/keyvault/azure-security-keyvault-secrets/pom.xml b/sdk/keyvault/azure-security-keyvault-secrets/pom.xml index 9cc998e6c286..b18ad57b9dd4 100644 --- a/sdk/keyvault/azure-security-keyvault-secrets/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-secrets/pom.xml @@ -103,7 +103,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/maps/azure-maps-render/pom.xml b/sdk/maps/azure-maps-render/pom.xml index e303608e6b72..95d6a528b85b 100644 --- a/sdk/maps/azure-maps-render/pom.xml +++ b/sdk/maps/azure-maps-render/pom.xml @@ -105,7 +105,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/maps/azure-maps-route/pom.xml b/sdk/maps/azure-maps-route/pom.xml index 78c3c1e09ec3..a5d0d1f1ea75 100644 --- a/sdk/maps/azure-maps-route/pom.xml +++ b/sdk/maps/azure-maps-route/pom.xml @@ -111,7 +111,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/maps/azure-maps-search/pom.xml b/sdk/maps/azure-maps-search/pom.xml index 821703ecd256..3fa5d7a93ec4 100644 --- a/sdk/maps/azure-maps-search/pom.xml +++ b/sdk/maps/azure-maps-search/pom.xml @@ -106,7 +106,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/mixedreality/azure-mixedreality-authentication/pom.xml b/sdk/mixedreality/azure-mixedreality-authentication/pom.xml index d5701fd0cb4f..b5bc5693d2b0 100644 --- a/sdk/mixedreality/azure-mixedreality-authentication/pom.xml +++ b/sdk/mixedreality/azure-mixedreality-authentication/pom.xml @@ -82,7 +82,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/monitor/azure-monitor-ingestion/pom.xml b/sdk/monitor/azure-monitor-ingestion/pom.xml index d4d824bfb44f..47172f0304bb 100644 --- a/sdk/monitor/azure-monitor-ingestion/pom.xml +++ b/sdk/monitor/azure-monitor-ingestion/pom.xml @@ -94,7 +94,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/pom.xml b/sdk/remoterendering/azure-mixedreality-remoterendering/pom.xml index b5c2a050fef9..a08a019de141 100644 --- a/sdk/remoterendering/azure-mixedreality-remoterendering/pom.xml +++ b/sdk/remoterendering/azure-mixedreality-remoterendering/pom.xml @@ -79,7 +79,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/pom.xml b/sdk/resourcemanager/azure-resourcemanager-resources/pom.xml index 20f68f01a9d8..e8c85faeef14 100644 --- a/sdk/resourcemanager/azure-resourcemanager-resources/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-resources/pom.xml @@ -94,7 +94,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/resourcemanagerhybrid/azure-resourcemanager-resources/pom.xml b/sdk/resourcemanagerhybrid/azure-resourcemanager-resources/pom.xml index 0629adcdf98a..0fcdbcfb66ac 100644 --- a/sdk/resourcemanagerhybrid/azure-resourcemanager-resources/pom.xml +++ b/sdk/resourcemanagerhybrid/azure-resourcemanager-resources/pom.xml @@ -93,7 +93,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/schemaregistry/azure-data-schemaregistry-apacheavro/pom.xml b/sdk/schemaregistry/azure-data-schemaregistry-apacheavro/pom.xml index 7914552cb5c5..c932e955da40 100644 --- a/sdk/schemaregistry/azure-data-schemaregistry-apacheavro/pom.xml +++ b/sdk/schemaregistry/azure-data-schemaregistry-apacheavro/pom.xml @@ -77,7 +77,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/schemaregistry/azure-data-schemaregistry/pom.xml b/sdk/schemaregistry/azure-data-schemaregistry/pom.xml index e8338b2efa66..2e91b7f44351 100644 --- a/sdk/schemaregistry/azure-data-schemaregistry/pom.xml +++ b/sdk/schemaregistry/azure-data-schemaregistry/pom.xml @@ -61,7 +61,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/search/azure-search-documents/pom.xml b/sdk/search/azure-search-documents/pom.xml index de284a68364d..36d430f84a12 100644 --- a/sdk/search/azure-search-documents/pom.xml +++ b/sdk/search/azure-search-documents/pom.xml @@ -112,7 +112,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/servicebus/azure-messaging-servicebus/pom.xml b/sdk/servicebus/azure-messaging-servicebus/pom.xml index 56a28a228f65..3f215f4b2185 100644 --- a/sdk/servicebus/azure-messaging-servicebus/pom.xml +++ b/sdk/servicebus/azure-messaging-servicebus/pom.xml @@ -103,7 +103,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/storage/azure-storage-blob-batch/pom.xml b/sdk/storage/azure-storage-blob-batch/pom.xml index aa7c5f95ce85..b010af1adb09 100644 --- a/sdk/storage/azure-storage-blob-batch/pom.xml +++ b/sdk/storage/azure-storage-blob-batch/pom.xml @@ -115,7 +115,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/storage/azure-storage-blob-changefeed/pom.xml b/sdk/storage/azure-storage-blob-changefeed/pom.xml index 3130420fd188..d9e1b3246532 100644 --- a/sdk/storage/azure-storage-blob-changefeed/pom.xml +++ b/sdk/storage/azure-storage-blob-changefeed/pom.xml @@ -121,7 +121,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/storage/azure-storage-blob-nio/pom.xml b/sdk/storage/azure-storage-blob-nio/pom.xml index abf520f9e36a..8c69717ea035 100644 --- a/sdk/storage/azure-storage-blob-nio/pom.xml +++ b/sdk/storage/azure-storage-blob-nio/pom.xml @@ -98,7 +98,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/storage/azure-storage-blob/pom.xml b/sdk/storage/azure-storage-blob/pom.xml index fa4fd2c9b055..13fee2309663 100644 --- a/sdk/storage/azure-storage-blob/pom.xml +++ b/sdk/storage/azure-storage-blob/pom.xml @@ -126,7 +126,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/storage/azure-storage-common/pom.xml b/sdk/storage/azure-storage-common/pom.xml index 403aa00940a0..cb762425fe4c 100644 --- a/sdk/storage/azure-storage-common/pom.xml +++ b/sdk/storage/azure-storage-common/pom.xml @@ -97,7 +97,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/storage/azure-storage-file-datalake/pom.xml b/sdk/storage/azure-storage-file-datalake/pom.xml index 001d7472a5da..2b59539acae1 100644 --- a/sdk/storage/azure-storage-file-datalake/pom.xml +++ b/sdk/storage/azure-storage-file-datalake/pom.xml @@ -121,7 +121,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/storage/azure-storage-file-share/pom.xml b/sdk/storage/azure-storage-file-share/pom.xml index 68b0ba46f352..3e732a7f155a 100644 --- a/sdk/storage/azure-storage-file-share/pom.xml +++ b/sdk/storage/azure-storage-file-share/pom.xml @@ -96,7 +96,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/storage/azure-storage-internal-avro/pom.xml b/sdk/storage/azure-storage-internal-avro/pom.xml index 0125585f331a..2df8a70d6a4c 100644 --- a/sdk/storage/azure-storage-internal-avro/pom.xml +++ b/sdk/storage/azure-storage-internal-avro/pom.xml @@ -62,7 +62,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/storage/azure-storage-queue/pom.xml b/sdk/storage/azure-storage-queue/pom.xml index 9ee18fbef43f..f77b9e050dba 100644 --- a/sdk/storage/azure-storage-queue/pom.xml +++ b/sdk/storage/azure-storage-queue/pom.xml @@ -82,7 +82,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/tables/azure-data-tables/pom.xml b/sdk/tables/azure-data-tables/pom.xml index eb110f6344bc..0048bd1ad1a7 100644 --- a/sdk/tables/azure-data-tables/pom.xml +++ b/sdk/tables/azure-data-tables/pom.xml @@ -74,7 +74,7 @@ Licensed under the MIT License. io.projectreactor reactor-test - 3.4.22 + 3.4.21 test diff --git a/sdk/webpubsub/azure-messaging-webpubsub/pom.xml b/sdk/webpubsub/azure-messaging-webpubsub/pom.xml index af24e786b73a..1883d1130db1 100644 --- a/sdk/webpubsub/azure-messaging-webpubsub/pom.xml +++ b/sdk/webpubsub/azure-messaging-webpubsub/pom.xml @@ -89,7 +89,7 @@ io.projectreactor reactor-test - 3.4.22 + 3.4.21 test From cce652f7f9d826e5195b7e6022605615ae2c6a1d Mon Sep 17 00:00:00 2001 From: Shili Chen Date: Tue, 30 Aug 2022 13:53:41 +0800 Subject: [PATCH 03/15] Revert unnecessary changes --- sdk/appconfiguration/ci.yml | 2 - .../aad/AadWebSecurityConfigurerAdapter.java | 2 +- .../AadOAuth2ClientConfigurationTests.java | 106 ++++++++++++++++++ .../AadAuthenticationPropertiesTests.java | 26 ++--- 4 files changed, 120 insertions(+), 16 deletions(-) diff --git a/sdk/appconfiguration/ci.yml b/sdk/appconfiguration/ci.yml index 0c74eca6220d..0d64dd7f53a6 100644 --- a/sdk/appconfiguration/ci.yml +++ b/sdk/appconfiguration/ci.yml @@ -129,5 +129,3 @@ extends: # - name: azure-spring-cloud-test-appconfiguration-config # groupId: com.azure.spring # safeName: azurespringcloudtestappconfigurationconfig - MatrixFilters: - - JavaTestVersion=^(?!1.8|1.11).* \ No newline at end of file diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/AadWebSecurityConfigurerAdapter.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/AadWebSecurityConfigurerAdapter.java index 1ff989ac8d6b..e932443fbb76 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/AadWebSecurityConfigurerAdapter.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aad/AadWebSecurityConfigurerAdapter.java @@ -84,7 +84,7 @@ protected void configure(HttpSecurity http) throws Exception { Filter conditionalAccessFilter = conditionalAccessFilter(); if (conditionalAccessFilter != null) { - http.addFilterAfter(conditionalAccessFilter, (Class) OAuth2AuthorizationRequestRedirectFilter.class); + http.addFilterAfter(conditionalAccessFilter, OAuth2AuthorizationRequestRedirectFilter.class); } } diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/oauth2/AadOAuth2ClientConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/oauth2/AadOAuth2ClientConfigurationTests.java index da33c38cc03a..05120cea9bc4 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/oauth2/AadOAuth2ClientConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/oauth2/AadOAuth2ClientConfigurationTests.java @@ -5,13 +5,29 @@ import com.azure.spring.cloud.autoconfigure.aad.AadClientRegistrationRepository; import com.azure.spring.cloud.autoconfigure.aad.configuration.AadOAuth2ClientConfiguration; +import com.azure.spring.cloud.autoconfigure.aad.implementation.TestJwks; +import com.azure.spring.cloud.autoconfigure.aad.implementation.webapi.AadJwtBearerGrantRequestEntityConverter; import com.azure.spring.cloud.autoconfigure.aad.properties.AadAuthenticationProperties; +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.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.registration.ClientRegistration; import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository; import org.springframework.security.oauth2.client.web.OAuth2AuthorizedClientRepository; +import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames; +import org.springframework.security.oauth2.jwt.Jwt; +import org.springframework.test.util.ReflectionTestUtils; +import org.springframework.util.MultiValueMap; +import java.util.Arrays; import java.util.Set; import static com.azure.spring.cloud.autoconfigure.aad.implementation.WebApplicationContextRunnerUtils.oauthClientAndResourceServerRunner; @@ -20,6 +36,11 @@ import static com.azure.spring.cloud.autoconfigure.aad.implementation.WebApplicationContextRunnerUtils.webApplicationContextRunner; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; class AadOAuth2ClientConfigurationTests { @@ -141,4 +162,89 @@ void testResourceServerWithOboExistCustomAndGraphClient() { assertThat(customScopes).containsOnly("api://52261059-e515-488e-84fd-a09a3f372814/File.Read"); }); } + + @Test + void defaultConverterInJwtBearerOAuth2AuthorizedClientProviderWhenNotUsingPrivateKeyJwtMethod() { + resourceServerWithOboContextRunner() + .withUserConfiguration(AadOAuth2ClientConfiguration.class) + .withPropertyValues( + "spring.cloud.azure.active-directory.enabled=true", + "spring.cloud.azure.active-directory.authorization-clients.graph.scopes=https://graph.microsoft.com/User.Read", + "spring.cloud.azure.active-directory.authorization-clients.graph.authorization-grant-type=on_behalf_of", + "spring.cloud.azure.active-directory.authorization-clients.graph.scopes=api://52261059-e515-488e-84fd-a09a3f372814/File.Read" + ) + .run(context -> { + assertThat(context).doesNotHaveBean(OAuth2ClientAuthenticationJwkResolver.class); + final JwtBearerOAuth2AuthorizedClientProvider jwtBearerProvider = context.getBean( + JwtBearerOAuth2AuthorizedClientProvider.class); + final ClientRegistrationRepository clientRepository = context.getBean( + ClientRegistrationRepository.class); + MultiValueMap parameters = convertParameters(jwtBearerProvider, clientRepository); + assertThat(parameters).containsEntry("requested_token_use", Arrays.asList("on_behalf_of")); + }); + } + + @Test + void customConverterInJwtBearerOAuth2AuthorizedClientProviderWhenUsingPrivateKeyJwtMethod() { + RSAKey rsaJwk = spy(TestJwks.DEFAULT_RSA_JWK); + OAuth2ClientAuthenticationJwkResolver jwkResolver = spy(new TestOAuth2ClientAuthenticationJwkResolver(rsaJwk)); + given(jwkResolver.resolve(any())).willReturn(rsaJwk); + given(rsaJwk.getX509CertThumbprint()).willReturn(new Base64URL("dGVzdA")); + + resourceServerWithOboContextRunner() + .withBean(OAuth2ClientAuthenticationJwkResolver.class, () -> jwkResolver) + .withUserConfiguration(AadOAuth2ClientConfiguration.class) + .withPropertyValues( + "spring.cloud.azure.active-directory.enabled=true", + "spring.cloud.azure.active-directory.credential.client-certificate-path=/test/test.pfx", + "spring.cloud.azure.active-directory.credential.client-certificate-password=test", + "spring.cloud.azure.active-directory.authorization-clients.graph.scopes=https://graph.microsoft.com/User.Read", + "spring.cloud.azure.active-directory.authorization-clients.graph.authorization-grant-type=urn:ietf:params:oauth:grant-type:jwt-bearer", + "spring.cloud.azure.active-directory.authorization-clients.graph.scopes=api://52261059-e515-488e-84fd-a09a3f372814/File.Read", + "spring.cloud.azure.active-directory.authorization-clients.graph.client-authentication-method=private_key_jwt" + ) + .run(context -> { + assertThat(context).hasSingleBean(OAuth2ClientAuthenticationJwkResolver.class); + final JwtBearerOAuth2AuthorizedClientProvider jwtBearerProvider = context.getBean( + JwtBearerOAuth2AuthorizedClientProvider.class); + final ClientRegistrationRepository clientRepository = context.getBean( + ClientRegistrationRepository.class); + + MultiValueMap parameters = convertParameters(jwtBearerProvider, clientRepository); + assertThat(parameters).containsEntry("requested_token_use", Arrays.asList("on_behalf_of")); + assertThat(parameters).containsKey(OAuth2ParameterNames.CLIENT_ASSERTION_TYPE); + verify(jwkResolver).resolve(clientRepository.findByRegistrationId("graph")); + }); + } + + @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()); + + Converter> parametersConverter = + (Converter>) ReflectionTestUtils.getField(requestEntityConverter, "parametersConverter"); + JwtBearerGrantRequest request = new JwtBearerGrantRequest(clientRepository.findByRegistrationId("graph"), mock(Jwt.class)); + return parametersConverter.convert(request); + } + + class TestOAuth2ClientAuthenticationJwkResolver implements OAuth2ClientAuthenticationJwkResolver { + + private final JWK jwk; + + TestOAuth2ClientAuthenticationJwkResolver(JWK jwk) { + this.jwk = jwk; + } + + @Override + public JWK resolve(ClientRegistration clientRegistration) { + return this.jwk; + } + } } diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/properties/AadAuthenticationPropertiesTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/properties/AadAuthenticationPropertiesTests.java index 862c9306c976..97512850021a 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/properties/AadAuthenticationPropertiesTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/properties/AadAuthenticationPropertiesTests.java @@ -380,24 +380,24 @@ void applicationTypeWithWebApplicationAndResourceServer() { @Test void applicationTypeWithWebApplicationAndResourceServerWithWrongAuthorizationGrantTypeConfigured() { resourceServerWithOboContextRunner() - .withPropertyValues( - "spring.cloud.azure.active-directory.application-type=web_application_and_resource_server", - "spring.cloud.azure.active-directory.authorization-clients.azure.authorization-grant-type=client_credential" - ) - .run(context -> assertThrows(IllegalStateException.class, () -> context.getBean(AadAuthenticationProperties.class))); + .withPropertyValues( + "spring.cloud.azure.active-directory.application-type=web_application_and_resource_server", + "spring.cloud.azure.active-directory.authorization-clients.azure.authorization-grant-type=client_credential" + ) + .run(context -> assertThrows(IllegalStateException.class, () -> context.getBean(AadAuthenticationProperties.class))); } @Test void applicationTypeWithWebApplicationAndResourceServerWithRightAuthorizationGrantTypeConfigured() { resourceServerWithOboContextRunner() - .withPropertyValues( - "spring.cloud.azure.active-directory.application-type=web_application_and_resource_server", - "spring.cloud.azure.active-directory.authorization-clients.azure.authorization-grant-type=authorization_code" - ) - .run(context -> { - AadAuthenticationProperties properties = context.getBean(AadAuthenticationProperties.class); - assertEquals(properties.getApplicationType(), AadApplicationType.WEB_APPLICATION_AND_RESOURCE_SERVER); - }); + .withPropertyValues( + "spring.cloud.azure.active-directory.application-type=web_application_and_resource_server", + "spring.cloud.azure.active-directory.authorization-clients.azure.authorization-grant-type=authorization_code" + ) + .run(context -> { + AadAuthenticationProperties properties = context.getBean(AadAuthenticationProperties.class); + assertEquals(properties.getApplicationType(), AadApplicationType.WEB_APPLICATION_AND_RESOURCE_SERVER); + }); } @Test From 298d39a13f0603531477ea50a06df79cdf116a5a Mon Sep 17 00:00:00 2001 From: Shili Chen Date: Tue, 30 Aug 2022 13:53:52 +0800 Subject: [PATCH 04/15] Add an issue link for test class disabled description --- .../implementation/graph/UserPrincipalMicrosoftGraphTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/graph/UserPrincipalMicrosoftGraphTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/graph/UserPrincipalMicrosoftGraphTests.java index c066de007c3b..79bd255dc3ae 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/graph/UserPrincipalMicrosoftGraphTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/graph/UserPrincipalMicrosoftGraphTests.java @@ -45,7 +45,7 @@ import static org.springframework.http.HttpHeaders.CONTENT_TYPE; import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; -@Disabled("No available jakarta version for 'com.github.tomakehurst:wiremock-jre8'") +@Disabled("No available jakarta version for 'com.github.tomakehurst:wiremock-jre8', https://github.com/wiremock/wiremock/issues/1760") @TestInstance(TestInstance.Lifecycle.PER_CLASS) //@WireMockTest(httpPort = 8080) class UserPrincipalMicrosoftGraphTests { From 5f0f53d3c5980de3e9344c888ed3ddab4fdfaad5 Mon Sep 17 00:00:00 2001 From: Shili Chen Date: Tue, 30 Aug 2022 14:50:03 +0800 Subject: [PATCH 05/15] Exclude artifact azure-spring-cloud-feature-management in appconfiguration ci job --- sdk/appconfiguration/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk/appconfiguration/ci.yml b/sdk/appconfiguration/ci.yml index 0d64dd7f53a6..e546c2b75800 100644 --- a/sdk/appconfiguration/ci.yml +++ b/sdk/appconfiguration/ci.yml @@ -109,10 +109,10 @@ extends: # groupId: com.azure.spring # safeName: azurespringcloudappconfigurationconfigweb # releaseInBatch: ${{ parameters.release_azurespringcloudappconfigurationconfigweb }} - - name: azure-spring-cloud-feature-management - groupId: com.azure.spring - safeName: azurespringcloudfeaturemanagement - releaseInBatch: ${{ parameters.release_azurespringcloudfeaturemanagement }} +# - name: azure-spring-cloud-feature-management +# groupId: com.azure.spring +# safeName: azurespringcloudfeaturemanagement +# releaseInBatch: ${{ parameters.release_azurespringcloudfeaturemanagement }} # - name: azure-spring-cloud-feature-management-web # groupId: com.azure.spring # safeName: azurespringcloudfeaturemanagementweb From 8d4212fc06752c410b64f4f0397bec9a2b7dc738 Mon Sep 17 00:00:00 2001 From: Shili Chen Date: Thu, 1 Sep 2022 17:03:01 +0800 Subject: [PATCH 06/15] Fix comments: Remove low version Spring Boot content --- eng/versioning/external_dependencies.txt | 4 +- ...ot_2.7.3_managed_external_dependencies.txt | 1538 ----------------- 2 files changed, 2 insertions(+), 1540 deletions(-) delete mode 100644 sdk/spring/scripts/spring_boot_2.7.3_managed_external_dependencies.txt diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index 9129e546ad55..822d8379733b 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -1,6 +1,6 @@ # To avoid dependency conflicts between SDK and Spring, when modifying or adding dependencies, -# make sure the version is same to sdk/spring/scripts/spring_boot_2.7.2_managed_external_dependencies.txt -# If your version is different from sdk/spring/scripts/spring_boot_2.7.2_managed_external_dependencies.txt, +# make sure the version is same to sdk/spring/scripts/spring_boot_3.0.0-M4_managed_external_dependencies.txt +# If your version is different from sdk/spring/scripts/spring_boot_3.0.0-M4_managed_external_dependencies.txt, # please discuss with Spring Integration team members: # @chenrujun (rujche), @saragluna (xiada), @yiliuTo (yiliu6), @backwind1233 (zhihaoguo). # Thanks. diff --git a/sdk/spring/scripts/spring_boot_2.7.3_managed_external_dependencies.txt b/sdk/spring/scripts/spring_boot_2.7.3_managed_external_dependencies.txt deleted file mode 100644 index 130acb0ff56a..000000000000 --- a/sdk/spring/scripts/spring_boot_2.7.3_managed_external_dependencies.txt +++ /dev/null @@ -1,1538 +0,0 @@ -antlr:antlr;2.7.7 -ch.qos.logback:logback-access;1.2.11 -ch.qos.logback:logback-classic;1.2.11 -ch.qos.logback:logback-core;1.2.11 -com.atomikos:transactions-jdbc;4.0.6 -com.atomikos:transactions-jms;4.0.6 -com.atomikos:transactions-jta;4.0.6 -com.couchbase.client:java-client;3.3.3 -com.datastax.oss:java-driver-bom;4.14.1 -com.datastax.oss:java-driver-core;4.14.1 -com.datastax.oss:java-driver-core-shaded;4.14.1 -com.datastax.oss:java-driver-mapper-processor;4.14.1 -com.datastax.oss:java-driver-mapper-runtime;4.14.1 -com.datastax.oss:java-driver-metrics-micrometer;4.14.1 -com.datastax.oss:java-driver-metrics-microprofile;4.14.1 -com.datastax.oss:java-driver-query-builder;4.14.1 -com.datastax.oss:java-driver-shaded-guava;25.1-jre-graal-sub-1 -com.datastax.oss:java-driver-test-infra;4.14.1 -com.datastax.oss:native-protocol;1.5.1 -com.ecwid.consul:consul-api;1.4.5 -com.fasterxml.jackson.core:jackson-annotations;2.13.3 -com.fasterxml.jackson.core:jackson-core;2.13.3 -com.fasterxml.jackson.core:jackson-databind;2.13.3 -com.fasterxml.jackson.dataformat:jackson-dataformat-avro;2.13.3 -com.fasterxml.jackson.dataformat:jackson-dataformat-cbor;2.13.3 -com.fasterxml.jackson.dataformat:jackson-dataformat-csv;2.13.3 -com.fasterxml.jackson.dataformat:jackson-dataformat-ion;2.13.3 -com.fasterxml.jackson.dataformat:jackson-dataformat-properties;2.13.3 -com.fasterxml.jackson.dataformat:jackson-dataformat-protobuf;2.13.3 -com.fasterxml.jackson.dataformat:jackson-dataformat-smile;2.13.3 -com.fasterxml.jackson.dataformat:jackson-dataformat-toml;2.13.3 -com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.13.3 -com.fasterxml.jackson.dataformat:jackson-dataformat-yaml;2.13.3 -com.fasterxml.jackson.datatype:jackson-datatype-eclipse-collections;2.13.3 -com.fasterxml.jackson.datatype:jackson-datatype-guava;2.13.3 -com.fasterxml.jackson.datatype:jackson-datatype-hibernate4;2.13.3 -com.fasterxml.jackson.datatype:jackson-datatype-hibernate5;2.13.3 -com.fasterxml.jackson.datatype:jackson-datatype-hibernate5-jakarta;2.13.3 -com.fasterxml.jackson.datatype:jackson-datatype-hppc;2.13.3 -com.fasterxml.jackson.datatype:jackson-datatype-jakarta-jsonp;2.13.3 -com.fasterxml.jackson.datatype:jackson-datatype-jaxrs;2.13.3 -com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.13.3 -com.fasterxml.jackson.datatype:jackson-datatype-joda;2.13.3 -com.fasterxml.jackson.datatype:jackson-datatype-joda-money;2.13.3 -com.fasterxml.jackson.datatype:jackson-datatype-json-org;2.13.3 -com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.13.3 -com.fasterxml.jackson.datatype:jackson-datatype-jsr353;2.13.3 -com.fasterxml.jackson.datatype:jackson-datatype-pcollections;2.13.3 -com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-base;2.13.3 -com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-cbor-provider;2.13.3 -com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-json-provider;2.13.3 -com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-smile-provider;2.13.3 -com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-xml-provider;2.13.3 -com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-yaml-provider;2.13.3 -com.fasterxml.jackson.jaxrs:jackson-jaxrs-base;2.13.3 -com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider;2.13.3 -com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider;2.13.3 -com.fasterxml.jackson.jaxrs:jackson-jaxrs-smile-provider;2.13.3 -com.fasterxml.jackson.jaxrs:jackson-jaxrs-xml-provider;2.13.3 -com.fasterxml.jackson.jaxrs:jackson-jaxrs-yaml-provider;2.13.3 -com.fasterxml.jackson.jr:jackson-jr-all;2.13.3 -com.fasterxml.jackson.jr:jackson-jr-annotation-support;2.13.3 -com.fasterxml.jackson.jr:jackson-jr-objects;2.13.3 -com.fasterxml.jackson.jr:jackson-jr-retrofit2;2.13.3 -com.fasterxml.jackson.jr:jackson-jr-stree;2.13.3 -com.fasterxml.jackson.module:jackson-module-afterburner;2.13.3 -com.fasterxml.jackson.module:jackson-module-blackbird;2.13.3 -com.fasterxml.jackson.module:jackson-module-guice;2.13.3 -com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations;2.13.3 -com.fasterxml.jackson.module:jackson-module-jaxb-annotations;2.13.3 -com.fasterxml.jackson.module:jackson-module-jsonSchema;2.13.3 -com.fasterxml.jackson.module:jackson-module-kotlin;2.13.3 -com.fasterxml.jackson.module:jackson-module-mrbean;2.13.3 -com.fasterxml.jackson.module:jackson-module-no-ctor-deser;2.13.3 -com.fasterxml.jackson.module:jackson-module-osgi;2.13.3 -com.fasterxml.jackson.module:jackson-module-parameter-names;2.13.3 -com.fasterxml.jackson.module:jackson-module-paranamer;2.13.3 -com.fasterxml.jackson.module:jackson-module-scala_2.11;2.13.3 -com.fasterxml.jackson.module:jackson-module-scala_2.12;2.13.3 -com.fasterxml.jackson.module:jackson-module-scala_2.13;2.13.3 -com.fasterxml.jackson.module:jackson-module-scala_3;2.13.3 -com.fasterxml.jackson:jackson-bom;2.13.3 -com.fasterxml:classmate;1.5.1 -com.github.ben-manes.caffeine:caffeine;2.9.3 -com.github.ben-manes.caffeine:guava;2.9.3 -com.github.ben-manes.caffeine:jcache;2.9.3 -com.github.ben-manes.caffeine:simulator;2.9.3 -com.github.mxab.thymeleaf.extras:thymeleaf-extras-data-attribute;2.0.1 -com.github.tomakehurst:wiremock-jre8;2.26.3 -com.github.tomakehurst:wiremock-jre8-standalone;2.33.0 -com.google.appengine:appengine-api-1.0-sdk;1.9.98 -com.google.code.gson:gson;2.9.1 -com.graphql-java:graphql-java;18.3 -com.h2database:h2;2.1.214 -com.hazelcast:hazelcast;5.1.3 -com.hazelcast:hazelcast-hibernate52;2.2.1 -com.hazelcast:hazelcast-hibernate53;2.2.1 -com.hazelcast:hazelcast-spring;5.1.3 -com.ibm.db2:jcc;11.5.7.0 -com.jayway.jsonpath:json-path;2.7.0 -com.jayway.jsonpath:json-path-assert;2.7.0 -com.jcraft:jsch;0.1.55 -com.microsoft.sqlserver:mssql-jdbc;10.2.1.jre8 -com.netflix.eureka:eureka-client;1.10.17 -com.netflix.eureka:eureka-core;1.10.17 -com.oracle.database.ha:ons;21.5.0.0 -com.oracle.database.ha:simplefan;21.5.0.0 -com.oracle.database.jdbc.debug:ojdbc11-debug;21.5.0.0 -com.oracle.database.jdbc.debug:ojdbc11-observability-debug;21.5.0.0 -com.oracle.database.jdbc.debug:ojdbc11_g;21.5.0.0 -com.oracle.database.jdbc.debug:ojdbc11dms_g;21.5.0.0 -com.oracle.database.jdbc.debug:ojdbc8-debug;21.5.0.0 -com.oracle.database.jdbc.debug:ojdbc8-observability-debug;21.5.0.0 -com.oracle.database.jdbc.debug:ojdbc8_g;21.5.0.0 -com.oracle.database.jdbc.debug:ojdbc8dms_g;21.5.0.0 -com.oracle.database.jdbc:ojdbc-bom;21.5.0.0 -com.oracle.database.jdbc:ojdbc11;21.5.0.0 -com.oracle.database.jdbc:ojdbc11-production;21.5.0.0 -com.oracle.database.jdbc:ojdbc8;21.5.0.0 -com.oracle.database.jdbc:ojdbc8-production;21.5.0.0 -com.oracle.database.jdbc:rsi;21.5.0.0 -com.oracle.database.jdbc:ucp;21.5.0.0 -com.oracle.database.jdbc:ucp11;21.5.0.0 -com.oracle.database.nls:orai18n;21.5.0.0 -com.oracle.database.observability:dms;21.5.0.0 -com.oracle.database.observability:ojdbc11-observability;21.5.0.0 -com.oracle.database.observability:ojdbc11dms;21.5.0.0 -com.oracle.database.observability:ojdbc8-observability;21.5.0.0 -com.oracle.database.observability:ojdbc8dms;21.5.0.0 -com.oracle.database.r2dbc:oracle-r2dbc;0.4.0 -com.oracle.database.security:oraclepki;21.5.0.0 -com.oracle.database.security:osdt_cert;21.5.0.0 -com.oracle.database.security:osdt_core;21.5.0.0 -com.oracle.database.xml:xdb;21.5.0.0 -com.oracle.database.xml:xmlparserv2;21.5.0.0 -com.querydsl:querydsl-apt;5.0.0 -com.querydsl:querydsl-bom;5.0.0 -com.querydsl:querydsl-codegen;5.0.0 -com.querydsl:querydsl-codegen-utils;5.0.0 -com.querydsl:querydsl-collections;5.0.0 -com.querydsl:querydsl-core;5.0.0 -com.querydsl:querydsl-guava;5.0.0 -com.querydsl:querydsl-hibernate-search;5.0.0 -com.querydsl:querydsl-jdo;5.0.0 -com.querydsl:querydsl-jpa;5.0.0 -com.querydsl:querydsl-jpa-codegen;5.0.0 -com.querydsl:querydsl-kotlin;5.0.0 -com.querydsl:querydsl-kotlin-codegen;5.0.0 -com.querydsl:querydsl-lucene3;5.0.0 -com.querydsl:querydsl-lucene4;5.0.0 -com.querydsl:querydsl-lucene5;5.0.0 -com.querydsl:querydsl-mongodb;5.0.0 -com.querydsl:querydsl-scala;5.0.0 -com.querydsl:querydsl-spatial;5.0.0 -com.querydsl:querydsl-sql;5.0.0 -com.querydsl:querydsl-sql-codegen;5.0.0 -com.querydsl:querydsl-sql-spatial;5.0.0 -com.querydsl:querydsl-sql-spring;5.0.0 -com.rabbitmq:amqp-client;5.14.2 -com.rabbitmq:stream-client;0.5.0 -com.samskivert:jmustache;1.15 -com.sendgrid:sendgrid-java;4.9.3 -com.squareup.okhttp3:logging-interceptor;4.9.3 -com.squareup.okhttp3:mockwebserver;4.9.3 -com.squareup.okhttp3:okcurl;4.9.3 -com.squareup.okhttp3:okhttp;4.9.3 -com.squareup.okhttp3:okhttp-bom;4.9.3 -com.squareup.okhttp3:okhttp-brotli;4.9.3 -com.squareup.okhttp3:okhttp-dnsoverhttps;4.9.3 -com.squareup.okhttp3:okhttp-sse;4.9.3 -com.squareup.okhttp3:okhttp-tls;4.9.3 -com.squareup.okhttp3:okhttp-urlconnection;4.9.3 -com.sun.activation:jakarta.activation;1.2.2 -com.sun.mail:jakarta.mail;1.6.7 -com.sun.xml.messaging.saaj:saaj-impl;1.5.3 -com.toomuchcoding.jsonassert:jsonassert;0.6.2 -com.toomuchcoding.jsonassert:jsonassert-shade;0.6.2 -com.unboundid:unboundid-ldapsdk;6.0.5 -com.zaxxer:HikariCP;4.0.3 -commons-codec:commons-codec;1.15 -commons-pool:commons-pool;1.6 -de.flapdoodle.embed:de.flapdoodle.embed.mongo;3.4.8 -io.dropwizard.metrics:metrics-annotation;4.2.11 -io.dropwizard.metrics:metrics-bom;4.2.11 -io.dropwizard.metrics:metrics-caffeine;4.2.11 -io.dropwizard.metrics:metrics-caffeine3;4.2.11 -io.dropwizard.metrics:metrics-collectd;4.2.11 -io.dropwizard.metrics:metrics-core;4.2.11 -io.dropwizard.metrics:metrics-ehcache;4.2.11 -io.dropwizard.metrics:metrics-graphite;4.2.11 -io.dropwizard.metrics:metrics-healthchecks;4.2.11 -io.dropwizard.metrics:metrics-httpasyncclient;4.2.11 -io.dropwizard.metrics:metrics-httpclient;4.2.11 -io.dropwizard.metrics:metrics-httpclient5;4.2.11 -io.dropwizard.metrics:metrics-jakarta-servlet;4.2.11 -io.dropwizard.metrics:metrics-jakarta-servlets;4.2.11 -io.dropwizard.metrics:metrics-jcache;4.2.11 -io.dropwizard.metrics:metrics-jdbi;4.2.11 -io.dropwizard.metrics:metrics-jdbi3;4.2.11 -io.dropwizard.metrics:metrics-jersey2;4.2.11 -io.dropwizard.metrics:metrics-jersey3;4.2.11 -io.dropwizard.metrics:metrics-jetty10;4.2.11 -io.dropwizard.metrics:metrics-jetty11;4.2.11 -io.dropwizard.metrics:metrics-jetty9;4.2.11 -io.dropwizard.metrics:metrics-jmx;4.2.11 -io.dropwizard.metrics:metrics-json;4.2.11 -io.dropwizard.metrics:metrics-jvm;4.2.11 -io.dropwizard.metrics:metrics-log4j2;4.2.11 -io.dropwizard.metrics:metrics-logback;4.2.11 -io.dropwizard.metrics:metrics-servlet;4.2.11 -io.dropwizard.metrics:metrics-servlets;4.2.11 -io.fabric8.kubernetes:kubernetes-karaf;5.10.2 -io.fabric8.kubernetes:kubernetes-karaf-itests;5.10.2 -io.fabric8:camel-k-client;5.10.2 -io.fabric8:camel-k-mock;5.10.2 -io.fabric8:camel-k-model-v1;5.10.2 -io.fabric8:camel-k-model-v1alpha1;5.10.2 -io.fabric8:camel-k-tests;5.10.2 -io.fabric8:certmanager-client;5.10.2 -io.fabric8:certmanager-examples;5.10.2 -io.fabric8:certmanager-model-v1;5.10.2 -io.fabric8:certmanager-model-v1alpha2;5.10.2 -io.fabric8:certmanager-model-v1alpha3;5.10.2 -io.fabric8:certmanager-model-v1beta1;5.10.2 -io.fabric8:certmanager-server-mock;5.10.2 -io.fabric8:certmanager-tests;5.10.2 -io.fabric8:chaosmesh-client;5.10.2 -io.fabric8:chaosmesh-examples;5.10.2 -io.fabric8:chaosmesh-model;5.10.2 -io.fabric8:chaosmesh-server-mock;5.10.2 -io.fabric8:chaosmesh-tests;5.10.2 -io.fabric8:crd-generator-api;5.10.2 -io.fabric8:crd-generator-apt;5.10.2 -io.fabric8:knative-client;5.10.2 -io.fabric8:knative-examples;5.10.2 -io.fabric8:knative-mock;5.10.2 -io.fabric8:knative-model;5.10.2 -io.fabric8:knative-tests;5.10.2 -io.fabric8:kubernetes-client;5.10.2 -io.fabric8:kubernetes-client-bom;5.10.2 -io.fabric8:kubernetes-examples;5.10.2 -io.fabric8:kubernetes-model;5.10.2 -io.fabric8:kubernetes-model-admissionregistration;5.10.2 -io.fabric8:kubernetes-model-apiextensions;5.10.2 -io.fabric8:kubernetes-model-apps;5.10.2 -io.fabric8:kubernetes-model-autoscaling;5.10.2 -io.fabric8:kubernetes-model-batch;5.10.2 -io.fabric8:kubernetes-model-certificates;5.10.2 -io.fabric8:kubernetes-model-common;5.10.2 -io.fabric8:kubernetes-model-coordination;5.10.2 -io.fabric8:kubernetes-model-core;5.10.2 -io.fabric8:kubernetes-model-discovery;5.10.2 -io.fabric8:kubernetes-model-events;5.10.2 -io.fabric8:kubernetes-model-extensions;5.10.2 -io.fabric8:kubernetes-model-flowcontrol;5.10.2 -io.fabric8:kubernetes-model-jsonschema2pojo;5.10.2 -io.fabric8:kubernetes-model-metrics;5.10.2 -io.fabric8:kubernetes-model-networking;5.10.2 -io.fabric8:kubernetes-model-node;5.10.2 -io.fabric8:kubernetes-model-policy;5.10.2 -io.fabric8:kubernetes-model-rbac;5.10.2 -io.fabric8:kubernetes-model-scheduling;5.10.2 -io.fabric8:kubernetes-model-storageclass;5.10.2 -io.fabric8:kubernetes-openshift-uberjar;5.10.2 -io.fabric8:kubernetes-server-mock;5.10.2 -io.fabric8:kubernetes-test;5.10.2 -io.fabric8:model-annotator;5.10.2 -io.fabric8:openshift-client;5.10.2 -io.fabric8:openshift-model;5.10.2 -io.fabric8:openshift-model-clusterautoscaling;5.10.2 -io.fabric8:openshift-model-console;5.10.2 -io.fabric8:openshift-model-machine;5.10.2 -io.fabric8:openshift-model-machineconfig;5.10.2 -io.fabric8:openshift-model-miscellaneous;5.10.2 -io.fabric8:openshift-model-monitoring;5.10.2 -io.fabric8:openshift-model-operator;5.10.2 -io.fabric8:openshift-model-operatorhub;5.10.2 -io.fabric8:openshift-model-storageversionmigrator;5.10.2 -io.fabric8:openshift-model-tuned;5.10.2 -io.fabric8:openshift-model-whereabouts;5.10.2 -io.fabric8:openshift-server-mock;5.10.2 -io.fabric8:service-catalog-examples;5.10.2 -io.fabric8:servicecatalog-client;5.10.2 -io.fabric8:servicecatalog-model;5.10.2 -io.fabric8:servicecatalog-server-mock;5.10.2 -io.fabric8:servicecatalog-tests;5.10.2 -io.fabric8:tekton-client;5.10.2 -io.fabric8:tekton-examples;5.10.2 -io.fabric8:tekton-mock;5.10.2 -io.fabric8:tekton-model-triggers;5.10.2 -io.fabric8:tekton-model-v1alpha1;5.10.2 -io.fabric8:tekton-model-v1beta1;5.10.2 -io.fabric8:tekton-tests;5.10.2 -io.fabric8:verticalpodautoscaler-client;5.10.2 -io.fabric8:verticalpodautoscaler-examples;5.10.2 -io.fabric8:verticalpodautoscaler-model-v1;5.10.2 -io.fabric8:verticalpodautoscaler-server-mock;5.10.2 -io.fabric8:verticalpodautoscaler-tests;5.10.2 -io.fabric8:volumesnapshot-client;5.10.2 -io.fabric8:volumesnapshot-examples;5.10.2 -io.fabric8:volumesnapshot-model;5.10.2 -io.fabric8:volumesnapshot-server-mock;5.10.2 -io.fabric8:volumesnapshot-tests;5.10.2 -io.github.lognet:grpc-spring-boot-starter;4.2.2 -io.github.openfeign.form:feign-form-spring;3.8.0 -io.github.openfeign:feign-annotation-error-decoder;11.8 -io.github.openfeign:feign-bom;11.8 -io.github.openfeign:feign-core;11.8 -io.github.openfeign:feign-dropwizard-metrics4;11.8 -io.github.openfeign:feign-dropwizard-metrics5;11.8 -io.github.openfeign:feign-googlehttpclient;11.8 -io.github.openfeign:feign-gson;11.8 -io.github.openfeign:feign-hc5;11.8 -io.github.openfeign:feign-httpclient;11.8 -io.github.openfeign:feign-hystrix;11.8 -io.github.openfeign:feign-jackson;11.8 -io.github.openfeign:feign-jackson-jaxb;11.8 -io.github.openfeign:feign-jackson-jr;11.8 -io.github.openfeign:feign-jaxb;11.8 -io.github.openfeign:feign-jaxrs;11.8 -io.github.openfeign:feign-jaxrs2;11.8 -io.github.openfeign:feign-json;11.8 -io.github.openfeign:feign-micrometer;11.8 -io.github.openfeign:feign-mock;11.8 -io.github.openfeign:feign-okhttp;11.8 -io.github.openfeign:feign-reactive-wrappers;11.8 -io.github.openfeign:feign-ribbon;11.8 -io.github.openfeign:feign-sax;11.8 -io.github.openfeign:feign-slf4j;11.8 -io.github.openfeign:feign-soap;11.8 -io.github.openfeign:feign-spring4;11.8 -io.github.resilience4j:resilience4j-all;1.7.0 -io.github.resilience4j:resilience4j-annotations;1.7.0 -io.github.resilience4j:resilience4j-bom;1.7.0 -io.github.resilience4j:resilience4j-bulkhead;1.7.0 -io.github.resilience4j:resilience4j-cache;1.7.0 -io.github.resilience4j:resilience4j-circuitbreaker;1.7.0 -io.github.resilience4j:resilience4j-circularbuffer;1.7.0 -io.github.resilience4j:resilience4j-consumer;1.7.0 -io.github.resilience4j:resilience4j-core;1.7.0 -io.github.resilience4j:resilience4j-feign;1.7.0 -io.github.resilience4j:resilience4j-kotlin;1.7.0 -io.github.resilience4j:resilience4j-metrics;1.7.0 -io.github.resilience4j:resilience4j-micrometer;1.7.0 -io.github.resilience4j:resilience4j-prometheus;1.7.0 -io.github.resilience4j:resilience4j-ratelimiter;1.7.0 -io.github.resilience4j:resilience4j-ratpack;1.7.0 -io.github.resilience4j:resilience4j-reactor;1.7.0 -io.github.resilience4j:resilience4j-retrofit;1.7.0 -io.github.resilience4j:resilience4j-retry;1.7.0 -io.github.resilience4j:resilience4j-rxjava2;1.7.0 -io.github.resilience4j:resilience4j-rxjava3;1.7.0 -io.github.resilience4j:resilience4j-spring;1.7.0 -io.github.resilience4j:resilience4j-spring-boot2;1.7.0 -io.github.resilience4j:resilience4j-spring-cloud2;1.7.0 -io.github.resilience4j:resilience4j-timelimiter;1.7.0 -io.github.resilience4j:resilience4j-vertx;1.7.0 -io.kubernetes:client-java;13.0.2 -io.kubernetes:client-java-extended;13.0.2 -io.kubernetes:client-java-spring-integration;13.0.2 -io.lettuce:lettuce-core;6.1.9.RELEASE -io.micrometer:micrometer-bom;1.9.3 -io.micrometer:micrometer-core;1.9.3 -io.micrometer:micrometer-registry-appoptics;1.9.3 -io.micrometer:micrometer-registry-atlas;1.9.3 -io.micrometer:micrometer-registry-azure-monitor;1.9.3 -io.micrometer:micrometer-registry-cloudwatch;1.9.3 -io.micrometer:micrometer-registry-cloudwatch2;1.9.3 -io.micrometer:micrometer-registry-datadog;1.9.3 -io.micrometer:micrometer-registry-dynatrace;1.9.3 -io.micrometer:micrometer-registry-elastic;1.9.3 -io.micrometer:micrometer-registry-ganglia;1.9.3 -io.micrometer:micrometer-registry-graphite;1.9.3 -io.micrometer:micrometer-registry-health;1.9.3 -io.micrometer:micrometer-registry-humio;1.9.3 -io.micrometer:micrometer-registry-influx;1.9.3 -io.micrometer:micrometer-registry-jmx;1.9.3 -io.micrometer:micrometer-registry-kairos;1.9.3 -io.micrometer:micrometer-registry-new-relic;1.9.3 -io.micrometer:micrometer-registry-opentsdb;1.9.3 -io.micrometer:micrometer-registry-otlp;1.9.3 -io.micrometer:micrometer-registry-prometheus;1.9.3 -io.micrometer:micrometer-registry-signalfx;1.9.3 -io.micrometer:micrometer-registry-stackdriver;1.9.3 -io.micrometer:micrometer-registry-statsd;1.9.3 -io.micrometer:micrometer-registry-wavefront;1.9.3 -io.micrometer:micrometer-test;1.9.3 -io.netty:netty-all;4.1.79.Final -io.netty:netty-bom;4.1.79.Final -io.netty:netty-buffer;4.1.79.Final -io.netty:netty-codec;4.1.79.Final -io.netty:netty-codec-dns;4.1.79.Final -io.netty:netty-codec-haproxy;4.1.79.Final -io.netty:netty-codec-http;4.1.79.Final -io.netty:netty-codec-http2;4.1.79.Final -io.netty:netty-codec-memcache;4.1.79.Final -io.netty:netty-codec-mqtt;4.1.79.Final -io.netty:netty-codec-redis;4.1.79.Final -io.netty:netty-codec-smtp;4.1.79.Final -io.netty:netty-codec-socks;4.1.79.Final -io.netty:netty-codec-stomp;4.1.79.Final -io.netty:netty-codec-xml;4.1.79.Final -io.netty:netty-common;4.1.79.Final -io.netty:netty-dev-tools;4.1.79.Final -io.netty:netty-example;4.1.79.Final -io.netty:netty-handler;4.1.79.Final -io.netty:netty-handler-proxy;4.1.79.Final -io.netty:netty-resolver;4.1.79.Final -io.netty:netty-resolver-dns;4.1.79.Final -io.netty:netty-resolver-dns-classes-macos;4.1.79.Final -io.netty:netty-resolver-dns-native-macos;4.1.79.Final -io.netty:netty-tcnative;2.0.53.Final -io.netty:netty-tcnative-boringssl-static;2.0.53.Final -io.netty:netty-tcnative-classes;2.0.53.Final -io.netty:netty-transport;4.1.79.Final -io.netty:netty-transport-classes-epoll;4.1.79.Final -io.netty:netty-transport-classes-kqueue;4.1.79.Final -io.netty:netty-transport-native-epoll;4.1.79.Final -io.netty:netty-transport-native-kqueue;4.1.79.Final -io.netty:netty-transport-native-unix-common;4.1.79.Final -io.netty:netty-transport-rxtx;4.1.79.Final -io.netty:netty-transport-sctp;4.1.79.Final -io.netty:netty-transport-udt;4.1.79.Final -io.opentracing.brave:brave-opentracing;0.37.4 -io.projectreactor.addons:reactor-adapter;3.4.8 -io.projectreactor.addons:reactor-extra;3.4.8 -io.projectreactor.addons:reactor-pool;0.2.9 -io.projectreactor.kafka:reactor-kafka;1.3.12 -io.projectreactor.kotlin:reactor-kotlin-extensions;1.1.7 -io.projectreactor.netty:reactor-netty;1.0.22 -io.projectreactor.netty:reactor-netty-core;1.0.22 -io.projectreactor.netty:reactor-netty-http;1.0.22 -io.projectreactor.netty:reactor-netty-http-brave;1.0.22 -io.projectreactor.rabbitmq:reactor-rabbitmq;1.5.5 -io.projectreactor:reactor-bom;2020.0.22 -io.projectreactor:reactor-core;3.4.22 -io.projectreactor:reactor-test;3.4.22 -io.projectreactor:reactor-tools;3.4.22 -io.prometheus:simpleclient;0.15.0 -io.prometheus:simpleclient_bom;0.15.0 -io.prometheus:simpleclient_caffeine;0.15.0 -io.prometheus:simpleclient_common;0.15.0 -io.prometheus:simpleclient_dropwizard;0.15.0 -io.prometheus:simpleclient_graphite_bridge;0.15.0 -io.prometheus:simpleclient_guava;0.15.0 -io.prometheus:simpleclient_hibernate;0.15.0 -io.prometheus:simpleclient_hotspot;0.15.0 -io.prometheus:simpleclient_httpserver;0.15.0 -io.prometheus:simpleclient_jetty;0.15.0 -io.prometheus:simpleclient_jetty_jdk8;0.15.0 -io.prometheus:simpleclient_log4j;0.15.0 -io.prometheus:simpleclient_log4j2;0.15.0 -io.prometheus:simpleclient_logback;0.15.0 -io.prometheus:simpleclient_pushgateway;0.15.0 -io.prometheus:simpleclient_servlet;0.15.0 -io.prometheus:simpleclient_servlet_jakarta;0.15.0 -io.prometheus:simpleclient_spring_boot;0.15.0 -io.prometheus:simpleclient_spring_web;0.15.0 -io.prometheus:simpleclient_tracer_otel;0.15.0 -io.prometheus:simpleclient_tracer_otel_agent;0.15.0 -io.prometheus:simpleclient_vertx;0.15.0 -io.r2dbc:r2dbc-bom;Borca-SR1 -io.r2dbc:r2dbc-h2;0.9.1.RELEASE -io.r2dbc:r2dbc-mssql;0.9.0.RELEASE -io.r2dbc:r2dbc-pool;0.9.0.RELEASE -io.r2dbc:r2dbc-proxy;0.9.0.RELEASE -io.r2dbc:r2dbc-spi;0.9.1.RELEASE -io.reactivex.rxjava2:rxjava;2.2.21 -io.reactivex:rxjava;1.3.8 -io.reactivex:rxjava-reactive-streams;1.2.1 -io.rest-assured.examples:kotlin-example;4.5.1 -io.rest-assured.examples:rest-assured-itest-java;4.5.1 -io.rest-assured.examples:scala-example;4.5.1 -io.rest-assured.examples:scala-mock-mvc-example;4.5.1 -io.rest-assured.examples:scalatra-example;4.5.1 -io.rest-assured.examples:scalatra-webapp;4.5.1 -io.rest-assured.examples:spring-mvc-webapp;4.5.1 -io.rest-assured:json-path;4.5.1 -io.rest-assured:json-schema-validator;4.5.1 -io.rest-assured:kotlin-extensions;4.5.1 -io.rest-assured:rest-assured;4.5.1 -io.rest-assured:rest-assured-all;4.5.1 -io.rest-assured:rest-assured-bom;4.5.1 -io.rest-assured:rest-assured-common;4.5.1 -io.rest-assured:scala-support;4.5.1 -io.rest-assured:spring-commons;4.5.1 -io.rest-assured:spring-mock-mvc;4.5.1 -io.rest-assured:spring-mock-mvc-kotlin-extensions;4.5.1 -io.rest-assured:spring-web-test-client;4.5.1 -io.rest-assured:xml-path;4.5.1 -io.rsocket:rsocket-bom;1.1.2 -io.rsocket:rsocket-core;1.1.2 -io.rsocket:rsocket-load-balancer;1.1.2 -io.rsocket:rsocket-micrometer;1.1.2 -io.rsocket:rsocket-test;1.1.2 -io.rsocket:rsocket-transport-local;1.1.2 -io.rsocket:rsocket-transport-netty;1.1.2 -io.specto:hoverfly-java;0.13.0 -io.specto:hoverfly-java-junit5;0.13.0 -io.spring.gradle:dependency-management-plugin;1.0.13.RELEASE -io.undertow:undertow-core;2.2.19.Final -io.undertow:undertow-servlet;2.2.19.Final -io.undertow:undertow-websockets-jsr;2.2.19.Final -io.zipkin.brave:brave;5.13.9 -io.zipkin.brave:brave-bom;5.13.9 -io.zipkin.brave:brave-context-jfr;5.13.9 -io.zipkin.brave:brave-context-log4j12;5.13.9 -io.zipkin.brave:brave-context-log4j2;5.13.9 -io.zipkin.brave:brave-context-rxjava2;5.13.9 -io.zipkin.brave:brave-context-slf4j;5.13.9 -io.zipkin.brave:brave-instrumentation-dubbo;5.13.9 -io.zipkin.brave:brave-instrumentation-dubbo-rpc;5.13.9 -io.zipkin.brave:brave-instrumentation-grpc;5.13.9 -io.zipkin.brave:brave-instrumentation-http;5.13.9 -io.zipkin.brave:brave-instrumentation-http-tests;5.13.9 -io.zipkin.brave:brave-instrumentation-httpasyncclient;5.13.9 -io.zipkin.brave:brave-instrumentation-httpclient;5.13.9 -io.zipkin.brave:brave-instrumentation-jaxrs2;5.13.9 -io.zipkin.brave:brave-instrumentation-jersey-server;5.13.9 -io.zipkin.brave:brave-instrumentation-jms;5.13.9 -io.zipkin.brave:brave-instrumentation-kafka-clients;5.13.9 -io.zipkin.brave:brave-instrumentation-kafka-streams;5.13.9 -io.zipkin.brave:brave-instrumentation-messaging;5.13.9 -io.zipkin.brave:brave-instrumentation-mongodb;5.13.9 -io.zipkin.brave:brave-instrumentation-mysql;5.13.9 -io.zipkin.brave:brave-instrumentation-mysql6;5.13.9 -io.zipkin.brave:brave-instrumentation-mysql8;5.13.9 -io.zipkin.brave:brave-instrumentation-netty-codec-http;5.13.9 -io.zipkin.brave:brave-instrumentation-okhttp3;5.13.9 -io.zipkin.brave:brave-instrumentation-p6spy;5.13.9 -io.zipkin.brave:brave-instrumentation-rpc;5.13.9 -io.zipkin.brave:brave-instrumentation-servlet;5.13.9 -io.zipkin.brave:brave-instrumentation-sparkjava;5.13.9 -io.zipkin.brave:brave-instrumentation-spring-rabbit;5.13.9 -io.zipkin.brave:brave-instrumentation-spring-web;5.13.9 -io.zipkin.brave:brave-instrumentation-spring-webmvc;5.13.9 -io.zipkin.brave:brave-instrumentation-vertx-web;5.13.9 -io.zipkin.brave:brave-spring-beans;5.13.9 -io.zipkin.brave:brave-tests;5.13.9 -io.zipkin.proto3:zipkin-proto3;1.0.0 -io.zipkin.reporter2:zipkin-reporter;2.16.3 -io.zipkin.reporter2:zipkin-reporter-bom;2.16.3 -io.zipkin.reporter2:zipkin-reporter-brave;2.16.3 -io.zipkin.reporter2:zipkin-reporter-metrics-micrometer;2.16.3 -io.zipkin.reporter2:zipkin-reporter-spring-beans;2.16.3 -io.zipkin.reporter2:zipkin-sender-activemq-client;2.16.3 -io.zipkin.reporter2:zipkin-sender-amqp-client;2.16.3 -io.zipkin.reporter2:zipkin-sender-kafka;2.16.3 -io.zipkin.reporter2:zipkin-sender-kafka08;2.16.3 -io.zipkin.reporter2:zipkin-sender-libthrift;2.16.3 -io.zipkin.reporter2:zipkin-sender-okhttp3;2.16.3 -io.zipkin.reporter2:zipkin-sender-urlconnection;2.16.3 -io.zipkin.zipkin2:zipkin;2.23.2 -jakarta.activation:jakarta.activation-api;1.2.2 -jakarta.annotation:jakarta.annotation-api;1.3.5 -jakarta.jms:jakarta.jms-api;2.0.3 -jakarta.json.bind:jakarta.json.bind-api;1.0.2 -jakarta.json:jakarta.json-api;1.1.6 -jakarta.mail:jakarta.mail-api;1.6.7 -jakarta.management.j2ee:jakarta.management.j2ee-api;1.1.4 -jakarta.persistence:jakarta.persistence-api;2.2.3 -jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api;1.2.7 -jakarta.servlet:jakarta.servlet-api;4.0.4 -jakarta.transaction:jakarta.transaction-api;1.3.3 -jakarta.validation:jakarta.validation-api;2.0.2 -jakarta.websocket:jakarta.websocket-api;1.1.2 -jakarta.ws.rs:jakarta.ws.rs-api;2.1.6 -jakarta.xml.bind:jakarta.xml.bind-api;2.3.3 -jakarta.xml.soap:jakarta.xml.soap-api;1.4.2 -jakarta.xml.ws:jakarta.xml.ws-api;2.3.3 -javax.activation:javax.activation-api;1.2.0 -javax.annotation:javax.annotation-api;1.3.2 -javax.cache:cache-api;1.1.1 -javax.jms:javax.jms-api;2.0.1 -javax.json.bind:javax.json.bind-api;1.0 -javax.json:javax.json-api;1.1.4 -javax.mail:javax.mail-api;1.6.2 -javax.money:money-api;1.1 -javax.persistence:javax.persistence-api;2.2 -javax.servlet:javax.servlet-api;4.0.1 -javax.servlet:jstl;1.2 -javax.transaction:javax.transaction-api;1.3 -javax.validation:validation-api;2.0.1.Final -javax.websocket:javax.websocket-api;1.1 -javax.xml.bind:jaxb-api;2.3.1 -javax.xml.ws:jaxws-api;2.3.1 -jaxen:jaxen;1.2.0 -junit:junit;4.13.2 -me.snowdrop:istio-client;1.7.7.1 -mysql:mysql-connector-java;8.0.30 -net.bytebuddy:byte-buddy;1.12.13 -net.bytebuddy:byte-buddy-agent;1.12.13 -net.minidev:json-smart;2.4.8 -net.sf.ehcache:ehcache;2.10.9.2 -net.sourceforge.htmlunit:htmlunit;2.60.0 -net.sourceforge.jtds:jtds;1.3.1 -net.sourceforge.nekohtml:nekohtml;1.9.22 -nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect;3.0.0 -org.apache.activemq:activemq-amqp;5.16.5 -org.apache.activemq:activemq-blueprint;5.16.5 -org.apache.activemq:activemq-broker;5.16.5 -org.apache.activemq:activemq-camel;5.16.5 -org.apache.activemq:activemq-client;5.16.5 -org.apache.activemq:activemq-console;5.16.5 -org.apache.activemq:activemq-http;5.16.5 -org.apache.activemq:activemq-jaas;5.16.5 -org.apache.activemq:activemq-jdbc-store;5.16.5 -org.apache.activemq:activemq-jms-pool;5.16.5 -org.apache.activemq:activemq-kahadb-store;5.16.5 -org.apache.activemq:activemq-karaf;5.16.5 -org.apache.activemq:activemq-leveldb-store;5.16.5 -org.apache.activemq:activemq-log4j-appender;5.16.5 -org.apache.activemq:activemq-mqtt;5.16.5 -org.apache.activemq:activemq-openwire-generator;5.16.5 -org.apache.activemq:activemq-openwire-legacy;5.16.5 -org.apache.activemq:activemq-osgi;5.16.5 -org.apache.activemq:activemq-partition;5.16.5 -org.apache.activemq:activemq-pool;5.16.5 -org.apache.activemq:activemq-ra;5.16.5 -org.apache.activemq:activemq-run;5.16.5 -org.apache.activemq:activemq-runtime-config;5.16.5 -org.apache.activemq:activemq-shiro;5.16.5 -org.apache.activemq:activemq-spring;5.16.5 -org.apache.activemq:activemq-stomp;5.16.5 -org.apache.activemq:activemq-web;5.16.5 -org.apache.activemq:artemis-amqp-protocol;2.19.1 -org.apache.activemq:artemis-commons;2.19.1 -org.apache.activemq:artemis-core-client;2.19.1 -org.apache.activemq:artemis-jdbc-store;2.19.1 -org.apache.activemq:artemis-jms-client;2.19.1 -org.apache.activemq:artemis-jms-server;2.19.1 -org.apache.activemq:artemis-journal;2.19.1 -org.apache.activemq:artemis-quorum-api;2.19.1 -org.apache.activemq:artemis-selector;2.19.1 -org.apache.activemq:artemis-server;2.19.1 -org.apache.activemq:artemis-service-extensions;2.19.1 -org.apache.commons:commons-collections4;4.4 -org.apache.commons:commons-dbcp2;2.9.0 -org.apache.commons:commons-lang3;3.12.0 -org.apache.commons:commons-pool2;2.11.1 -org.apache.curator:curator-framework;5.1.0 -org.apache.curator:curator-recipes;5.1.0 -org.apache.curator:curator-test;5.1.0 -org.apache.curator:curator-x-discovery;5.1.0 -org.apache.derby:derby;10.14.2.0 -org.apache.derby:derbyclient;10.14.2.0 -org.apache.derby:derbynet;10.14.2.0 -org.apache.derby:derbyoptionaltools;10.14.2.0 -org.apache.derby:derbytools;10.14.2.0 -org.apache.httpcomponents.client5:httpclient5;5.1.3 -org.apache.httpcomponents.client5:httpclient5-cache;5.1.3 -org.apache.httpcomponents.client5:httpclient5-fluent;5.1.3 -org.apache.httpcomponents.client5:httpclient5-win;5.1.3 -org.apache.httpcomponents.core5:httpcore5;5.1.4 -org.apache.httpcomponents.core5:httpcore5-h2;5.1.4 -org.apache.httpcomponents.core5:httpcore5-reactive;5.1.4 -org.apache.httpcomponents:fluent-hc;4.5.13 -org.apache.httpcomponents:httpasyncclient;4.1.5 -org.apache.httpcomponents:httpclient;4.5.13 -org.apache.httpcomponents:httpclient-cache;4.5.13 -org.apache.httpcomponents:httpclient-osgi;4.5.13 -org.apache.httpcomponents:httpclient-win;4.5.13 -org.apache.httpcomponents:httpcore;4.4.15 -org.apache.httpcomponents:httpcore-nio;4.4.15 -org.apache.httpcomponents:httpmime;4.5.13 -org.apache.johnzon:johnzon-core;1.2.18 -org.apache.johnzon:johnzon-jaxrs;1.2.18 -org.apache.johnzon:johnzon-jsonb;1.2.18 -org.apache.johnzon:johnzon-jsonb-extras;1.2.18 -org.apache.johnzon:johnzon-jsonschema;1.2.18 -org.apache.johnzon:johnzon-mapper;1.2.18 -org.apache.johnzon:johnzon-websocket;1.2.18 -org.apache.kafka:connect;3.1.1 -org.apache.kafka:connect-api;3.1.1 -org.apache.kafka:connect-basic-auth-extension;3.1.1 -org.apache.kafka:connect-file;3.1.1 -org.apache.kafka:connect-json;3.1.1 -org.apache.kafka:connect-mirror;3.1.1 -org.apache.kafka:connect-mirror-client;3.1.1 -org.apache.kafka:connect-runtime;3.1.1 -org.apache.kafka:connect-transforms;3.1.1 -org.apache.kafka:generator;3.1.1 -org.apache.kafka:kafka-clients;3.1.1 -org.apache.kafka:kafka-log4j-appender;3.1.1 -org.apache.kafka:kafka-metadata;3.1.1 -org.apache.kafka:kafka-raft;3.1.1 -org.apache.kafka:kafka-server-common;3.1.1 -org.apache.kafka:kafka-shell;3.1.1 -org.apache.kafka:kafka-storage;3.1.1 -org.apache.kafka:kafka-storage-api;3.1.1 -org.apache.kafka:kafka-streams;3.1.1 -org.apache.kafka:kafka-streams-scala_2.12;3.1.1 -org.apache.kafka:kafka-streams-scala_2.13;3.1.1 -org.apache.kafka:kafka-streams-test-utils;3.1.1 -org.apache.kafka:kafka-tools;3.1.1 -org.apache.kafka:kafka_2.12;3.1.1 -org.apache.kafka:kafka_2.13;3.1.1 -org.apache.kafka:trogdor;3.1.1 -org.apache.logging.log4j:log4j-1.2-api;2.17.2 -org.apache.logging.log4j:log4j-api;2.17.2 -org.apache.logging.log4j:log4j-appserver;2.17.2 -org.apache.logging.log4j:log4j-bom;2.17.2 -org.apache.logging.log4j:log4j-cassandra;2.17.2 -org.apache.logging.log4j:log4j-core;2.17.2 -org.apache.logging.log4j:log4j-couchdb;2.17.2 -org.apache.logging.log4j:log4j-docker;2.17.2 -org.apache.logging.log4j:log4j-flume-ng;2.17.2 -org.apache.logging.log4j:log4j-iostreams;2.17.2 -org.apache.logging.log4j:log4j-jcl;2.17.2 -org.apache.logging.log4j:log4j-jmx-gui;2.17.2 -org.apache.logging.log4j:log4j-jpa;2.17.2 -org.apache.logging.log4j:log4j-jpl;2.17.2 -org.apache.logging.log4j:log4j-jul;2.17.2 -org.apache.logging.log4j:log4j-kubernetes;2.17.2 -org.apache.logging.log4j:log4j-layout-template-json;2.17.2 -org.apache.logging.log4j:log4j-liquibase;2.17.2 -org.apache.logging.log4j:log4j-mongodb3;2.17.2 -org.apache.logging.log4j:log4j-mongodb4;2.17.2 -org.apache.logging.log4j:log4j-slf4j-impl;2.17.2 -org.apache.logging.log4j:log4j-slf4j18-impl;2.17.2 -org.apache.logging.log4j:log4j-spring-boot;2.17.2 -org.apache.logging.log4j:log4j-spring-cloud-config-client;2.17.2 -org.apache.logging.log4j:log4j-taglib;2.17.2 -org.apache.logging.log4j:log4j-to-slf4j;2.17.2 -org.apache.logging.log4j:log4j-web;2.17.2 -org.apache.solr:solr-analysis-extras;8.11.2 -org.apache.solr:solr-analytics;8.11.2 -org.apache.solr:solr-cell;8.11.2 -org.apache.solr:solr-core;8.11.2 -org.apache.solr:solr-dataimporthandler;8.11.2 -org.apache.solr:solr-dataimporthandler-extras;8.11.2 -org.apache.solr:solr-gcs-repository;8.11.2 -org.apache.solr:solr-jaegertracer-configurator;8.11.2 -org.apache.solr:solr-langid;8.11.2 -org.apache.solr:solr-ltr;8.11.2 -org.apache.solr:solr-prometheus-exporter;8.11.2 -org.apache.solr:solr-s3-repository;8.11.2 -org.apache.solr:solr-solrj;8.11.2 -org.apache.solr:solr-test-framework;8.11.2 -org.apache.solr:solr-velocity;8.11.2 -org.apache.tomcat.embed:tomcat-embed-core;9.0.65 -org.apache.tomcat.embed:tomcat-embed-el;9.0.65 -org.apache.tomcat.embed:tomcat-embed-jasper;9.0.65 -org.apache.tomcat.embed:tomcat-embed-websocket;9.0.65 -org.apache.tomcat:tomcat-annotations-api;9.0.65 -org.apache.tomcat:tomcat-jdbc;9.0.65 -org.apache.tomcat:tomcat-jsp-api;9.0.65 -org.arquillian.cube:arquillian-cube-kubernetes;1.15.2 -org.arquillian.cube:arquillian-cube-openshift;1.15.2 -org.arquillian.cube:arquillian-cube-requirement;1.15.2 -org.aspectj:aspectjrt;1.9.7 -org.aspectj:aspectjtools;1.9.7 -org.aspectj:aspectjweaver;1.9.7 -org.assertj:assertj-core;3.22.0 -org.awaitility:awaitility;4.2.0 -org.awaitility:awaitility-groovy;4.2.0 -org.awaitility:awaitility-kotlin;4.2.0 -org.awaitility:awaitility-scala;4.2.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.groovy:groovy;3.0.12 -org.codehaus.groovy:groovy-ant;3.0.12 -org.codehaus.groovy:groovy-astbuilder;3.0.12 -org.codehaus.groovy:groovy-bom;3.0.12 -org.codehaus.groovy:groovy-bsf;3.0.12 -org.codehaus.groovy:groovy-cli-commons;3.0.12 -org.codehaus.groovy:groovy-cli-picocli;3.0.12 -org.codehaus.groovy:groovy-console;3.0.12 -org.codehaus.groovy:groovy-datetime;3.0.12 -org.codehaus.groovy:groovy-dateutil;3.0.12 -org.codehaus.groovy:groovy-docgenerator;3.0.12 -org.codehaus.groovy:groovy-groovydoc;3.0.12 -org.codehaus.groovy:groovy-groovysh;3.0.12 -org.codehaus.groovy:groovy-jaxb;3.0.12 -org.codehaus.groovy:groovy-jmx;3.0.12 -org.codehaus.groovy:groovy-json;3.0.12 -org.codehaus.groovy:groovy-jsr223;3.0.12 -org.codehaus.groovy:groovy-macro;3.0.12 -org.codehaus.groovy:groovy-nio;3.0.12 -org.codehaus.groovy:groovy-servlet;3.0.12 -org.codehaus.groovy:groovy-sql;3.0.12 -org.codehaus.groovy:groovy-swing;3.0.12 -org.codehaus.groovy:groovy-templates;3.0.12 -org.codehaus.groovy:groovy-test;3.0.12 -org.codehaus.groovy:groovy-test-junit5;3.0.12 -org.codehaus.groovy:groovy-testng;3.0.12 -org.codehaus.groovy:groovy-xml;3.0.12 -org.codehaus.groovy:groovy-yaml;3.0.12 -org.codehaus.janino:commons-compiler;3.1.7 -org.codehaus.janino:commons-compiler-jdk;3.1.7 -org.codehaus.janino:janino;3.1.7 -org.eclipse.jetty.fcgi:fcgi-client;9.4.48.v20220622 -org.eclipse.jetty.fcgi:fcgi-server;9.4.48.v20220622 -org.eclipse.jetty.gcloud:jetty-gcloud-session-manager;9.4.48.v20220622 -org.eclipse.jetty.http2:http2-client;9.4.48.v20220622 -org.eclipse.jetty.http2:http2-common;9.4.48.v20220622 -org.eclipse.jetty.http2:http2-hpack;9.4.48.v20220622 -org.eclipse.jetty.http2:http2-http-client-transport;9.4.48.v20220622 -org.eclipse.jetty.http2:http2-server;9.4.48.v20220622 -org.eclipse.jetty.memcached:jetty-memcached-sessions;9.4.48.v20220622 -org.eclipse.jetty.orbit:javax.servlet.jsp;2.2.0.v201112011158 -org.eclipse.jetty.osgi:jetty-httpservice;9.4.48.v20220622 -org.eclipse.jetty.osgi:jetty-osgi-boot;9.4.48.v20220622 -org.eclipse.jetty.osgi:jetty-osgi-boot-jsp;9.4.48.v20220622 -org.eclipse.jetty.osgi:jetty-osgi-boot-warurl;9.4.48.v20220622 -org.eclipse.jetty.websocket:javax-websocket-client-impl;9.4.48.v20220622 -org.eclipse.jetty.websocket:javax-websocket-server-impl;9.4.48.v20220622 -org.eclipse.jetty.websocket:websocket-api;9.4.48.v20220622 -org.eclipse.jetty.websocket:websocket-client;9.4.48.v20220622 -org.eclipse.jetty.websocket:websocket-common;9.4.48.v20220622 -org.eclipse.jetty.websocket:websocket-server;9.4.48.v20220622 -org.eclipse.jetty.websocket:websocket-servlet;9.4.48.v20220622 -org.eclipse.jetty:apache-jsp;9.4.48.v20220622 -org.eclipse.jetty:apache-jstl;9.4.48.v20220622 -org.eclipse.jetty:infinispan-common;9.4.48.v20220622 -org.eclipse.jetty:infinispan-embedded-query;9.4.48.v20220622 -org.eclipse.jetty:infinispan-remote-query;9.4.48.v20220622 -org.eclipse.jetty:jetty-alpn-client;9.4.48.v20220622 -org.eclipse.jetty:jetty-alpn-conscrypt-client;9.4.48.v20220622 -org.eclipse.jetty:jetty-alpn-conscrypt-server;9.4.48.v20220622 -org.eclipse.jetty:jetty-alpn-java-client;9.4.48.v20220622 -org.eclipse.jetty:jetty-alpn-java-server;9.4.48.v20220622 -org.eclipse.jetty:jetty-alpn-openjdk8-client;9.4.48.v20220622 -org.eclipse.jetty:jetty-alpn-openjdk8-server;9.4.48.v20220622 -org.eclipse.jetty:jetty-alpn-server;9.4.48.v20220622 -org.eclipse.jetty:jetty-annotations;9.4.48.v20220622 -org.eclipse.jetty:jetty-ant;9.4.48.v20220622 -org.eclipse.jetty:jetty-bom;9.4.48.v20220622 -org.eclipse.jetty:jetty-client;9.4.48.v20220622 -org.eclipse.jetty:jetty-continuation;9.4.48.v20220622 -org.eclipse.jetty:jetty-deploy;9.4.48.v20220622 -org.eclipse.jetty:jetty-distribution;9.4.48.v20220622 -org.eclipse.jetty:jetty-hazelcast;9.4.48.v20220622 -org.eclipse.jetty:jetty-home;9.4.48.v20220622 -org.eclipse.jetty:jetty-http;9.4.48.v20220622 -org.eclipse.jetty:jetty-http-spi;9.4.48.v20220622 -org.eclipse.jetty:jetty-io;9.4.48.v20220622 -org.eclipse.jetty:jetty-jaas;9.4.48.v20220622 -org.eclipse.jetty:jetty-jaspi;9.4.48.v20220622 -org.eclipse.jetty:jetty-jmx;9.4.48.v20220622 -org.eclipse.jetty:jetty-jndi;9.4.48.v20220622 -org.eclipse.jetty:jetty-nosql;9.4.48.v20220622 -org.eclipse.jetty:jetty-openid;9.4.48.v20220622 -org.eclipse.jetty:jetty-plus;9.4.48.v20220622 -org.eclipse.jetty:jetty-proxy;9.4.48.v20220622 -org.eclipse.jetty:jetty-quickstart;9.4.48.v20220622 -org.eclipse.jetty:jetty-reactive-httpclient;1.1.12 -org.eclipse.jetty:jetty-rewrite;9.4.48.v20220622 -org.eclipse.jetty:jetty-security;9.4.48.v20220622 -org.eclipse.jetty:jetty-server;9.4.48.v20220622 -org.eclipse.jetty:jetty-servlet;9.4.48.v20220622 -org.eclipse.jetty:jetty-servlets;9.4.48.v20220622 -org.eclipse.jetty:jetty-spring;9.4.48.v20220622 -org.eclipse.jetty:jetty-unixsocket;9.4.48.v20220622 -org.eclipse.jetty:jetty-util;9.4.48.v20220622 -org.eclipse.jetty:jetty-util-ajax;9.4.48.v20220622 -org.eclipse.jetty:jetty-webapp;9.4.48.v20220622 -org.eclipse.jetty:jetty-xml;9.4.48.v20220622 -org.eclipse.jgit:org.eclipse.jgit;5.12.0.202106070339-r -org.eclipse.jgit:org.eclipse.jgit.http.apache;5.12.0.202106070339-r -org.eclipse.jgit:org.eclipse.jgit.junit.http;5.12.0.202106070339-r -org.eclipse.jgit:org.eclipse.jgit.ssh.jsch;5.12.0.202106070339-r -org.ehcache:ehcache;3.10.0 -org.ehcache:ehcache-clustered;3.10.0 -org.ehcache:ehcache-transactions;3.10.0 -org.elasticsearch.client:elasticsearch-rest-client;7.17.4 -org.elasticsearch.client:elasticsearch-rest-client-sniffer;7.17.4 -org.elasticsearch.client:elasticsearch-rest-high-level-client;7.17.4 -org.elasticsearch.client:transport;7.17.4 -org.elasticsearch.distribution.integ-test-zip:elasticsearch;7.17.4 -org.elasticsearch.plugin:transport-netty4-client;7.17.4 -org.elasticsearch:elasticsearch;7.17.4 -org.firebirdsql.jdbc:jaybird;4.0.6.java8 -org.firebirdsql.jdbc:jaybird-jdk18;4.0.6.java8 -org.flywaydb:flyway-core;8.5.13 -org.flywaydb:flyway-firebird;8.5.13 -org.flywaydb:flyway-mysql;8.5.13 -org.flywaydb:flyway-sqlserver;8.5.13 -org.freemarker:freemarker;2.3.31 -org.glassfish.jaxb:codemodel;2.3.6 -org.glassfish.jaxb:codemodel-annotation-compiler;2.3.6 -org.glassfish.jaxb:jaxb-jxc;2.3.6 -org.glassfish.jaxb:jaxb-runtime;2.3.6 -org.glassfish.jaxb:jaxb-xjc;2.3.6 -org.glassfish.jaxb:txw2;2.3.6 -org.glassfish.jaxb:txwc2;2.3.6 -org.glassfish.jaxb:xsom;2.3.6 -org.glassfish.jersey.bundles:jaxrs-ri;2.35 -org.glassfish.jersey.connectors:jersey-apache-connector;2.35 -org.glassfish.jersey.connectors:jersey-grizzly-connector;2.35 -org.glassfish.jersey.connectors:jersey-helidon-connector;2.35 -org.glassfish.jersey.connectors:jersey-jdk-connector;2.35 -org.glassfish.jersey.connectors:jersey-jetty-connector;2.35 -org.glassfish.jersey.connectors:jersey-netty-connector;2.35 -org.glassfish.jersey.containers.glassfish:jersey-gf-ejb;2.35 -org.glassfish.jersey.containers:jersey-container-grizzly2-http;2.35 -org.glassfish.jersey.containers:jersey-container-grizzly2-servlet;2.35 -org.glassfish.jersey.containers:jersey-container-jdk-http;2.35 -org.glassfish.jersey.containers:jersey-container-jetty-http;2.35 -org.glassfish.jersey.containers:jersey-container-jetty-servlet;2.35 -org.glassfish.jersey.containers:jersey-container-netty-http;2.35 -org.glassfish.jersey.containers:jersey-container-servlet;2.35 -org.glassfish.jersey.containers:jersey-container-servlet-core;2.35 -org.glassfish.jersey.containers:jersey-container-simple-http;2.35 -org.glassfish.jersey.core:jersey-client;2.35 -org.glassfish.jersey.core:jersey-common;2.35 -org.glassfish.jersey.core:jersey-server;2.35 -org.glassfish.jersey.ext.cdi:jersey-cdi-rs-inject;2.35 -org.glassfish.jersey.ext.cdi:jersey-cdi1x;2.35 -org.glassfish.jersey.ext.cdi:jersey-cdi1x-ban-custom-hk2-binding;2.35 -org.glassfish.jersey.ext.cdi:jersey-cdi1x-servlet;2.35 -org.glassfish.jersey.ext.cdi:jersey-cdi1x-transaction;2.35 -org.glassfish.jersey.ext.cdi:jersey-cdi1x-validation;2.35 -org.glassfish.jersey.ext.cdi:jersey-weld2-se;2.35 -org.glassfish.jersey.ext.microprofile:jersey-mp-config;2.35 -org.glassfish.jersey.ext.microprofile:jersey-mp-rest-client;2.35 -org.glassfish.jersey.ext.rx:jersey-rx-client-guava;2.35 -org.glassfish.jersey.ext.rx:jersey-rx-client-rxjava;2.35 -org.glassfish.jersey.ext.rx:jersey-rx-client-rxjava2;2.35 -org.glassfish.jersey.ext:jersey-bean-validation;2.35 -org.glassfish.jersey.ext:jersey-declarative-linking;2.35 -org.glassfish.jersey.ext:jersey-entity-filtering;2.35 -org.glassfish.jersey.ext:jersey-metainf-services;2.35 -org.glassfish.jersey.ext:jersey-mvc;2.35 -org.glassfish.jersey.ext:jersey-mvc-bean-validation;2.35 -org.glassfish.jersey.ext:jersey-mvc-freemarker;2.35 -org.glassfish.jersey.ext:jersey-mvc-jsp;2.35 -org.glassfish.jersey.ext:jersey-mvc-mustache;2.35 -org.glassfish.jersey.ext:jersey-proxy-client;2.35 -org.glassfish.jersey.ext:jersey-servlet-portability;2.35 -org.glassfish.jersey.ext:jersey-spring4;2.35 -org.glassfish.jersey.ext:jersey-spring5;2.35 -org.glassfish.jersey.ext:jersey-wadl-doclet;2.35 -org.glassfish.jersey.inject:jersey-cdi2-se;2.35 -org.glassfish.jersey.inject:jersey-hk2;2.35 -org.glassfish.jersey.media:jersey-media-jaxb;2.35 -org.glassfish.jersey.media:jersey-media-json-binding;2.35 -org.glassfish.jersey.media:jersey-media-json-jackson;2.35 -org.glassfish.jersey.media:jersey-media-json-jettison;2.35 -org.glassfish.jersey.media:jersey-media-json-processing;2.35 -org.glassfish.jersey.media:jersey-media-kryo;2.35 -org.glassfish.jersey.media:jersey-media-moxy;2.35 -org.glassfish.jersey.media:jersey-media-multipart;2.35 -org.glassfish.jersey.media:jersey-media-sse;2.35 -org.glassfish.jersey.security:oauth1-client;2.35 -org.glassfish.jersey.security:oauth1-server;2.35 -org.glassfish.jersey.security:oauth1-signature;2.35 -org.glassfish.jersey.security:oauth2-client;2.35 -org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-bundle;2.35 -org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-external;2.35 -org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2;2.35 -org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-inmemory;2.35 -org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jdk-http;2.35 -org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jetty;2.35 -org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-simple;2.35 -org.glassfish.jersey.test-framework:jersey-test-framework-core;2.35 -org.glassfish.jersey.test-framework:jersey-test-framework-util;2.35 -org.glassfish.jersey:jersey-bom;2.35 -org.glassfish.web:jakarta.servlet.jsp.jstl;1.2.6 -org.glassfish:jakarta.el;3.0.4 -org.hamcrest:hamcrest;2.2 -org.hamcrest:hamcrest-core;2.2 -org.hamcrest:hamcrest-library;2.2 -org.hibernate.validator:hibernate-validator;6.2.4.Final -org.hibernate.validator:hibernate-validator-annotation-processor;6.2.4.Final -org.hibernate:hibernate-c3p0;5.6.10.Final -org.hibernate:hibernate-core;5.6.10.Final -org.hibernate:hibernate-ehcache;5.6.10.Final -org.hibernate:hibernate-entitymanager;5.6.10.Final -org.hibernate:hibernate-envers;5.6.10.Final -org.hibernate:hibernate-hikaricp;5.6.10.Final -org.hibernate:hibernate-java8;5.6.10.Final -org.hibernate:hibernate-jcache;5.6.10.Final -org.hibernate:hibernate-jpamodelgen;5.6.10.Final -org.hibernate:hibernate-micrometer;5.6.10.Final -org.hibernate:hibernate-proxool;5.6.10.Final -org.hibernate:hibernate-spatial;5.6.10.Final -org.hibernate:hibernate-testing;5.6.10.Final -org.hibernate:hibernate-vibur;5.6.10.Final -org.hsqldb:hsqldb;2.5.2 -org.infinispan.protostream:protostream;4.4.3.Final -org.infinispan.protostream:protostream-processor;4.4.3.Final -org.infinispan.protostream:protostream-types;4.4.3.Final -org.infinispan:infinispan-anchored-keys;13.0.10.Final -org.infinispan:infinispan-api;13.0.10.Final -org.infinispan:infinispan-bom;13.0.10.Final -org.infinispan:infinispan-cachestore-jdbc;13.0.10.Final -org.infinispan:infinispan-cachestore-jpa;13.0.10.Final -org.infinispan:infinispan-cachestore-remote;13.0.10.Final -org.infinispan:infinispan-cachestore-rocksdb;13.0.10.Final -org.infinispan:infinispan-cachestore-sql;13.0.10.Final -org.infinispan:infinispan-cdi-common;13.0.10.Final -org.infinispan:infinispan-cdi-embedded;13.0.10.Final -org.infinispan:infinispan-cdi-remote;13.0.10.Final -org.infinispan:infinispan-checkstyle;13.0.10.Final -org.infinispan:infinispan-cli-client;13.0.10.Final -org.infinispan:infinispan-client-hotrod;13.0.10.Final -org.infinispan:infinispan-client-rest;13.0.10.Final -org.infinispan:infinispan-cloudevents-integration;13.0.10.Final -org.infinispan:infinispan-clustered-counter;13.0.10.Final -org.infinispan:infinispan-clustered-lock;13.0.10.Final -org.infinispan:infinispan-commons;13.0.10.Final -org.infinispan:infinispan-commons-test;13.0.10.Final -org.infinispan:infinispan-component-annotations;13.0.10.Final -org.infinispan:infinispan-component-processor;13.0.10.Final -org.infinispan:infinispan-console;0.15.5.Final -org.infinispan:infinispan-core;13.0.10.Final -org.infinispan:infinispan-extended-statistics;13.0.10.Final -org.infinispan:infinispan-hibernate-cache-commons;13.0.10.Final -org.infinispan:infinispan-hibernate-cache-spi;13.0.10.Final -org.infinispan:infinispan-hibernate-cache-v53;13.0.10.Final -org.infinispan:infinispan-jboss-marshalling;13.0.10.Final -org.infinispan:infinispan-jcache;13.0.10.Final -org.infinispan:infinispan-jcache-commons;13.0.10.Final -org.infinispan:infinispan-jcache-remote;13.0.10.Final -org.infinispan:infinispan-key-value-store-client;13.0.10.Final -org.infinispan:infinispan-multimap;13.0.10.Final -org.infinispan:infinispan-objectfilter;13.0.10.Final -org.infinispan:infinispan-query;13.0.10.Final -org.infinispan:infinispan-query-core;13.0.10.Final -org.infinispan:infinispan-query-dsl;13.0.10.Final -org.infinispan:infinispan-remote-query-client;13.0.10.Final -org.infinispan:infinispan-remote-query-server;13.0.10.Final -org.infinispan:infinispan-scripting;13.0.10.Final -org.infinispan:infinispan-server-core;13.0.10.Final -org.infinispan:infinispan-server-hotrod;13.0.10.Final -org.infinispan:infinispan-server-memcached;13.0.10.Final -org.infinispan:infinispan-server-rest;13.0.10.Final -org.infinispan:infinispan-server-router;13.0.10.Final -org.infinispan:infinispan-server-runtime;13.0.10.Final -org.infinispan:infinispan-server-testdriver-core;13.0.10.Final -org.infinispan:infinispan-server-testdriver-junit4;13.0.10.Final -org.infinispan:infinispan-server-testdriver-junit5;13.0.10.Final -org.infinispan:infinispan-spring-boot-starter-embedded;13.0.10.Final -org.infinispan:infinispan-spring-boot-starter-remote;13.0.10.Final -org.infinispan:infinispan-spring5-common;13.0.10.Final -org.infinispan:infinispan-spring5-embedded;13.0.10.Final -org.infinispan:infinispan-spring5-remote;13.0.10.Final -org.infinispan:infinispan-tasks;13.0.10.Final -org.infinispan:infinispan-tasks-api;13.0.10.Final -org.infinispan:infinispan-tools;13.0.10.Final -org.influxdb:influxdb-java;2.22 -org.jboss.arquillian.junit:arquillian-junit-standalone;1.6.0.Final -org.jboss.logging:jboss-logging;3.4.3.Final -org.jdom:jdom2;2.0.6.1 -org.jetbrains.kotlin:kotlin-bom;1.6.21 -org.jetbrains.kotlin:kotlin-compiler;1.6.21 -org.jetbrains.kotlin:kotlin-compiler-embeddable;1.6.21 -org.jetbrains.kotlin:kotlin-daemon-client;1.6.21 -org.jetbrains.kotlin:kotlin-main-kts;1.6.21 -org.jetbrains.kotlin:kotlin-osgi-bundle;1.6.21 -org.jetbrains.kotlin:kotlin-reflect;1.6.21 -org.jetbrains.kotlin:kotlin-script-runtime;1.6.21 -org.jetbrains.kotlin:kotlin-script-util;1.6.21 -org.jetbrains.kotlin:kotlin-scripting-common;1.6.21 -org.jetbrains.kotlin:kotlin-scripting-ide-services;1.6.21 -org.jetbrains.kotlin:kotlin-scripting-jvm;1.6.21 -org.jetbrains.kotlin:kotlin-scripting-jvm-host;1.6.21 -org.jetbrains.kotlin:kotlin-stdlib;1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-common;1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk7;1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk8;1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-js;1.6.21 -org.jetbrains.kotlin:kotlin-test;1.6.21 -org.jetbrains.kotlin:kotlin-test-annotations-common;1.6.21 -org.jetbrains.kotlin:kotlin-test-common;1.6.21 -org.jetbrains.kotlin:kotlin-test-js;1.6.21 -org.jetbrains.kotlin:kotlin-test-junit;1.6.21 -org.jetbrains.kotlin:kotlin-test-junit5;1.6.21 -org.jetbrains.kotlin:kotlin-test-testng;1.6.21 -org.jetbrains.kotlinx:kotlinx-coroutines-android;1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-bom;1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-core;1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm;1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-debug;1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-guava;1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-javafx;1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-jdk8;1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-jdk9;1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-play-services;1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-reactive;1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-reactor;1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-rx2;1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-rx3;1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-slf4j;1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-swing;1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-test;1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-test-jvm;1.6.4 -org.jolokia:jolokia-core;1.7.1 -org.jooq:jooq;3.14.16 -org.jooq:jooq-codegen;3.14.16 -org.jooq:jooq-kotlin;3.14.16 -org.jooq:jooq-meta;3.14.16 -org.junit.jupiter:junit-jupiter;5.8.2 -org.junit.jupiter:junit-jupiter-api;5.8.2 -org.junit.jupiter:junit-jupiter-engine;5.8.2 -org.junit.jupiter:junit-jupiter-migrationsupport;5.8.2 -org.junit.jupiter:junit-jupiter-params;5.8.2 -org.junit.platform:junit-platform-commons;1.8.2 -org.junit.platform:junit-platform-console;1.8.2 -org.junit.platform:junit-platform-engine;1.8.2 -org.junit.platform:junit-platform-jfr;1.8.2 -org.junit.platform:junit-platform-launcher;1.8.2 -org.junit.platform:junit-platform-reporting;1.8.2 -org.junit.platform:junit-platform-runner;1.8.2 -org.junit.platform:junit-platform-suite;1.8.2 -org.junit.platform:junit-platform-suite-api;1.8.2 -org.junit.platform:junit-platform-suite-commons;1.8.2 -org.junit.platform:junit-platform-suite-engine;1.8.2 -org.junit.platform:junit-platform-testkit;1.8.2 -org.junit.vintage:junit-vintage-engine;5.8.2 -org.junit:junit-bom;5.8.2 -org.liquibase:liquibase-cdi;4.9.1 -org.liquibase:liquibase-core;4.9.1 -org.mariadb.jdbc:mariadb-java-client;3.0.7 -org.mariadb:r2dbc-mariadb;1.1.1-rc -org.messaginghub:pooled-jms;1.2.4 -org.mockito:mockito-android;4.5.1 -org.mockito:mockito-bom;4.5.1 -org.mockito:mockito-core;4.5.1 -org.mockito:mockito-errorprone;4.5.1 -org.mockito:mockito-inline;4.5.1 -org.mockito:mockito-junit-jupiter;4.5.1 -org.mockito:mockito-proxy;4.5.1 -org.mongodb:bson;4.6.1 -org.mongodb:mongodb-driver-core;4.6.1 -org.mongodb:mongodb-driver-legacy;4.6.1 -org.mongodb:mongodb-driver-reactivestreams;4.6.1 -org.mongodb:mongodb-driver-sync;4.6.1 -org.mortbay.jasper:apache-el;9.0.52 -org.neo4j.driver:neo4j-java-driver;4.4.9 -org.postgresql:postgresql;42.3.6 -org.postgresql:r2dbc-postgresql;0.9.1.RELEASE -org.projectlombok:lombok;1.18.24 -org.quartz-scheduler:quartz;2.3.2 -org.quartz-scheduler:quartz-jobs;2.3.2 -org.reactivestreams:reactive-streams;1.0.4 -org.seleniumhq.selenium:htmlunit-driver;3.61.0 -org.seleniumhq.selenium:selenium-api;4.1.4 -org.seleniumhq.selenium:selenium-chrome-driver;4.1.4 -org.seleniumhq.selenium:selenium-edge-driver;4.1.4 -org.seleniumhq.selenium:selenium-firefox-driver;4.1.4 -org.seleniumhq.selenium:selenium-ie-driver;4.1.4 -org.seleniumhq.selenium:selenium-java;4.1.4 -org.seleniumhq.selenium:selenium-opera-driver;4.1.4 -org.seleniumhq.selenium:selenium-remote-driver;4.1.4 -org.seleniumhq.selenium:selenium-safari-driver;4.1.4 -org.seleniumhq.selenium:selenium-support;4.1.4 -org.skyscreamer:jsonassert;1.5.1 -org.slf4j:jcl-over-slf4j;1.7.36 -org.slf4j:jul-to-slf4j;1.7.36 -org.slf4j:log4j-over-slf4j;1.7.36 -org.slf4j:slf4j-api;1.7.36 -org.slf4j:slf4j-ext;1.7.36 -org.slf4j:slf4j-jcl;1.7.36 -org.slf4j:slf4j-jdk14;1.7.36 -org.slf4j:slf4j-log4j12;1.7.36 -org.slf4j:slf4j-nop;1.7.36 -org.slf4j:slf4j-simple;1.7.36 -org.springframework.amqp:spring-amqp;2.4.6 -org.springframework.amqp:spring-rabbit;2.4.6 -org.springframework.amqp:spring-rabbit-junit;2.4.6 -org.springframework.amqp:spring-rabbit-stream;2.4.6 -org.springframework.amqp:spring-rabbit-test;2.4.6 -org.springframework.batch:spring-batch-core;4.3.6 -org.springframework.batch:spring-batch-infrastructure;4.3.6 -org.springframework.batch:spring-batch-integration;4.3.6 -org.springframework.batch:spring-batch-test;4.3.6 -org.springframework.boot:spring-boot;2.7.3 -org.springframework.boot:spring-boot-actuator;2.7.3 -org.springframework.boot:spring-boot-actuator-autoconfigure;2.7.3 -org.springframework.boot:spring-boot-autoconfigure;2.7.3 -org.springframework.boot:spring-boot-autoconfigure-processor;2.7.3 -org.springframework.boot:spring-boot-buildpack-platform;2.7.3 -org.springframework.boot:spring-boot-configuration-metadata;2.7.3 -org.springframework.boot:spring-boot-configuration-processor;2.7.3 -org.springframework.boot:spring-boot-dependencies;2.7.3 -org.springframework.boot:spring-boot-devtools;2.7.3 -org.springframework.boot:spring-boot-jarmode-layertools;2.7.3 -org.springframework.boot:spring-boot-loader;2.7.3 -org.springframework.boot:spring-boot-loader-tools;2.7.3 -org.springframework.boot:spring-boot-properties-migrator;2.7.3 -org.springframework.boot:spring-boot-starter;2.7.3 -org.springframework.boot:spring-boot-starter-activemq;2.7.3 -org.springframework.boot:spring-boot-starter-actuator;2.7.3 -org.springframework.boot:spring-boot-starter-amqp;2.7.3 -org.springframework.boot:spring-boot-starter-aop;2.7.3 -org.springframework.boot:spring-boot-starter-artemis;2.7.3 -org.springframework.boot:spring-boot-starter-batch;2.7.3 -org.springframework.boot:spring-boot-starter-cache;2.7.3 -org.springframework.boot:spring-boot-starter-data-cassandra;2.7.3 -org.springframework.boot:spring-boot-starter-data-cassandra-reactive;2.7.3 -org.springframework.boot:spring-boot-starter-data-couchbase;2.7.3 -org.springframework.boot:spring-boot-starter-data-couchbase-reactive;2.7.3 -org.springframework.boot:spring-boot-starter-data-elasticsearch;2.7.3 -org.springframework.boot:spring-boot-starter-data-jdbc;2.7.3 -org.springframework.boot:spring-boot-starter-data-jpa;2.7.3 -org.springframework.boot:spring-boot-starter-data-ldap;2.7.3 -org.springframework.boot:spring-boot-starter-data-mongodb;2.7.3 -org.springframework.boot:spring-boot-starter-data-mongodb-reactive;2.7.3 -org.springframework.boot:spring-boot-starter-data-neo4j;2.7.3 -org.springframework.boot:spring-boot-starter-data-r2dbc;2.7.3 -org.springframework.boot:spring-boot-starter-data-redis;2.7.3 -org.springframework.boot:spring-boot-starter-data-redis-reactive;2.7.3 -org.springframework.boot:spring-boot-starter-data-rest;2.7.3 -org.springframework.boot:spring-boot-starter-freemarker;2.7.3 -org.springframework.boot:spring-boot-starter-graphql;2.7.3 -org.springframework.boot:spring-boot-starter-groovy-templates;2.7.3 -org.springframework.boot:spring-boot-starter-hateoas;2.7.3 -org.springframework.boot:spring-boot-starter-integration;2.7.3 -org.springframework.boot:spring-boot-starter-jdbc;2.7.3 -org.springframework.boot:spring-boot-starter-jersey;2.7.3 -org.springframework.boot:spring-boot-starter-jetty;2.7.3 -org.springframework.boot:spring-boot-starter-jooq;2.7.3 -org.springframework.boot:spring-boot-starter-json;2.7.3 -org.springframework.boot:spring-boot-starter-jta-atomikos;2.7.3 -org.springframework.boot:spring-boot-starter-log4j2;2.7.3 -org.springframework.boot:spring-boot-starter-logging;2.7.3 -org.springframework.boot:spring-boot-starter-mail;2.7.3 -org.springframework.boot:spring-boot-starter-mustache;2.7.3 -org.springframework.boot:spring-boot-starter-oauth2-client;2.7.3 -org.springframework.boot:spring-boot-starter-oauth2-resource-server;2.7.3 -org.springframework.boot:spring-boot-starter-parent;2.7.3 -org.springframework.boot:spring-boot-starter-quartz;2.7.3 -org.springframework.boot:spring-boot-starter-reactor-netty;2.7.3 -org.springframework.boot:spring-boot-starter-rsocket;2.7.3 -org.springframework.boot:spring-boot-starter-security;2.7.3 -org.springframework.boot:spring-boot-starter-test;2.7.3 -org.springframework.boot:spring-boot-starter-thymeleaf;2.7.3 -org.springframework.boot:spring-boot-starter-tomcat;2.7.3 -org.springframework.boot:spring-boot-starter-undertow;2.7.3 -org.springframework.boot:spring-boot-starter-validation;2.7.3 -org.springframework.boot:spring-boot-starter-web;2.7.3 -org.springframework.boot:spring-boot-starter-web-services;2.7.3 -org.springframework.boot:spring-boot-starter-webflux;2.7.3 -org.springframework.boot:spring-boot-starter-websocket;2.7.3 -org.springframework.boot:spring-boot-test;2.7.3 -org.springframework.boot:spring-boot-test-autoconfigure;2.7.3 -org.springframework.cloud:spring-cloud-bus;3.1.2 -org.springframework.cloud:spring-cloud-bus-dependencies;3.1.2 -org.springframework.cloud:spring-cloud-bus-rsocket;3.1.2 -org.springframework.cloud:spring-cloud-circuitbreaker-dependencies;2.1.3 -org.springframework.cloud:spring-cloud-circuitbreaker-resilience4j;2.1.3 -org.springframework.cloud:spring-cloud-circuitbreaker-spring-retry;2.1.3 -org.springframework.cloud:spring-cloud-cloudfoundry-commons;3.1.2 -org.springframework.cloud:spring-cloud-cloudfoundry-dependencies;3.1.2 -org.springframework.cloud:spring-cloud-cloudfoundry-discovery;3.1.2 -org.springframework.cloud:spring-cloud-cloudfoundry-web;3.1.2 -org.springframework.cloud:spring-cloud-commons;3.1.3 -org.springframework.cloud:spring-cloud-commons-dependencies;3.1.3 -org.springframework.cloud:spring-cloud-config-client;3.1.3 -org.springframework.cloud:spring-cloud-config-dependencies;3.1.3 -org.springframework.cloud:spring-cloud-config-monitor;3.1.3 -org.springframework.cloud:spring-cloud-config-server;3.1.3 -org.springframework.cloud:spring-cloud-consul-binder;3.1.1 -org.springframework.cloud:spring-cloud-consul-config;3.1.1 -org.springframework.cloud:spring-cloud-consul-core;3.1.1 -org.springframework.cloud:spring-cloud-consul-dependencies;3.1.1 -org.springframework.cloud:spring-cloud-consul-discovery;3.1.1 -org.springframework.cloud:spring-cloud-context;3.1.3 -org.springframework.cloud:spring-cloud-contract-converters;3.1.3 -org.springframework.cloud:spring-cloud-contract-dependencies;3.1.3 -org.springframework.cloud:spring-cloud-contract-gradle-plugin;3.1.3 -org.springframework.cloud:spring-cloud-contract-maven-plugin;3.1.3 -org.springframework.cloud:spring-cloud-contract-pact;3.1.3 -org.springframework.cloud:spring-cloud-contract-shade;3.1.3 -org.springframework.cloud:spring-cloud-contract-spec;3.1.3 -org.springframework.cloud:spring-cloud-contract-spec-groovy;3.1.3 -org.springframework.cloud:spring-cloud-contract-spec-java;3.1.3 -org.springframework.cloud:spring-cloud-contract-spec-kotlin;3.1.3 -org.springframework.cloud:spring-cloud-contract-stub-runner;3.1.3 -org.springframework.cloud:spring-cloud-contract-stub-runner-boot;3.1.3 -org.springframework.cloud:spring-cloud-contract-verifier;3.1.3 -org.springframework.cloud:spring-cloud-contract-wiremock;3.1.3 -org.springframework.cloud:spring-cloud-dependencies;2021.0.3 -org.springframework.cloud:spring-cloud-function-adapter-aws;3.2.5 -org.springframework.cloud:spring-cloud-function-adapter-azure;3.2.5 -org.springframework.cloud:spring-cloud-function-adapter-gcp;3.2.5 -org.springframework.cloud:spring-cloud-function-adapter-openwhisk;3.2.5 -org.springframework.cloud:spring-cloud-function-context;3.2.5 -org.springframework.cloud:spring-cloud-function-core;3.2.5 -org.springframework.cloud:spring-cloud-function-dependencies;3.2.5 -org.springframework.cloud:spring-cloud-function-deployer;3.2.5 -org.springframework.cloud:spring-cloud-function-grpc;3.2.5 -org.springframework.cloud:spring-cloud-function-grpc-cloudevent-ext;3.2.5 -org.springframework.cloud:spring-cloud-function-kotlin;3.2.5 -org.springframework.cloud:spring-cloud-function-rsocket;3.2.5 -org.springframework.cloud:spring-cloud-function-web;3.2.5 -org.springframework.cloud:spring-cloud-gateway-dependencies;3.1.3 -org.springframework.cloud:spring-cloud-gateway-mvc;3.1.3 -org.springframework.cloud:spring-cloud-gateway-server;3.1.3 -org.springframework.cloud:spring-cloud-gateway-webflux;3.1.3 -org.springframework.cloud:spring-cloud-kubernetes-client-autoconfig;2.1.3 -org.springframework.cloud:spring-cloud-kubernetes-client-config;2.1.3 -org.springframework.cloud:spring-cloud-kubernetes-client-discovery;2.1.3 -org.springframework.cloud:spring-cloud-kubernetes-client-loadbalancer;2.1.3 -org.springframework.cloud:spring-cloud-kubernetes-commons;2.1.3 -org.springframework.cloud:spring-cloud-kubernetes-dependencies;2.1.3 -org.springframework.cloud:spring-cloud-kubernetes-discovery;2.1.3 -org.springframework.cloud:spring-cloud-kubernetes-fabric8-autoconfig;2.1.3 -org.springframework.cloud:spring-cloud-kubernetes-fabric8-config;2.1.3 -org.springframework.cloud:spring-cloud-kubernetes-fabric8-discovery;2.1.3 -org.springframework.cloud:spring-cloud-kubernetes-fabric8-istio;2.1.3 -org.springframework.cloud:spring-cloud-kubernetes-fabric8-leader;2.1.3 -org.springframework.cloud:spring-cloud-kubernetes-fabric8-loadbalancer;2.1.3 -org.springframework.cloud:spring-cloud-kubernetes-test-support;2.1.3 -org.springframework.cloud:spring-cloud-loadbalancer;3.1.3 -org.springframework.cloud:spring-cloud-netflix-dependencies;3.1.3 -org.springframework.cloud:spring-cloud-netflix-eureka-client;3.1.3 -org.springframework.cloud:spring-cloud-netflix-eureka-server;3.1.3 -org.springframework.cloud:spring-cloud-openfeign-core;3.1.3 -org.springframework.cloud:spring-cloud-openfeign-dependencies;3.1.3 -org.springframework.cloud:spring-cloud-sleuth-api;3.1.3 -org.springframework.cloud:spring-cloud-sleuth-autoconfigure;3.1.3 -org.springframework.cloud:spring-cloud-sleuth-brave;3.1.3 -org.springframework.cloud:spring-cloud-sleuth-dependencies;3.1.3 -org.springframework.cloud:spring-cloud-sleuth-instrumentation;3.1.3 -org.springframework.cloud:spring-cloud-sleuth-tests-common;3.1.3 -org.springframework.cloud:spring-cloud-sleuth-zipkin;3.1.3 -org.springframework.cloud:spring-cloud-starter;3.1.3 -org.springframework.cloud:spring-cloud-starter-bootstrap;3.1.3 -org.springframework.cloud:spring-cloud-starter-bus-amqp;3.1.2 -org.springframework.cloud:spring-cloud-starter-bus-kafka;3.1.2 -org.springframework.cloud:spring-cloud-starter-bus-stream;3.1.2 -org.springframework.cloud:spring-cloud-starter-circuitbreaker-reactor-resilience4j;2.1.3 -org.springframework.cloud:spring-cloud-starter-circuitbreaker-resilience4j;2.1.3 -org.springframework.cloud:spring-cloud-starter-cloudfoundry;3.1.2 -org.springframework.cloud:spring-cloud-starter-config;3.1.3 -org.springframework.cloud:spring-cloud-starter-consul;3.1.1 -org.springframework.cloud:spring-cloud-starter-consul-all;3.1.1 -org.springframework.cloud:spring-cloud-starter-consul-bus;3.1.1 -org.springframework.cloud:spring-cloud-starter-consul-config;3.1.1 -org.springframework.cloud:spring-cloud-starter-consul-discovery;3.1.1 -org.springframework.cloud:spring-cloud-starter-contract-stub-runner;3.1.3 -org.springframework.cloud:spring-cloud-starter-contract-stub-runner-jetty;3.1.3 -org.springframework.cloud:spring-cloud-starter-contract-verifier;3.1.3 -org.springframework.cloud:spring-cloud-starter-function-web;3.2.5 -org.springframework.cloud:spring-cloud-starter-function-webflux;3.2.5 -org.springframework.cloud:spring-cloud-starter-gateway;3.1.3 -org.springframework.cloud:spring-cloud-starter-kubernetes-client;2.1.3 -org.springframework.cloud:spring-cloud-starter-kubernetes-client-all;2.1.3 -org.springframework.cloud:spring-cloud-starter-kubernetes-client-config;2.1.3 -org.springframework.cloud:spring-cloud-starter-kubernetes-client-loadbalancer;2.1.3 -org.springframework.cloud:spring-cloud-starter-kubernetes-discoveryclient;2.1.3 -org.springframework.cloud:spring-cloud-starter-kubernetes-fabric8;2.1.3 -org.springframework.cloud:spring-cloud-starter-kubernetes-fabric8-all;2.1.3 -org.springframework.cloud:spring-cloud-starter-kubernetes-fabric8-config;2.1.3 -org.springframework.cloud:spring-cloud-starter-kubernetes-fabric8-loadbalancer;2.1.3 -org.springframework.cloud:spring-cloud-starter-loadbalancer;3.1.3 -org.springframework.cloud:spring-cloud-starter-netflix-eureka-client;3.1.3 -org.springframework.cloud:spring-cloud-starter-netflix-eureka-server;3.1.3 -org.springframework.cloud:spring-cloud-starter-openfeign;3.1.3 -org.springframework.cloud:spring-cloud-starter-sleuth;3.1.3 -org.springframework.cloud:spring-cloud-starter-stream-kafka;3.2.4 -org.springframework.cloud:spring-cloud-starter-stream-rabbit;3.2.4 -org.springframework.cloud:spring-cloud-starter-task;2.4.3 -org.springframework.cloud:spring-cloud-starter-vault-config;3.1.1 -org.springframework.cloud:spring-cloud-starter-zookeeper;3.1.2 -org.springframework.cloud:spring-cloud-starter-zookeeper-all;3.1.2 -org.springframework.cloud:spring-cloud-starter-zookeeper-config;3.1.2 -org.springframework.cloud:spring-cloud-starter-zookeeper-discovery;3.1.2 -org.springframework.cloud:spring-cloud-stream;3.2.4 -org.springframework.cloud:spring-cloud-stream-binder-kafka;3.2.4 -org.springframework.cloud:spring-cloud-stream-binder-kafka-core;3.2.4 -org.springframework.cloud:spring-cloud-stream-binder-kafka-streams;3.2.4 -org.springframework.cloud:spring-cloud-stream-binder-rabbit;3.2.4 -org.springframework.cloud:spring-cloud-stream-binder-rabbit-core;3.2.4 -org.springframework.cloud:spring-cloud-stream-binder-rabbit-test-support;3.2.4 -org.springframework.cloud:spring-cloud-stream-binder-test;3.2.4 -org.springframework.cloud:spring-cloud-stream-dependencies;3.2.4 -org.springframework.cloud:spring-cloud-stream-test-support;3.2.4 -org.springframework.cloud:spring-cloud-task-batch;2.4.3 -org.springframework.cloud:spring-cloud-task-core;2.4.3 -org.springframework.cloud:spring-cloud-task-dependencies;2.4.3 -org.springframework.cloud:spring-cloud-task-stream;2.4.3 -org.springframework.cloud:spring-cloud-test-support;3.1.3 -org.springframework.cloud:spring-cloud-vault-config;3.1.1 -org.springframework.cloud:spring-cloud-vault-config-aws;3.1.1 -org.springframework.cloud:spring-cloud-vault-config-consul;3.1.1 -org.springframework.cloud:spring-cloud-vault-config-databases;3.1.1 -org.springframework.cloud:spring-cloud-vault-config-rabbitmq;3.1.1 -org.springframework.cloud:spring-cloud-vault-dependencies;3.1.1 -org.springframework.cloud:spring-cloud-zookeeper-config;3.1.2 -org.springframework.cloud:spring-cloud-zookeeper-core;3.1.2 -org.springframework.cloud:spring-cloud-zookeeper-dependencies;3.1.2 -org.springframework.cloud:spring-cloud-zookeeper-discovery;3.1.2 -org.springframework.credhub:spring-credhub-core;2.1.1.RELEASE -org.springframework.data:spring-data-bom;2021.2.2 -org.springframework.data:spring-data-cassandra;3.4.2 -org.springframework.data:spring-data-commons;2.7.2 -org.springframework.data:spring-data-couchbase;4.4.2 -org.springframework.data:spring-data-elasticsearch;4.4.2 -org.springframework.data:spring-data-envers;2.7.2 -org.springframework.data:spring-data-geode;2.7.2 -org.springframework.data:spring-data-jdbc;2.4.2 -org.springframework.data:spring-data-jpa;2.7.2 -org.springframework.data:spring-data-keyvalue;2.7.2 -org.springframework.data:spring-data-ldap;2.7.2 -org.springframework.data:spring-data-mongodb;3.4.2 -org.springframework.data:spring-data-neo4j;6.3.2 -org.springframework.data:spring-data-r2dbc;1.5.2 -org.springframework.data:spring-data-redis;2.7.2 -org.springframework.data:spring-data-relational;2.4.2 -org.springframework.data:spring-data-rest-core;3.7.2 -org.springframework.data:spring-data-rest-hal-explorer;3.7.2 -org.springframework.data:spring-data-rest-webmvc;3.7.2 -org.springframework.graphql:spring-graphql;1.0.1 -org.springframework.graphql:spring-graphql-test;1.0.1 -org.springframework.hateoas:spring-hateoas;1.5.1 -org.springframework.integration:spring-integration-amqp;5.5.14 -org.springframework.integration:spring-integration-bom;5.5.14 -org.springframework.integration:spring-integration-core;5.5.14 -org.springframework.integration:spring-integration-event;5.5.14 -org.springframework.integration:spring-integration-feed;5.5.14 -org.springframework.integration:spring-integration-file;5.5.14 -org.springframework.integration:spring-integration-ftp;5.5.14 -org.springframework.integration:spring-integration-gemfire;5.5.14 -org.springframework.integration:spring-integration-groovy;5.5.14 -org.springframework.integration:spring-integration-http;5.5.14 -org.springframework.integration:spring-integration-ip;5.5.14 -org.springframework.integration:spring-integration-jdbc;5.5.14 -org.springframework.integration:spring-integration-jms;5.5.14 -org.springframework.integration:spring-integration-jmx;5.5.14 -org.springframework.integration:spring-integration-jpa;5.5.14 -org.springframework.integration:spring-integration-kafka;5.5.14 -org.springframework.integration:spring-integration-mail;5.5.14 -org.springframework.integration:spring-integration-mongodb;5.5.14 -org.springframework.integration:spring-integration-mqtt;5.5.14 -org.springframework.integration:spring-integration-r2dbc;5.5.14 -org.springframework.integration:spring-integration-redis;5.5.14 -org.springframework.integration:spring-integration-rmi;5.5.14 -org.springframework.integration:spring-integration-rsocket;5.5.14 -org.springframework.integration:spring-integration-scripting;5.5.14 -org.springframework.integration:spring-integration-security;5.5.14 -org.springframework.integration:spring-integration-sftp;5.5.14 -org.springframework.integration:spring-integration-stomp;5.5.14 -org.springframework.integration:spring-integration-stream;5.5.14 -org.springframework.integration:spring-integration-syslog;5.5.14 -org.springframework.integration:spring-integration-test;5.5.14 -org.springframework.integration:spring-integration-test-support;5.5.14 -org.springframework.integration:spring-integration-webflux;5.5.14 -org.springframework.integration:spring-integration-websocket;5.5.14 -org.springframework.integration:spring-integration-ws;5.5.14 -org.springframework.integration:spring-integration-xml;5.5.14 -org.springframework.integration:spring-integration-xmpp;5.5.14 -org.springframework.integration:spring-integration-zeromq;5.5.14 -org.springframework.integration:spring-integration-zookeeper;5.5.14 -org.springframework.kafka:spring-kafka;2.8.8 -org.springframework.kafka:spring-kafka-test;2.8.8 -org.springframework.ldap:spring-ldap-core;2.4.1 -org.springframework.ldap:spring-ldap-core-tiger;2.4.1 -org.springframework.ldap:spring-ldap-ldif-core;2.4.1 -org.springframework.ldap:spring-ldap-odm;2.4.1 -org.springframework.ldap:spring-ldap-test;2.4.1 -org.springframework.restdocs:spring-restdocs-asciidoctor;2.0.6.RELEASE -org.springframework.restdocs:spring-restdocs-core;2.0.6.RELEASE -org.springframework.restdocs:spring-restdocs-mockmvc;2.0.6.RELEASE -org.springframework.restdocs:spring-restdocs-restassured;2.0.6.RELEASE -org.springframework.restdocs:spring-restdocs-webtestclient;2.0.6.RELEASE -org.springframework.retry:spring-retry;1.3.3 -org.springframework.security.oauth.boot:spring-security-oauth2-autoconfigure;2.1.2.RELEASE -org.springframework.security:spring-security-acl;5.7.3 -org.springframework.security:spring-security-aspects;5.7.3 -org.springframework.security:spring-security-bom;5.7.3 -org.springframework.security:spring-security-cas;5.7.3 -org.springframework.security:spring-security-config;5.7.3 -org.springframework.security:spring-security-core;5.7.3 -org.springframework.security:spring-security-crypto;5.7.3 -org.springframework.security:spring-security-data;5.7.3 -org.springframework.security:spring-security-ldap;5.7.3 -org.springframework.security:spring-security-messaging;5.7.3 -org.springframework.security:spring-security-oauth2-client;5.7.3 -org.springframework.security:spring-security-oauth2-core;5.7.3 -org.springframework.security:spring-security-oauth2-jose;5.7.3 -org.springframework.security:spring-security-oauth2-resource-server;5.7.3 -org.springframework.security:spring-security-openid;5.7.3 -org.springframework.security:spring-security-remoting;5.7.3 -org.springframework.security:spring-security-rsa;1.0.10.RELEASE -org.springframework.security:spring-security-rsocket;5.7.3 -org.springframework.security:spring-security-saml2-service-provider;5.7.3 -org.springframework.security:spring-security-taglibs;5.7.3 -org.springframework.security:spring-security-test;5.7.3 -org.springframework.security:spring-security-web;5.7.3 -org.springframework.session:spring-session-bom;2021.2.0 -org.springframework.session:spring-session-core;2.7.0 -org.springframework.session:spring-session-data-geode;2.7.0 -org.springframework.session:spring-session-data-mongodb;2.7.0 -org.springframework.session:spring-session-data-redis;2.7.0 -org.springframework.session:spring-session-hazelcast;2.7.0 -org.springframework.session:spring-session-jdbc;2.7.0 -org.springframework.vault:spring-vault-core;2.3.2 -org.springframework.ws:spring-ws-core;3.1.3 -org.springframework.ws:spring-ws-security;3.1.3 -org.springframework.ws:spring-ws-support;3.1.3 -org.springframework.ws:spring-ws-test;3.1.3 -org.springframework.ws:spring-xml;3.1.3 -org.springframework:spring-aop;5.3.22 -org.springframework:spring-aspects;5.3.22 -org.springframework:spring-beans;5.3.22 -org.springframework:spring-context;5.3.22 -org.springframework:spring-context-indexer;5.3.22 -org.springframework:spring-context-support;5.3.22 -org.springframework:spring-core;5.3.22 -org.springframework:spring-expression;5.3.22 -org.springframework:spring-framework-bom;5.3.22 -org.springframework:spring-instrument;5.3.22 -org.springframework:spring-jcl;5.3.22 -org.springframework:spring-jdbc;5.3.22 -org.springframework:spring-jms;5.3.22 -org.springframework:spring-messaging;5.3.22 -org.springframework:spring-orm;5.3.22 -org.springframework:spring-oxm;5.3.22 -org.springframework:spring-r2dbc;5.3.22 -org.springframework:spring-test;5.3.22 -org.springframework:spring-tx;5.3.22 -org.springframework:spring-web;5.3.22 -org.springframework:spring-webflux;5.3.22 -org.springframework:spring-webmvc;5.3.22 -org.springframework:spring-websocket;5.3.22 -org.thymeleaf.extras:thymeleaf-extras-java8time;3.0.4.RELEASE -org.thymeleaf.extras:thymeleaf-extras-springsecurity5;3.0.4.RELEASE -org.thymeleaf:thymeleaf;3.0.15.RELEASE -org.thymeleaf:thymeleaf-spring5;3.0.15.RELEASE -org.tmatesoft.svnkit:svnkit;1.10.1 -org.webjars:webjars-locator-core;0.50 -org.xerial:sqlite-jdbc;3.36.0.3 -org.xmlunit:xmlunit-assertj;2.9.0 -org.xmlunit:xmlunit-core;2.9.0 -org.xmlunit:xmlunit-legacy;2.9.0 -org.xmlunit:xmlunit-matchers;2.9.0 -org.xmlunit:xmlunit-placeholders;2.9.0 -org.yaml:snakeyaml;1.30 -redis.clients:jedis;3.8.0 -wsdl4j:wsdl4j;1.6.3 From 9ce974059b6fc11a0dfd0f7803cb3f71076275fa Mon Sep 17 00:00:00 2001 From: Shili Chen Date: Thu, 1 Sep 2022 17:14:47 +0800 Subject: [PATCH 07/15] Fix comments: Remove source code of spring data cosmos related in Spring Cloud Azure except for spring-cloud-azure-starter-data-cosmos --- eng/jacoco-test-coverage/pom.xml | 12 -- .../spring-cloud-azure-dependencies/pom.xml | 13 -- .../spring-cloud-azure-autoconfigure/pom.xml | 7 -- .../CosmosDataAutoConfigurationTests.java | 77 ------------ ...iveRepositoriesAutoConfigurationTests.java | 117 ----------------- ...mosRepositoriesAutoConfigurationTests.java | 119 ------------------ .../cosmos/TestAutoConfigurationPackage.java | 23 ---- ...TestAutoConfigurationPackageRegistrar.java | 26 ---- .../data/cosmos/domain/Person.java | 46 ------- .../data/cosmos/domain/PersonRepository.java | 9 -- .../domain/ReactivePersonRepository.java | 9 -- .../pom.xml | 6 - .../cosmos/springdata/SpringDataCosmosIT.java | 36 ------ .../cosmos/springdata/UserRepository.java | 11 -- 14 files changed, 511 deletions(-) delete mode 100644 sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosDataAutoConfigurationTests.java delete mode 100644 sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosReactiveRepositoriesAutoConfigurationTests.java delete mode 100644 sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosRepositoriesAutoConfigurationTests.java delete mode 100644 sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/TestAutoConfigurationPackage.java delete mode 100644 sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/TestAutoConfigurationPackageRegistrar.java delete mode 100644 sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/domain/Person.java delete mode 100644 sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/domain/PersonRepository.java delete mode 100644 sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/domain/ReactivePersonRepository.java delete mode 100644 sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/cosmos/springdata/SpringDataCosmosIT.java delete mode 100644 sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/cosmos/springdata/UserRepository.java diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml index 67526ab390fd..a8adcbd2d811 100644 --- a/eng/jacoco-test-coverage/pom.xml +++ b/eng/jacoco-test-coverage/pom.xml @@ -552,11 +552,6 @@ spring-cloud-azure-starter-cosmos 6.0.0-beta.1 - com.azure.spring spring-cloud-azure-starter-storage @@ -632,13 +627,6 @@ spring-cloud-azure-stream-binder-eventhubs-core 6.0.0-beta.1 - com.azure azure-digitaltwins-core diff --git a/sdk/boms/spring-cloud-azure-dependencies/pom.xml b/sdk/boms/spring-cloud-azure-dependencies/pom.xml index 97c6aaa130b0..0ad87776602a 100644 --- a/sdk/boms/spring-cloud-azure-dependencies/pom.xml +++ b/sdk/boms/spring-cloud-azure-dependencies/pom.xml @@ -105,12 +105,6 @@ azure-storage-queue 12.14.1 - - com.azure.resourcemanager azure-resourcemanager @@ -178,13 +172,6 @@ spring-cloud-azure-starter-cosmos ${project.version} - com.azure.spring spring-cloud-azure-starter-eventhubs diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml index 6576342640a5..f16a9222698a 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml +++ b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml @@ -129,13 +129,6 @@ 3.0.0-M5 true - - org.springframework spring-tx diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosDataAutoConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosDataAutoConfigurationTests.java deleted file mode 100644 index e5e29330502e..000000000000 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosDataAutoConfigurationTests.java +++ /dev/null @@ -1,77 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// -//package com.azure.spring.cloud.autoconfigure.data.cosmos; -// -//import com.azure.cosmos.CosmosAsyncClient; -//import com.azure.cosmos.CosmosClient; -//import com.azure.cosmos.CosmosClientBuilder; -//import com.azure.spring.cloud.autoconfigure.context.AzureGlobalPropertiesAutoConfiguration; -//import com.azure.spring.cloud.autoconfigure.cosmos.AzureCosmosAutoConfiguration; -//import com.azure.spring.data.cosmos.CosmosFactory; -//import com.azure.spring.data.cosmos.config.CosmosConfig; -//import com.azure.spring.data.cosmos.core.CosmosTemplate; -//import com.azure.spring.data.cosmos.core.ReactiveCosmosTemplate; -//import org.junit.jupiter.api.Test; -//import org.mockito.MockedStatic; -//import org.springframework.boot.autoconfigure.AutoConfigurations; -//import org.springframework.boot.test.context.FilteredClassLoader; -//import org.springframework.boot.test.context.runner.ApplicationContextRunner; -// -//import static org.assertj.core.api.Assertions.assertThat; -//import static org.mockito.Mockito.mock; -//import static org.mockito.Mockito.when; -//import static org.mockito.Mockito.mockStatic; -//import static org.mockito.Mockito.RETURNS_MOCKS; -// -//class CosmosDataAutoConfigurationTests { -// -// private static final String ENDPOINT = "https://test.documents.azure.com:443/"; -// private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() -// .withConfiguration(AutoConfigurations.of( -// AzureGlobalPropertiesAutoConfiguration.class, -// AzureCosmosAutoConfiguration.class, -// CosmosDataAutoConfiguration.class)); -// -// @Test -// void configureWithoutCosmosTemplate() { -// this.contextRunner -// .withClassLoader(new FilteredClassLoader(CosmosTemplate.class)) -// .run((context) -> assertThat(context).doesNotHaveBean(CosmosConfig.class)); -// } -// -// @Test -// void configureWithCosmosDisabled() { -// this.contextRunner -// .withPropertyValues("spring.cloud.azure.cosmos.enabled=false") -// .run(context -> assertThat(context).doesNotHaveBean(CosmosConfig.class)); -// } -// -// @Test -// void configureWithoutEndpoint() { -// this.contextRunner -// .withPropertyValues("spring.cloud.azure.cosmos.enabled=true") -// .run(context -> assertThat(context).doesNotHaveBean(CosmosConfig.class)); -// } -// -// @Test -// void cosmosTemplateExistsAndUsesIt() { -// try (MockedStatic mockedStatic = mockStatic(CosmosFactory.class, RETURNS_MOCKS)) { -// CosmosClientBuilder cosmosClientBuilder = mock(CosmosClientBuilder.class); -// CosmosAsyncClient cosmosAsyncClient = mock(CosmosAsyncClient.class); -// when(cosmosClientBuilder.buildAsyncClient()).thenReturn(cosmosAsyncClient); -// mockedStatic.when(() -> CosmosFactory.createCosmosAsyncClient(cosmosClientBuilder)) -// .thenReturn(cosmosAsyncClient); -// this.contextRunner -// .withBean(CosmosClientBuilder.class, () -> cosmosClientBuilder) -// .withBean(CosmosClient.class, () -> mock(CosmosClient.class)) -// .withPropertyValues( -// "spring.cloud.azure.cosmos.endpoint=" + ENDPOINT, -// "spring.cloud.azure.cosmos.database=test") -// .run(context -> { -// assertThat(context).hasSingleBean(CosmosTemplate.class); -// assertThat(context).hasSingleBean(ReactiveCosmosTemplate.class); -// }); -// } -// } -//} diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosReactiveRepositoriesAutoConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosReactiveRepositoriesAutoConfigurationTests.java deleted file mode 100644 index b29b19d98839..000000000000 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosReactiveRepositoriesAutoConfigurationTests.java +++ /dev/null @@ -1,117 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// -//package com.azure.spring.cloud.autoconfigure.data.cosmos; -// -//import com.azure.cosmos.models.CosmosContainerProperties; -//import com.azure.cosmos.models.CosmosContainerResponse; -//import com.azure.spring.cloud.autoconfigure.data.cosmos.domain.Person; -//import com.azure.spring.cloud.autoconfigure.data.cosmos.domain.ReactivePersonRepository; -//import com.azure.spring.data.cosmos.core.ReactiveCosmosTemplate; -//import com.azure.spring.data.cosmos.core.convert.MappingCosmosConverter; -//import com.azure.spring.data.cosmos.core.mapping.CosmosMappingContext; -//import com.azure.spring.data.cosmos.repository.ReactiveCosmosRepository; -//import com.azure.spring.data.cosmos.repository.config.EnableReactiveCosmosRepositories; -//import com.azure.spring.data.cosmos.repository.config.ReactiveCosmosRepositoryConfigurationExtension; -//import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; -//import com.azure.spring.data.cosmos.repository.support.ReactiveCosmosRepositoryFactoryBean; -//import com.fasterxml.jackson.databind.ObjectMapper; -//import org.junit.jupiter.api.BeforeEach; -//import org.junit.jupiter.api.Test; -//import org.springframework.boot.autoconfigure.AutoConfigurations; -//import org.springframework.boot.test.context.FilteredClassLoader; -//import org.springframework.boot.test.context.runner.ApplicationContextRunner; -//import org.springframework.context.annotation.Configuration; -//import reactor.core.publisher.Mono; -// -//import static org.assertj.core.api.Assertions.assertThat; -//import static org.mockito.ArgumentMatchers.any; -//import static org.mockito.Mockito.mock; -//import static org.mockito.Mockito.when; -// -//public class CosmosReactiveRepositoriesAutoConfigurationTests { -// -// private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() -// .withConfiguration(AutoConfigurations.of(CosmosReactiveRepositoriesAutoConfiguration.class)); -// private ReactiveCosmosTemplate reactiveCosmosTemplate; -// -// @BeforeEach -// void beforeEach() { -// reactiveCosmosTemplate = mock(ReactiveCosmosTemplate.class); -// CosmosMappingContext mappingContext = new CosmosMappingContext(); -// MappingCosmosConverter cosmosConverter = new MappingCosmosConverter(mappingContext, new ObjectMapper()); -// when(reactiveCosmosTemplate.createContainerIfNotExists(any(CosmosEntityInformation.class))) -// .thenReturn(Mono.just(mock(CosmosContainerResponse.class))); -// when(reactiveCosmosTemplate.getContainerProperties(any())) -// .thenReturn(Mono.just(mock(CosmosContainerProperties.class))); -// when(reactiveCosmosTemplate.getConverter()).thenReturn(cosmosConverter); -// } -// -// @Test -// void enabledDefaultRepositoryConfiguration() { -// this.contextRunner -// .withBean(ReactiveCosmosTemplate.class, () -> reactiveCosmosTemplate) -// .withUserConfiguration(CosmosReactiveRepositoriesAutoConfigurationTests.TestConfiguration.class) -// .run((context) -> assertThat(context).hasSingleBean(ReactivePersonRepository.class)); -// } -// -// @Test -// void disabledWhenReactiveCosmosRepositoryMissing() { -// this.contextRunner -// .withClassLoader(new FilteredClassLoader(ReactiveCosmosRepository.class)) -// .withBean(ReactiveCosmosTemplate.class, () -> reactiveCosmosTemplate) -// .withUserConfiguration(CosmosReactiveRepositoriesAutoConfigurationTests.TestConfiguration.class) -// .run(context -> assertThat(context).doesNotHaveBean(ReactivePersonRepository.class)); -// } -// -// @Test -// void disabledWhenSpecialBeanExist() { -// this.contextRunner -// .withBean(ReactiveCosmosRepositoryFactoryBean.class, () -> mock(ReactiveCosmosRepositoryFactoryBean.class)) -// .withBean(ReactiveCosmosTemplate.class, () -> reactiveCosmosTemplate) -// .withUserConfiguration(CosmosReactiveRepositoriesAutoConfigurationTests.TestConfiguration.class) -// .run(context -> assertThat(context).doesNotHaveBean(ReactivePersonRepository.class)); -// -// this.contextRunner -// .withBean(ReactiveCosmosRepositoryConfigurationExtension.class, () -> mock(ReactiveCosmosRepositoryConfigurationExtension.class)) -// .withBean(ReactiveCosmosTemplate.class, () -> reactiveCosmosTemplate) -// .withUserConfiguration(CosmosReactiveRepositoriesAutoConfigurationTests.TestConfiguration.class) -// .run(context -> assertThat(context).doesNotHaveBean(ReactivePersonRepository.class)); -// } -// -// @Test -// void disabledWhenReactiveCosmosTemplateMissing() { -// this.contextRunner -// .withUserConfiguration(CosmosReactiveRepositoriesAutoConfigurationTests.TestConfiguration.class) -// .run(context -> assertThat(context).doesNotHaveBean(ReactivePersonRepository.class)); -// } -// -// @Test -// void disabledWhenPropertiesDisabled() { -// this.contextRunner -// .withBean(ReactiveCosmosTemplate.class, () -> reactiveCosmosTemplate) -// .withPropertyValues("spring.cloud.azure.cosmos.repositories.enabled=false") -// .withUserConfiguration(CosmosReactiveRepositoriesAutoConfigurationTests.TestConfiguration.class) -// .run(context -> assertThat(context).doesNotHaveBean(ReactivePersonRepository.class)); -// } -// -// @Test -// void autoConfigNotKickInIfManualConfigDidNotCreateRepositories() { -// this.contextRunner -// .withBean(ReactiveCosmosTemplate.class, () -> reactiveCosmosTemplate) -// .withUserConfiguration(CosmosReactiveRepositoriesAutoConfigurationTests.InvalidCustomConfiguration.class) -// .run(context -> assertThat(context).doesNotHaveBean(ReactivePersonRepository.class)); -// } -// -// @Configuration -// @TestAutoConfigurationPackage(Person.class) -// static class TestConfiguration { -// } -// -// @Configuration -// @EnableReactiveCosmosRepositories("foo.bar") -// @TestAutoConfigurationPackage(CosmosReactiveRepositoriesAutoConfigurationTests.class) -// static class InvalidCustomConfiguration { -// -// } -//} diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosRepositoriesAutoConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosRepositoriesAutoConfigurationTests.java deleted file mode 100644 index 50f621299db2..000000000000 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosRepositoriesAutoConfigurationTests.java +++ /dev/null @@ -1,119 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// -//package com.azure.spring.cloud.autoconfigure.data.cosmos; -// -//import com.azure.cosmos.models.CosmosContainerProperties; -//import com.azure.spring.cloud.autoconfigure.data.cosmos.domain.Person; -//import com.azure.spring.cloud.autoconfigure.data.cosmos.domain.PersonRepository; -//import com.azure.spring.data.cosmos.core.CosmosTemplate; -//import com.azure.spring.data.cosmos.core.convert.MappingCosmosConverter; -//import com.azure.spring.data.cosmos.core.mapping.CosmosMappingContext; -//import com.azure.spring.data.cosmos.repository.CosmosRepository; -//import com.azure.spring.data.cosmos.repository.config.CosmosRepositoryConfigurationExtension; -//import com.azure.spring.data.cosmos.repository.config.EnableCosmosRepositories; -//import com.azure.spring.data.cosmos.repository.support.CosmosRepositoryFactoryBean; -//import com.fasterxml.jackson.databind.ObjectMapper; -//import org.junit.jupiter.api.BeforeEach; -//import org.junit.jupiter.api.Test; -//import org.springframework.boot.autoconfigure.AutoConfigurations; -//import org.springframework.boot.test.context.FilteredClassLoader; -//import org.springframework.boot.test.context.runner.ApplicationContextRunner; -//import org.springframework.context.annotation.Configuration; -// -//import static org.assertj.core.api.Assertions.assertThat; -//import static org.mockito.ArgumentMatchers.any; -//import static org.mockito.Mockito.mock; -//import static org.mockito.Mockito.when; -// -//class CosmosRepositoriesAutoConfigurationTests { -// -// private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() -// .withConfiguration(AutoConfigurations.of(CosmosRepositoriesAutoConfiguration.class)); -// -// private CosmosTemplate cosmosTemplate; -// -// @BeforeEach -// void beforeEach() { -// cosmosTemplate = mock(CosmosTemplate.class); -// CosmosMappingContext mappingContext = new CosmosMappingContext(); -// MappingCosmosConverter cosmosConverter = new MappingCosmosConverter(mappingContext, new ObjectMapper()); -// -// when(cosmosTemplate.getContainerProperties(any())).thenReturn(mock(CosmosContainerProperties.class)); -// when(cosmosTemplate.getConverter()).thenReturn(cosmosConverter); -// } -// -// @Test -// void enabledDefaultRepositoryConfiguration() { -// this.contextRunner -// .withBean(CosmosTemplate.class, () -> cosmosTemplate) -// .withUserConfiguration(TestConfiguration.class) -// .run(context -> assertThat(context).hasSingleBean(PersonRepository.class)); -// } -// -// @Test -// void disabledWhenCosmosRepositoryMissing() { -// this.contextRunner -// .withClassLoader(new FilteredClassLoader(CosmosRepository.class)) -// .withBean(CosmosTemplate.class, () -> cosmosTemplate) -// .withUserConfiguration(TestConfiguration.class) -// .run(context -> assertThat(context).doesNotHaveBean(PersonRepository.class)); -// } -// -// @Test -// void disabledWhenCosmosRepositoryFactoryBeanExists() { -// this.contextRunner -// .withBean(CosmosTemplate.class, () -> cosmosTemplate) -// .withBean(CosmosRepositoryFactoryBean.class, () -> mock(CosmosRepositoryFactoryBean.class)) -// .withUserConfiguration(TestConfiguration.class) -// .run(context -> assertThat(context).doesNotHaveBean(PersonRepository.class)); -// } -// -// @Test -// void disabledWhenCosmosRepositoryConfigurationExtensionBeanExists() { -// this.contextRunner -// .withBean(CosmosTemplate.class, () -> cosmosTemplate) -// .withBean(CosmosRepositoryConfigurationExtension.class, () -> mock(CosmosRepositoryConfigurationExtension.class)) -// .withUserConfiguration(TestConfiguration.class) -// .run(context -> assertThat(context).doesNotHaveBean(PersonRepository.class)); -// } -// -// @Test -// void disabledWhenPropertiesDisabled() { -// this.contextRunner -// .withBean(CosmosTemplate.class, () -> cosmosTemplate) -// .withPropertyValues("spring.cloud.azure.cosmos.repositories.enabled=false") -// .withUserConfiguration(TestConfiguration.class) -// .run(context -> assertThat(context).doesNotHaveBean(PersonRepository.class)); -// } -// -// @Test -// void disabledWhenCosmosTemplateBeanMissing() { -// this.contextRunner -// .withUserConfiguration(TestConfiguration.class) -// .run(context -> assertThat(context).doesNotHaveBean(PersonRepository.class)); -// } -// -// @Test -// void autoConfigNotKickInIfManualConfigDidNotCreateRepositories() { -// this.contextRunner -// .withBean(CosmosTemplate.class, () -> cosmosTemplate) -// .withUserConfiguration(InvalidCustomConfiguration.class) -// .run(context -> assertThat(context).doesNotHaveBean(PersonRepository.class)); -// } -// -// -// @Configuration -// @TestAutoConfigurationPackage(Person.class) -// static class TestConfiguration { -// } -// -// @Configuration -// @EnableCosmosRepositories("foo.bar") -// @TestAutoConfigurationPackage(CosmosRepositoriesAutoConfigurationTests.class) -// static class InvalidCustomConfiguration { -// -// } -// -//} -// diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/TestAutoConfigurationPackage.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/TestAutoConfigurationPackage.java deleted file mode 100644 index cae4eb939500..000000000000 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/TestAutoConfigurationPackage.java +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// -//package com.azure.spring.cloud.autoconfigure.data.cosmos; -// -//import org.springframework.context.annotation.Import; -// -//import java.lang.annotation.Documented; -//import java.lang.annotation.ElementType; -//import java.lang.annotation.Retention; -//import java.lang.annotation.RetentionPolicy; -//import java.lang.annotation.Target; -// -// -//@Target(ElementType.TYPE) -//@Retention(RetentionPolicy.RUNTIME) -//@Documented -//@Import(TestAutoConfigurationPackageRegistrar.class) -//public @interface TestAutoConfigurationPackage { -// -// Class value(); -// -//} diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/TestAutoConfigurationPackageRegistrar.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/TestAutoConfigurationPackageRegistrar.java deleted file mode 100644 index 70168eb9e956..000000000000 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/TestAutoConfigurationPackageRegistrar.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.data.cosmos; -// -//import org.springframework.beans.factory.support.BeanDefinitionRegistry; -//import org.springframework.boot.autoconfigure.AutoConfigurationPackages; -//import org.springframework.context.annotation.ImportBeanDefinitionRegistrar; -//import org.springframework.core.annotation.AnnotationAttributes; -//import org.springframework.core.type.AnnotationMetadata; -//import org.springframework.util.ClassUtils; -// -//public class TestAutoConfigurationPackageRegistrar -// implements ImportBeanDefinitionRegistrar { -// -// @Override -// public void registerBeanDefinitions(AnnotationMetadata metadata, -// BeanDefinitionRegistry registry) { -// final AnnotationAttributes attributes = AnnotationAttributes -// .fromMap(metadata.getAnnotationAttributes( -// TestAutoConfigurationPackage.class.getName(), true)); -// AutoConfigurationPackages.register(registry, -// ClassUtils.getPackageName(attributes.getString("value"))); -// } -// -//} diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/domain/Person.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/domain/Person.java deleted file mode 100644 index f6c1aa5514ab..000000000000 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/domain/Person.java +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -package com.azure.spring.cloud.autoconfigure.data.cosmos.domain; - - -public class Person { - private String firstName; - private String lastName; - - private String id; - - public Person() { - this(null, null, null); - } - - public Person(String id, String firstName, String lastName) { - this.firstName = firstName; - this.lastName = lastName; - this.id = id; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFirstName() { - return firstName; - } - - public void setFirstName(String fname) { - this.firstName = fname; - } - - public String getLastName() { - return lastName; - } - - public void setLastName(String lastName) { - this.lastName = lastName; - } -} diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/domain/PersonRepository.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/domain/PersonRepository.java deleted file mode 100644 index 82a34fd8f9a6..000000000000 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/domain/PersonRepository.java +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// -//package com.azure.spring.cloud.autoconfigure.data.cosmos.domain; -// -//import com.azure.spring.data.cosmos.repository.CosmosRepository; -// -//public interface PersonRepository extends CosmosRepository { -//} diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/domain/ReactivePersonRepository.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/domain/ReactivePersonRepository.java deleted file mode 100644 index 16d1a5e1ddf6..000000000000 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/data/cosmos/domain/ReactivePersonRepository.java +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// -//package com.azure.spring.cloud.autoconfigure.data.cosmos.domain; -// -//import com.azure.spring.data.cosmos.repository.ReactiveCosmosRepository; -// -//public interface ReactivePersonRepository extends ReactiveCosmosRepository { -//} diff --git a/sdk/spring/spring-cloud-azure-integration-tests/pom.xml b/sdk/spring/spring-cloud-azure-integration-tests/pom.xml index ffe778c77676..24dc8b2cdf26 100644 --- a/sdk/spring/spring-cloud-azure-integration-tests/pom.xml +++ b/sdk/spring/spring-cloud-azure-integration-tests/pom.xml @@ -101,12 +101,6 @@ spring-cloud-azure-starter-appconfiguration 6.0.0-beta.1 - - com.azure.spring spring-cloud-azure-starter-cosmos diff --git a/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/cosmos/springdata/SpringDataCosmosIT.java b/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/cosmos/springdata/SpringDataCosmosIT.java deleted file mode 100644 index 13c309ac1f7a..000000000000 --- a/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/cosmos/springdata/SpringDataCosmosIT.java +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -//package com.azure.spring.cloud.integration.tests.cosmos.springdata; -// -//import com.azure.spring.cloud.integration.tests.cosmos.User; -//import org.junit.jupiter.api.Assertions; -//import org.junit.jupiter.api.Test; -//import org.slf4j.Logger; -//import org.slf4j.LoggerFactory; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.boot.test.context.SpringBootTest; -//import org.springframework.test.context.ActiveProfiles; -// -//import java.util.Optional; -// -//@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE) -//@ActiveProfiles("cosmos-springdata") -//public class SpringDataCosmosIT { -// private static final Logger LOGGER = LoggerFactory.getLogger(SpringDataCosmosIT.class); -// private static final String USER_ID = "testSpringDataCosmos"; -// -// @Autowired -// private UserRepository userRepository; -// -// @Test -// public void testSpringDataCosmosOperation() { -// LOGGER.info("SpringDataCosmosIT begin."); -// User testUser = new User(USER_ID, "testFirstName", "testLastName", "test address line one"); -// userRepository.save(testUser); -// Optional user = userRepository.findById(USER_ID); -// Assertions.assertEquals(testUser, user.get()); -// userRepository.delete(testUser); -// Assertions.assertFalse(userRepository.findById(USER_ID).isPresent()); -// LOGGER.info("SpringDataCosmosIT end."); -// } -//} diff --git a/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/cosmos/springdata/UserRepository.java b/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/cosmos/springdata/UserRepository.java deleted file mode 100644 index e79f9f7f7c24..000000000000 --- a/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/cosmos/springdata/UserRepository.java +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -//package com.azure.spring.cloud.integration.tests.cosmos.springdata; -// -//import com.azure.spring.cloud.integration.tests.cosmos.User; -//import com.azure.spring.data.cosmos.repository.CosmosRepository; -//import org.springframework.stereotype.Repository; -// -//@Repository -//public interface UserRepository extends CosmosRepository { -//} From 9175d6725d1e12ac285e4a795c60a9a278193f86 Mon Sep 17 00:00:00 2001 From: Shili Chen Date: Fri, 2 Sep 2022 12:38:54 +0800 Subject: [PATCH 08/15] Test removal exclude appconfiguration in script generate_from_source_pom.py --- eng/scripts/generate_from_source_pom.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/eng/scripts/generate_from_source_pom.py b/eng/scripts/generate_from_source_pom.py index bef9cd26bc48..f52b599cf8f4 100644 --- a/eng/scripts/generate_from_source_pom.py +++ b/eng/scripts/generate_from_source_pom.py @@ -54,11 +54,6 @@ # Exclude artifacts list when build from source.These artifacts may be not compatible with current dependencies. exclude_artifacts_list = [ - 'azure-spring-cloud-appconfiguration-config', - 'azure-spring-cloud-appconfiguration-config-web', - 'azure-spring-cloud-feature-management-web', - 'azure-spring-cloud-starter-appconfiguration-config', - 'azure-spring-cloud-test-appconfiguration-config', 'azure-spring-data-cosmos', 'azure-spring-data-cosmos-test', 'spring-cloud-azure-starter-data-cosmos' From e9cffa42b3e613d9aee748c3c7699466c00f0c1b Mon Sep 17 00:00:00 2001 From: Shili Chen Date: Fri, 2 Sep 2022 14:00:49 +0800 Subject: [PATCH 09/15] Test removal exclude condition in script generate_from_source_pom.py --- eng/scripts/generate_from_source_pom.py | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/eng/scripts/generate_from_source_pom.py b/eng/scripts/generate_from_source_pom.py index f52b599cf8f4..0d39e4d9123c 100644 --- a/eng/scripts/generate_from_source_pom.py +++ b/eng/scripts/generate_from_source_pom.py @@ -52,13 +52,6 @@ sdk_string = "/sdk/" -# Exclude artifacts list when build from source.These artifacts may be not compatible with current dependencies. -exclude_artifacts_list = [ - 'azure-spring-data-cosmos', - 'azure-spring-data-cosmos-test', - 'spring-cloud-azure-starter-data-cosmos' -] - # Function that creates the aggregate POM. def create_from_source_pom(project_list: str, set_skip_linting_projects: str, match_any_version: bool): project_list_identifiers = project_list.split(',') @@ -202,14 +195,9 @@ def create_projects(project_list_identifiers: list, artifact_identifier_to_versi for file_name in files: file_path = root + os.sep + file_name + # Only parse files that are pom.xml files. if (file_name.startswith('pom') and file_name.endswith('.xml')): - pom_file_path_list = file_path.split(os.sep) - if 'sdk' in pom_file_path_list and len(pom_file_path_list[pom_file_path_list.index('sdk'):]) == 4: - artifact_id = pom_file_path_list[pom_file_path_list.index('sdk') + 2] - if artifact_id in exclude_artifacts_list: - print('Exclude artifact:', artifact_id) - continue project = create_project_for_pom(file_path, project_list_identifiers, artifact_identifier_to_version, match_any_version) if project is not None: projects[project.identifier] = project From 7cacd45f42dce2bb926c19f8a83f932eebf57449 Mon Sep 17 00:00:00 2001 From: Shili Chen Date: Fri, 2 Sep 2022 17:01:00 +0800 Subject: [PATCH 10/15] Make all spring pipelines run successfully first. --- eng/scripts/generate_from_source_pom.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/eng/scripts/generate_from_source_pom.py b/eng/scripts/generate_from_source_pom.py index 0d39e4d9123c..e976ae6b6001 100644 --- a/eng/scripts/generate_from_source_pom.py +++ b/eng/scripts/generate_from_source_pom.py @@ -52,6 +52,13 @@ sdk_string = "/sdk/" +# Exclude artifacts list when build from source.These artifacts may be not compatible with current dependencies. +exclude_artifacts_list = [ + 'azure-spring-data-cosmos', + 'azure-spring-data-cosmos-test', + 'spring-cloud-azure-starter-data-cosmos' +] + # Function that creates the aggregate POM. def create_from_source_pom(project_list: str, set_skip_linting_projects: str, match_any_version: bool): project_list_identifiers = project_list.split(',') @@ -198,6 +205,12 @@ def create_projects(project_list_identifiers: list, artifact_identifier_to_versi # Only parse files that are pom.xml files. if (file_name.startswith('pom') and file_name.endswith('.xml')): + pom_file_path_list = file_path.split(os.sep) + if 'sdk' in pom_file_path_list and len(pom_file_path_list[pom_file_path_list.index('sdk'):]) == 4: + artifact_id = pom_file_path_list[pom_file_path_list.index('sdk') + 2] + if artifact_id in exclude_artifacts_list: + print('Exclude artifact:', artifact_id) + continue project = create_project_for_pom(file_path, project_list_identifiers, artifact_identifier_to_version, match_any_version) if project is not None: projects[project.identifier] = project From 678ccb614359cfe2aff6aec6d76caa0ae7098bd1 Mon Sep 17 00:00:00 2001 From: Shili Chen Date: Mon, 5 Sep 2022 10:48:38 +0800 Subject: [PATCH 11/15] Revert appconfiguration's exclusion modification --- sdk/appconfiguration/ci.yml | 120 ++++++++++++++++----------------- sdk/appconfiguration/pom.xml | 6 +- sdk/appconfiguration/tests.yml | 34 +++++----- 3 files changed, 78 insertions(+), 82 deletions(-) diff --git a/sdk/appconfiguration/ci.yml b/sdk/appconfiguration/ci.yml index e546c2b75800..b4af603483bd 100644 --- a/sdk/appconfiguration/ci.yml +++ b/sdk/appconfiguration/ci.yml @@ -12,23 +12,23 @@ trigger: - sdk/appconfiguration/azure-data-appconfiguration/ - sdk/appconfiguration/azure-data-appconfiguration-perf/ - sdk/appconfiguration/azure-resourcemanager-appconfiguration/ -# - sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/ -# - sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/ + - sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/ + - sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/ - sdk/appconfiguration/azure-spring-cloud-feature-management/ -# - sdk/appconfiguration/azure-spring-cloud-feature-management-web/ -# - sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/ -# - sdk/appconfiguration/azure-spring-cloud-test-appconfiguration-config/ + - sdk/appconfiguration/azure-spring-cloud-feature-management-web/ + - sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/ + - sdk/appconfiguration/azure-spring-cloud-test-appconfiguration-config/ exclude: - sdk/appconfiguration/pom.xml - sdk/appconfiguration/azure-data-appconfiguration/pom.xml - sdk/appconfiguration/azure-data-appconfiguration-perf/pom.xml - sdk/appconfiguration/azure-resourcemanager-appconfiguration/pom.xml -# - sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml -# - sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/pom.xml + - sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml + - sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/pom.xml - sdk/appconfiguration/azure-spring-cloud-feature-management/pom.xml -# - sdk/appconfiguration/azure-spring-cloud-feature-management-web/pom.xml -# - sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/pom.xml -# - sdk/appconfiguration/azure-spring-cloud-test-appconfiguration-config/pom.xml + - sdk/appconfiguration/azure-spring-cloud-feature-management-web/pom.xml + - sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/pom.xml + - sdk/appconfiguration/azure-spring-cloud-test-appconfiguration-config/pom.xml pr: branches: @@ -43,49 +43,49 @@ pr: - sdk/appconfiguration/azure-data-appconfiguration/ - sdk/appconfiguration/azure-data-appconfiguration-perf/ - sdk/appconfiguration/azure-resourcemanager-appconfiguration/ -# - sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/ -# - sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/ + - sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/ + - sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/ - sdk/appconfiguration/azure-spring-cloud-feature-management/ -# - sdk/appconfiguration/azure-spring-cloud-feature-management-web/ -# - sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/ -# - sdk/appconfiguration/azure-spring-cloud-test-appconfiguration-config/ + - sdk/appconfiguration/azure-spring-cloud-feature-management-web/ + - sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/ + - sdk/appconfiguration/azure-spring-cloud-test-appconfiguration-config/ exclude: - sdk/appconfiguration/pom.xml - sdk/appconfiguration/azure-data-appconfiguration/pom.xml - sdk/appconfiguration/azure-data-appconfiguration-perf/pom.xml - sdk/appconfiguration/azure-resourcemanager-appconfiguration/pom.xml -# - sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml -# - sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/pom.xml + - sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml + - sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/pom.xml - sdk/appconfiguration/azure-spring-cloud-feature-management/pom.xml -# - sdk/appconfiguration/azure-spring-cloud-feature-management-web/pom.xml -# - sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/pom.xml -# - sdk/appconfiguration/azure-spring-cloud-test-appconfiguration-config/pom.xml + - sdk/appconfiguration/azure-spring-cloud-feature-management-web/pom.xml + - sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/pom.xml + - sdk/appconfiguration/azure-spring-cloud-test-appconfiguration-config/pom.xml parameters: - name: release_azuredataappconfiguration displayName: 'azure-data-appconfiguration' type: boolean default: true -#- name: release_azurespringcloudappconfigurationconfig -# displayName: 'azure-spring-cloud-appconfiguration-config' -# type: boolean -# default: true -#- name: release_azurespringcloudappconfigurationconfigweb -# displayName: 'azure-spring-cloud-appconfiguration-config-web' -# type: boolean -# default: true +- name: release_azurespringcloudappconfigurationconfig + displayName: 'azure-spring-cloud-appconfiguration-config' + type: boolean + default: true +- name: release_azurespringcloudappconfigurationconfigweb + displayName: 'azure-spring-cloud-appconfiguration-config-web' + type: boolean + default: true - name: release_azurespringcloudfeaturemanagement displayName: 'azure-spring-cloud-feature-management' type: boolean default: true -#- name: release_azurespringcloudfeaturemanagementweb -# displayName: 'azure-spring-cloud-feature-management-web' -# type: boolean -# default: true -#- name: release_azurespringcloudstarterappconfigurationconfig -# displayName: 'azure-spring-cloud-starter-appconfiguration-config' -# type: boolean -# default: true +- name: release_azurespringcloudfeaturemanagementweb + displayName: 'azure-spring-cloud-feature-management-web' + type: boolean + default: true +- name: release_azurespringcloudstarterappconfigurationconfig + displayName: 'azure-spring-cloud-starter-appconfiguration-config' + type: boolean + default: true - name: release_azureresourcemanagerappconfiguration displayName: 'azure-resourcemanager-appconfiguration' type: boolean @@ -101,31 +101,31 @@ extends: groupId: com.azure safeName: azuredataappconfiguration releaseInBatch: ${{ parameters.release_azuredataappconfiguration }} -# - name: azure-spring-cloud-appconfiguration-config -# groupId: com.azure.spring -# safeName: azurespringcloudappconfigurationconfig -# releaseInBatch: ${{ parameters.release_azurespringcloudappconfigurationconfig }} -# - name: azure-spring-cloud-appconfiguration-config-web -# groupId: com.azure.spring -# safeName: azurespringcloudappconfigurationconfigweb -# releaseInBatch: ${{ parameters.release_azurespringcloudappconfigurationconfigweb }} -# - name: azure-spring-cloud-feature-management -# groupId: com.azure.spring -# safeName: azurespringcloudfeaturemanagement -# releaseInBatch: ${{ parameters.release_azurespringcloudfeaturemanagement }} -# - name: azure-spring-cloud-feature-management-web -# groupId: com.azure.spring -# safeName: azurespringcloudfeaturemanagementweb -# releaseInBatch: ${{ parameters.release_azurespringcloudfeaturemanagementweb }} -# - name: azure-spring-cloud-starter-appconfiguration-config -# groupId: com.azure.spring -# safeName: azurespringcloudstarterappconfigurationconfig -# releaseInBatch: ${{ parameters.release_azurespringcloudstarterappconfigurationconfig }} + - name: azure-spring-cloud-appconfiguration-config + groupId: com.azure.spring + safeName: azurespringcloudappconfigurationconfig + releaseInBatch: ${{ parameters.release_azurespringcloudappconfigurationconfig }} + - name: azure-spring-cloud-appconfiguration-config-web + groupId: com.azure.spring + safeName: azurespringcloudappconfigurationconfigweb + releaseInBatch: ${{ parameters.release_azurespringcloudappconfigurationconfigweb }} + - name: azure-spring-cloud-feature-management + groupId: com.azure.spring + safeName: azurespringcloudfeaturemanagement + releaseInBatch: ${{ parameters.release_azurespringcloudfeaturemanagement }} + - name: azure-spring-cloud-feature-management-web + groupId: com.azure.spring + safeName: azurespringcloudfeaturemanagementweb + releaseInBatch: ${{ parameters.release_azurespringcloudfeaturemanagementweb }} + - name: azure-spring-cloud-starter-appconfiguration-config + groupId: com.azure.spring + safeName: azurespringcloudstarterappconfigurationconfig + releaseInBatch: ${{ parameters.release_azurespringcloudstarterappconfigurationconfig }} - name: azure-resourcemanager-appconfiguration groupId: com.azure.resourcemanager safeName: azureresourcemanagerappconfiguration releaseInBatch: ${{ parameters.release_azureresourcemanagerappconfiguration }} -# AdditionalModules: -# - name: azure-spring-cloud-test-appconfiguration-config -# groupId: com.azure.spring -# safeName: azurespringcloudtestappconfigurationconfig + AdditionalModules: + - name: azure-spring-cloud-test-appconfiguration-config + groupId: com.azure.spring + safeName: azurespringcloudtestappconfigurationconfig \ No newline at end of file diff --git a/sdk/appconfiguration/pom.xml b/sdk/appconfiguration/pom.xml index 314502b5d6eb..8e88ca6ca599 100644 --- a/sdk/appconfiguration/pom.xml +++ b/sdk/appconfiguration/pom.xml @@ -12,15 +12,11 @@ azure-data-appconfiguration azure-data-appconfiguration-perf azure-resourcemanager-appconfiguration - azure-spring-cloud-feature-management - + azure-spring-cloud-starter-appconfiguration-config diff --git a/sdk/appconfiguration/tests.yml b/sdk/appconfiguration/tests.yml index 6e6adca28e1f..085217d310b0 100644 --- a/sdk/appconfiguration/tests.yml +++ b/sdk/appconfiguration/tests.yml @@ -1,19 +1,19 @@ trigger: none -#stages: -# - template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml -# parameters: -# ServiceDirectory: appconfiguration -# Artifacts: -# - name: azure-spring-cloud-test-appconfiguration-config -# groupId: com.azure.spring -# safeName: azurespringcloudtestappconfigurationconfig -# TimeoutInMinutes: 90 -# SupportedClouds: 'Public,UsGov,China' -# EnvVars: -# AZURE_APPCONFIG_CONNECTION_STRING: $(AZURE_APPCONFIG_CONNECTION_STRING) -# AZURE_CLIENT_ID: $(aad-azure-sdk-test-client-id) -# AZURE_CLIENT_SECRET: $(aad-azure-sdk-test-client-secret) -# AZURE_TENANT_ID: $(aad-azure-sdk-test-tenant-id) -# TestGoals: 'verify' -# TestOptions: '-DskipSpringITs=false' +stages: + - template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml + parameters: + ServiceDirectory: appconfiguration + Artifacts: + - name: azure-spring-cloud-test-appconfiguration-config + groupId: com.azure.spring + safeName: azurespringcloudtestappconfigurationconfig + TimeoutInMinutes: 90 + SupportedClouds: 'Public,UsGov,China' + EnvVars: + AZURE_APPCONFIG_CONNECTION_STRING: $(AZURE_APPCONFIG_CONNECTION_STRING) + AZURE_CLIENT_ID: $(aad-azure-sdk-test-client-id) + AZURE_CLIENT_SECRET: $(aad-azure-sdk-test-client-secret) + AZURE_TENANT_ID: $(aad-azure-sdk-test-tenant-id) + TestGoals: 'verify' + TestOptions: '-DskipSpringITs=false' From 1ea23ad5019ae2bcf3ce18459f3e8ff8fac15f6a Mon Sep 17 00:00:00 2001 From: Shili Chen Date: Mon, 5 Sep 2022 11:15:32 +0800 Subject: [PATCH 12/15] Remove configuration class of Spring Data Cosoms. --- .../cosmos/CosmosDataAutoConfiguration.java | 55 ------------------- ...ReactiveRepositoriesAutoConfiguration.java | 33 ----------- ...iveRepositoriesAutoConfigureRegistrar.java | 38 ------------- .../CosmosRepositoriesAutoConfiguration.java | 33 ----------- ...mosRepositoriesAutoConfigureRegistrar.java | 38 ------------- .../data/cosmos/package-info.java | 7 --- 6 files changed, 204 deletions(-) delete mode 100644 sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosDataAutoConfiguration.java delete mode 100644 sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosReactiveRepositoriesAutoConfiguration.java delete mode 100644 sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosReactiveRepositoriesAutoConfigureRegistrar.java delete mode 100644 sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosRepositoriesAutoConfiguration.java delete mode 100644 sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosRepositoriesAutoConfigureRegistrar.java delete mode 100644 sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/package-info.java diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosDataAutoConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosDataAutoConfiguration.java deleted file mode 100644 index 5639bf5fb73d..000000000000 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosDataAutoConfiguration.java +++ /dev/null @@ -1,55 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// -//package com.azure.spring.cloud.autoconfigure.data.cosmos; -// -//import com.azure.spring.cloud.autoconfigure.implementation.cosmos.properties.AzureCosmosProperties; -//import com.azure.spring.data.cosmos.config.AbstractCosmosConfiguration; -//import com.azure.spring.data.cosmos.config.CosmosConfig; -//import com.azure.spring.data.cosmos.core.CosmosTemplate; -//import com.azure.spring.data.cosmos.core.ResponseDiagnosticsProcessor; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -//import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -//import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; -//import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -//import org.springframework.context.annotation.Configuration; -// -///** -// * {@link EnableAutoConfiguration Auto-configuration} for Spring Data Cosmos support. -// * -// * @since 4.0.0 -// */ -//@Configuration(proxyBeanMethods = false) -//@ConditionalOnClass({ CosmosTemplate.class }) -//@ConditionalOnExpression("${spring.cloud.azure.cosmos.enabled:true}") -//@ConditionalOnProperty(prefix = "spring.cloud.azure.cosmos", name = { "endpoint", "database" }) -//public class CosmosDataAutoConfiguration extends AbstractCosmosConfiguration { -// -// private final AzureCosmosProperties cosmosProperties; -// private final ResponseDiagnosticsProcessor responseDiagnosticsProcessor; -// -// CosmosDataAutoConfiguration(AzureCosmosProperties cosmosProperties, -// @Autowired(required = false) ResponseDiagnosticsProcessor responseDiagnosticsProcessor) { -// this.cosmosProperties = cosmosProperties; -// this.responseDiagnosticsProcessor = responseDiagnosticsProcessor; -// } -// -// @Override -// protected String getDatabaseName() { -// return cosmosProperties.getDatabase(); -// } -// -// @Override -// public CosmosConfig cosmosConfig() { -// final CosmosConfig.CosmosConfigBuilder builder = CosmosConfig.builder(); -// builder.enableQueryMetrics(cosmosProperties.isPopulateQueryMetrics()); -// -// if (responseDiagnosticsProcessor != null) { -// builder.responseDiagnosticsProcessor(responseDiagnosticsProcessor); -// } -// -// return builder.build(); -// } -// -//} diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosReactiveRepositoriesAutoConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosReactiveRepositoriesAutoConfiguration.java deleted file mode 100644 index 44fbfb5df550..000000000000 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosReactiveRepositoriesAutoConfiguration.java +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// -//package com.azure.spring.cloud.autoconfigure.data.cosmos; -// -//import com.azure.spring.data.cosmos.core.ReactiveCosmosTemplate; -//import com.azure.spring.data.cosmos.repository.ReactiveCosmosRepository; -//import com.azure.spring.data.cosmos.repository.config.ReactiveCosmosRepositoryConfigurationExtension; -//import com.azure.spring.data.cosmos.repository.support.ReactiveCosmosRepositoryFactoryBean; -//import org.springframework.boot.autoconfigure.AutoConfigureAfter; -//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.condition.ConditionalOnProperty; -//import org.springframework.context.annotation.Configuration; -//import org.springframework.context.annotation.Import; -// -///** -// * Import {@link CosmosReactiveRepositoriesAutoConfigureRegistrar} class as a Bean in Spring. -// */ -//@Configuration(proxyBeanMethods = false) -//@ConditionalOnClass({ ReactiveCosmosRepository.class }) -//@ConditionalOnMissingBean({ ReactiveCosmosRepositoryFactoryBean.class, -// ReactiveCosmosRepositoryConfigurationExtension.class }) -//@AutoConfigureAfter(CosmosDataAutoConfiguration.class) -//@ConditionalOnBean(ReactiveCosmosTemplate.class) -//@ConditionalOnProperty(prefix = "spring.cloud.azure.cosmos.repositories", -// name = "enabled", -// havingValue = "true", -// matchIfMissing = true) -//@Import(CosmosReactiveRepositoriesAutoConfigureRegistrar.class) -//public class CosmosReactiveRepositoriesAutoConfiguration { -//} diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosReactiveRepositoriesAutoConfigureRegistrar.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosReactiveRepositoriesAutoConfigureRegistrar.java deleted file mode 100644 index f873d1a503d2..000000000000 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosReactiveRepositoriesAutoConfigureRegistrar.java +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// -//package com.azure.spring.cloud.autoconfigure.data.cosmos; -// -//import com.azure.spring.data.cosmos.repository.config.EnableReactiveCosmosRepositories; -//import com.azure.spring.data.cosmos.repository.config.ReactiveCosmosRepositoryConfigurationExtension; -//import org.springframework.boot.autoconfigure.data.AbstractRepositoryConfigurationSourceSupport; -//import org.springframework.data.repository.config.RepositoryConfigurationExtension; -// -//import java.lang.annotation.Annotation; -// -///** -// * Declare {@link EnableReactiveCosmosRepositories} annotation and {@link EnableCosmosReactiveRepositoriesConfiguration} -// * configuration for default async auto-configuration. -// */ -//public class CosmosReactiveRepositoriesAutoConfigureRegistrar extends AbstractRepositoryConfigurationSourceSupport { -// @Override -// protected Class getAnnotation() { -// return EnableReactiveCosmosRepositories.class; -// } -// -// @Override -// protected Class getConfiguration() { -// return EnableCosmosReactiveRepositoriesConfiguration.class; -// } -// -// @Override -// protected RepositoryConfigurationExtension getRepositoryConfigurationExtension() { -// return new ReactiveCosmosRepositoryConfigurationExtension(); -// } -// -// @EnableReactiveCosmosRepositories -// private static class EnableCosmosReactiveRepositoriesConfiguration { -// -// } -// -//} diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosRepositoriesAutoConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosRepositoriesAutoConfiguration.java deleted file mode 100644 index 93db668cced8..000000000000 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosRepositoriesAutoConfiguration.java +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// -//package com.azure.spring.cloud.autoconfigure.data.cosmos; -// -//import com.azure.spring.data.cosmos.core.CosmosTemplate; -//import com.azure.spring.data.cosmos.repository.CosmosRepository; -//import com.azure.spring.data.cosmos.repository.config.CosmosRepositoryConfigurationExtension; -//import com.azure.spring.data.cosmos.repository.support.CosmosRepositoryFactoryBean; -//import org.springframework.boot.autoconfigure.AutoConfigureAfter; -//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.condition.ConditionalOnProperty; -//import org.springframework.context.annotation.Configuration; -//import org.springframework.context.annotation.Import; -// -///** -// * Import {@link CosmosRepositoriesAutoConfigureRegistrar} class as a Bean in Spring. -// */ -//@Configuration(proxyBeanMethods = false) -//@ConditionalOnClass({ CosmosRepository.class }) -//@ConditionalOnMissingBean({ CosmosRepositoryFactoryBean.class, -// CosmosRepositoryConfigurationExtension.class }) -//@AutoConfigureAfter(CosmosDataAutoConfiguration.class) -//@ConditionalOnBean(CosmosTemplate.class) -//@ConditionalOnProperty(prefix = "spring.cloud.azure.cosmos.repositories", -// name = "enabled", -// havingValue = "true", -// matchIfMissing = true) -//@Import(CosmosRepositoriesAutoConfigureRegistrar.class) -//public class CosmosRepositoriesAutoConfiguration { -//} diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosRepositoriesAutoConfigureRegistrar.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosRepositoriesAutoConfigureRegistrar.java deleted file mode 100644 index 8e36cf1b2642..000000000000 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosRepositoriesAutoConfigureRegistrar.java +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// -//package com.azure.spring.cloud.autoconfigure.data.cosmos; -// -//import com.azure.spring.data.cosmos.repository.config.CosmosRepositoryConfigurationExtension; -//import com.azure.spring.data.cosmos.repository.config.EnableCosmosRepositories; -//import org.springframework.boot.autoconfigure.data.AbstractRepositoryConfigurationSourceSupport; -//import org.springframework.data.repository.config.RepositoryConfigurationExtension; -// -//import java.lang.annotation.Annotation; -// -///** -// * Declare {@link EnableCosmosRepositories} annotation and {@link EnableCosmosRepositoriesConfiguration} configuration -// * for default non-async auto-configuration. -// */ -//public class CosmosRepositoriesAutoConfigureRegistrar extends AbstractRepositoryConfigurationSourceSupport { -// @Override -// protected Class getAnnotation() { -// return EnableCosmosRepositories.class; -// } -// -// @Override -// protected Class getConfiguration() { -// return EnableCosmosRepositoriesConfiguration.class; -// } -// -// @Override -// protected RepositoryConfigurationExtension getRepositoryConfigurationExtension() { -// return new CosmosRepositoryConfigurationExtension(); -// } -// -// @EnableCosmosRepositories -// private static class EnableCosmosRepositoriesConfiguration { -// -// } -// -//} diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/package-info.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/package-info.java deleted file mode 100644 index b3fa7e87c46f..000000000000 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/data/cosmos/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// -///** -// * Spring Cloud Azure's auto-configuration for Spring Data Cosmos. -// */ -//package com.azure.spring.cloud.autoconfigure.data.cosmos; From b9ce86b4a31d6d39e968ab10eb0a8450c538fafd Mon Sep 17 00:00:00 2001 From: Shili Chen Date: Mon, 5 Sep 2022 16:05:09 +0800 Subject: [PATCH 13/15] Revert the cosmos yml changes; --- sdk/cosmos/ci.yml | 28 ++++++++++++------------- sdk/cosmos/pom.xml | 4 +--- sdk/cosmos/tests.yml | 50 ++++++++++++++++++++++---------------------- 3 files changed, 40 insertions(+), 42 deletions(-) diff --git a/sdk/cosmos/ci.yml b/sdk/cosmos/ci.yml index 4dc0167cda09..dc5bbc839346 100644 --- a/sdk/cosmos/ci.yml +++ b/sdk/cosmos/ci.yml @@ -17,8 +17,8 @@ trigger: - sdk/cosmos/azure-cosmos-spark_3_2-12/ - sdk/cosmos/azure-cosmos-spark_3-1_2-12/ - sdk/cosmos/azure-cosmos-spark_3-2_2-12/ -# - sdk/cosmos/azure-spring-data-cosmos/ -# - sdk/cosmos/azure-spring-data-cosmos-test/ + - sdk/cosmos/azure-spring-data-cosmos/ + - sdk/cosmos/azure-spring-data-cosmos-test/ - sdk/cosmos/faq/ exclude: - sdk/cosmos/pom.xml @@ -29,8 +29,8 @@ trigger: - sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml - sdk/cosmos/azure-cosmos-spark_3-1_2-12/pom.xml - sdk/cosmos/azure-cosmos-spark_3-2_2-12/pom.xml -# - sdk/cosmos/azure-spring-data-cosmos/pom.xml -# - sdk/cosmos/azure-spring-data-cosmos-test/pom.xml + - sdk/cosmos/azure-spring-data-cosmos/pom.xml + - sdk/cosmos/azure-spring-data-cosmos-test/pom.xml pr: branches: @@ -51,8 +51,8 @@ pr: - sdk/cosmos/azure-cosmos-spark_3_2-12/ - sdk/cosmos/azure-cosmos-spark_3-1_2-12/ - sdk/cosmos/azure-cosmos-spark_3-2_2-12/ -# - sdk/cosmos/azure-spring-data-cosmos/ -# - sdk/cosmos/azure-spring-data-cosmos-test/ + - sdk/cosmos/azure-spring-data-cosmos/ + - sdk/cosmos/azure-spring-data-cosmos-test/ - sdk/cosmos/faq/ exclude: - sdk/cosmos/pom.xml @@ -63,8 +63,8 @@ pr: - sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml - sdk/cosmos/azure-cosmos-spark_3-1_2-12/pom.xml - sdk/cosmos/azure-cosmos-spark_3-2_2-12/pom.xml -# - sdk/cosmos/azure-spring-data-cosmos/pom.xml -# - sdk/cosmos/azure-spring-data-cosmos-test/pom.xml + - sdk/cosmos/azure-spring-data-cosmos/pom.xml + - sdk/cosmos/azure-spring-data-cosmos-test/pom.xml parameters: - name: release_azurecosmos @@ -99,10 +99,10 @@ extends: groupId: com.azure safeName: azurecosmos releaseInBatch: ${{ parameters.release_azurecosmos }} -# - name: azure-spring-data-cosmos -# groupId: com.azure -# safeName: azurespringdatacosmos -# releaseInBatch: ${{ parameters.release_azurespringdatacosmos }} + - name: azure-spring-data-cosmos + groupId: com.azure + safeName: azurespringdatacosmos + releaseInBatch: ${{ parameters.release_azurespringdatacosmos }} - name: azure-cosmos-encryption groupId: com.azure safeName: azurecosmosencryption @@ -124,7 +124,7 @@ extends: AdditionalModules: - name: azure-cosmos-benchmark groupId: com.azure -# - name: azure-spring-data-cosmos-test -# groupId: com.azure + - name: azure-spring-data-cosmos-test + groupId: com.azure - name: azure-cosmos-spark_3_2-12 groupId: com.azure.cosmos.spark diff --git a/sdk/cosmos/pom.xml b/sdk/cosmos/pom.xml index 94a2d60a9d20..8a2d575db8ac 100644 --- a/sdk/cosmos/pom.xml +++ b/sdk/cosmos/pom.xml @@ -14,10 +14,8 @@ azure-cosmos-benchmark azure-cosmos-dotnet-benchmark azure-cosmos-encryption - + azure-spring-data-cosmos-test azure-cosmos-spark_3_2-12 azure-cosmos-spark_3-1_2-12 azure-cosmos-spark_3-2_2-12 diff --git a/sdk/cosmos/tests.yml b/sdk/cosmos/tests.yml index 0286e4f21763..25653de37e21 100644 --- a/sdk/cosmos/tests.yml +++ b/sdk/cosmos/tests.yml @@ -37,28 +37,28 @@ stages: TestOptions: '$(ProfileFlag) $(AdditionalArgs)' TestResultsFiles: '**/junitreports/TEST-*.xml' -# - template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml -# parameters: -# TestName: 'Integration' -# CloudConfig: -# Public: -# SubscriptionConfigurations: -# - $(sub-config-azure-cloud-test-resources) -# - $(sub-config-cosmos-azure-cloud-test-resources) -# MatrixConfigs: -# - Name: Cosmos_live_test_integration -# Path: sdk/cosmos/integration-matrix.json -# Selection: all -# GenerateVMJobs: true -# MatrixReplace: -# - JavaTestVersion=(.*1)\.17(.*)/$1.11$2 -# ServiceDirectory: cosmos -# Artifacts: -# - name: azure-spring-data-cosmos-test -# groupId: com.azure -# safeName: azurespringdatacosmostest -# TimeoutInMinutes: 90 -# PreSteps: -# - template: /eng/pipelines/templates/steps/install-reporting-tools.yml -# TestGoals: 'clean verify' -# TestOptions: '$(ProfileFlag)' + - template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml + parameters: + TestName: 'Integration' + CloudConfig: + Public: + SubscriptionConfigurations: + - $(sub-config-azure-cloud-test-resources) + - $(sub-config-cosmos-azure-cloud-test-resources) + MatrixConfigs: + - Name: Cosmos_live_test_integration + Path: sdk/cosmos/integration-matrix.json + Selection: all + GenerateVMJobs: true + MatrixReplace: + - JavaTestVersion=(.*1)\.17(.*)/$1.11$2 + ServiceDirectory: cosmos + Artifacts: + - name: azure-spring-data-cosmos-test + groupId: com.azure + safeName: azurespringdatacosmostest + TimeoutInMinutes: 90 + PreSteps: + - template: /eng/pipelines/templates/steps/install-reporting-tools.yml + TestGoals: 'clean verify' + TestOptions: '$(ProfileFlag)' From 6f46af5b9af4135f7f477437723d11665156905b Mon Sep 17 00:00:00 2001 From: Shili Chen Date: Mon, 5 Sep 2022 16:06:01 +0800 Subject: [PATCH 14/15] Revert version verifier ut and annotation process for file spring-configuration-metadata.json; --- .../spring-cloud-azure-autoconfigure/pom.xml | 32 ++++++ .../AzureSpringBootVersionVerifierTest.java | 99 ++++++++++++++++++- .../pom.xml | 32 ++++++ .../pom.xml | 32 ++++++ 4 files changed, 192 insertions(+), 3 deletions(-) diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml index f16a9222698a..c329c7f33439 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml +++ b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml @@ -397,4 +397,36 @@ + + + + annotation-process-for-java-17 + + [17,) + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.10.1 + + + annotation-process-for-java-17 + + compile + + + + -proc:only + + 17 + + + + + + + + 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 07d2e39999a8..1c0c46121376 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 @@ -9,14 +9,16 @@ 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 org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; class AzureSpringBootVersionVerifierTest { @ParameterizedTest - @ValueSource(strings = { "3.0.0" }) + @ValueSource(strings = { "3.0.0", "3.0.x", "3.0.0-M" }) public void shouldMatchWhenManifestNumberAndAcceptedNumberSpecifiedCase1(String acceptedVersion) { List acceptedVersions = Collections.singletonList(acceptedVersion); ClassNameResolverPredicate mockResolver = mock(ClassNameResolverPredicate.class); @@ -24,7 +26,7 @@ public void shouldMatchWhenManifestNumberAndAcceptedNumberSpecifiedCase1(String mockResolver) { String getVersionFromManifest() { - return "3.0.0M3"; + return "3.0.0-M4"; } }; VerificationResult verificationResult = versionVerifier.verify(); @@ -33,7 +35,7 @@ String getVersionFromManifest() { } @ParameterizedTest - @ValueSource(strings = { "3.0.0" }) + @ValueSource(strings = { "3.0.0", "3.0.x" }) public void shouldNotMatchWhenManifestNumberAndAcceptedNumberSpecifiedCase1(String acceptedVersion) { List acceptedVersions = Collections.singletonList(acceptedVersion); ClassNameResolverPredicate mockResolver = mock(ClassNameResolverPredicate.class); @@ -46,4 +48,95 @@ String getVersionFromManifest() { assertThrows(AzureCompatibilityNotMetException.class, versionVerifier::verify); } + + + @ParameterizedTest + @ValueSource(strings = { "3.0", "3.0.x" }) + public 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); + + AzureSpringBootVersionVerifier versionVerifier = new AzureSpringBootVersionVerifier(acceptedVersions, + mockResolver) { + String getVersionFromManifest() { + return ""; + } + }; + + VerificationResult verificationResult = versionVerifier.verify(); + + assertEquals(verificationResult.getDescription(), ""); + assertEquals(verificationResult.getAction(), ""); + } + + + @ParameterizedTest + @ValueSource(strings = { "3.1", "3.1.x" }) + public 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); + + AzureSpringBootVersionVerifier versionVerifier = new AzureSpringBootVersionVerifier(acceptedVersions, + mockResolver) { + String getVersionFromManifest() { + return ""; + } + }; + + assertThrows(AzureCompatibilityNotMetException.class, versionVerifier::verify); + } + + @ParameterizedTest + @ValueSource(strings = { "3.0.0-M3" }) + public 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); + + AzureSpringBootVersionVerifier versionVerifier = new AzureSpringBootVersionVerifier(acceptedVersions, + mockResolver) { + String getVersionFromManifest() { + return ""; + } + }; + + assertThrows(AzureCompatibilityNotMetException.class, versionVerifier::verify); + } + + @ParameterizedTest + @ValueSource(strings = { "3.0.0-M4" }) + public 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); + + AzureSpringBootVersionVerifier versionVerifier = new AzureSpringBootVersionVerifier(acceptedVersions, + mockResolver) { + String getVersionFromManifest() { + return ""; + } + }; + + assertThrows(AzureCompatibilityNotMetException.class, versionVerifier::verify); + } + + + @ParameterizedTest + @ValueSource(strings = { "3.0", "3.0.x" }) + public 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); + + AzureSpringBootVersionVerifier versionVerifier = new AzureSpringBootVersionVerifier(acceptedVersions, + mockResolver) { + String getVersionFromManifest() { + return ""; + } + }; + + assertThrows(AzureCompatibilityNotMetException.class, versionVerifier::verify); + } } 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 36d3a913dbae..0bac1957e07e 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 @@ -155,4 +155,36 @@ + + + + annotation-process-for-java-17 + + [17,) + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.10.1 + + + annotation-process-for-java-17 + + compile + + + + -proc:only + + 17 + + + + + + + + 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 3023b717c5d7..0c3c466fefc7 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 @@ -153,4 +153,36 @@ + + + + annotation-process-for-java-17 + + [17,) + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.10.1 + + + annotation-process-for-java-17 + + compile + + + + -proc:only + + 17 + + + + + + + + From 1680440fabc7e2f8ca50dd052212d92fae7d1beb Mon Sep 17 00:00:00 2001 From: Shili Chen Date: Mon, 5 Sep 2022 16:49:18 +0800 Subject: [PATCH 15/15] Fix comments: remove maven-compiler-plugin plugin. --- .../pom.xml | 8 -------- .../spring-cloud-azure-starter-storage-queue/pom.xml | 8 -------- 2 files changed, 16 deletions(-) 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 e855136ce3a1..e4e151ba916f 100644 --- a/sdk/spring/spring-cloud-azure-starter-integration-servicebus/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-integration-servicebus/pom.xml @@ -99,14 +99,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - 17 - - org.apache.maven.plugins maven-jar-plugin 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 7f600d8ca01f..a329059428cc 100644 --- a/sdk/spring/spring-cloud-azure-starter-storage-queue/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-storage-queue/pom.xml @@ -97,14 +97,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - 17 - - org.apache.maven.plugins maven-jar-plugin