From c00c8452411f34a15a297c2c85deba6ba6dbd89a Mon Sep 17 00:00:00 2001 From: Muyao Feng <92105726+Netyyyy@users.noreply.github.com> Date: Wed, 12 Nov 2025 09:55:30 +0800 Subject: [PATCH 01/76] Create versions.agent.md --- .github/agents/versions.agent.md | 82 ++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 .github/agents/versions.agent.md diff --git a/.github/agents/versions.agent.md b/.github/agents/versions.agent.md new file mode 100644 index 000000000000..0a93263f2a3c --- /dev/null +++ b/.github/agents/versions.agent.md @@ -0,0 +1,82 @@ +--- +# Fill in the fields below to create a basic custom agent for your repository. +# The Copilot CLI can be used for local testing: https://gh.io/customagents/cli +# To make this agent available, merge this file into the default repository branch. +# For format details, see: https://gh.io/customagents/config + +name: Update Spring versions +description: Create a task to update Spring Boot and Spring Cloud versions. +--- + +# My Agent + +Task: Create a PR to upgrade Spring dependencies to the target version by running our repository Python scripts. Confirm Spring Cloud ↔ Spring Boot compatibility using official references and include the conclusion and links in the PR. + +Requirements: +- Run the repository’s Python scripts(use `python3`). +- In the PR, state the compatibility conclusion (compatible / not compatible / conditionally compatible) and include official reference links to the Spring Cloud release train ↔ Spring Boot compatibility. +- If execution is not possible, fall back to directly editing files to produce the expected outputs, and note this in the PR. + +Milestone/Snapshot rule: +- If either target version is a Milestone (contains `-M` or `-RC`) or a Snapshot (contains `-SNAPSHOT`), add Spring milestone (and optionally snapshot) repositories to the build files (Maven) for dependency resolution. + - Spring Milestone: https://repo.spring.io/milestone + - Spring Snapshot: https://repo.spring.io/snapshot (only if snapshot artifacts are needed) + +Steps (existing flow): +1) Compatibility check: + - Verify whether Spring Cloud is compatible with Spring Boot , citing official docs/compatibility table. + - Add the conclusion and links in the PR. If incompatible, propose the nearest compatible Spring Cloud version, and mark the PR as "needs review". + +2) Generate managed external dependencies: + - Run: + python ./sdk/spring/scripts/get_spring_boot_managed_external_dependencies.py -b ${SPRING_BOOT_VERSION} -c ${SPRING_CLOUD_VERSION} + - Output file: + ./sdk/spring/scripts/spring_boot_${SPRING_BOOT_VERSION}_managed_external_dependencies.txt + +3) Sync external dependencies: + - Run: + python ./sdk/spring/scripts/sync_external_dependencies.py -b ${SPRING_BOOT_VERSION} -sbmvn 3 + - Target file: + ./eng/versioning/external_dependencies.txt + +4) Update version aggregation: + - Run: + python ./eng/versioning/update_versions.py --sr + +5) Update Spring changelog: + - Run: + python ./sdk/spring/scripts/update_changelog.py -b ${SPRING_BOOT_VERSION} -c ${SPRING_CLOUD_VERSION} + - Target file: + ./sdk/spring/CHANGELOG.md (add a new entry: date, versions, brief notes) + +6) Cleanup old files: + - Remove previous ./sdk/spring/scripts/spring_boot_*_managed_external_dependencies.txt files, keep only the current ${SPRING_BOOT_VERSION}. + - List removed files in the PR. + +Build file alignment (if present): +- For pom.xml: + - Align to official BOMs (Spring Boot BOM and Spring Cloud BOM if applicable), remove redundant explicit versions. + - Apply the Milestone/Snapshot rule: if target versions are Milestone/RC/Snapshot, add the Spring milestone/snapshot repositories (Maven) required for resolution. + - Keep changes minimal and focused. + +Branch & commit: +- Branch: chore/spring-upgrade-${SPRING_BOOT_VERSION}-${SPRING_CLOUD_VERSION} +- Commit message: chore(spring): upgrade Spring Boot to ${SPRING_BOOT_VERSION} and Spring Cloud to ${SPRING_CLOUD_VERSION} + +Open a PR with this description structure (Markdown): +1. Summary: purpose and scope +2. Target Versions: Boot/Cloud targets +3. Compatibility: conclusion + official links (mandatory) +4. Files Changed: key changes (managed_external_dependencies, external_dependencies, CHANGELOG, build file alignment if any) +5. Breaking Changes & Notes: e.g., javax.* -> jakarta.*, Security DSL changes, Actuator exposure differences (brief) +6. Checklist: + - [ ] Generated & synced spring_boot_${SPRING_BOOT_VERSION}_managed_external_dependencies.txt + - [ ] Updated eng/versioning/external_dependencies.txt + - [ ] Updated version aggregation (ran update_versions.py --sr or manual equivalent) + - [ ] Updated sdk/spring/CHANGELOG.md + - [ ] Removed old spring_boot_*_managed_external_dependencies.txt + - [ ] Build files aligned to BOM (if applicable) + - [ ] Milestone/Snapshot repositories added (if applicable) + +Please create the branch, run the commands above (or produce equivalent edits if execution is not possible), and open the PR with the specified description and labels. +`` From f83e7ed62a1905f303377865fd8fdf3eb3575551 Mon Sep 17 00:00:00 2001 From: Muyao Feng <92105726+Netyyyy@users.noreply.github.com> Date: Wed, 12 Nov 2025 13:01:11 +0800 Subject: [PATCH 02/76] Update Spring Cloud Azure upgrade instructions --- ...gent.md => springcloudazure-versions-upgrade.agent.md} | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) rename .github/agents/{versions.agent.md => springcloudazure-versions-upgrade.agent.md} (96%) diff --git a/.github/agents/versions.agent.md b/.github/agents/springcloudazure-versions-upgrade.agent.md similarity index 96% rename from .github/agents/versions.agent.md rename to .github/agents/springcloudazure-versions-upgrade.agent.md index 0a93263f2a3c..7a8f425b7083 100644 --- a/.github/agents/versions.agent.md +++ b/.github/agents/springcloudazure-versions-upgrade.agent.md @@ -29,12 +29,15 @@ Steps (existing flow): 2) Generate managed external dependencies: - Run: + pip install termcolor python ./sdk/spring/scripts/get_spring_boot_managed_external_dependencies.py -b ${SPRING_BOOT_VERSION} -c ${SPRING_CLOUD_VERSION} - Output file: ./sdk/spring/scripts/spring_boot_${SPRING_BOOT_VERSION}_managed_external_dependencies.txt 3) Sync external dependencies: - Run: + pip install termcolor + pip install in_place python ./sdk/spring/scripts/sync_external_dependencies.py -b ${SPRING_BOOT_VERSION} -sbmvn 3 - Target file: ./eng/versioning/external_dependencies.txt @@ -42,6 +45,7 @@ Steps (existing flow): 4) Update version aggregation: - Run: python ./eng/versioning/update_versions.py --sr + - Target file: all pom.xml under ./sdk/spring 5) Update Spring changelog: - Run: @@ -72,11 +76,9 @@ Open a PR with this description structure (Markdown): 6. Checklist: - [ ] Generated & synced spring_boot_${SPRING_BOOT_VERSION}_managed_external_dependencies.txt - [ ] Updated eng/versioning/external_dependencies.txt - - [ ] Updated version aggregation (ran update_versions.py --sr or manual equivalent) + - [ ] Updated all versions under ./sdk/spring - [ ] Updated sdk/spring/CHANGELOG.md - [ ] Removed old spring_boot_*_managed_external_dependencies.txt - - [ ] Build files aligned to BOM (if applicable) - [ ] Milestone/Snapshot repositories added (if applicable) Please create the branch, run the commands above (or produce equivalent edits if execution is not possible), and open the PR with the specified description and labels. -`` From 8917931ba8bf5cb1e68f18686c259593b005556b Mon Sep 17 00:00:00 2001 From: Muyao Feng <92105726+Netyyyy@users.noreply.github.com> Date: Wed, 12 Nov 2025 15:47:00 +0800 Subject: [PATCH 03/76] Update springcloudazure-versions-upgrade.agent.md --- .github/agents/springcloudazure-versions-upgrade.agent.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/agents/springcloudazure-versions-upgrade.agent.md b/.github/agents/springcloudazure-versions-upgrade.agent.md index 7a8f425b7083..3027021c5ea3 100644 --- a/.github/agents/springcloudazure-versions-upgrade.agent.md +++ b/.github/agents/springcloudazure-versions-upgrade.agent.md @@ -57,6 +57,13 @@ Steps (existing flow): - Remove previous ./sdk/spring/scripts/spring_boot_*_managed_external_dependencies.txt files, keep only the current ${SPRING_BOOT_VERSION}. - List removed files in the PR. +7) Run command from repo root to validate the Spring SDK module build after the upgrade: + - Run: + mvn clean install -Dcheckstyle.skip=true -Dcodesnippet.skip -Denforcer.skip -Djacoco.skip=true -Dmaven.javadoc.skip=true -Drevapi.skip=true -DskipTests -Dspotbugs.skip=true -Pdev -T 4 -ntp -f sdk/spring/pom.xml + - If the build FAILS: + * Capture and paste the **root cause** from the logs + * Provide **at least two remediation options** for reviewers to choose from + Build file alignment (if present): - For pom.xml: - Align to official BOMs (Spring Boot BOM and Spring Cloud BOM if applicable), remove redundant explicit versions. @@ -79,6 +86,7 @@ Open a PR with this description structure (Markdown): - [ ] Updated all versions under ./sdk/spring - [ ] Updated sdk/spring/CHANGELOG.md - [ ] Removed old spring_boot_*_managed_external_dependencies.txt + - [ ] Run command from repo root to validate the Spring SDK module build after the upgrade - [ ] Milestone/Snapshot repositories added (if applicable) Please create the branch, run the commands above (or produce equivalent edits if execution is not possible), and open the PR with the specified description and labels. From 6bc487586fb67f783d08e75a6ea287356cdd804c Mon Sep 17 00:00:00 2001 From: Muyao Feng <92105726+Netyyyy@users.noreply.github.com> Date: Thu, 13 Nov 2025 11:04:22 +0800 Subject: [PATCH 04/76] Update springcloudazure-versions-upgrade.agent.md --- .../springcloudazure-versions-upgrade.agent.md | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/.github/agents/springcloudazure-versions-upgrade.agent.md b/.github/agents/springcloudazure-versions-upgrade.agent.md index 3027021c5ea3..3bc47ff6bb2f 100644 --- a/.github/agents/springcloudazure-versions-upgrade.agent.md +++ b/.github/agents/springcloudazure-versions-upgrade.agent.md @@ -61,8 +61,22 @@ Steps (existing flow): - Run: mvn clean install -Dcheckstyle.skip=true -Dcodesnippet.skip -Denforcer.skip -Djacoco.skip=true -Dmaven.javadoc.skip=true -Drevapi.skip=true -DskipTests -Dspotbugs.skip=true -Pdev -T 4 -ntp -f sdk/spring/pom.xml - If the build FAILS: - * Capture and paste the **root cause** from the logs - * Provide **at least two remediation options** for reviewers to choose from + - Do NOT modify repository files yet. Do NOT commit any changes. + - Capture and paste the root cause from the logs (first failing module, key exception, dependency conflict). + - Provide at least two remediation options. For each option include: + - scope of changes (files, dependencies, BOM/exclusions, or code migrations) + - pros/cons and risk level + - a preview patch (unapplied unified diff) if file edits are involved + - Post the analysis as a PR comment under the section “Build Failure Analysis”. + - WAIT for explicit approval before proceeding. Only act after a reviewer comments: + - APPROVE OPTION 1 + - APPROVE OPTION 2 + - APPROVE OPTION WITH NOTES: + - After approval: + - Implement ONLY the approved option. + - Commit and push changes. + - Update the PR description: add “Applied Remediation” with the chosen option and rationale. + - Re-run the build command and post the result. Build file alignment (if present): - For pom.xml: From a94621383ce0e1085d001dd5ee101a6720016352 Mon Sep 17 00:00:00 2001 From: Muyao Feng <92105726+Netyyyy@users.noreply.github.com> Date: Thu, 13 Nov 2025 14:28:48 +0800 Subject: [PATCH 05/76] Update springcloudazure-versions-upgrade.agent.md --- .../agents/springcloudazure-versions-upgrade.agent.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/agents/springcloudazure-versions-upgrade.agent.md b/.github/agents/springcloudazure-versions-upgrade.agent.md index 3bc47ff6bb2f..ded49624c7e8 100644 --- a/.github/agents/springcloudazure-versions-upgrade.agent.md +++ b/.github/agents/springcloudazure-versions-upgrade.agent.md @@ -63,7 +63,7 @@ Steps (existing flow): - If the build FAILS: - Do NOT modify repository files yet. Do NOT commit any changes. - Capture and paste the root cause from the logs (first failing module, key exception, dependency conflict). - - Provide at least two remediation options. For each option include: + - Provide at least three remediation options. For each option include: - scope of changes (files, dependencies, BOM/exclusions, or code migrations) - pros/cons and risk level - a preview patch (unapplied unified diff) if file edits are involved @@ -76,7 +76,12 @@ Steps (existing flow): - Implement ONLY the approved option. - Commit and push changes. - Update the PR description: add “Applied Remediation” with the chosen option and rationale. - - Re-run the build command and post the result. + - Re-run the build command (same as above). + - Repeat until no errors: + - If the rebuild still fails, REPEAT the failure analysis and approval cycle described above (do not apply changes without approval). + - Continue this loop until the build succeeds with no errors. + - Once the build passes, mark the PR status update accordingly in the “Build Verification” section. + Build file alignment (if present): - For pom.xml: From 8166d4e26b23723dc517cf694d68af56df1cfe32 Mon Sep 17 00:00:00 2001 From: Muyao Feng <92105726+Netyyyy@users.noreply.github.com> Date: Thu, 13 Nov 2025 16:09:11 +0800 Subject: [PATCH 06/76] Update springcloudazure-versions-upgrade.agent.md --- .github/agents/springcloudazure-versions-upgrade.agent.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/agents/springcloudazure-versions-upgrade.agent.md b/.github/agents/springcloudazure-versions-upgrade.agent.md index ded49624c7e8..e370ab4783e3 100644 --- a/.github/agents/springcloudazure-versions-upgrade.agent.md +++ b/.github/agents/springcloudazure-versions-upgrade.agent.md @@ -16,6 +16,7 @@ Requirements: - Run the repository’s Python scripts(use `python3`). - In the PR, state the compatibility conclusion (compatible / not compatible / conditionally compatible) and include official reference links to the Spring Cloud release train ↔ Spring Boot compatibility. - If execution is not possible, fall back to directly editing files to produce the expected outputs, and note this in the PR. +- Do not Milestone/Snapshot rule: - If either target version is a Milestone (contains `-M` or `-RC`) or a Snapshot (contains `-SNAPSHOT`), add Spring milestone (and optionally snapshot) repositories to the build files (Maven) for dependency resolution. @@ -33,6 +34,7 @@ Steps (existing flow): python ./sdk/spring/scripts/get_spring_boot_managed_external_dependencies.py -b ${SPRING_BOOT_VERSION} -c ${SPRING_CLOUD_VERSION} - Output file: ./sdk/spring/scripts/spring_boot_${SPRING_BOOT_VERSION}_managed_external_dependencies.txt + - Do not edit other files 3) Sync external dependencies: - Run: @@ -41,21 +43,25 @@ Steps (existing flow): python ./sdk/spring/scripts/sync_external_dependencies.py -b ${SPRING_BOOT_VERSION} -sbmvn 3 - Target file: ./eng/versioning/external_dependencies.txt + - Do not edit other files 4) Update version aggregation: - Run: python ./eng/versioning/update_versions.py --sr - Target file: all pom.xml under ./sdk/spring + - Do not edit other files 5) Update Spring changelog: - Run: python ./sdk/spring/scripts/update_changelog.py -b ${SPRING_BOOT_VERSION} -c ${SPRING_CLOUD_VERSION} - Target file: ./sdk/spring/CHANGELOG.md (add a new entry: date, versions, brief notes) + - Do not edit other files 6) Cleanup old files: - Remove previous ./sdk/spring/scripts/spring_boot_*_managed_external_dependencies.txt files, keep only the current ${SPRING_BOOT_VERSION}. - List removed files in the PR. + - Do not edit other files 7) Run command from repo root to validate the Spring SDK module build after the upgrade: - Run: From a30c5dbd2b197696e40106433233fd47baa37ebd Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 13 Nov 2025 08:09:50 +0000 Subject: [PATCH 07/76] Initial plan From 8971091c7ed32e0d9a5153d08dbdd60b235a02cb Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 13 Nov 2025 08:20:00 +0000 Subject: [PATCH 08/76] chore(spring): upgrade Spring Boot to 4.0.0-RC2 and Spring Cloud to 2025.1.0-M4 Co-authored-by: Netyyyy <92105726+Netyyyy@users.noreply.github.com> --- eng/versioning/external_dependencies.txt | 138 +- sdk/spring/CHANGELOG.md | 2 + sdk/spring/azure-spring-data-cosmos/pom.xml | 66 +- sdk/spring/pom.xml | 23 + ...ot_3.5.5_managed_external_dependencies.txt | 1889 ----------------- ....0.0-RC2_managed_external_dependencies.txt | 1745 +++++++++++++++ sdk/spring/scripts/version_util.py | 16 +- .../pom.xml | 24 +- .../spring-cloud-azure-actuator/pom.xml | 18 +- .../pom.xml | 24 +- .../pom.xml | 28 +- .../spring-cloud-azure-autoconfigure/pom.xml | 92 +- sdk/spring/spring-cloud-azure-core/pom.xml | 18 +- .../spring-cloud-azure-docker-compose/pom.xml | 18 +- .../pom.xml | 22 +- .../pom.xml | 38 +- .../pom.xml | 6 +- .../pom.xml | 4 +- .../pom.xml | 14 +- sdk/spring/spring-cloud-azure-service/pom.xml | 20 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 4 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../spring-cloud-azure-starter-cosmos/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 4 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 2 +- .../pom.xml | 4 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 8 +- .../pom.xml | 8 +- .../pom.xml | 18 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- sdk/spring/spring-cloud-azure-starter/pom.xml | 4 +- .../pom.xml | 22 +- .../pom.xml | 16 +- .../pom.xml | 22 +- .../pom.xml | 16 +- .../spring-cloud-azure-testcontainers/pom.xml | 16 +- .../spring-integration-azure-core/pom.xml | 20 +- .../pom.xml | 14 +- .../pom.xml | 14 +- .../pom.xml | 10 +- .../spring-messaging-azure-eventhubs/pom.xml | 20 +- .../spring-messaging-azure-servicebus/pom.xml | 16 +- .../pom.xml | 12 +- sdk/spring/spring-messaging-azure/pom.xml | 20 +- 63 files changed, 2209 insertions(+), 2316 deletions(-) delete mode 100644 sdk/spring/scripts/spring_boot_3.5.5_managed_external_dependencies.txt create mode 100644 sdk/spring/scripts/spring_boot_4.0.0-RC2_managed_external_dependencies.txt diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index 47e532c6ee5c..cbcc0991487b 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -315,70 +315,70 @@ storage_com.microsoft.azure:azure-storage;8.6.6 # sdk\spring\pom.xml modules springboot3_com.diffplug.spotless:spotless-maven-plugin;2.30.0 -springboot3_com.fasterxml.jackson.core:jackson-annotations;2.19.2 -springboot3_com.fasterxml.jackson.core:jackson-core;2.19.2 -springboot3_com.fasterxml.jackson.core:jackson-databind;2.19.2 -springboot3_com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.19.2 -springboot3_com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.19.2 -springboot3_com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.19.2 -springboot3_com.fasterxml.jackson.module:jackson-module-afterburner;2.19.2 -springboot3_com.fasterxml.jackson.module:jackson-module-parameter-names;2.19.2 +springboot3_com.fasterxml.jackson.core:jackson-annotations;2.20 +springboot3_com.fasterxml.jackson.core:jackson-core;2.20.1 +springboot3_com.fasterxml.jackson.core:jackson-databind;2.20.1 +springboot3_com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.20.1 +springboot3_com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.20.1 +springboot3_com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.20.1 +springboot3_com.fasterxml.jackson.module:jackson-module-afterburner;2.20.1 +springboot3_com.fasterxml.jackson.module:jackson-module-parameter-names;2.20.1 springboot3_com.github.spotbugs:spotbugs-maven-plugin;4.8.2.0 springboot3_com.google.code.findbugs:jsr305;3.0.2 springboot3_com.mysql:mysql-connector-j;9.4.0 springboot3_com.nimbusds:nimbus-jose-jwt;9.37.3 -springboot3_io.lettuce:lettuce-core;6.6.0.RELEASE +springboot3_io.lettuce:lettuce-core;6.8.1.RELEASE springboot3_io.micrometer:micrometer-core;1.15.3 -springboot3_io.netty:netty-buffer;4.1.124.Final -springboot3_io.netty:netty-codec-http;4.1.124.Final -springboot3_io.netty:netty-common;4.1.124.Final -springboot3_io.netty:netty-handler;4.1.124.Final -springboot3_io.netty:netty-transport-native-epoll;4.1.124.Final -springboot3_io.netty:netty-transport-native-kqueue;4.1.124.Final -springboot3_io.netty:netty-transport;4.1.124.Final -springboot3_io.projectreactor.netty:reactor-netty;1.2.9 -springboot3_io.projectreactor:reactor-test;3.7.9 -springboot3_jakarta.servlet:jakarta.servlet-api;6.0.0 -springboot3_jakarta.validation:jakarta.validation-api;3.0.2 +springboot3_io.netty:netty-buffer;4.2.7.Final +springboot3_io.netty:netty-codec-http;4.2.7.Final +springboot3_io.netty:netty-common;4.2.7.Final +springboot3_io.netty:netty-handler;4.2.7.Final +springboot3_io.netty:netty-transport-native-epoll;4.2.7.Final +springboot3_io.netty:netty-transport-native-kqueue;4.2.7.Final +springboot3_io.netty:netty-transport;4.2.7.Final +springboot3_io.projectreactor.netty:reactor-netty;1.3.0-RC1 +springboot3_io.projectreactor:reactor-test;3.8.0-RC1 +springboot3_jakarta.servlet:jakarta.servlet-api;6.1.0 +springboot3_jakarta.validation:jakarta.validation-api;3.1.1 springboot3_javax.annotation:javax.annotation-api;1.3.2 springboot3_junit:junit;4.13.2 -springboot3_net.bytebuddy:byte-buddy-agent;1.17.7 -springboot3_net.bytebuddy:byte-buddy;1.17.7 -springboot3_org.apache.commons:commons-lang3;3.17.0 -springboot3_org.apache.kafka:kafka-clients;3.9.1 -springboot3_org.apache.maven.plugins:maven-antrun-plugin;3.1.0 -springboot3_org.apache.maven.plugins:maven-compiler-plugin;3.14.0 -springboot3_org.apache.maven.plugins:maven-enforcer-plugin;3.5.0 -springboot3_org.apache.maven.plugins:maven-failsafe-plugin;3.5.3 +springboot3_net.bytebuddy:byte-buddy-agent;1.17.8 +springboot3_net.bytebuddy:byte-buddy;1.17.8 +springboot3_org.apache.commons:commons-lang3;3.19.0 +springboot3_org.apache.kafka:kafka-clients;4.1.0 +springboot3_org.apache.maven.plugins:maven-antrun-plugin;3.2.0 +springboot3_org.apache.maven.plugins:maven-compiler-plugin;3.14.1 +springboot3_org.apache.maven.plugins:maven-enforcer-plugin;3.6.2 +springboot3_org.apache.maven.plugins:maven-failsafe-plugin;3.5.4 springboot3_org.apache.maven.plugins:maven-jar-plugin;3.4.2 -springboot3_org.apache.maven.plugins:maven-javadoc-plugin;3.11.3 -springboot3_org.apache.maven.plugins:maven-surefire-plugin;3.5.3 -springboot3_org.assertj:assertj-core;3.27.4 -springboot3_org.hibernate.validator:hibernate-validator;8.0.3.Final +springboot3_org.apache.maven.plugins:maven-javadoc-plugin;3.12.0 +springboot3_org.apache.maven.plugins:maven-surefire-plugin;3.5.4 +springboot3_org.assertj:assertj-core;3.27.6 +springboot3_org.hibernate.validator:hibernate-validator;9.0.1.Final springboot3_org.javatuples:javatuples;1.2 -springboot3_org.junit.jupiter:junit-jupiter;5.12.2 -springboot3_org.junit.vintage:junit-vintage-engine;5.12.2 +springboot3_org.junit.jupiter:junit-jupiter;6.0.1 +springboot3_org.junit.vintage:junit-vintage-engine;6.0.1 springboot3_org.messaginghub:pooled-jms;3.1.7 -springboot3_org.mockito:mockito-core;5.17.0 -springboot3_org.postgresql:postgresql;42.7.7 +springboot3_org.mockito:mockito-core;5.20.0 +springboot3_org.postgresql:postgresql;42.7.8 springboot3_org.revapi:revapi-maven-plugin;0.14.6 springboot3_org.slf4j:slf4j-api;2.0.17 springboot3_org.slf4j:slf4j-simple;2.0.17 -springboot3_org.springframework.boot:spring-boot-actuator-autoconfigure;3.5.5 -springboot3_org.springframework.boot:spring-boot-actuator;3.5.5 -springboot3_org.springframework.boot:spring-boot-autoconfigure;3.5.5 -springboot3_org.springframework.boot:spring-boot-configuration-metadata;3.5.5 -springboot3_org.springframework.boot:spring-boot-configuration-processor;3.5.5 -springboot3_org.springframework.boot:spring-boot-docker-compose;3.5.5 -springboot3_org.springframework.boot:spring-boot-starter-actuator;3.5.5 -springboot3_org.springframework.boot:spring-boot-starter-data-jdbc;3.5.5 -springboot3_org.springframework.boot:spring-boot-starter-integration;3.5.5 -springboot3_org.springframework.boot:spring-boot-starter-parent;3.5.5 -springboot3_org.springframework.boot:spring-boot-starter-test;3.5.5 -springboot3_org.springframework.boot:spring-boot-starter-web;3.5.5 -springboot3_org.springframework.boot:spring-boot-starter;3.5.5 -springboot3_org.springframework.boot:spring-boot-test;3.5.5 -springboot3_org.springframework.boot:spring-boot-testcontainers;3.5.5 +springboot3_org.springframework.boot:spring-boot-actuator-autoconfigure;4.0.0-RC2 +springboot3_org.springframework.boot:spring-boot-actuator;4.0.0-RC2 +springboot3_org.springframework.boot:spring-boot-autoconfigure;4.0.0-RC2 +springboot3_org.springframework.boot:spring-boot-configuration-metadata;4.0.0-RC2 +springboot3_org.springframework.boot:spring-boot-configuration-processor;4.0.0-RC2 +springboot3_org.springframework.boot:spring-boot-docker-compose;4.0.0-RC2 +springboot3_org.springframework.boot:spring-boot-starter-actuator;4.0.0-RC2 +springboot3_org.springframework.boot:spring-boot-starter-data-jdbc;4.0.0-RC2 +springboot3_org.springframework.boot:spring-boot-starter-integration;4.0.0-RC2 +springboot3_org.springframework.boot:spring-boot-starter-parent;4.0.0-RC2 +springboot3_org.springframework.boot:spring-boot-starter-test;4.0.0-RC2 +springboot3_org.springframework.boot:spring-boot-starter-web;4.0.0-RC2 +springboot3_org.springframework.boot:spring-boot-starter;4.0.0-RC2 +springboot3_org.springframework.boot:spring-boot-test;4.0.0-RC2 +springboot3_org.springframework.boot:spring-boot-testcontainers;4.0.0-RC2 springboot3_org.springframework.cloud:spring-cloud-bus;4.3.0 springboot3_org.springframework.cloud:spring-cloud-context;4.3.0 springboot3_org.springframework.cloud:spring-cloud-starter-stream-kafka;4.3.0 @@ -386,34 +386,34 @@ springboot3_org.springframework.cloud:spring-cloud-stream-test-binder;4.3.0 springboot3_org.springframework.cloud:spring-cloud-stream;4.3.0 springboot3_org.springframework.data:spring-data-commons;3.5.3 springboot3_org.springframework.data:spring-data-redis;3.5.3 -springboot3_org.springframework.integration:spring-integration-core;6.5.1 -springboot3_org.springframework.kafka:spring-kafka;3.3.9 +springboot3_org.springframework.integration:spring-integration-core;7.0.0-RC2 +springboot3_org.springframework.kafka:spring-kafka;4.0.0-RC1 springboot3_org.springframework.retry:spring-retry;2.0.12 springboot3_org.springframework.security:spring-security-config;6.5.3 springboot3_org.springframework.security:spring-security-oauth2-client;6.5.3 springboot3_org.springframework.security:spring-security-oauth2-jose;6.5.3 springboot3_org.springframework.security:spring-security-oauth2-resource-server;6.5.3 springboot3_org.springframework.security:spring-security-web;6.5.3 -springboot3_org.springframework:spring-beans;6.2.10 -springboot3_org.springframework:spring-context-support;6.2.10 -springboot3_org.springframework:spring-context;6.2.10 -springboot3_org.springframework:spring-core-test;6.2.10 -springboot3_org.springframework:spring-core;6.2.10 -springboot3_org.springframework:spring-expression;6.2.10 -springboot3_org.springframework:spring-jdbc;6.2.10 -springboot3_org.springframework:spring-jms;6.2.10 -springboot3_org.springframework:spring-messaging;6.2.10 -springboot3_org.springframework:spring-test;6.2.10 -springboot3_org.springframework:spring-tx;6.2.10 -springboot3_org.springframework:spring-web;6.2.10 -springboot3_org.springframework:spring-webmvc;6.2.10 +springboot3_org.springframework:spring-beans;7.0.0-RC3 +springboot3_org.springframework:spring-context-support;7.0.0-RC3 +springboot3_org.springframework:spring-context;7.0.0-RC3 +springboot3_org.springframework:spring-core-test;7.0.0-RC3 +springboot3_org.springframework:spring-core;7.0.0-RC3 +springboot3_org.springframework:spring-expression;7.0.0-RC3 +springboot3_org.springframework:spring-jdbc;7.0.0-RC3 +springboot3_org.springframework:spring-jms;7.0.0-RC3 +springboot3_org.springframework:spring-messaging;7.0.0-RC3 +springboot3_org.springframework:spring-test;7.0.0-RC3 +springboot3_org.springframework:spring-tx;7.0.0-RC3 +springboot3_org.springframework:spring-web;7.0.0-RC3 +springboot3_org.springframework:spring-webmvc;7.0.0-RC3 springboot3_org.testcontainers:junit-jupiter;1.21.3 springboot3_org.testcontainers:azure;1.21.3 springboot3_jakarta.annotation:jakarta.annotation-api;3.0.0 -springboot3_ch.qos.logback:logback-classic;1.5.18 +springboot3_ch.qos.logback:logback-classic;1.5.20 # Used for Spring version updates -springboot3_org.springframework.boot:spring-boot-dependencies;3.5.5 -springboot3_org.springframework.cloud:spring-cloud-dependencies;2025.0.0 +springboot3_org.springframework.boot:spring-boot-dependencies;4.0.0-RC2 +springboot3_org.springframework.cloud:spring-cloud-dependencies;2025.1.0-M4 # Java 7 support diff --git a/sdk/spring/CHANGELOG.md b/sdk/spring/CHANGELOG.md index 725fce466446..cfc275f58b5f 100644 --- a/sdk/spring/CHANGELOG.md +++ b/sdk/spring/CHANGELOG.md @@ -1,4 +1,6 @@ # Release History +# (Unreleased) +Upgrade Spring Boot dependencies version to 4.0.0-RC2 and Spring Cloud dependencies version to 2025.1.0-M4 ## 6.0.0 (2025-09-22) - This release is compatible with Spring Boot 3.5.0-3.5.5. (Note: 3.5.x (x>5) should be supported, but they aren't tested with this release.) diff --git a/sdk/spring/azure-spring-data-cosmos/pom.xml b/sdk/spring/azure-spring-data-cosmos/pom.xml index b5840b325b6a..c853393f446f 100644 --- a/sdk/spring/azure-spring-data-cosmos/pom.xml +++ b/sdk/spring/azure-spring-data-cosmos/pom.xml @@ -53,7 +53,7 @@ org.springframework spring-core - 6.2.10 + 7.0.0-RC3 commons-logging @@ -64,22 +64,22 @@ org.springframework spring-web - 6.2.10 + 7.0.0-RC3 org.springframework spring-beans - 6.2.10 + 7.0.0-RC3 org.springframework spring-context - 6.2.10 + 7.0.0-RC3 org.springframework spring-tx - 6.2.10 + 7.0.0-RC3 org.springframework.data @@ -95,7 +95,7 @@ org.springframework spring-expression - 6.2.10 + 7.0.0-RC3 com.azure @@ -105,17 +105,17 @@ com.fasterxml.jackson.module jackson-module-parameter-names - 2.19.2 + 2.20.1 com.fasterxml.jackson.datatype jackson-datatype-jdk8 - 2.19.2 + 2.20.1 com.fasterxml.jackson.core jackson-annotations - 2.19.2 + 2.20 org.javatuples @@ -130,14 +130,14 @@ org.apache.commons commons-lang3 - 3.17.0 + 3.19.0 org.mockito mockito-core - 5.17.0 + 5.20.0 test @@ -145,13 +145,13 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test @@ -163,7 +163,7 @@ org.springframework.boot spring-boot-starter-test - 3.5.5 + 4.0.0-RC2 test @@ -175,7 +175,7 @@ io.projectreactor reactor-test - 3.7.9 + 3.8.0-RC1 test @@ -205,7 +205,7 @@ org.junit.vintage junit-vintage-engine - 5.12.2 + 6.0.1 test @@ -221,7 +221,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -268,24 +268,24 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.2 - org.springframework:spring-beans:[6.2.10] - org.springframework:spring-web:[6.2.10] - org.springframework:spring-tx:[6.2.10] - org.springframework:spring-expression:[6.2.10] - org.springframework:spring-core:[6.2.10] - org.springframework:spring-context:[6.2.10] + org.springframework:spring-beans:[7.0.0-RC3] + org.springframework:spring-web:[7.0.0-RC3] + org.springframework:spring-tx:[7.0.0-RC3] + org.springframework:spring-expression:[7.0.0-RC3] + org.springframework:spring-core:[7.0.0-RC3] + org.springframework:spring-context:[7.0.0-RC3] org.springframework.data:spring-data-commons:[3.5.3] org.javatuples:javatuples:[1.2] - com.fasterxml.jackson.core:jackson-annotations:[2.19.2] - com.fasterxml.jackson.datatype:jackson-datatype-jdk8:[2.19.2] - com.fasterxml.jackson.module:jackson-module-parameter-names:[2.19.2] + com.fasterxml.jackson.core:jackson-annotations:[2.20] + com.fasterxml.jackson.datatype:jackson-datatype-jdk8:[2.20.1] + com.fasterxml.jackson.module:jackson-module-parameter-names:[2.20.1] javax.annotation:javax.annotation-api:[1.3.2] - org.apache.commons:commons-lang3:[3.17.0] + org.apache.commons:commons-lang3:[3.19.0] org.slf4j:slf4j-api:[2.0.17] @@ -296,7 +296,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.11.3 + 3.12.0 com/azure/spring/data/cosmos/core/mapping/BasicCosmosPersistentProperty.java @@ -314,7 +314,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.5.3 + 3.5.4 src/test/resources/application.properties ${skip.integration.tests} @@ -348,7 +348,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.3 + 3.5.4 @@ -369,7 +369,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.3 + 3.5.4 @@ -389,7 +389,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.5.3 + 3.5.4 diff --git a/sdk/spring/pom.xml b/sdk/spring/pom.xml index 005b5bc5c160..59df68d9ae92 100644 --- a/sdk/spring/pom.xml +++ b/sdk/spring/pom.xml @@ -8,6 +8,29 @@ pom 1.0.0 + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + default diff --git a/sdk/spring/scripts/spring_boot_3.5.5_managed_external_dependencies.txt b/sdk/spring/scripts/spring_boot_3.5.5_managed_external_dependencies.txt deleted file mode 100644 index 4ba839f64a4a..000000000000 --- a/sdk/spring/scripts/spring_boot_3.5.5_managed_external_dependencies.txt +++ /dev/null @@ -1,1889 +0,0 @@ -ch.qos.logback:logback-classic;1.5.18 -ch.qos.logback:logback-core;1.5.18 -co.elastic.clients:elasticsearch-java;8.18.5 -com.couchbase.client:java-client;3.8.3 -com.datastax.oss:native-protocol;1.5.1 -com.ecwid.consul:consul-api;1.4.5 -com.fasterxml.jackson.core:jackson-annotations;2.19.2 -com.fasterxml.jackson.core:jackson-core;2.19.2 -com.fasterxml.jackson.core:jackson-databind;2.19.2 -com.fasterxml.jackson.dataformat:jackson-dataformat-avro;2.19.2 -com.fasterxml.jackson.dataformat:jackson-dataformat-cbor;2.19.2 -com.fasterxml.jackson.dataformat:jackson-dataformat-csv;2.19.2 -com.fasterxml.jackson.dataformat:jackson-dataformat-ion;2.19.2 -com.fasterxml.jackson.dataformat:jackson-dataformat-properties;2.19.2 -com.fasterxml.jackson.dataformat:jackson-dataformat-protobuf;2.19.2 -com.fasterxml.jackson.dataformat:jackson-dataformat-smile;2.19.2 -com.fasterxml.jackson.dataformat:jackson-dataformat-toml;2.19.2 -com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.19.2 -com.fasterxml.jackson.dataformat:jackson-dataformat-yaml;2.19.2 -com.fasterxml.jackson.datatype:jackson-datatype-eclipse-collections;2.19.2 -com.fasterxml.jackson.datatype:jackson-datatype-guava;2.19.2 -com.fasterxml.jackson.datatype:jackson-datatype-hibernate4;2.19.2 -com.fasterxml.jackson.datatype:jackson-datatype-hibernate5;2.19.2 -com.fasterxml.jackson.datatype:jackson-datatype-hibernate5-jakarta;2.19.2 -com.fasterxml.jackson.datatype:jackson-datatype-hibernate6;2.19.2 -com.fasterxml.jackson.datatype:jackson-datatype-hppc;2.19.2 -com.fasterxml.jackson.datatype:jackson-datatype-jakarta-jsonp;2.19.2 -com.fasterxml.jackson.datatype:jackson-datatype-javax-money;2.19.2 -com.fasterxml.jackson.datatype:jackson-datatype-jaxrs;2.19.2 -com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.19.2 -com.fasterxml.jackson.datatype:jackson-datatype-joda;2.19.2 -com.fasterxml.jackson.datatype:jackson-datatype-joda-money;2.19.2 -com.fasterxml.jackson.datatype:jackson-datatype-json-org;2.19.2 -com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.19.2 -com.fasterxml.jackson.datatype:jackson-datatype-jsr353;2.19.2 -com.fasterxml.jackson.datatype:jackson-datatype-moneta;2.19.2 -com.fasterxml.jackson.datatype:jackson-datatype-pcollections;2.19.2 -com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-base;2.19.2 -com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-cbor-provider;2.19.2 -com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-json-provider;2.19.2 -com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-smile-provider;2.19.2 -com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-xml-provider;2.19.2 -com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-yaml-provider;2.19.2 -com.fasterxml.jackson.jaxrs:jackson-jaxrs-base;2.19.2 -com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider;2.19.2 -com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider;2.19.2 -com.fasterxml.jackson.jaxrs:jackson-jaxrs-smile-provider;2.19.2 -com.fasterxml.jackson.jaxrs:jackson-jaxrs-xml-provider;2.19.2 -com.fasterxml.jackson.jaxrs:jackson-jaxrs-yaml-provider;2.19.2 -com.fasterxml.jackson.jr:jackson-jr-all;2.19.2 -com.fasterxml.jackson.jr:jackson-jr-annotation-support;2.19.2 -com.fasterxml.jackson.jr:jackson-jr-extension-javatime;2.19.2 -com.fasterxml.jackson.jr:jackson-jr-objects;2.19.2 -com.fasterxml.jackson.jr:jackson-jr-retrofit2;2.19.2 -com.fasterxml.jackson.jr:jackson-jr-stree;2.19.2 -com.fasterxml.jackson.module:jackson-module-afterburner;2.19.2 -com.fasterxml.jackson.module:jackson-module-android-record;2.19.2 -com.fasterxml.jackson.module:jackson-module-blackbird;2.19.2 -com.fasterxml.jackson.module:jackson-module-guice;2.19.2 -com.fasterxml.jackson.module:jackson-module-guice7;2.19.2 -com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations;2.19.2 -com.fasterxml.jackson.module:jackson-module-jaxb-annotations;2.19.2 -com.fasterxml.jackson.module:jackson-module-jsonSchema;2.19.2 -com.fasterxml.jackson.module:jackson-module-jsonSchema-jakarta;2.19.2 -com.fasterxml.jackson.module:jackson-module-kotlin;2.19.2 -com.fasterxml.jackson.module:jackson-module-mrbean;2.19.2 -com.fasterxml.jackson.module:jackson-module-no-ctor-deser;2.19.2 -com.fasterxml.jackson.module:jackson-module-osgi;2.19.2 -com.fasterxml.jackson.module:jackson-module-parameter-names;2.19.2 -com.fasterxml.jackson.module:jackson-module-paranamer;2.19.2 -com.fasterxml.jackson.module:jackson-module-scala_2.11;2.19.2 -com.fasterxml.jackson.module:jackson-module-scala_2.12;2.19.2 -com.fasterxml.jackson.module:jackson-module-scala_2.13;2.19.2 -com.fasterxml.jackson.module:jackson-module-scala_3;2.19.2 -com.fasterxml.jackson:jackson-bom;2.19.2 -com.fasterxml:classmate;1.7.0 -com.github.ben-manes.caffeine:caffeine;3.2.2 -com.github.ben-manes.caffeine:guava;3.2.2 -com.github.ben-manes.caffeine:jcache;3.2.2 -com.github.ben-manes.caffeine:simulator;3.2.2 -com.github.mxab.thymeleaf.extras:thymeleaf-extras-data-attribute;2.0.1 -com.github.tomakehurst:wiremock-jre8-standalone;2.35.1 -com.google.code.gson:gson;2.13.1 -com.graphql-java:graphql-java;24.1 -com.h2database:h2;2.3.232 -com.hazelcast:hazelcast;5.5.0 -com.hazelcast:hazelcast-spring;5.5.0 -com.ibm.db2:jcc;12.1.2.0 -com.jayway.jsonpath:json-path;2.9.0 -com.jayway.jsonpath:json-path-assert;2.9.0 -com.microsoft.sqlserver:mssql-jdbc;12.10.1.jre11 -com.mysql:mysql-connector-j;9.4.0 -com.netflix.eureka:eureka-client;2.0.4 -com.netflix.eureka:eureka-client-jersey3;2.0.4 -com.netflix.eureka:eureka-core;2.0.4 -com.netflix.eureka:eureka-core-jersey3;2.0.4 -com.oracle.database.ha:ons;23.7.0.25.01 -com.oracle.database.ha:simplefan;23.7.0.25.01 -com.oracle.database.jdbc:ojdbc11;23.7.0.25.01 -com.oracle.database.jdbc:ojdbc11-production;23.7.0.25.01 -com.oracle.database.jdbc:ojdbc17;23.7.0.25.01 -com.oracle.database.jdbc:ojdbc17-production;23.7.0.25.01 -com.oracle.database.jdbc:ojdbc8;23.7.0.25.01 -com.oracle.database.jdbc:ojdbc8-production;23.7.0.25.01 -com.oracle.database.jdbc:rsi;23.7.0.25.01 -com.oracle.database.jdbc:ucp;23.7.0.25.01 -com.oracle.database.jdbc:ucp11;23.7.0.25.01 -com.oracle.database.jdbc:ucp17;23.7.0.25.01 -com.oracle.database.nls:orai18n;23.7.0.25.01 -com.oracle.database.r2dbc:oracle-r2dbc;1.3.0 -com.oracle.database.security:oraclepki;23.7.0.25.01 -com.oracle.database.xml:xdb;23.7.0.25.01 -com.oracle.database.xml:xmlparserv2;23.7.0.25.01 -com.querydsl:codegen-utils;5.1.0 -com.querydsl:querydsl-apt;5.1.0 -com.querydsl:querydsl-bom;5.1.0 -com.querydsl:querydsl-codegen;5.1.0 -com.querydsl:querydsl-collections;5.1.0 -com.querydsl:querydsl-core;5.1.0 -com.querydsl:querydsl-guava;5.1.0 -com.querydsl:querydsl-hibernate-search;5.1.0 -com.querydsl:querydsl-jdo;5.1.0 -com.querydsl:querydsl-jpa;5.1.0 -com.querydsl:querydsl-jpa-codegen;5.1.0 -com.querydsl:querydsl-kotlin;5.1.0 -com.querydsl:querydsl-kotlin-codegen;5.1.0 -com.querydsl:querydsl-lucene3;5.1.0 -com.querydsl:querydsl-lucene4;5.1.0 -com.querydsl:querydsl-lucene5;5.1.0 -com.querydsl:querydsl-mongodb;5.1.0 -com.querydsl:querydsl-scala;5.1.0 -com.querydsl:querydsl-spatial;5.1.0 -com.querydsl:querydsl-sql;5.1.0 -com.querydsl:querydsl-sql-codegen;5.1.0 -com.querydsl:querydsl-sql-spatial;5.1.0 -com.querydsl:querydsl-sql-spring;5.1.0 -com.rabbitmq:amqp-client;5.25.0 -com.rabbitmq:stream-client;0.23.0 -com.redis:testcontainers-redis;2.2.4 -com.samskivert:jmustache;1.16 -com.sendgrid:sendgrid-java;4.10.3 -com.squareup.okhttp3:logging-interceptor;4.12.0 -com.squareup.okhttp3:mockwebserver;4.12.0 -com.squareup.okhttp3:okcurl;4.12.0 -com.squareup.okhttp3:okhttp;4.12.0 -com.squareup.okhttp3:okhttp-bom;4.12.0 -com.squareup.okhttp3:okhttp-brotli;4.12.0 -com.squareup.okhttp3:okhttp-dnsoverhttps;4.12.0 -com.squareup.okhttp3:okhttp-sse;4.12.0 -com.squareup.okhttp3:okhttp-tls;4.12.0 -com.squareup.okhttp3:okhttp-urlconnection;4.12.0 -com.sun.istack:istack-commons-runtime;4.1.2 -com.sun.xml.bind:jaxb-core;4.0.5 -com.sun.xml.bind:jaxb-impl;4.0.5 -com.sun.xml.bind:jaxb-jxc;4.0.5 -com.sun.xml.bind:jaxb-osgi;4.0.5 -com.sun.xml.bind:jaxb-xjc;4.0.5 -com.sun.xml.fastinfoset:FastInfoset;2.1.1 -com.sun.xml.messaging.saaj:saaj-impl;3.0.4 -com.toomuchcoding.jsonassert:jsonassert;0.8.0 -com.toomuchcoding.jsonassert:jsonassert-shade;0.8.0 -com.unboundid:unboundid-ldapsdk;7.0.3 -com.zaxxer:HikariCP;6.3.2 -commons-codec:commons-codec;1.18.0 -commons-pool:commons-pool;1.6 -io.asyncer:r2dbc-mysql;1.4.1 -io.fabric8.java-generator:io.fabric8.java-generator.gradle.plugin;7.3.1 -io.fabric8.kubernetes:kubernetes-karaf;7.3.1 -io.fabric8:certmanager-client;7.3.1 -io.fabric8:certmanager-model;7.3.1 -io.fabric8:chaosmesh-client;7.3.1 -io.fabric8:chaosmesh-model;7.3.1 -io.fabric8:crd-generator-api;7.3.1 -io.fabric8:crd-generator-api-v2;7.3.1 -io.fabric8:crd-generator-apt;7.3.1 -io.fabric8:crd-generator-cli;7.3.1 -io.fabric8:crd-generator-collector;7.3.1 -io.fabric8:crd-generator-maven-plugin;7.3.1 -io.fabric8:generator-annotations;7.3.1 -io.fabric8:istio-client;7.3.1 -io.fabric8:istio-model;7.3.1 -io.fabric8:java-generator-benchmark;7.3.1 -io.fabric8:java-generator-cli;7.3.1 -io.fabric8:java-generator-core;7.3.1 -io.fabric8:java-generator-maven-plugin;7.3.1 -io.fabric8:knative-client;7.3.1 -io.fabric8:knative-model;7.3.1 -io.fabric8:kube-api-test;7.3.1 -io.fabric8:kube-api-test-client-inject;7.3.1 -io.fabric8:kubernetes-client;7.3.1 -io.fabric8:kubernetes-client-api;7.3.1 -io.fabric8:kubernetes-client-bom;7.3.1 -io.fabric8:kubernetes-client-init-bc-fips;7.3.1 -io.fabric8:kubernetes-httpclient-jdk;7.3.1 -io.fabric8:kubernetes-httpclient-jetty;7.3.1 -io.fabric8:kubernetes-httpclient-okhttp;7.3.1 -io.fabric8:kubernetes-httpclient-vertx;7.3.1 -io.fabric8:kubernetes-junit-jupiter;7.3.1 -io.fabric8:kubernetes-junit-jupiter-autodetected;7.3.1 -io.fabric8:kubernetes-log4j;7.3.1 -io.fabric8:kubernetes-model-admissionregistration;7.3.1 -io.fabric8:kubernetes-model-apiextensions;7.3.1 -io.fabric8:kubernetes-model-apps;7.3.1 -io.fabric8:kubernetes-model-autoscaling;7.3.1 -io.fabric8:kubernetes-model-batch;7.3.1 -io.fabric8:kubernetes-model-certificates;7.3.1 -io.fabric8:kubernetes-model-common;7.3.1 -io.fabric8:kubernetes-model-coordination;7.3.1 -io.fabric8:kubernetes-model-core;7.3.1 -io.fabric8:kubernetes-model-discovery;7.3.1 -io.fabric8:kubernetes-model-events;7.3.1 -io.fabric8:kubernetes-model-extensions;7.3.1 -io.fabric8:kubernetes-model-flowcontrol;7.3.1 -io.fabric8:kubernetes-model-gatewayapi;7.3.1 -io.fabric8:kubernetes-model-kustomize;7.3.1 -io.fabric8:kubernetes-model-metrics;7.3.1 -io.fabric8:kubernetes-model-networking;7.3.1 -io.fabric8:kubernetes-model-node;7.3.1 -io.fabric8:kubernetes-model-policy;7.3.1 -io.fabric8:kubernetes-model-rbac;7.3.1 -io.fabric8:kubernetes-model-resource;7.3.1 -io.fabric8:kubernetes-model-scheduling;7.3.1 -io.fabric8:kubernetes-model-storageclass;7.3.1 -io.fabric8:kubernetes-model-validator;7.3.1 -io.fabric8:kubernetes-openshift-uberjar;7.3.1 -io.fabric8:kubernetes-server-mock;7.3.1 -io.fabric8:mockwebserver;7.3.1 -io.fabric8:open-cluster-management-client;7.3.1 -io.fabric8:open-cluster-management-model;7.3.1 -io.fabric8:openapi-model-generator-maven-plugin;7.3.1 -io.fabric8:openshift-client;7.3.1 -io.fabric8:openshift-client-api;7.3.1 -io.fabric8:openshift-model;7.3.1 -io.fabric8:openshift-model-autoscaling;7.3.1 -io.fabric8:openshift-model-config;7.3.1 -io.fabric8:openshift-model-console;7.3.1 -io.fabric8:openshift-model-hive;7.3.1 -io.fabric8:openshift-model-installer;7.3.1 -io.fabric8:openshift-model-machine;7.3.1 -io.fabric8:openshift-model-machineconfiguration;7.3.1 -io.fabric8:openshift-model-miscellaneous;7.3.1 -io.fabric8:openshift-model-monitoring;7.3.1 -io.fabric8:openshift-model-operator;7.3.1 -io.fabric8:openshift-model-operatorhub;7.3.1 -io.fabric8:openshift-model-storageversionmigrator;7.3.1 -io.fabric8:openshift-model-tuned;7.3.1 -io.fabric8:openshift-model-whereabouts;7.3.1 -io.fabric8:ovn-client;7.3.1 -io.fabric8:ovn-model;7.3.1 -io.fabric8:tekton-client;7.3.1 -io.fabric8:tekton-model;7.3.1 -io.fabric8:verticalpodautoscaler-client;7.3.1 -io.fabric8:verticalpodautoscaler-model;7.3.1 -io.fabric8:volcano-client;7.3.1 -io.fabric8:volcano-model;7.3.1 -io.fabric8:volumesnapshot-client;7.3.1 -io.fabric8:volumesnapshot-model;7.3.1 -io.fabric8:zjsonpatch;7.3.1 -io.github.git-commit-id:git-commit-id-maven-plugin;9.0.2 -io.github.openfeign:feign-annotation-error-decoder;13.6 -io.github.openfeign:feign-bom;13.6 -io.github.openfeign:feign-core;13.6 -io.github.openfeign:feign-dropwizard-metrics4;13.6 -io.github.openfeign:feign-dropwizard-metrics5;13.6 -io.github.openfeign:feign-fastjson2;13.6 -io.github.openfeign:feign-form;13.6 -io.github.openfeign:feign-form-spring;13.6 -io.github.openfeign:feign-googlehttpclient;13.6 -io.github.openfeign:feign-gson;13.6 -io.github.openfeign:feign-hc5;13.6 -io.github.openfeign:feign-httpclient;13.6 -io.github.openfeign:feign-hystrix;13.6 -io.github.openfeign:feign-jackson;13.6 -io.github.openfeign:feign-jackson-jaxb;13.6 -io.github.openfeign:feign-jackson-jr;13.6 -io.github.openfeign:feign-jakarta;13.6 -io.github.openfeign:feign-java11;13.6 -io.github.openfeign:feign-jaxb;13.6 -io.github.openfeign:feign-jaxb-jakarta;13.6 -io.github.openfeign:feign-jaxrs;13.6 -io.github.openfeign:feign-jaxrs2;13.6 -io.github.openfeign:feign-jaxrs3;13.6 -io.github.openfeign:feign-jaxrs4;13.6 -io.github.openfeign:feign-json;13.6 -io.github.openfeign:feign-kotlin;13.6 -io.github.openfeign:feign-micrometer;13.6 -io.github.openfeign:feign-mock;13.6 -io.github.openfeign:feign-moshi;13.6 -io.github.openfeign:feign-okhttp;13.6 -io.github.openfeign:feign-reactive-wrappers;13.6 -io.github.openfeign:feign-ribbon;13.6 -io.github.openfeign:feign-sax;13.6 -io.github.openfeign:feign-slf4j;13.6 -io.github.openfeign:feign-soap;13.6 -io.github.openfeign:feign-soap-jakarta;13.6 -io.github.openfeign:feign-spring;13.6 -io.github.openfeign:feign-vertx;13.6 -io.github.openfeign:feign-vertx4-test;13.6 -io.github.openfeign:feign-vertx5-test;13.6 -io.github.resilience4j:resilience4j-all;2.2.0 -io.github.resilience4j:resilience4j-annotations;2.2.0 -io.github.resilience4j:resilience4j-bom;2.2.0 -io.github.resilience4j:resilience4j-bulkhead;2.2.0 -io.github.resilience4j:resilience4j-cache;2.2.0 -io.github.resilience4j:resilience4j-circuitbreaker;2.2.0 -io.github.resilience4j:resilience4j-circularbuffer;2.2.0 -io.github.resilience4j:resilience4j-consumer;2.2.0 -io.github.resilience4j:resilience4j-core;2.2.0 -io.github.resilience4j:resilience4j-feign;2.2.0 -io.github.resilience4j:resilience4j-kotlin;2.2.0 -io.github.resilience4j:resilience4j-metrics;2.2.0 -io.github.resilience4j:resilience4j-micrometer;2.2.0 -io.github.resilience4j:resilience4j-ratelimiter;2.2.0 -io.github.resilience4j:resilience4j-reactor;2.2.0 -io.github.resilience4j:resilience4j-retry;2.2.0 -io.github.resilience4j:resilience4j-rxjava2;2.2.0 -io.github.resilience4j:resilience4j-rxjava3;2.2.0 -io.github.resilience4j:resilience4j-spring;2.2.0 -io.github.resilience4j:resilience4j-spring-boot2;2.2.0 -io.github.resilience4j:resilience4j-spring-boot3;2.2.0 -io.github.resilience4j:resilience4j-spring-cloud2;2.2.0 -io.github.resilience4j:resilience4j-spring6;2.2.0 -io.github.resilience4j:resilience4j-timelimiter;2.2.0 -io.github.resilience4j:resilience4j-vavr;2.2.0 -io.kubernetes:client-java;19.0.2 -io.kubernetes:client-java-extended;19.0.2 -io.kubernetes:client-java-spring-integration;19.0.2 -io.lettuce:lettuce-core;6.6.0.RELEASE -io.micrometer:context-propagation;1.1.3 -io.micrometer:docs;1.5.3 -io.micrometer:micrometer-bom;1.15.3 -io.micrometer:micrometer-commons;1.15.3 -io.micrometer:micrometer-core;1.15.3 -io.micrometer:micrometer-jakarta9;1.15.3 -io.micrometer:micrometer-java11;1.15.3 -io.micrometer:micrometer-java21;1.15.3 -io.micrometer:micrometer-jetty11;1.15.3 -io.micrometer:micrometer-jetty12;1.15.3 -io.micrometer:micrometer-observation;1.15.3 -io.micrometer:micrometer-observation-test;1.15.3 -io.micrometer:micrometer-registry-appoptics;1.15.3 -io.micrometer:micrometer-registry-atlas;1.15.3 -io.micrometer:micrometer-registry-azure-monitor;1.15.3 -io.micrometer:micrometer-registry-cloudwatch2;1.15.3 -io.micrometer:micrometer-registry-datadog;1.15.3 -io.micrometer:micrometer-registry-dynatrace;1.15.3 -io.micrometer:micrometer-registry-elastic;1.15.3 -io.micrometer:micrometer-registry-ganglia;1.15.3 -io.micrometer:micrometer-registry-graphite;1.15.3 -io.micrometer:micrometer-registry-health;1.15.3 -io.micrometer:micrometer-registry-humio;1.15.3 -io.micrometer:micrometer-registry-influx;1.15.3 -io.micrometer:micrometer-registry-jmx;1.15.3 -io.micrometer:micrometer-registry-kairos;1.15.3 -io.micrometer:micrometer-registry-new-relic;1.15.3 -io.micrometer:micrometer-registry-opentsdb;1.15.3 -io.micrometer:micrometer-registry-otlp;1.15.3 -io.micrometer:micrometer-registry-prometheus;1.15.3 -io.micrometer:micrometer-registry-prometheus-simpleclient;1.15.3 -io.micrometer:micrometer-registry-signalfx;1.15.3 -io.micrometer:micrometer-registry-stackdriver;1.15.3 -io.micrometer:micrometer-registry-statsd;1.15.3 -io.micrometer:micrometer-registry-wavefront;1.15.3 -io.micrometer:micrometer-test;1.15.3 -io.micrometer:micrometer-tracing;1.5.3 -io.micrometer:micrometer-tracing-bom;1.5.3 -io.micrometer:micrometer-tracing-bridge-brave;1.5.3 -io.micrometer:micrometer-tracing-bridge-otel;1.5.3 -io.micrometer:micrometer-tracing-integration-test;1.5.3 -io.micrometer:micrometer-tracing-reporter-wavefront;1.5.3 -io.micrometer:micrometer-tracing-test;1.5.3 -io.netty:netty-all;4.1.124.Final -io.netty:netty-bom;4.1.124.Final -io.netty:netty-buffer;4.1.124.Final -io.netty:netty-codec;4.1.124.Final -io.netty:netty-codec-dns;4.1.124.Final -io.netty:netty-codec-haproxy;4.1.124.Final -io.netty:netty-codec-http;4.1.124.Final -io.netty:netty-codec-http2;4.1.124.Final -io.netty:netty-codec-memcache;4.1.124.Final -io.netty:netty-codec-mqtt;4.1.124.Final -io.netty:netty-codec-redis;4.1.124.Final -io.netty:netty-codec-smtp;4.1.124.Final -io.netty:netty-codec-socks;4.1.124.Final -io.netty:netty-codec-stomp;4.1.124.Final -io.netty:netty-codec-xml;4.1.124.Final -io.netty:netty-common;4.1.124.Final -io.netty:netty-dev-tools;4.1.124.Final -io.netty:netty-handler;4.1.124.Final -io.netty:netty-handler-proxy;4.1.124.Final -io.netty:netty-handler-ssl-ocsp;4.1.124.Final -io.netty:netty-resolver;4.1.124.Final -io.netty:netty-resolver-dns;4.1.124.Final -io.netty:netty-resolver-dns-classes-macos;4.1.124.Final -io.netty:netty-resolver-dns-native-macos;4.1.124.Final -io.netty:netty-tcnative;2.0.72.Final -io.netty:netty-tcnative-boringssl-static;2.0.72.Final -io.netty:netty-tcnative-classes;2.0.72.Final -io.netty:netty-transport;4.1.124.Final -io.netty:netty-transport-classes-epoll;4.1.124.Final -io.netty:netty-transport-classes-kqueue;4.1.124.Final -io.netty:netty-transport-native-epoll;4.1.124.Final -io.netty:netty-transport-native-kqueue;4.1.124.Final -io.netty:netty-transport-native-unix-common;4.1.124.Final -io.netty:netty-transport-rxtx;4.1.124.Final -io.netty:netty-transport-sctp;4.1.124.Final -io.netty:netty-transport-udt;4.1.124.Final -io.opentelemetry:opentelemetry-api;1.49.0 -io.opentelemetry:opentelemetry-bom;1.49.0 -io.opentelemetry:opentelemetry-context;1.49.0 -io.opentelemetry:opentelemetry-exporter-common;1.49.0 -io.opentelemetry:opentelemetry-exporter-logging;1.49.0 -io.opentelemetry:opentelemetry-exporter-logging-otlp;1.49.0 -io.opentelemetry:opentelemetry-exporter-otlp;1.49.0 -io.opentelemetry:opentelemetry-exporter-otlp-common;1.49.0 -io.opentelemetry:opentelemetry-exporter-sender-grpc-managed-channel;1.49.0 -io.opentelemetry:opentelemetry-exporter-sender-jdk;1.49.0 -io.opentelemetry:opentelemetry-exporter-sender-okhttp;1.49.0 -io.opentelemetry:opentelemetry-exporter-zipkin;1.49.0 -io.opentelemetry:opentelemetry-extension-kotlin;1.49.0 -io.opentelemetry:opentelemetry-extension-trace-propagators;1.49.0 -io.opentelemetry:opentelemetry-opentracing-shim;1.49.0 -io.opentelemetry:opentelemetry-sdk;1.49.0 -io.opentelemetry:opentelemetry-sdk-common;1.49.0 -io.opentelemetry:opentelemetry-sdk-extension-autoconfigure;1.49.0 -io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi;1.49.0 -io.opentelemetry:opentelemetry-sdk-extension-jaeger-remote-sampler;1.49.0 -io.opentelemetry:opentelemetry-sdk-logs;1.49.0 -io.opentelemetry:opentelemetry-sdk-metrics;1.49.0 -io.opentelemetry:opentelemetry-sdk-testing;1.49.0 -io.opentelemetry:opentelemetry-sdk-trace;1.49.0 -io.projectreactor.addons:reactor-adapter;3.5.2 -io.projectreactor.addons:reactor-extra;3.5.2 -io.projectreactor.addons:reactor-pool;1.1.3 -io.projectreactor.addons:reactor-pool-micrometer;0.2.3 -io.projectreactor.kafka:reactor-kafka;1.3.23 -io.projectreactor.kotlin:reactor-kotlin-extensions;1.2.3 -io.projectreactor.netty:reactor-netty;1.2.9 -io.projectreactor.netty:reactor-netty-core;1.2.9 -io.projectreactor.netty:reactor-netty-http;1.2.9 -io.projectreactor.netty:reactor-netty-http-brave;1.2.9 -io.projectreactor:reactor-bom;2024.0.9 -io.projectreactor:reactor-core;3.7.9 -io.projectreactor:reactor-core-micrometer;1.2.9 -io.projectreactor:reactor-test;3.7.9 -io.projectreactor:reactor-tools;3.7.9 -io.prometheus:prometheus-metrics-bom;1.3.10 -io.prometheus:prometheus-metrics-config;1.3.10 -io.prometheus:prometheus-metrics-core;1.3.10 -io.prometheus:prometheus-metrics-exporter-common;1.3.10 -io.prometheus:prometheus-metrics-exporter-httpserver;1.3.10 -io.prometheus:prometheus-metrics-exporter-opentelemetry;1.3.10 -io.prometheus:prometheus-metrics-exporter-opentelemetry-no-otel;1.3.10 -io.prometheus:prometheus-metrics-exporter-opentelemetry-otel-agent-resources;1.3.10 -io.prometheus:prometheus-metrics-exporter-pushgateway;1.3.10 -io.prometheus:prometheus-metrics-exporter-servlet-jakarta;1.3.10 -io.prometheus:prometheus-metrics-exporter-servlet-javax;1.3.10 -io.prometheus:prometheus-metrics-exposition-formats;1.3.10 -io.prometheus:prometheus-metrics-exposition-formats-no-protobuf;1.3.10 -io.prometheus:prometheus-metrics-exposition-textformats;1.3.10 -io.prometheus:prometheus-metrics-instrumentation-caffeine;1.3.10 -io.prometheus:prometheus-metrics-instrumentation-dropwizard;1.3.10 -io.prometheus:prometheus-metrics-instrumentation-dropwizard5;1.3.10 -io.prometheus:prometheus-metrics-instrumentation-guava;1.3.10 -io.prometheus:prometheus-metrics-instrumentation-jvm;1.3.10 -io.prometheus:prometheus-metrics-model;1.3.10 -io.prometheus:prometheus-metrics-simpleclient-bridge;1.3.10 -io.prometheus:prometheus-metrics-tracer;1.3.10 -io.prometheus:prometheus-metrics-tracer-common;1.3.10 -io.prometheus:prometheus-metrics-tracer-initializer;1.3.10 -io.prometheus:prometheus-metrics-tracer-otel;1.3.10 -io.prometheus:prometheus-metrics-tracer-otel-agent;1.3.10 -io.prometheus:simpleclient;0.16.0 -io.prometheus:simpleclient_bom;0.16.0 -io.prometheus:simpleclient_caffeine;0.16.0 -io.prometheus:simpleclient_common;0.16.0 -io.prometheus:simpleclient_dropwizard;0.16.0 -io.prometheus:simpleclient_graphite_bridge;0.16.0 -io.prometheus:simpleclient_guava;0.16.0 -io.prometheus:simpleclient_hibernate;0.16.0 -io.prometheus:simpleclient_hotspot;0.16.0 -io.prometheus:simpleclient_httpserver;0.16.0 -io.prometheus:simpleclient_jetty;0.16.0 -io.prometheus:simpleclient_jetty_jdk8;0.16.0 -io.prometheus:simpleclient_log4j;0.16.0 -io.prometheus:simpleclient_log4j2;0.16.0 -io.prometheus:simpleclient_logback;0.16.0 -io.prometheus:simpleclient_pushgateway;0.16.0 -io.prometheus:simpleclient_servlet;0.16.0 -io.prometheus:simpleclient_servlet_jakarta;0.16.0 -io.prometheus:simpleclient_spring_boot;0.16.0 -io.prometheus:simpleclient_spring_web;0.16.0 -io.prometheus:simpleclient_tracer_common;0.16.0 -io.prometheus:simpleclient_tracer_otel;0.16.0 -io.prometheus:simpleclient_tracer_otel_agent;0.16.0 -io.prometheus:simpleclient_vertx;0.16.0 -io.r2dbc:r2dbc-h2;1.0.0.RELEASE -io.r2dbc:r2dbc-mssql;1.0.2.RELEASE -io.r2dbc:r2dbc-pool;1.0.2.RELEASE -io.r2dbc:r2dbc-proxy;1.1.6.RELEASE -io.r2dbc:r2dbc-spi;1.0.0.RELEASE -io.reactivex.rxjava3:rxjava;3.1.11 -io.rest-assured:json-path;5.5.6 -io.rest-assured:json-schema-validator;5.5.6 -io.rest-assured:kotlin-extensions;5.5.6 -io.rest-assured:rest-assured;5.5.6 -io.rest-assured:rest-assured-all;5.5.6 -io.rest-assured:rest-assured-bom;5.5.6 -io.rest-assured:rest-assured-common;5.5.6 -io.rest-assured:scala-extensions;5.5.6 -io.rest-assured:scala-support;5.5.6 -io.rest-assured:spring-commons;5.5.6 -io.rest-assured:spring-mock-mvc;5.5.6 -io.rest-assured:spring-mock-mvc-kotlin-extensions;5.5.6 -io.rest-assured:spring-web-test-client;5.5.6 -io.rest-assured:spring-web-test-client-kotlin-extensions;5.5.6 -io.rest-assured:xml-path;5.5.6 -io.rsocket:rsocket-bom;1.1.5 -io.rsocket:rsocket-core;1.1.5 -io.rsocket:rsocket-load-balancer;1.1.5 -io.rsocket:rsocket-micrometer;1.1.5 -io.rsocket:rsocket-test;1.1.5 -io.rsocket:rsocket-transport-local;1.1.5 -io.rsocket:rsocket-transport-netty;1.1.5 -io.spring.gradle:dependency-management-plugin;1.1.7 -io.undertow:undertow-core;2.3.18.Final -io.undertow:undertow-servlet;2.3.18.Final -io.undertow:undertow-websockets-jsr;2.3.18.Final -io.zipkin.brave:brave;6.1.0 -io.zipkin.brave:brave-bom;6.1.0 -io.zipkin.brave:brave-context-jfr;6.1.0 -io.zipkin.brave:brave-context-log4j12;6.1.0 -io.zipkin.brave:brave-context-log4j2;6.1.0 -io.zipkin.brave:brave-context-slf4j;6.1.0 -io.zipkin.brave:brave-instrumentation-dubbo;6.1.0 -io.zipkin.brave:brave-instrumentation-grpc;6.1.0 -io.zipkin.brave:brave-instrumentation-http;6.1.0 -io.zipkin.brave:brave-instrumentation-http-tests;6.1.0 -io.zipkin.brave:brave-instrumentation-http-tests-jakarta;6.1.0 -io.zipkin.brave:brave-instrumentation-httpasyncclient;6.1.0 -io.zipkin.brave:brave-instrumentation-httpclient;6.1.0 -io.zipkin.brave:brave-instrumentation-httpclient5;6.1.0 -io.zipkin.brave:brave-instrumentation-jakarta-jms;6.1.0 -io.zipkin.brave:brave-instrumentation-jaxrs2;6.1.0 -io.zipkin.brave:brave-instrumentation-jersey-server;6.1.0 -io.zipkin.brave:brave-instrumentation-jms;6.1.0 -io.zipkin.brave:brave-instrumentation-jms-jakarta;6.1.0 -io.zipkin.brave:brave-instrumentation-kafka-clients;6.1.0 -io.zipkin.brave:brave-instrumentation-kafka-streams;6.1.0 -io.zipkin.brave:brave-instrumentation-messaging;6.1.0 -io.zipkin.brave:brave-instrumentation-mongodb;6.1.0 -io.zipkin.brave:brave-instrumentation-mysql;6.1.0 -io.zipkin.brave:brave-instrumentation-mysql6;6.1.0 -io.zipkin.brave:brave-instrumentation-mysql8;6.1.0 -io.zipkin.brave:brave-instrumentation-netty-codec-http;6.1.0 -io.zipkin.brave:brave-instrumentation-okhttp3;6.1.0 -io.zipkin.brave:brave-instrumentation-rocketmq-client;6.1.0 -io.zipkin.brave:brave-instrumentation-rpc;6.1.0 -io.zipkin.brave:brave-instrumentation-servlet;6.1.0 -io.zipkin.brave:brave-instrumentation-servlet-jakarta;6.1.0 -io.zipkin.brave:brave-instrumentation-spring-rabbit;6.1.0 -io.zipkin.brave:brave-instrumentation-spring-web;6.1.0 -io.zipkin.brave:brave-instrumentation-spring-webmvc;6.1.0 -io.zipkin.brave:brave-instrumentation-vertx-web;6.1.0 -io.zipkin.brave:brave-spring-beans;6.1.0 -io.zipkin.brave:brave-tests;6.1.0 -io.zipkin.reporter2:zipkin-reporter;3.5.1 -io.zipkin.reporter2:zipkin-reporter-bom;3.5.1 -io.zipkin.reporter2:zipkin-reporter-brave;3.5.1 -io.zipkin.reporter2:zipkin-reporter-metrics-micrometer;3.5.1 -io.zipkin.reporter2:zipkin-reporter-spring-beans;3.5.1 -io.zipkin.reporter2:zipkin-sender-activemq-client;3.5.1 -io.zipkin.reporter2:zipkin-sender-amqp-client;3.5.1 -io.zipkin.reporter2:zipkin-sender-kafka;3.5.1 -io.zipkin.reporter2:zipkin-sender-libthrift;3.5.1 -io.zipkin.reporter2:zipkin-sender-okhttp3;3.5.1 -io.zipkin.reporter2:zipkin-sender-pulsar-client;3.5.1 -io.zipkin.reporter2:zipkin-sender-urlconnection;3.5.1 -jakarta.activation:jakarta.activation-api;2.1.3 -jakarta.annotation:jakarta.annotation-api;2.1.1 -jakarta.inject:jakarta.inject-api;2.0.1 -jakarta.jms:jakarta.jms-api;3.1.0 -jakarta.json.bind:jakarta.json.bind-api;3.0.1 -jakarta.json:jakarta.json-api;2.1.3 -jakarta.mail:jakarta.mail-api;2.1.3 -jakarta.management.j2ee:jakarta.management.j2ee-api;1.1.4 -jakarta.persistence:jakarta.persistence-api;3.1.0 -jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api;3.0.2 -jakarta.servlet:jakarta.servlet-api;6.0.0 -jakarta.transaction:jakarta.transaction-api;2.0.1 -jakarta.validation:jakarta.validation-api;3.0.2 -jakarta.websocket:jakarta.websocket-api;2.1.1 -jakarta.websocket:jakarta.websocket-client-api;2.1.1 -jakarta.ws.rs:jakarta.ws.rs-api;3.1.0 -jakarta.xml.bind:jakarta.xml.bind-api;4.0.2 -jakarta.xml.soap:jakarta.xml.soap-api;3.0.2 -jakarta.xml.ws:jakarta.xml.ws-api;4.0.2 -javax.cache:cache-api;1.1.1 -javax.money:money-api;1.1 -jaxen:jaxen;2.0.0 -junit:junit;4.13.2 -net.bytebuddy:byte-buddy;1.17.7 -net.bytebuddy:byte-buddy-agent;1.17.7 -net.minidev:json-smart;2.5.2 -net.sourceforge.jtds:jtds;1.3.1 -net.sourceforge.nekohtml:nekohtml;1.9.22 -nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect;3.4.0 -org.apache.activemq:activemq-all;6.1.7 -org.apache.activemq:activemq-amqp;6.1.7 -org.apache.activemq:activemq-blueprint;6.1.7 -org.apache.activemq:activemq-bom;6.1.7 -org.apache.activemq:activemq-branding;2.40.0 -org.apache.activemq:activemq-broker;6.1.7 -org.apache.activemq:activemq-client;6.1.7 -org.apache.activemq:activemq-console;6.1.7 -org.apache.activemq:activemq-http;6.1.7 -org.apache.activemq:activemq-jaas;6.1.7 -org.apache.activemq:activemq-jdbc-store;6.1.7 -org.apache.activemq:activemq-jms-pool;6.1.7 -org.apache.activemq:activemq-kahadb-store;6.1.7 -org.apache.activemq:activemq-karaf;6.1.7 -org.apache.activemq:activemq-log4j-appender;6.1.7 -org.apache.activemq:activemq-mqtt;6.1.7 -org.apache.activemq:activemq-openwire-generator;6.1.7 -org.apache.activemq:activemq-openwire-legacy;6.1.7 -org.apache.activemq:activemq-osgi;6.1.7 -org.apache.activemq:activemq-pool;6.1.7 -org.apache.activemq:activemq-ra;6.1.7 -org.apache.activemq:activemq-rar;6.1.7 -org.apache.activemq:activemq-run;6.1.7 -org.apache.activemq:activemq-runtime-config;6.1.7 -org.apache.activemq:activemq-shiro;6.1.7 -org.apache.activemq:activemq-spring;6.1.7 -org.apache.activemq:activemq-stomp;6.1.7 -org.apache.activemq:activemq-web;6.1.7 -org.apache.activemq:activemq-web-console;6.1.7 -org.apache.activemq:activemq-web-demo;6.1.7 -org.apache.activemq:artemis-amqp-protocol;2.40.0 -org.apache.activemq:artemis-bom;2.40.0 -org.apache.activemq:artemis-boot;2.40.0 -org.apache.activemq:artemis-cdi-client;2.40.0 -org.apache.activemq:artemis-cli;2.40.0 -org.apache.activemq:artemis-commons;2.40.0 -org.apache.activemq:artemis-console;2.40.0 -org.apache.activemq:artemis-core-client;2.40.0 -org.apache.activemq:artemis-core-client-all;2.40.0 -org.apache.activemq:artemis-core-client-osgi;2.40.0 -org.apache.activemq:artemis-dto;2.40.0 -org.apache.activemq:artemis-features;2.40.0 -org.apache.activemq:artemis-hornetq-protocol;2.40.0 -org.apache.activemq:artemis-hqclient-protocol;2.40.0 -org.apache.activemq:artemis-jakarta-cdi-client;2.40.0 -org.apache.activemq:artemis-jakarta-client;2.40.0 -org.apache.activemq:artemis-jakarta-client-all;2.40.0 -org.apache.activemq:artemis-jakarta-openwire-protocol;2.40.0 -org.apache.activemq:artemis-jakarta-ra;2.40.0 -org.apache.activemq:artemis-jakarta-server;2.40.0 -org.apache.activemq:artemis-jakarta-service-extensions;2.40.0 -org.apache.activemq:artemis-jdbc-store;2.40.0 -org.apache.activemq:artemis-jms-client;2.40.0 -org.apache.activemq:artemis-jms-client-all;2.40.0 -org.apache.activemq:artemis-jms-client-osgi;2.40.0 -org.apache.activemq:artemis-jms-server;2.40.0 -org.apache.activemq:artemis-journal;2.40.0 -org.apache.activemq:artemis-lockmanager-api;2.40.0 -org.apache.activemq:artemis-lockmanager-ri;2.40.0 -org.apache.activemq:artemis-mqtt-protocol;2.40.0 -org.apache.activemq:artemis-openwire-protocol;2.40.0 -org.apache.activemq:artemis-ra;2.40.0 -org.apache.activemq:artemis-selector;2.40.0 -org.apache.activemq:artemis-server;2.40.0 -org.apache.activemq:artemis-server-osgi;2.40.0 -org.apache.activemq:artemis-service-extensions;2.40.0 -org.apache.activemq:artemis-stomp-protocol;2.40.0 -org.apache.activemq:artemis-web;2.40.0 -org.apache.activemq:artemis-website;2.40.0 -org.apache.cassandra:java-driver-bom;4.19.0 -org.apache.cassandra:java-driver-core;4.19.0 -org.apache.cassandra:java-driver-core-shaded;4.19.0 -org.apache.cassandra:java-driver-guava-shaded;4.19.0 -org.apache.cassandra:java-driver-mapper-processor;4.19.0 -org.apache.cassandra:java-driver-mapper-runtime;4.19.0 -org.apache.cassandra:java-driver-metrics-micrometer;4.19.0 -org.apache.cassandra:java-driver-metrics-microprofile;4.19.0 -org.apache.cassandra:java-driver-query-builder;4.19.0 -org.apache.cassandra:java-driver-test-infra;4.19.0 -org.apache.commons:commons-dbcp2;2.13.0 -org.apache.commons:commons-lang3;3.17.0 -org.apache.commons:commons-pool2;2.12.1 -org.apache.curator:curator-framework;5.8.0 -org.apache.curator:curator-recipes;5.8.0 -org.apache.curator:curator-test;5.8.0 -org.apache.curator:curator-x-discovery;5.8.0 -org.apache.derby:derby;10.16.1.1 -org.apache.derby:derbyclient;10.16.1.1 -org.apache.derby:derbynet;10.16.1.1 -org.apache.derby:derbyoptionaltools;10.16.1.1 -org.apache.derby:derbyshared;10.16.1.1 -org.apache.derby:derbytools;10.16.1.1 -org.apache.groovy:groovy;4.0.28 -org.apache.groovy:groovy-ant;4.0.28 -org.apache.groovy:groovy-astbuilder;4.0.28 -org.apache.groovy:groovy-bom;4.0.28 -org.apache.groovy:groovy-cli-commons;4.0.28 -org.apache.groovy:groovy-cli-picocli;4.0.28 -org.apache.groovy:groovy-console;4.0.28 -org.apache.groovy:groovy-contracts;4.0.28 -org.apache.groovy:groovy-datetime;4.0.28 -org.apache.groovy:groovy-dateutil;4.0.28 -org.apache.groovy:groovy-docgenerator;4.0.28 -org.apache.groovy:groovy-ginq;4.0.28 -org.apache.groovy:groovy-groovydoc;4.0.28 -org.apache.groovy:groovy-groovysh;4.0.28 -org.apache.groovy:groovy-jmx;4.0.28 -org.apache.groovy:groovy-json;4.0.28 -org.apache.groovy:groovy-jsr223;4.0.28 -org.apache.groovy:groovy-macro;4.0.28 -org.apache.groovy:groovy-macro-library;4.0.28 -org.apache.groovy:groovy-nio;4.0.28 -org.apache.groovy:groovy-servlet;4.0.28 -org.apache.groovy:groovy-sql;4.0.28 -org.apache.groovy:groovy-swing;4.0.28 -org.apache.groovy:groovy-templates;4.0.28 -org.apache.groovy:groovy-test;4.0.28 -org.apache.groovy:groovy-test-junit5;4.0.28 -org.apache.groovy:groovy-testng;4.0.28 -org.apache.groovy:groovy-toml;4.0.28 -org.apache.groovy:groovy-typecheckers;4.0.28 -org.apache.groovy:groovy-xml;4.0.28 -org.apache.groovy:groovy-yaml;4.0.28 -org.apache.httpcomponents.client5:httpclient5;5.5 -org.apache.httpcomponents.client5:httpclient5-cache;5.5 -org.apache.httpcomponents.client5:httpclient5-fluent;5.5 -org.apache.httpcomponents.core5:httpcore5;5.3.4 -org.apache.httpcomponents.core5:httpcore5-h2;5.3.4 -org.apache.httpcomponents.core5:httpcore5-reactive;5.3.4 -org.apache.httpcomponents:httpasyncclient;4.1.5 -org.apache.httpcomponents:httpcore;4.4.16 -org.apache.httpcomponents:httpcore-nio;4.4.16 -org.apache.kafka:connect;3.9.1 -org.apache.kafka:connect-api;3.9.1 -org.apache.kafka:connect-basic-auth-extension;3.9.1 -org.apache.kafka:connect-file;3.9.1 -org.apache.kafka:connect-json;3.9.1 -org.apache.kafka:connect-mirror;3.9.1 -org.apache.kafka:connect-mirror-client;3.9.1 -org.apache.kafka:connect-runtime;3.9.1 -org.apache.kafka:connect-transforms;3.9.1 -org.apache.kafka:generator;3.9.1 -org.apache.kafka:kafka-clients;3.9.1 -org.apache.kafka:kafka-log4j-appender;3.9.1 -org.apache.kafka:kafka-metadata;3.9.1 -org.apache.kafka:kafka-raft;3.9.1 -org.apache.kafka:kafka-server;3.9.1 -org.apache.kafka:kafka-server-common;3.9.1 -org.apache.kafka:kafka-shell;3.9.1 -org.apache.kafka:kafka-storage;3.9.1 -org.apache.kafka:kafka-storage-api;3.9.1 -org.apache.kafka:kafka-streams;3.9.1 -org.apache.kafka:kafka-streams-scala_2.12;3.9.1 -org.apache.kafka:kafka-streams-scala_2.13;3.9.1 -org.apache.kafka:kafka-streams-test-utils;3.9.1 -org.apache.kafka:kafka-tools;3.9.1 -org.apache.kafka:kafka_2.12;3.9.1 -org.apache.kafka:kafka_2.13;3.9.1 -org.apache.kafka:trogdor;3.9.1 -org.apache.logging.log4j:log4j-1.2-api;2.24.3 -org.apache.logging.log4j:log4j-api;2.24.3 -org.apache.logging.log4j:log4j-api-test;2.24.3 -org.apache.logging.log4j:log4j-appserver;2.24.3 -org.apache.logging.log4j:log4j-bom;2.24.3 -org.apache.logging.log4j:log4j-cassandra;2.24.3 -org.apache.logging.log4j:log4j-core;2.24.3 -org.apache.logging.log4j:log4j-core-test;2.24.3 -org.apache.logging.log4j:log4j-couchdb;2.24.3 -org.apache.logging.log4j:log4j-docker;2.24.3 -org.apache.logging.log4j:log4j-flume-ng;2.23.1 -org.apache.logging.log4j:log4j-iostreams;2.24.3 -org.apache.logging.log4j:log4j-jakarta-smtp;2.24.3 -org.apache.logging.log4j:log4j-jakarta-web;2.24.3 -org.apache.logging.log4j:log4j-jcl;2.24.3 -org.apache.logging.log4j:log4j-jpa;2.24.3 -org.apache.logging.log4j:log4j-jpl;2.24.3 -org.apache.logging.log4j:log4j-jul;2.24.3 -org.apache.logging.log4j:log4j-layout-template-json;2.24.3 -org.apache.logging.log4j:log4j-mongodb;2.24.3 -org.apache.logging.log4j:log4j-mongodb4;2.24.3 -org.apache.logging.log4j:log4j-slf4j-impl;2.24.3 -org.apache.logging.log4j:log4j-slf4j2-impl;2.24.3 -org.apache.logging.log4j:log4j-spring-boot;2.24.3 -org.apache.logging.log4j:log4j-spring-cloud-config-client;2.24.3 -org.apache.logging.log4j:log4j-taglib;2.24.3 -org.apache.logging.log4j:log4j-to-jul;2.24.3 -org.apache.logging.log4j:log4j-to-slf4j;2.24.3 -org.apache.logging.log4j:log4j-web;2.24.3 -org.apache.maven.plugins:maven-antrun-plugin;3.1.0 -org.apache.maven.plugins:maven-assembly-plugin;3.7.1 -org.apache.maven.plugins:maven-clean-plugin;3.4.1 -org.apache.maven.plugins:maven-compiler-plugin;3.14.0 -org.apache.maven.plugins:maven-dependency-plugin;3.8.1 -org.apache.maven.plugins:maven-deploy-plugin;3.1.4 -org.apache.maven.plugins:maven-enforcer-plugin;3.5.0 -org.apache.maven.plugins:maven-failsafe-plugin;3.5.3 -org.apache.maven.plugins:maven-gpg-plugin;3.1.0 -org.apache.maven.plugins:maven-help-plugin;3.5.1 -org.apache.maven.plugins:maven-install-plugin;3.1.4 -org.apache.maven.plugins:maven-invoker-plugin;3.9.1 -org.apache.maven.plugins:maven-jar-plugin;3.4.2 -org.apache.maven.plugins:maven-javadoc-plugin;3.11.3 -org.apache.maven.plugins:maven-release-plugin;2.5.3 -org.apache.maven.plugins:maven-resources-plugin;3.3.1 -org.apache.maven.plugins:maven-shade-plugin;3.6.0 -org.apache.maven.plugins:maven-source-plugin;3.3.1 -org.apache.maven.plugins:maven-surefire-plugin;3.5.3 -org.apache.maven.plugins:maven-war-plugin;3.4.0 -org.apache.pulsar:bouncy-castle-bc;4.0.6 -org.apache.pulsar:bouncy-castle-bcfips;4.0.6 -org.apache.pulsar:bouncy-castle-parent;4.0.6 -org.apache.pulsar:buildtools;4.0.6 -org.apache.pulsar:distribution;4.0.6 -org.apache.pulsar:docker-images;4.0.6 -org.apache.pulsar:jclouds-shaded;4.0.6 -org.apache.pulsar:managed-ledger;4.0.6 -org.apache.pulsar:pulsar;4.0.6 -org.apache.pulsar:pulsar-all-docker-image;4.0.6 -org.apache.pulsar:pulsar-bom;4.0.6 -org.apache.pulsar:pulsar-broker;4.0.6 -org.apache.pulsar:pulsar-broker-auth-athenz;4.0.6 -org.apache.pulsar:pulsar-broker-auth-oidc;4.0.6 -org.apache.pulsar:pulsar-broker-auth-sasl;4.0.6 -org.apache.pulsar:pulsar-broker-common;4.0.6 -org.apache.pulsar:pulsar-cli-utils;4.0.6 -org.apache.pulsar:pulsar-client;4.0.6 -org.apache.pulsar:pulsar-client-admin;4.0.6 -org.apache.pulsar:pulsar-client-admin-api;4.0.6 -org.apache.pulsar:pulsar-client-admin-original;4.0.6 -org.apache.pulsar:pulsar-client-all;4.0.6 -org.apache.pulsar:pulsar-client-api;4.0.6 -org.apache.pulsar:pulsar-client-auth-athenz;4.0.6 -org.apache.pulsar:pulsar-client-auth-sasl;4.0.6 -org.apache.pulsar:pulsar-client-messagecrypto-bc;4.0.6 -org.apache.pulsar:pulsar-client-original;4.0.6 -org.apache.pulsar:pulsar-client-reactive-adapter;0.6.0 -org.apache.pulsar:pulsar-client-reactive-api;0.6.0 -org.apache.pulsar:pulsar-client-reactive-bom;0.6.0 -org.apache.pulsar:pulsar-client-reactive-jackson;0.6.0 -org.apache.pulsar:pulsar-client-reactive-producer-cache-caffeine;0.6.0 -org.apache.pulsar:pulsar-client-reactive-producer-cache-caffeine-shaded;0.6.0 -org.apache.pulsar:pulsar-client-tools;4.0.6 -org.apache.pulsar:pulsar-client-tools-api;4.0.6 -org.apache.pulsar:pulsar-common;4.0.6 -org.apache.pulsar:pulsar-config-validation;4.0.6 -org.apache.pulsar:pulsar-docker-image;4.0.6 -org.apache.pulsar:pulsar-docs-tools;4.0.6 -org.apache.pulsar:pulsar-functions;4.0.6 -org.apache.pulsar:pulsar-functions-api;4.0.6 -org.apache.pulsar:pulsar-functions-api-examples;4.0.6 -org.apache.pulsar:pulsar-functions-api-examples-builtin;4.0.6 -org.apache.pulsar:pulsar-functions-instance;4.0.6 -org.apache.pulsar:pulsar-functions-local-runner;4.0.6 -org.apache.pulsar:pulsar-functions-local-runner-original;4.0.6 -org.apache.pulsar:pulsar-functions-proto;4.0.6 -org.apache.pulsar:pulsar-functions-runtime;4.0.6 -org.apache.pulsar:pulsar-functions-runtime-all;4.0.6 -org.apache.pulsar:pulsar-functions-secrets;4.0.6 -org.apache.pulsar:pulsar-functions-utils;4.0.6 -org.apache.pulsar:pulsar-functions-worker;4.0.6 -org.apache.pulsar:pulsar-io;4.0.6 -org.apache.pulsar:pulsar-io-aerospike;4.0.6 -org.apache.pulsar:pulsar-io-alluxio;4.0.6 -org.apache.pulsar:pulsar-io-aws;4.0.6 -org.apache.pulsar:pulsar-io-batch-data-generator;4.0.6 -org.apache.pulsar:pulsar-io-batch-discovery-triggerers;4.0.6 -org.apache.pulsar:pulsar-io-canal;4.0.6 -org.apache.pulsar:pulsar-io-cassandra;4.0.6 -org.apache.pulsar:pulsar-io-common;4.0.6 -org.apache.pulsar:pulsar-io-core;4.0.6 -org.apache.pulsar:pulsar-io-data-generator;4.0.6 -org.apache.pulsar:pulsar-io-debezium;4.0.6 -org.apache.pulsar:pulsar-io-debezium-core;4.0.6 -org.apache.pulsar:pulsar-io-debezium-mongodb;4.0.6 -org.apache.pulsar:pulsar-io-debezium-mssql;4.0.6 -org.apache.pulsar:pulsar-io-debezium-mysql;4.0.6 -org.apache.pulsar:pulsar-io-debezium-oracle;4.0.6 -org.apache.pulsar:pulsar-io-debezium-postgres;4.0.6 -org.apache.pulsar:pulsar-io-distribution;4.0.6 -org.apache.pulsar:pulsar-io-docs;4.0.6 -org.apache.pulsar:pulsar-io-dynamodb;4.0.6 -org.apache.pulsar:pulsar-io-elastic-search;4.0.6 -org.apache.pulsar:pulsar-io-file;4.0.6 -org.apache.pulsar:pulsar-io-flume;4.0.6 -org.apache.pulsar:pulsar-io-hbase;4.0.6 -org.apache.pulsar:pulsar-io-hdfs3;4.0.6 -org.apache.pulsar:pulsar-io-http;4.0.6 -org.apache.pulsar:pulsar-io-influxdb;4.0.6 -org.apache.pulsar:pulsar-io-jdbc;4.0.6 -org.apache.pulsar:pulsar-io-jdbc-clickhouse;4.0.6 -org.apache.pulsar:pulsar-io-jdbc-core;4.0.6 -org.apache.pulsar:pulsar-io-jdbc-mariadb;4.0.6 -org.apache.pulsar:pulsar-io-jdbc-openmldb;4.0.6 -org.apache.pulsar:pulsar-io-jdbc-postgres;4.0.6 -org.apache.pulsar:pulsar-io-jdbc-sqlite;4.0.6 -org.apache.pulsar:pulsar-io-kafka;4.0.6 -org.apache.pulsar:pulsar-io-kafka-connect-adaptor;4.0.6 -org.apache.pulsar:pulsar-io-kafka-connect-adaptor-nar;4.0.6 -org.apache.pulsar:pulsar-io-kinesis;4.0.6 -org.apache.pulsar:pulsar-io-mongo;4.0.6 -org.apache.pulsar:pulsar-io-netty;4.0.6 -org.apache.pulsar:pulsar-io-nsq;4.0.6 -org.apache.pulsar:pulsar-io-rabbitmq;4.0.6 -org.apache.pulsar:pulsar-io-redis;4.0.6 -org.apache.pulsar:pulsar-io-solr;4.0.6 -org.apache.pulsar:pulsar-io-twitter;4.0.6 -org.apache.pulsar:pulsar-metadata;4.0.6 -org.apache.pulsar:pulsar-offloader-distribution;4.0.6 -org.apache.pulsar:pulsar-package-bookkeeper-storage;4.0.6 -org.apache.pulsar:pulsar-package-core;4.0.6 -org.apache.pulsar:pulsar-package-filesystem-storage;4.0.6 -org.apache.pulsar:pulsar-package-management;4.0.6 -org.apache.pulsar:pulsar-proxy;4.0.6 -org.apache.pulsar:pulsar-server-distribution;4.0.6 -org.apache.pulsar:pulsar-shell-distribution;4.0.6 -org.apache.pulsar:pulsar-testclient;4.0.6 -org.apache.pulsar:pulsar-transaction-common;4.0.6 -org.apache.pulsar:pulsar-transaction-coordinator;4.0.6 -org.apache.pulsar:pulsar-transaction-parent;4.0.6 -org.apache.pulsar:pulsar-websocket;4.0.6 -org.apache.pulsar:structured-event-log;4.0.6 -org.apache.pulsar:testmocks;4.0.6 -org.apache.pulsar:tiered-storage-file-system;4.0.6 -org.apache.pulsar:tiered-storage-jcloud;4.0.6 -org.apache.pulsar:tiered-storage-parent;4.0.6 -org.apache.tomcat.embed:tomcat-embed-core;10.1.44 -org.apache.tomcat.embed:tomcat-embed-el;10.1.44 -org.apache.tomcat.embed:tomcat-embed-jasper;10.1.44 -org.apache.tomcat.embed:tomcat-embed-websocket;10.1.44 -org.apache.tomcat:tomcat-annotations-api;10.1.44 -org.apache.tomcat:tomcat-jdbc;10.1.44 -org.apache.tomcat:tomcat-jsp-api;10.1.44 -org.aspectj:aspectjrt;1.9.24 -org.aspectj:aspectjtools;1.9.24 -org.aspectj:aspectjweaver;1.9.24 -org.assertj:assertj-bom;3.27.4 -org.assertj:assertj-core;3.27.4 -org.assertj:assertj-guava;3.27.4 -org.awaitility:awaitility;4.2.2 -org.awaitility:awaitility-groovy;4.2.2 -org.awaitility:awaitility-kotlin;4.2.2 -org.awaitility:awaitility-scala;4.2.2 -org.cache2k:cache2k-api;2.6.1.Final -org.cache2k:cache2k-config;2.6.1.Final -org.cache2k:cache2k-core;2.6.1.Final -org.cache2k:cache2k-jcache;2.6.1.Final -org.cache2k:cache2k-micrometer;2.6.1.Final -org.cache2k:cache2k-spring;2.6.1.Final -org.codehaus.janino:commons-compiler;3.1.12 -org.codehaus.janino:commons-compiler-jdk;3.1.12 -org.codehaus.janino:janino;3.1.12 -org.codehaus.mojo:build-helper-maven-plugin;3.6.1 -org.codehaus.mojo:versions-maven-plugin;2.18.0 -org.codehaus.mojo:xml-maven-plugin;1.1.0 -org.crac:crac;1.5.0 -org.cyclonedx:cyclonedx-maven-plugin;2.9.1 -org.eclipse.angus:angus-activation;2.0.2 -org.eclipse.angus:angus-core;2.0.4 -org.eclipse.angus:angus-mail;2.0.4 -org.eclipse.angus:dsn;2.0.4 -org.eclipse.angus:gimap;2.0.4 -org.eclipse.angus:imap;2.0.4 -org.eclipse.angus:jakarta.mail;2.0.4 -org.eclipse.angus:logging-mailhandler;2.0.4 -org.eclipse.angus:pop3;2.0.4 -org.eclipse.angus:smtp;2.0.4 -org.eclipse.jetty.demos:jetty-demo-handler;12.0.25 -org.eclipse.jetty.ee10.osgi:jetty-ee10-osgi-alpn;12.0.25 -org.eclipse.jetty.ee10.osgi:jetty-ee10-osgi-boot;12.0.25 -org.eclipse.jetty.ee10.osgi:jetty-ee10-osgi-boot-jsp;12.0.25 -org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-client;12.0.25 -org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-client-webapp;12.0.25 -org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-common;12.0.25 -org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-server;12.0.25 -org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jetty-client-webapp;12.0.25 -org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jetty-server;12.0.25 -org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-servlet;12.0.25 -org.eclipse.jetty.ee10:jetty-ee10-annotations;12.0.25 -org.eclipse.jetty.ee10:jetty-ee10-apache-jsp;12.0.25 -org.eclipse.jetty.ee10:jetty-ee10-bom;12.0.25 -org.eclipse.jetty.ee10:jetty-ee10-cdi;12.0.25 -org.eclipse.jetty.ee10:jetty-ee10-fcgi-proxy;12.0.25 -org.eclipse.jetty.ee10:jetty-ee10-glassfish-jstl;12.0.25 -org.eclipse.jetty.ee10:jetty-ee10-jaspi;12.0.25 -org.eclipse.jetty.ee10:jetty-ee10-jndi;12.0.25 -org.eclipse.jetty.ee10:jetty-ee10-jspc-maven-plugin;12.0.25 -org.eclipse.jetty.ee10:jetty-ee10-maven-plugin;12.0.25 -org.eclipse.jetty.ee10:jetty-ee10-plus;12.0.25 -org.eclipse.jetty.ee10:jetty-ee10-proxy;12.0.25 -org.eclipse.jetty.ee10:jetty-ee10-quickstart;12.0.25 -org.eclipse.jetty.ee10:jetty-ee10-runner;12.0.25 -org.eclipse.jetty.ee10:jetty-ee10-servlet;12.0.25 -org.eclipse.jetty.ee10:jetty-ee10-servlets;12.0.25 -org.eclipse.jetty.ee10:jetty-ee10-webapp;12.0.25 -org.eclipse.jetty.fcgi:jetty-fcgi-client;12.0.25 -org.eclipse.jetty.fcgi:jetty-fcgi-proxy;12.0.25 -org.eclipse.jetty.fcgi:jetty-fcgi-server;12.0.25 -org.eclipse.jetty.http2:jetty-http2-client;12.0.25 -org.eclipse.jetty.http2:jetty-http2-client-transport;12.0.25 -org.eclipse.jetty.http2:jetty-http2-common;12.0.25 -org.eclipse.jetty.http2:jetty-http2-hpack;12.0.25 -org.eclipse.jetty.http2:jetty-http2-server;12.0.25 -org.eclipse.jetty.http3:jetty-http3-client;12.0.25 -org.eclipse.jetty.http3:jetty-http3-client-transport;12.0.25 -org.eclipse.jetty.http3:jetty-http3-common;12.0.25 -org.eclipse.jetty.http3:jetty-http3-qpack;12.0.25 -org.eclipse.jetty.http3:jetty-http3-server;12.0.25 -org.eclipse.jetty.quic:jetty-quic-client;12.0.25 -org.eclipse.jetty.quic:jetty-quic-common;12.0.25 -org.eclipse.jetty.quic:jetty-quic-quiche-common;12.0.25 -org.eclipse.jetty.quic:jetty-quic-quiche-foreign;12.0.25 -org.eclipse.jetty.quic:jetty-quic-quiche-jna;12.0.25 -org.eclipse.jetty.quic:jetty-quic-server;12.0.25 -org.eclipse.jetty.websocket:jetty-websocket-core-client;12.0.25 -org.eclipse.jetty.websocket:jetty-websocket-core-common;12.0.25 -org.eclipse.jetty.websocket:jetty-websocket-core-server;12.0.25 -org.eclipse.jetty.websocket:jetty-websocket-jetty-api;12.0.25 -org.eclipse.jetty.websocket:jetty-websocket-jetty-client;12.0.25 -org.eclipse.jetty.websocket:jetty-websocket-jetty-common;12.0.25 -org.eclipse.jetty.websocket:jetty-websocket-jetty-server;12.0.25 -org.eclipse.jetty:jetty-alpn-client;12.0.25 -org.eclipse.jetty:jetty-alpn-conscrypt-client;12.0.25 -org.eclipse.jetty:jetty-alpn-conscrypt-server;12.0.25 -org.eclipse.jetty:jetty-alpn-java-client;12.0.25 -org.eclipse.jetty:jetty-alpn-java-server;12.0.25 -org.eclipse.jetty:jetty-alpn-server;12.0.25 -org.eclipse.jetty:jetty-bom;12.0.25 -org.eclipse.jetty:jetty-client;12.0.25 -org.eclipse.jetty:jetty-deploy;12.0.25 -org.eclipse.jetty:jetty-ee;12.0.25 -org.eclipse.jetty:jetty-http;12.0.25 -org.eclipse.jetty:jetty-http-spi;12.0.25 -org.eclipse.jetty:jetty-http-tools;12.0.25 -org.eclipse.jetty:jetty-io;12.0.25 -org.eclipse.jetty:jetty-jmx;12.0.25 -org.eclipse.jetty:jetty-jndi;12.0.25 -org.eclipse.jetty:jetty-keystore;12.0.25 -org.eclipse.jetty:jetty-openid;12.0.25 -org.eclipse.jetty:jetty-osgi;12.0.25 -org.eclipse.jetty:jetty-plus;12.0.25 -org.eclipse.jetty:jetty-proxy;12.0.25 -org.eclipse.jetty:jetty-reactive-httpclient;4.0.11 -org.eclipse.jetty:jetty-rewrite;12.0.25 -org.eclipse.jetty:jetty-security;12.0.25 -org.eclipse.jetty:jetty-server;12.0.25 -org.eclipse.jetty:jetty-session;12.0.25 -org.eclipse.jetty:jetty-slf4j-impl;12.0.25 -org.eclipse.jetty:jetty-start;12.0.25 -org.eclipse.jetty:jetty-unixdomain-server;12.0.25 -org.eclipse.jetty:jetty-util;12.0.25 -org.eclipse.jetty:jetty-util-ajax;12.0.25 -org.eclipse.jetty:jetty-xml;12.0.25 -org.eclipse.jgit:org.eclipse.jgit;6.10.1.202505221210-r -org.eclipse.jgit:org.eclipse.jgit.http.apache;6.10.1.202505221210-r -org.eclipse.jgit:org.eclipse.jgit.junit.http;6.10.1.202505221210-r -org.eclipse.jgit:org.eclipse.jgit.ssh.apache;6.10.1.202505221210-r -org.eclipse:yasson;3.0.4 -org.ehcache:ehcache;3.10.8 -org.ehcache:ehcache-clustered;3.10.8 -org.ehcache:ehcache-transactions;3.10.8 -org.elasticsearch.client:elasticsearch-rest-client;8.18.5 -org.elasticsearch.client:elasticsearch-rest-client-sniffer;8.18.5 -org.firebirdsql.jdbc:jaybird;6.0.2 -org.flywaydb:flyway-commandline;11.7.2 -org.flywaydb:flyway-core;11.7.2 -org.flywaydb:flyway-database-cassandra;11.7.2 -org.flywaydb:flyway-database-db2;11.7.2 -org.flywaydb:flyway-database-derby;11.7.2 -org.flywaydb:flyway-database-hsqldb;11.7.2 -org.flywaydb:flyway-database-informix;11.7.2 -org.flywaydb:flyway-database-mongodb;11.7.2 -org.flywaydb:flyway-database-oracle;11.7.2 -org.flywaydb:flyway-database-postgresql;11.7.2 -org.flywaydb:flyway-database-redshift;11.7.2 -org.flywaydb:flyway-database-saphana;11.7.2 -org.flywaydb:flyway-database-snowflake;11.7.2 -org.flywaydb:flyway-database-sybasease;11.7.2 -org.flywaydb:flyway-firebird;11.7.2 -org.flywaydb:flyway-gcp-bigquery;11.7.2 -org.flywaydb:flyway-gcp-spanner;11.7.2 -org.flywaydb:flyway-maven-plugin;11.7.2 -org.flywaydb:flyway-mysql;11.7.2 -org.flywaydb:flyway-singlestore;11.7.2 -org.flywaydb:flyway-sqlserver;11.7.2 -org.freemarker:freemarker;2.3.34 -org.glassfish.jaxb:codemodel;4.0.5 -org.glassfish.jaxb:jaxb-bom;4.0.5 -org.glassfish.jaxb:jaxb-core;4.0.5 -org.glassfish.jaxb:jaxb-jxc;4.0.5 -org.glassfish.jaxb:jaxb-runtime;4.0.5 -org.glassfish.jaxb:jaxb-xjc;4.0.5 -org.glassfish.jaxb:txw2;4.0.5 -org.glassfish.jaxb:xsom;4.0.5 -org.glassfish.jersey.bundles:jaxrs-ri;3.1.11 -org.glassfish.jersey.connectors:jersey-apache-connector;3.1.11 -org.glassfish.jersey.connectors:jersey-apache5-connector;3.1.11 -org.glassfish.jersey.connectors:jersey-grizzly-connector;3.1.11 -org.glassfish.jersey.connectors:jersey-helidon-connector;3.1.11 -org.glassfish.jersey.connectors:jersey-jdk-connector;3.1.11 -org.glassfish.jersey.connectors:jersey-jetty-connector;3.1.11 -org.glassfish.jersey.connectors:jersey-jetty-http2-connector;3.1.11 -org.glassfish.jersey.connectors:jersey-jetty11-connector;3.1.11 -org.glassfish.jersey.connectors:jersey-jnh-connector;3.1.11 -org.glassfish.jersey.connectors:jersey-netty-connector;3.1.11 -org.glassfish.jersey.containers.glassfish:jersey-gf-ejb;3.1.11 -org.glassfish.jersey.containers:jersey-container-grizzly2-http;3.1.11 -org.glassfish.jersey.containers:jersey-container-grizzly2-servlet;3.1.11 -org.glassfish.jersey.containers:jersey-container-jdk-http;3.1.11 -org.glassfish.jersey.containers:jersey-container-jetty-http;3.1.11 -org.glassfish.jersey.containers:jersey-container-jetty-http2;3.1.11 -org.glassfish.jersey.containers:jersey-container-jetty-servlet;3.1.11 -org.glassfish.jersey.containers:jersey-container-jetty11-http;3.1.11 -org.glassfish.jersey.containers:jersey-container-netty-http;3.1.11 -org.glassfish.jersey.containers:jersey-container-servlet;3.1.11 -org.glassfish.jersey.containers:jersey-container-servlet-core;3.1.11 -org.glassfish.jersey.containers:jersey-container-simple-http;3.1.11 -org.glassfish.jersey.core:jersey-client;3.1.11 -org.glassfish.jersey.core:jersey-common;3.1.11 -org.glassfish.jersey.core:jersey-server;3.1.11 -org.glassfish.jersey.ext.cdi:jersey-cdi-rs-inject;3.1.11 -org.glassfish.jersey.ext.cdi:jersey-cdi1x;3.1.11 -org.glassfish.jersey.ext.cdi:jersey-cdi1x-ban-custom-hk2-binding;3.1.11 -org.glassfish.jersey.ext.cdi:jersey-cdi1x-servlet;3.1.11 -org.glassfish.jersey.ext.cdi:jersey-cdi1x-transaction;3.1.11 -org.glassfish.jersey.ext.cdi:jersey-cdi1x-validation;3.1.11 -org.glassfish.jersey.ext.cdi:jersey-weld2-se;3.1.11 -org.glassfish.jersey.ext.microprofile:jersey-mp-config;3.1.11 -org.glassfish.jersey.ext.microprofile:jersey-mp-rest-client;3.1.11 -org.glassfish.jersey.ext.rx:jersey-rx-client-guava;3.1.11 -org.glassfish.jersey.ext.rx:jersey-rx-client-rxjava;3.1.11 -org.glassfish.jersey.ext.rx:jersey-rx-client-rxjava2;3.1.11 -org.glassfish.jersey.ext:jersey-bean-validation;3.1.11 -org.glassfish.jersey.ext:jersey-declarative-linking;3.1.11 -org.glassfish.jersey.ext:jersey-entity-filtering;3.1.11 -org.glassfish.jersey.ext:jersey-metainf-services;3.1.11 -org.glassfish.jersey.ext:jersey-micrometer;3.1.11 -org.glassfish.jersey.ext:jersey-mvc;3.1.11 -org.glassfish.jersey.ext:jersey-mvc-bean-validation;3.1.11 -org.glassfish.jersey.ext:jersey-mvc-freemarker;3.1.11 -org.glassfish.jersey.ext:jersey-mvc-jsp;3.1.11 -org.glassfish.jersey.ext:jersey-mvc-mustache;3.1.11 -org.glassfish.jersey.ext:jersey-proxy-client;3.1.11 -org.glassfish.jersey.ext:jersey-spring6;3.1.11 -org.glassfish.jersey.ext:jersey-wadl-doclet;3.1.11 -org.glassfish.jersey.inject:jersey-cdi2-se;3.1.11 -org.glassfish.jersey.inject:jersey-hk2;3.1.11 -org.glassfish.jersey.media:jersey-media-jaxb;3.1.11 -org.glassfish.jersey.media:jersey-media-json-binding;3.1.11 -org.glassfish.jersey.media:jersey-media-json-gson;3.1.11 -org.glassfish.jersey.media:jersey-media-json-jackson;3.1.11 -org.glassfish.jersey.media:jersey-media-json-jettison;3.1.11 -org.glassfish.jersey.media:jersey-media-json-processing;3.1.11 -org.glassfish.jersey.media:jersey-media-kryo;3.1.11 -org.glassfish.jersey.media:jersey-media-moxy;3.1.11 -org.glassfish.jersey.media:jersey-media-multipart;3.1.11 -org.glassfish.jersey.media:jersey-media-sse;3.1.11 -org.glassfish.jersey.security:oauth1-client;3.1.11 -org.glassfish.jersey.security:oauth1-server;3.1.11 -org.glassfish.jersey.security:oauth1-signature;3.1.11 -org.glassfish.jersey.security:oauth2-client;3.1.11 -org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-bundle;3.1.11 -org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-external;3.1.11 -org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2;3.1.11 -org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-inmemory;3.1.11 -org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jdk-http;3.1.11 -org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jetty;3.1.11 -org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jetty-http2;3.1.11 -org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-netty;3.1.11 -org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-simple;3.1.11 -org.glassfish.jersey.test-framework:jersey-test-framework-core;3.1.11 -org.glassfish.jersey.test-framework:jersey-test-framework-util;3.1.11 -org.glassfish.jersey:jersey-bom;3.1.11 -org.glassfish.web:jakarta.servlet.jsp.jstl;3.0.1 -org.graalvm.buildtools:native-maven-plugin;0.10.6 -org.hamcrest:hamcrest;3.0 -org.hamcrest:hamcrest-core;3.0 -org.hamcrest:hamcrest-library;3.0 -org.hibernate.orm:hibernate-agroal;6.6.26.Final -org.hibernate.orm:hibernate-ant;6.6.26.Final -org.hibernate.orm:hibernate-c3p0;6.6.26.Final -org.hibernate.orm:hibernate-community-dialects;6.6.26.Final -org.hibernate.orm:hibernate-core;6.6.26.Final -org.hibernate.orm:hibernate-envers;6.6.26.Final -org.hibernate.orm:hibernate-graalvm;6.6.26.Final -org.hibernate.orm:hibernate-hikaricp;6.6.26.Final -org.hibernate.orm:hibernate-jcache;6.6.26.Final -org.hibernate.orm:hibernate-jpamodelgen;6.6.26.Final -org.hibernate.orm:hibernate-micrometer;6.6.26.Final -org.hibernate.orm:hibernate-proxool;6.6.26.Final -org.hibernate.orm:hibernate-spatial;6.6.26.Final -org.hibernate.orm:hibernate-testing;6.6.26.Final -org.hibernate.orm:hibernate-vibur;6.6.26.Final -org.hibernate.validator:hibernate-validator;8.0.3.Final -org.hibernate.validator:hibernate-validator-annotation-processor;8.0.3.Final -org.hsqldb:hsqldb;2.7.3 -org.htmlunit:htmlunit;4.11.1 -org.infinispan.protostream:protostream;5.0.13.Final -org.infinispan.protostream:protostream-processor;5.0.13.Final -org.infinispan.protostream:protostream-types;5.0.13.Final -org.infinispan:infinispan-anchored-keys;15.2.5.Final -org.infinispan:infinispan-api;15.2.5.Final -org.infinispan:infinispan-bom;15.2.5.Final -org.infinispan:infinispan-cachestore-jdbc;15.2.5.Final -org.infinispan:infinispan-cachestore-jdbc-common;15.2.5.Final -org.infinispan:infinispan-cachestore-remote;15.2.5.Final -org.infinispan:infinispan-cachestore-rocksdb;15.2.5.Final -org.infinispan:infinispan-cachestore-sql;15.2.5.Final -org.infinispan:infinispan-cdi-common;15.2.5.Final -org.infinispan:infinispan-cdi-embedded;15.2.5.Final -org.infinispan:infinispan-cdi-remote;15.2.5.Final -org.infinispan:infinispan-checkstyle;15.2.5.Final -org.infinispan:infinispan-cli-client;15.2.5.Final -org.infinispan:infinispan-client-hotrod;15.2.5.Final -org.infinispan:infinispan-client-hotrod-legacy;15.2.5.Final -org.infinispan:infinispan-client-rest;15.2.5.Final -org.infinispan:infinispan-clustered-counter;15.2.5.Final -org.infinispan:infinispan-clustered-lock;15.2.5.Final -org.infinispan:infinispan-commons;15.2.5.Final -org.infinispan:infinispan-commons-graalvm;15.2.5.Final -org.infinispan:infinispan-commons-spi;15.2.5.Final -org.infinispan:infinispan-commons-test;15.2.5.Final -org.infinispan:infinispan-component-annotations;15.2.5.Final -org.infinispan:infinispan-component-processor;15.2.5.Final -org.infinispan:infinispan-console;15.2.1.Final -org.infinispan:infinispan-core;15.2.5.Final -org.infinispan:infinispan-core-graalvm;15.2.5.Final -org.infinispan:infinispan-counter-api;15.2.5.Final -org.infinispan:infinispan-hibernate-cache-commons;15.2.5.Final -org.infinispan:infinispan-hibernate-cache-spi;15.2.5.Final -org.infinispan:infinispan-hibernate-cache-v62;15.2.5.Final -org.infinispan:infinispan-jboss-marshalling;15.2.5.Final -org.infinispan:infinispan-jcache;15.2.5.Final -org.infinispan:infinispan-jcache-commons;15.2.5.Final -org.infinispan:infinispan-jcache-remote;15.2.5.Final -org.infinispan:infinispan-key-value-store-client;15.2.5.Final -org.infinispan:infinispan-logging-annotations;15.2.5.Final -org.infinispan:infinispan-logging-processor;15.2.5.Final -org.infinispan:infinispan-multimap;15.2.5.Final -org.infinispan:infinispan-objectfilter;15.2.5.Final -org.infinispan:infinispan-query;15.2.5.Final -org.infinispan:infinispan-query-core;15.2.5.Final -org.infinispan:infinispan-query-dsl;15.2.5.Final -org.infinispan:infinispan-remote-query-client;15.2.5.Final -org.infinispan:infinispan-remote-query-server;15.2.5.Final -org.infinispan:infinispan-scripting;15.2.5.Final -org.infinispan:infinispan-server-core;15.2.5.Final -org.infinispan:infinispan-server-hotrod;15.2.5.Final -org.infinispan:infinispan-server-memcached;15.2.5.Final -org.infinispan:infinispan-server-resp;15.2.5.Final -org.infinispan:infinispan-server-rest;15.2.5.Final -org.infinispan:infinispan-server-router;15.2.5.Final -org.infinispan:infinispan-server-runtime;15.2.5.Final -org.infinispan:infinispan-server-testdriver-core;15.2.5.Final -org.infinispan:infinispan-server-testdriver-junit4;15.2.5.Final -org.infinispan:infinispan-server-testdriver-junit5;15.2.5.Final -org.infinispan:infinispan-spring-boot3-starter-embedded;15.2.5.Final -org.infinispan:infinispan-spring-boot3-starter-remote;15.2.5.Final -org.infinispan:infinispan-spring6-common;15.2.5.Final -org.infinispan:infinispan-spring6-embedded;15.2.5.Final -org.infinispan:infinispan-spring6-remote;15.2.5.Final -org.infinispan:infinispan-tasks;15.2.5.Final -org.infinispan:infinispan-tasks-api;15.2.5.Final -org.infinispan:infinispan-tools;15.2.5.Final -org.influxdb:influxdb-java;2.25 -org.jboss.logging:jboss-logging;3.6.1.Final -org.jdom:jdom2;2.0.6.1 -org.jetbrains.kotlin:kotlin-bom;1.9.25 -org.jetbrains.kotlin:kotlin-compiler;1.9.25 -org.jetbrains.kotlin:kotlin-compiler-embeddable;1.9.25 -org.jetbrains.kotlin:kotlin-daemon-client;1.9.25 -org.jetbrains.kotlin:kotlin-main-kts;1.9.25 -org.jetbrains.kotlin:kotlin-maven-plugin;1.9.25 -org.jetbrains.kotlin:kotlin-osgi-bundle;1.9.25 -org.jetbrains.kotlin:kotlin-reflect;1.9.25 -org.jetbrains.kotlin:kotlin-script-runtime;1.9.25 -org.jetbrains.kotlin:kotlin-scripting-common;1.9.25 -org.jetbrains.kotlin:kotlin-scripting-ide-services;1.9.25 -org.jetbrains.kotlin:kotlin-scripting-jvm;1.9.25 -org.jetbrains.kotlin:kotlin-scripting-jvm-host;1.9.25 -org.jetbrains.kotlin:kotlin-stdlib;1.9.25 -org.jetbrains.kotlin:kotlin-stdlib-common;1.9.25 -org.jetbrains.kotlin:kotlin-stdlib-jdk7;1.9.25 -org.jetbrains.kotlin:kotlin-stdlib-jdk8;1.9.25 -org.jetbrains.kotlin:kotlin-stdlib-js;1.9.25 -org.jetbrains.kotlin:kotlin-test;1.9.25 -org.jetbrains.kotlin:kotlin-test-annotations-common;1.9.25 -org.jetbrains.kotlin:kotlin-test-common;1.9.25 -org.jetbrains.kotlin:kotlin-test-js;1.9.25 -org.jetbrains.kotlin:kotlin-test-junit;1.9.25 -org.jetbrains.kotlin:kotlin-test-junit5;1.9.25 -org.jetbrains.kotlin:kotlin-test-testng;1.9.25 -org.jetbrains.kotlinx:kotlinx-coroutines-android;1.8.1 -org.jetbrains.kotlinx:kotlinx-coroutines-bom;1.8.1 -org.jetbrains.kotlinx:kotlinx-coroutines-core;1.8.1 -org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm;1.8.1 -org.jetbrains.kotlinx:kotlinx-coroutines-debug;1.8.1 -org.jetbrains.kotlinx:kotlinx-coroutines-guava;1.8.1 -org.jetbrains.kotlinx:kotlinx-coroutines-javafx;1.8.1 -org.jetbrains.kotlinx:kotlinx-coroutines-jdk8;1.8.1 -org.jetbrains.kotlinx:kotlinx-coroutines-jdk9;1.8.1 -org.jetbrains.kotlinx:kotlinx-coroutines-play-services;1.8.1 -org.jetbrains.kotlinx:kotlinx-coroutines-reactive;1.8.1 -org.jetbrains.kotlinx:kotlinx-coroutines-reactor;1.8.1 -org.jetbrains.kotlinx:kotlinx-coroutines-rx2;1.8.1 -org.jetbrains.kotlinx:kotlinx-coroutines-rx3;1.8.1 -org.jetbrains.kotlinx:kotlinx-coroutines-slf4j;1.8.1 -org.jetbrains.kotlinx:kotlinx-coroutines-swing;1.8.1 -org.jetbrains.kotlinx:kotlinx-coroutines-test;1.8.1 -org.jetbrains.kotlinx:kotlinx-coroutines-test-jvm;1.8.1 -org.jetbrains.kotlinx:kotlinx-serialization-bom;1.6.3 -org.jetbrains.kotlinx:kotlinx-serialization-cbor;1.6.3 -org.jetbrains.kotlinx:kotlinx-serialization-cbor-jvm;1.6.3 -org.jetbrains.kotlinx:kotlinx-serialization-core;1.6.3 -org.jetbrains.kotlinx:kotlinx-serialization-core-jvm;1.6.3 -org.jetbrains.kotlinx:kotlinx-serialization-hocon;1.6.3 -org.jetbrains.kotlinx:kotlinx-serialization-json;1.6.3 -org.jetbrains.kotlinx:kotlinx-serialization-json-jvm;1.6.3 -org.jetbrains.kotlinx:kotlinx-serialization-json-okio;1.6.3 -org.jetbrains.kotlinx:kotlinx-serialization-json-okio-jvm;1.6.3 -org.jetbrains.kotlinx:kotlinx-serialization-properties;1.6.3 -org.jetbrains.kotlinx:kotlinx-serialization-properties-jvm;1.6.3 -org.jetbrains.kotlinx:kotlinx-serialization-protobuf;1.6.3 -org.jetbrains.kotlinx:kotlinx-serialization-protobuf-jvm;1.6.3 -org.jooq:jooq;3.19.25 -org.jooq:jooq-codegen;3.19.25 -org.jooq:jooq-codegen-maven;3.19.25 -org.jooq:jooq-kotlin;3.19.25 -org.jooq:jooq-meta;3.19.25 -org.junit.jupiter:junit-jupiter;5.12.2 -org.junit.jupiter:junit-jupiter-api;5.12.2 -org.junit.jupiter:junit-jupiter-engine;5.12.2 -org.junit.jupiter:junit-jupiter-migrationsupport;5.12.2 -org.junit.jupiter:junit-jupiter-params;5.12.2 -org.junit.platform:junit-platform-commons;1.12.2 -org.junit.platform:junit-platform-console;1.12.2 -org.junit.platform:junit-platform-engine;1.12.2 -org.junit.platform:junit-platform-jfr;1.12.2 -org.junit.platform:junit-platform-launcher;1.12.2 -org.junit.platform:junit-platform-reporting;1.12.2 -org.junit.platform:junit-platform-runner;1.12.2 -org.junit.platform:junit-platform-suite;1.12.2 -org.junit.platform:junit-platform-suite-api;1.12.2 -org.junit.platform:junit-platform-suite-commons;1.12.2 -org.junit.platform:junit-platform-suite-engine;1.12.2 -org.junit.platform:junit-platform-testkit;1.12.2 -org.junit.vintage:junit-vintage-engine;5.12.2 -org.junit:junit-bom;5.12.2 -org.jvnet.staxex:stax-ex;2.1.0 -org.liquibase:liquibase-cdi;4.31.1 -org.liquibase:liquibase-core;4.31.1 -org.liquibase:liquibase-maven-plugin;4.31.1 -org.mariadb.jdbc:mariadb-java-client;3.5.5 -org.mariadb:r2dbc-mariadb;1.3.0 -org.messaginghub:pooled-jms;3.1.7 -org.mockito:mockito-android;5.17.0 -org.mockito:mockito-bom;5.17.0 -org.mockito:mockito-core;5.17.0 -org.mockito:mockito-errorprone;5.17.0 -org.mockito:mockito-junit-jupiter;5.17.0 -org.mockito:mockito-proxy;5.17.0 -org.mockito:mockito-subclass;5.17.0 -org.mongodb.scala:mongo-scala-bson_2.11;5.5.1 -org.mongodb.scala:mongo-scala-bson_2.12;5.5.1 -org.mongodb.scala:mongo-scala-bson_2.13;5.5.1 -org.mongodb.scala:mongo-scala-driver_2.11;5.5.1 -org.mongodb.scala:mongo-scala-driver_2.12;5.5.1 -org.mongodb.scala:mongo-scala-driver_2.13;5.5.1 -org.mongodb:bson;5.5.1 -org.mongodb:bson-kotlin;5.5.1 -org.mongodb:bson-kotlinx;5.5.1 -org.mongodb:bson-record-codec;5.5.1 -org.mongodb:mongodb-crypt;5.5.1 -org.mongodb:mongodb-driver-bom;5.5.1 -org.mongodb:mongodb-driver-core;5.5.1 -org.mongodb:mongodb-driver-kotlin-coroutine;5.5.1 -org.mongodb:mongodb-driver-kotlin-extensions;5.5.1 -org.mongodb:mongodb-driver-kotlin-sync;5.5.1 -org.mongodb:mongodb-driver-reactivestreams;5.5.1 -org.mongodb:mongodb-driver-sync;5.5.1 -org.neo4j.driver:neo4j-java-driver;5.28.9 -org.postgresql:postgresql;42.7.7 -org.postgresql:r2dbc-postgresql;1.0.7.RELEASE -org.projectlombok:lombok;1.18.38 -org.quartz-scheduler:quartz;2.5.0 -org.quartz-scheduler:quartz-jobs;2.5.0 -org.reactivestreams:reactive-streams;1.0.4 -org.seleniumhq.selenium:htmlunit3-driver;4.30.0 -org.seleniumhq.selenium:selenium-api;4.31.0 -org.seleniumhq.selenium:selenium-bom;4.31.0 -org.seleniumhq.selenium:selenium-chrome-driver;4.31.0 -org.seleniumhq.selenium:selenium-chromium-driver;4.31.0 -org.seleniumhq.selenium:selenium-devtools-v133;4.31.0 -org.seleniumhq.selenium:selenium-devtools-v134;4.31.0 -org.seleniumhq.selenium:selenium-devtools-v135;4.31.0 -org.seleniumhq.selenium:selenium-edge-driver;4.31.0 -org.seleniumhq.selenium:selenium-firefox-driver;4.31.0 -org.seleniumhq.selenium:selenium-grid;4.31.0 -org.seleniumhq.selenium:selenium-http;4.31.0 -org.seleniumhq.selenium:selenium-ie-driver;4.31.0 -org.seleniumhq.selenium:selenium-java;4.31.0 -org.seleniumhq.selenium:selenium-json;4.31.0 -org.seleniumhq.selenium:selenium-manager;4.31.0 -org.seleniumhq.selenium:selenium-remote-driver;4.31.0 -org.seleniumhq.selenium:selenium-safari-driver;4.31.0 -org.seleniumhq.selenium:selenium-session-map-jdbc;4.31.0 -org.seleniumhq.selenium:selenium-session-map-redis;4.31.0 -org.seleniumhq.selenium:selenium-support;4.31.0 -org.skyscreamer:jsonassert;1.5.3 -org.slf4j:jcl-over-slf4j;2.0.17 -org.slf4j:jul-to-slf4j;2.0.17 -org.slf4j:log4j-over-slf4j;2.0.17 -org.slf4j:slf4j-api;2.0.17 -org.slf4j:slf4j-ext;2.0.17 -org.slf4j:slf4j-jdk-platform-logging;2.0.17 -org.slf4j:slf4j-jdk14;2.0.17 -org.slf4j:slf4j-log4j12;2.0.17 -org.slf4j:slf4j-nop;2.0.17 -org.slf4j:slf4j-reload4j;2.0.17 -org.slf4j:slf4j-simple;2.0.17 -org.sonatype.central:central-publishing-maven-plugin;0.7.0 -org.sonatype.plugins:nexus-staging-maven-plugin;1.7.0 -org.springframework.amqp:spring-amqp;3.2.6 -org.springframework.amqp:spring-amqp-bom;3.2.6 -org.springframework.amqp:spring-rabbit;3.2.6 -org.springframework.amqp:spring-rabbit-junit;3.2.6 -org.springframework.amqp:spring-rabbit-stream;3.2.6 -org.springframework.amqp:spring-rabbit-test;3.2.6 -org.springframework.batch:spring-batch-bom;5.2.2 -org.springframework.batch:spring-batch-core;5.2.2 -org.springframework.batch:spring-batch-infrastructure;5.2.2 -org.springframework.batch:spring-batch-integration;5.2.2 -org.springframework.batch:spring-batch-test;5.2.2 -org.springframework.boot:spring-boot;3.5.5 -org.springframework.boot:spring-boot-actuator;3.5.5 -org.springframework.boot:spring-boot-actuator-autoconfigure;3.5.5 -org.springframework.boot:spring-boot-autoconfigure;3.5.5 -org.springframework.boot:spring-boot-autoconfigure-processor;3.5.5 -org.springframework.boot:spring-boot-buildpack-platform;3.5.5 -org.springframework.boot:spring-boot-configuration-metadata;3.5.5 -org.springframework.boot:spring-boot-configuration-processor;3.5.5 -org.springframework.boot:spring-boot-dependencies;3.5.5 -org.springframework.boot:spring-boot-devtools;3.5.5 -org.springframework.boot:spring-boot-docker-compose;3.5.5 -org.springframework.boot:spring-boot-jarmode-tools;3.5.5 -org.springframework.boot:spring-boot-loader;3.5.5 -org.springframework.boot:spring-boot-loader-classic;3.5.5 -org.springframework.boot:spring-boot-loader-tools;3.5.5 -org.springframework.boot:spring-boot-maven-plugin;3.5.5 -org.springframework.boot:spring-boot-properties-migrator;3.5.5 -org.springframework.boot:spring-boot-starter;3.5.5 -org.springframework.boot:spring-boot-starter-activemq;3.5.5 -org.springframework.boot:spring-boot-starter-actuator;3.5.5 -org.springframework.boot:spring-boot-starter-amqp;3.5.5 -org.springframework.boot:spring-boot-starter-aop;3.5.5 -org.springframework.boot:spring-boot-starter-artemis;3.5.5 -org.springframework.boot:spring-boot-starter-batch;3.5.5 -org.springframework.boot:spring-boot-starter-cache;3.5.5 -org.springframework.boot:spring-boot-starter-data-cassandra;3.5.5 -org.springframework.boot:spring-boot-starter-data-cassandra-reactive;3.5.5 -org.springframework.boot:spring-boot-starter-data-couchbase;3.5.5 -org.springframework.boot:spring-boot-starter-data-couchbase-reactive;3.5.5 -org.springframework.boot:spring-boot-starter-data-elasticsearch;3.5.5 -org.springframework.boot:spring-boot-starter-data-jdbc;3.5.5 -org.springframework.boot:spring-boot-starter-data-jpa;3.5.5 -org.springframework.boot:spring-boot-starter-data-ldap;3.5.5 -org.springframework.boot:spring-boot-starter-data-mongodb;3.5.5 -org.springframework.boot:spring-boot-starter-data-mongodb-reactive;3.5.5 -org.springframework.boot:spring-boot-starter-data-neo4j;3.5.5 -org.springframework.boot:spring-boot-starter-data-r2dbc;3.5.5 -org.springframework.boot:spring-boot-starter-data-redis;3.5.5 -org.springframework.boot:spring-boot-starter-data-redis-reactive;3.5.5 -org.springframework.boot:spring-boot-starter-data-rest;3.5.5 -org.springframework.boot:spring-boot-starter-freemarker;3.5.5 -org.springframework.boot:spring-boot-starter-graphql;3.5.5 -org.springframework.boot:spring-boot-starter-groovy-templates;3.5.5 -org.springframework.boot:spring-boot-starter-hateoas;3.5.5 -org.springframework.boot:spring-boot-starter-integration;3.5.5 -org.springframework.boot:spring-boot-starter-jdbc;3.5.5 -org.springframework.boot:spring-boot-starter-jersey;3.5.5 -org.springframework.boot:spring-boot-starter-jetty;3.5.5 -org.springframework.boot:spring-boot-starter-jooq;3.5.5 -org.springframework.boot:spring-boot-starter-json;3.5.5 -org.springframework.boot:spring-boot-starter-log4j2;3.5.5 -org.springframework.boot:spring-boot-starter-logging;3.5.5 -org.springframework.boot:spring-boot-starter-mail;3.5.5 -org.springframework.boot:spring-boot-starter-mustache;3.5.5 -org.springframework.boot:spring-boot-starter-oauth2-authorization-server;3.5.5 -org.springframework.boot:spring-boot-starter-oauth2-client;3.5.5 -org.springframework.boot:spring-boot-starter-oauth2-resource-server;3.5.5 -org.springframework.boot:spring-boot-starter-parent;3.5.5 -org.springframework.boot:spring-boot-starter-pulsar;3.5.5 -org.springframework.boot:spring-boot-starter-pulsar-reactive;3.5.5 -org.springframework.boot:spring-boot-starter-quartz;3.5.5 -org.springframework.boot:spring-boot-starter-reactor-netty;3.5.5 -org.springframework.boot:spring-boot-starter-rsocket;3.5.5 -org.springframework.boot:spring-boot-starter-security;3.5.5 -org.springframework.boot:spring-boot-starter-test;3.5.5 -org.springframework.boot:spring-boot-starter-thymeleaf;3.5.5 -org.springframework.boot:spring-boot-starter-tomcat;3.5.5 -org.springframework.boot:spring-boot-starter-undertow;3.5.5 -org.springframework.boot:spring-boot-starter-validation;3.5.5 -org.springframework.boot:spring-boot-starter-web;3.5.5 -org.springframework.boot:spring-boot-starter-web-services;3.5.5 -org.springframework.boot:spring-boot-starter-webflux;3.5.5 -org.springframework.boot:spring-boot-starter-websocket;3.5.5 -org.springframework.boot:spring-boot-test;3.5.5 -org.springframework.boot:spring-boot-test-autoconfigure;3.5.5 -org.springframework.boot:spring-boot-testcontainers;3.5.5 -org.springframework.cloud:spring-cloud-bus;4.3.0 -org.springframework.cloud:spring-cloud-bus-dependencies;4.3.0 -org.springframework.cloud:spring-cloud-bus-rsocket;4.3.0 -org.springframework.cloud:spring-cloud-circuitbreaker-dependencies;3.3.0 -org.springframework.cloud:spring-cloud-circuitbreaker-resilience4j;3.3.0 -org.springframework.cloud:spring-cloud-circuitbreaker-spring-retry;3.3.0 -org.springframework.cloud:spring-cloud-commons;4.3.0 -org.springframework.cloud:spring-cloud-commons-dependencies;4.3.0 -org.springframework.cloud:spring-cloud-config-client;4.3.0 -org.springframework.cloud:spring-cloud-config-dependencies;4.3.0 -org.springframework.cloud:spring-cloud-config-monitor;4.3.0 -org.springframework.cloud:spring-cloud-config-server;4.3.0 -org.springframework.cloud:spring-cloud-consul-binder;4.3.0 -org.springframework.cloud:spring-cloud-consul-config;4.3.0 -org.springframework.cloud:spring-cloud-consul-core;4.3.0 -org.springframework.cloud:spring-cloud-consul-dependencies;4.3.0 -org.springframework.cloud:spring-cloud-consul-discovery;4.3.0 -org.springframework.cloud:spring-cloud-context;4.3.0 -org.springframework.cloud:spring-cloud-contract-converters;4.3.0 -org.springframework.cloud:spring-cloud-contract-dependencies;4.3.0 -org.springframework.cloud:spring-cloud-contract-gradle-plugin;4.3.0 -org.springframework.cloud:spring-cloud-contract-maven-plugin;4.3.0 -org.springframework.cloud:spring-cloud-contract-shade;4.3.0 -org.springframework.cloud:spring-cloud-contract-spec;4.3.0 -org.springframework.cloud:spring-cloud-contract-spec-groovy;4.3.0 -org.springframework.cloud:spring-cloud-contract-spec-java;4.3.0 -org.springframework.cloud:spring-cloud-contract-spec-kotlin;4.3.0 -org.springframework.cloud:spring-cloud-contract-stub-runner;4.3.0 -org.springframework.cloud:spring-cloud-contract-stub-runner-boot;4.3.0 -org.springframework.cloud:spring-cloud-contract-verifier;4.3.0 -org.springframework.cloud:spring-cloud-contract-wiremock;4.3.0 -org.springframework.cloud:spring-cloud-dependencies;2025.0.0 -org.springframework.cloud:spring-cloud-function-adapter-aws;4.3.0 -org.springframework.cloud:spring-cloud-function-adapter-azure;4.3.0 -org.springframework.cloud:spring-cloud-function-adapter-azure-web;4.3.0 -org.springframework.cloud:spring-cloud-function-adapter-gcp;4.3.0 -org.springframework.cloud:spring-cloud-function-context;4.3.0 -org.springframework.cloud:spring-cloud-function-core;4.3.0 -org.springframework.cloud:spring-cloud-function-dependencies;4.3.0 -org.springframework.cloud:spring-cloud-function-deployer;4.3.0 -org.springframework.cloud:spring-cloud-function-grpc;4.3.0 -org.springframework.cloud:spring-cloud-function-grpc-cloudevent-ext;4.3.0 -org.springframework.cloud:spring-cloud-function-integration;4.3.0 -org.springframework.cloud:spring-cloud-function-kotlin;4.3.0 -org.springframework.cloud:spring-cloud-function-rsocket;4.3.0 -org.springframework.cloud:spring-cloud-function-serverless-web;4.3.0 -org.springframework.cloud:spring-cloud-function-web;4.3.0 -org.springframework.cloud:spring-cloud-gateway-dependencies;4.3.0 -org.springframework.cloud:spring-cloud-gateway-mvc;4.3.0 -org.springframework.cloud:spring-cloud-gateway-proxyexchange-webflux;4.3.0 -org.springframework.cloud:spring-cloud-gateway-proxyexchange-webmvc;4.3.0 -org.springframework.cloud:spring-cloud-gateway-server;4.3.0 -org.springframework.cloud:spring-cloud-gateway-server-mvc;4.3.0 -org.springframework.cloud:spring-cloud-gateway-server-webflux;4.3.0 -org.springframework.cloud:spring-cloud-gateway-server-webmvc;4.3.0 -org.springframework.cloud:spring-cloud-gateway-webflux;4.3.0 -org.springframework.cloud:spring-cloud-kubernetes-client-autoconfig;3.3.0 -org.springframework.cloud:spring-cloud-kubernetes-client-config;3.3.0 -org.springframework.cloud:spring-cloud-kubernetes-client-discovery;3.3.0 -org.springframework.cloud:spring-cloud-kubernetes-client-loadbalancer;3.3.0 -org.springframework.cloud:spring-cloud-kubernetes-commons;3.3.0 -org.springframework.cloud:spring-cloud-kubernetes-dependencies;3.3.0 -org.springframework.cloud:spring-cloud-kubernetes-discovery;3.3.0 -org.springframework.cloud:spring-cloud-kubernetes-fabric8-autoconfig;3.3.0 -org.springframework.cloud:spring-cloud-kubernetes-fabric8-config;3.3.0 -org.springframework.cloud:spring-cloud-kubernetes-fabric8-discovery;3.3.0 -org.springframework.cloud:spring-cloud-kubernetes-fabric8-istio;3.3.0 -org.springframework.cloud:spring-cloud-kubernetes-fabric8-leader;3.3.0 -org.springframework.cloud:spring-cloud-kubernetes-fabric8-loadbalancer;3.3.0 -org.springframework.cloud:spring-cloud-kubernetes-test-support;3.3.0 -org.springframework.cloud:spring-cloud-loadbalancer;4.3.0 -org.springframework.cloud:spring-cloud-netflix-dependencies;4.3.0 -org.springframework.cloud:spring-cloud-netflix-eureka-client;4.3.0 -org.springframework.cloud:spring-cloud-netflix-eureka-server;4.3.0 -org.springframework.cloud:spring-cloud-openfeign-core;4.3.0 -org.springframework.cloud:spring-cloud-openfeign-dependencies;4.3.0 -org.springframework.cloud:spring-cloud-starter;4.3.0 -org.springframework.cloud:spring-cloud-starter-bootstrap;4.3.0 -org.springframework.cloud:spring-cloud-starter-bus-amqp;4.3.0 -org.springframework.cloud:spring-cloud-starter-bus-kafka;4.3.0 -org.springframework.cloud:spring-cloud-starter-bus-stream;4.3.0 -org.springframework.cloud:spring-cloud-starter-circuitbreaker-reactor-resilience4j;3.3.0 -org.springframework.cloud:spring-cloud-starter-circuitbreaker-resilience4j;3.3.0 -org.springframework.cloud:spring-cloud-starter-circuitbreaker-spring-retry;3.3.0 -org.springframework.cloud:spring-cloud-starter-config;4.3.0 -org.springframework.cloud:spring-cloud-starter-consul;4.3.0 -org.springframework.cloud:spring-cloud-starter-consul-all;4.3.0 -org.springframework.cloud:spring-cloud-starter-consul-bus;4.3.0 -org.springframework.cloud:spring-cloud-starter-consul-config;4.3.0 -org.springframework.cloud:spring-cloud-starter-consul-discovery;4.3.0 -org.springframework.cloud:spring-cloud-starter-contract-stub-runner;4.3.0 -org.springframework.cloud:spring-cloud-starter-contract-stub-runner-jetty;4.3.0 -org.springframework.cloud:spring-cloud-starter-contract-verifier;4.3.0 -org.springframework.cloud:spring-cloud-starter-function-web;4.3.0 -org.springframework.cloud:spring-cloud-starter-function-webflux;4.3.0 -org.springframework.cloud:spring-cloud-starter-gateway;4.3.0 -org.springframework.cloud:spring-cloud-starter-gateway-mvc;4.3.0 -org.springframework.cloud:spring-cloud-starter-gateway-server-webflux;4.3.0 -org.springframework.cloud:spring-cloud-starter-gateway-server-webmvc;4.3.0 -org.springframework.cloud:spring-cloud-starter-kubernetes-client;3.3.0 -org.springframework.cloud:spring-cloud-starter-kubernetes-client-all;3.3.0 -org.springframework.cloud:spring-cloud-starter-kubernetes-client-config;3.3.0 -org.springframework.cloud:spring-cloud-starter-kubernetes-client-loadbalancer;3.3.0 -org.springframework.cloud:spring-cloud-starter-kubernetes-discoveryclient;3.3.0 -org.springframework.cloud:spring-cloud-starter-kubernetes-fabric8;3.3.0 -org.springframework.cloud:spring-cloud-starter-kubernetes-fabric8-all;3.3.0 -org.springframework.cloud:spring-cloud-starter-kubernetes-fabric8-config;3.3.0 -org.springframework.cloud:spring-cloud-starter-kubernetes-fabric8-loadbalancer;3.3.0 -org.springframework.cloud:spring-cloud-starter-loadbalancer;4.3.0 -org.springframework.cloud:spring-cloud-starter-netflix-eureka-client;4.3.0 -org.springframework.cloud:spring-cloud-starter-netflix-eureka-server;4.3.0 -org.springframework.cloud:spring-cloud-starter-openfeign;4.3.0 -org.springframework.cloud:spring-cloud-starter-stream-kafka;4.3.0 -org.springframework.cloud:spring-cloud-starter-stream-rabbit;4.3.0 -org.springframework.cloud:spring-cloud-starter-task;3.3.0 -org.springframework.cloud:spring-cloud-starter-vault-config;4.3.0 -org.springframework.cloud:spring-cloud-starter-zookeeper;4.3.0 -org.springframework.cloud:spring-cloud-starter-zookeeper-all;4.3.0 -org.springframework.cloud:spring-cloud-starter-zookeeper-config;4.3.0 -org.springframework.cloud:spring-cloud-starter-zookeeper-discovery;4.3.0 -org.springframework.cloud:spring-cloud-stream;4.3.0 -org.springframework.cloud:spring-cloud-stream-binder-kafka;4.3.0 -org.springframework.cloud:spring-cloud-stream-binder-kafka-core;4.3.0 -org.springframework.cloud:spring-cloud-stream-binder-kafka-reactive;4.3.0 -org.springframework.cloud:spring-cloud-stream-binder-kafka-streams;4.3.0 -org.springframework.cloud:spring-cloud-stream-binder-pulsar;4.3.0 -org.springframework.cloud:spring-cloud-stream-binder-rabbit;4.3.0 -org.springframework.cloud:spring-cloud-stream-binder-rabbit-core;4.3.0 -org.springframework.cloud:spring-cloud-stream-binder-rabbit-test-support;4.3.0 -org.springframework.cloud:spring-cloud-stream-dependencies;4.3.0 -org.springframework.cloud:spring-cloud-stream-schema-registry-client;4.3.0 -org.springframework.cloud:spring-cloud-stream-schema-registry-core;4.3.0 -org.springframework.cloud:spring-cloud-stream-schema-registry-server;4.3.0 -org.springframework.cloud:spring-cloud-stream-test-binder;4.3.0 -org.springframework.cloud:spring-cloud-stream-test-support;4.3.0 -org.springframework.cloud:spring-cloud-task-batch;3.3.0 -org.springframework.cloud:spring-cloud-task-core;3.3.0 -org.springframework.cloud:spring-cloud-task-dependencies;3.3.0 -org.springframework.cloud:spring-cloud-task-stream;3.3.0 -org.springframework.cloud:spring-cloud-test-support;4.3.0 -org.springframework.cloud:spring-cloud-vault-config;4.3.0 -org.springframework.cloud:spring-cloud-vault-config-aws;4.3.0 -org.springframework.cloud:spring-cloud-vault-config-consul;4.3.0 -org.springframework.cloud:spring-cloud-vault-config-databases;4.3.0 -org.springframework.cloud:spring-cloud-vault-config-rabbitmq;4.3.0 -org.springframework.cloud:spring-cloud-vault-dependencies;4.3.0 -org.springframework.cloud:spring-cloud-zookeeper-config;4.3.0 -org.springframework.cloud:spring-cloud-zookeeper-core;4.3.0 -org.springframework.cloud:spring-cloud-zookeeper-dependencies;4.3.0 -org.springframework.cloud:spring-cloud-zookeeper-discovery;4.3.0 -org.springframework.credhub:spring-credhub-core;2.1.1.RELEASE -org.springframework.data:spring-data-bom;2025.0.3 -org.springframework.data:spring-data-cassandra;4.5.3 -org.springframework.data:spring-data-commons;3.5.3 -org.springframework.data:spring-data-couchbase;5.5.3 -org.springframework.data:spring-data-elasticsearch;5.5.3 -org.springframework.data:spring-data-envers;3.5.3 -org.springframework.data:spring-data-jdbc;3.5.3 -org.springframework.data:spring-data-jpa;3.5.3 -org.springframework.data:spring-data-keyvalue;3.5.3 -org.springframework.data:spring-data-ldap;3.5.3 -org.springframework.data:spring-data-mongodb;4.5.3 -org.springframework.data:spring-data-neo4j;7.5.3 -org.springframework.data:spring-data-r2dbc;3.5.3 -org.springframework.data:spring-data-redis;3.5.3 -org.springframework.data:spring-data-relational;3.5.3 -org.springframework.data:spring-data-rest-core;4.5.3 -org.springframework.data:spring-data-rest-hal-explorer;4.5.3 -org.springframework.data:spring-data-rest-webmvc;4.5.3 -org.springframework.graphql:spring-graphql;1.4.1 -org.springframework.graphql:spring-graphql-test;1.4.1 -org.springframework.hateoas:spring-hateoas;2.5.1 -org.springframework.integration:spring-integration-amqp;6.5.1 -org.springframework.integration:spring-integration-bom;6.5.1 -org.springframework.integration:spring-integration-camel;6.5.1 -org.springframework.integration:spring-integration-cassandra;6.5.1 -org.springframework.integration:spring-integration-core;6.5.1 -org.springframework.integration:spring-integration-debezium;6.5.1 -org.springframework.integration:spring-integration-event;6.5.1 -org.springframework.integration:spring-integration-feed;6.5.1 -org.springframework.integration:spring-integration-file;6.5.1 -org.springframework.integration:spring-integration-ftp;6.5.1 -org.springframework.integration:spring-integration-graphql;6.5.1 -org.springframework.integration:spring-integration-groovy;6.5.1 -org.springframework.integration:spring-integration-hazelcast;6.5.1 -org.springframework.integration:spring-integration-http;6.5.1 -org.springframework.integration:spring-integration-ip;6.5.1 -org.springframework.integration:spring-integration-jdbc;6.5.1 -org.springframework.integration:spring-integration-jms;6.5.1 -org.springframework.integration:spring-integration-jmx;6.5.1 -org.springframework.integration:spring-integration-jpa;6.5.1 -org.springframework.integration:spring-integration-kafka;6.5.1 -org.springframework.integration:spring-integration-mail;6.5.1 -org.springframework.integration:spring-integration-mongodb;6.5.1 -org.springframework.integration:spring-integration-mqtt;6.5.1 -org.springframework.integration:spring-integration-r2dbc;6.5.1 -org.springframework.integration:spring-integration-redis;6.5.1 -org.springframework.integration:spring-integration-rsocket;6.5.1 -org.springframework.integration:spring-integration-scripting;6.5.1 -org.springframework.integration:spring-integration-sftp;6.5.1 -org.springframework.integration:spring-integration-smb;6.5.1 -org.springframework.integration:spring-integration-stomp;6.5.1 -org.springframework.integration:spring-integration-stream;6.5.1 -org.springframework.integration:spring-integration-syslog;6.5.1 -org.springframework.integration:spring-integration-test;6.5.1 -org.springframework.integration:spring-integration-test-support;6.5.1 -org.springframework.integration:spring-integration-webflux;6.5.1 -org.springframework.integration:spring-integration-websocket;6.5.1 -org.springframework.integration:spring-integration-ws;6.5.1 -org.springframework.integration:spring-integration-xml;6.5.1 -org.springframework.integration:spring-integration-xmpp;6.5.1 -org.springframework.integration:spring-integration-zeromq;6.5.1 -org.springframework.integration:spring-integration-zip;6.5.1 -org.springframework.integration:spring-integration-zookeeper;6.5.1 -org.springframework.kafka:spring-kafka;3.3.9 -org.springframework.kafka:spring-kafka-test;3.3.9 -org.springframework.ldap:spring-ldap-core;3.3.3 -org.springframework.ldap:spring-ldap-ldif-core;3.3.3 -org.springframework.ldap:spring-ldap-odm;3.3.3 -org.springframework.ldap:spring-ldap-test;3.3.3 -org.springframework.pulsar:spring-pulsar;1.2.9 -org.springframework.pulsar:spring-pulsar-bom;1.2.9 -org.springframework.pulsar:spring-pulsar-cache-provider;1.2.9 -org.springframework.pulsar:spring-pulsar-cache-provider-caffeine;1.2.9 -org.springframework.pulsar:spring-pulsar-reactive;1.2.9 -org.springframework.pulsar:spring-pulsar-test;1.2.9 -org.springframework.restdocs:spring-restdocs-asciidoctor;3.0.5 -org.springframework.restdocs:spring-restdocs-bom;3.0.5 -org.springframework.restdocs:spring-restdocs-core;3.0.5 -org.springframework.restdocs:spring-restdocs-mockmvc;3.0.5 -org.springframework.restdocs:spring-restdocs-restassured;3.0.5 -org.springframework.restdocs:spring-restdocs-webtestclient;3.0.5 -org.springframework.retry:spring-retry;2.0.12 -org.springframework.security:spring-security-acl;6.5.3 -org.springframework.security:spring-security-aspects;6.5.3 -org.springframework.security:spring-security-bom;6.5.3 -org.springframework.security:spring-security-cas;6.5.3 -org.springframework.security:spring-security-config;6.5.3 -org.springframework.security:spring-security-core;6.5.3 -org.springframework.security:spring-security-crypto;6.5.3 -org.springframework.security:spring-security-data;6.5.3 -org.springframework.security:spring-security-ldap;6.5.3 -org.springframework.security:spring-security-messaging;6.5.3 -org.springframework.security:spring-security-oauth2-authorization-server;1.5.2 -org.springframework.security:spring-security-oauth2-client;6.5.3 -org.springframework.security:spring-security-oauth2-core;6.5.3 -org.springframework.security:spring-security-oauth2-jose;6.5.3 -org.springframework.security:spring-security-oauth2-resource-server;6.5.3 -org.springframework.security:spring-security-rsocket;6.5.3 -org.springframework.security:spring-security-saml2-service-provider;6.5.3 -org.springframework.security:spring-security-taglibs;6.5.3 -org.springframework.security:spring-security-test;6.5.3 -org.springframework.security:spring-security-web;6.5.3 -org.springframework.session:spring-session-bom;3.5.2 -org.springframework.session:spring-session-core;3.5.2 -org.springframework.session:spring-session-data-mongodb;3.5.2 -org.springframework.session:spring-session-data-redis;3.5.2 -org.springframework.session:spring-session-hazelcast;3.5.2 -org.springframework.session:spring-session-jdbc;3.5.2 -org.springframework.vault:spring-vault-core;3.2.0 -org.springframework.ws:spring-ws-bom;4.1.1 -org.springframework.ws:spring-ws-core;4.1.1 -org.springframework.ws:spring-ws-security;4.1.1 -org.springframework.ws:spring-ws-support;4.1.1 -org.springframework.ws:spring-ws-test;4.1.1 -org.springframework.ws:spring-xml;4.1.1 -org.springframework:spring-aop;6.2.10 -org.springframework:spring-aspects;6.2.10 -org.springframework:spring-beans;6.2.10 -org.springframework:spring-context;6.2.10 -org.springframework:spring-context-indexer;6.2.10 -org.springframework:spring-context-support;6.2.10 -org.springframework:spring-core;6.2.10 -org.springframework:spring-core-test;6.2.10 -org.springframework:spring-expression;6.2.10 -org.springframework:spring-framework-bom;6.2.10 -org.springframework:spring-instrument;6.2.10 -org.springframework:spring-jcl;6.2.10 -org.springframework:spring-jdbc;6.2.10 -org.springframework:spring-jms;6.2.10 -org.springframework:spring-messaging;6.2.10 -org.springframework:spring-orm;6.2.10 -org.springframework:spring-oxm;6.2.10 -org.springframework:spring-r2dbc;6.2.10 -org.springframework:spring-test;6.2.10 -org.springframework:spring-tx;6.2.10 -org.springframework:spring-web;6.2.10 -org.springframework:spring-webflux;6.2.10 -org.springframework:spring-webmvc;6.2.10 -org.springframework:spring-websocket;6.2.10 -org.testcontainers:activemq;1.21.3 -org.testcontainers:azure;1.21.3 -org.testcontainers:cassandra;1.21.3 -org.testcontainers:chromadb;1.21.3 -org.testcontainers:clickhouse;1.21.3 -org.testcontainers:cockroachdb;1.21.3 -org.testcontainers:consul;1.21.3 -org.testcontainers:couchbase;1.21.3 -org.testcontainers:cratedb;1.21.3 -org.testcontainers:database-commons;1.21.3 -org.testcontainers:databend;1.21.3 -org.testcontainers:db2;1.21.3 -org.testcontainers:dynalite;1.21.3 -org.testcontainers:elasticsearch;1.21.3 -org.testcontainers:gcloud;1.21.3 -org.testcontainers:grafana;1.21.3 -org.testcontainers:hivemq;1.21.3 -org.testcontainers:influxdb;1.21.3 -org.testcontainers:jdbc;1.21.3 -org.testcontainers:junit-jupiter;1.21.3 -org.testcontainers:k3s;1.21.3 -org.testcontainers:k6;1.21.3 -org.testcontainers:kafka;1.21.3 -org.testcontainers:ldap;1.21.3 -org.testcontainers:localstack;1.21.3 -org.testcontainers:mariadb;1.21.3 -org.testcontainers:milvus;1.21.3 -org.testcontainers:minio;1.21.3 -org.testcontainers:mockserver;1.21.3 -org.testcontainers:mongodb;1.21.3 -org.testcontainers:mssqlserver;1.21.3 -org.testcontainers:mysql;1.21.3 -org.testcontainers:neo4j;1.21.3 -org.testcontainers:nginx;1.21.3 -org.testcontainers:oceanbase;1.21.3 -org.testcontainers:ollama;1.21.3 -org.testcontainers:openfga;1.21.3 -org.testcontainers:oracle-free;1.21.3 -org.testcontainers:oracle-xe;1.21.3 -org.testcontainers:orientdb;1.21.3 -org.testcontainers:pinecone;1.21.3 -org.testcontainers:postgresql;1.21.3 -org.testcontainers:presto;1.21.3 -org.testcontainers:pulsar;1.21.3 -org.testcontainers:qdrant;1.21.3 -org.testcontainers:questdb;1.21.3 -org.testcontainers:r2dbc;1.21.3 -org.testcontainers:rabbitmq;1.21.3 -org.testcontainers:redpanda;1.21.3 -org.testcontainers:scylladb;1.21.3 -org.testcontainers:selenium;1.21.3 -org.testcontainers:solace;1.21.3 -org.testcontainers:solr;1.21.3 -org.testcontainers:spock;1.21.3 -org.testcontainers:testcontainers;1.21.3 -org.testcontainers:testcontainers-bom;1.21.3 -org.testcontainers:tidb;1.21.3 -org.testcontainers:timeplus;1.21.3 -org.testcontainers:toxiproxy;1.21.3 -org.testcontainers:trino;1.21.3 -org.testcontainers:typesense;1.21.3 -org.testcontainers:vault;1.21.3 -org.testcontainers:weaviate;1.21.3 -org.testcontainers:yugabytedb;1.21.3 -org.thymeleaf.extras:thymeleaf-extras-springsecurity6;3.1.3.RELEASE -org.thymeleaf:thymeleaf;3.1.3.RELEASE -org.thymeleaf:thymeleaf-spring6;3.1.3.RELEASE -org.tmatesoft.svnkit:svnkit;1.10.11 -org.vibur:vibur-dbcp;26.0 -org.vibur:vibur-object-pool;26.0 -org.webjars:webjars-locator-core;0.59 -org.webjars:webjars-locator-lite;1.1.0 -org.wiremock:wiremock-standalone;3.9.2 -org.xerial:sqlite-jdbc;3.49.1.0 -org.xmlunit:xmlunit-assertj;2.10.3 -org.xmlunit:xmlunit-assertj3;2.10.3 -org.xmlunit:xmlunit-core;2.10.3 -org.xmlunit:xmlunit-jakarta-jaxb-impl;2.10.3 -org.xmlunit:xmlunit-legacy;2.10.3 -org.xmlunit:xmlunit-matchers;2.10.3 -org.xmlunit:xmlunit-placeholders;2.10.3 -org.yaml:snakeyaml;2.4 -redis.clients:jedis;6.0.0 -wsdl4j:wsdl4j;1.6.3 diff --git a/sdk/spring/scripts/spring_boot_4.0.0-RC2_managed_external_dependencies.txt b/sdk/spring/scripts/spring_boot_4.0.0-RC2_managed_external_dependencies.txt new file mode 100644 index 000000000000..124377731965 --- /dev/null +++ b/sdk/spring/scripts/spring_boot_4.0.0-RC2_managed_external_dependencies.txt @@ -0,0 +1,1745 @@ +ch.qos.logback:logback-classic;1.5.20 +ch.qos.logback:logback-core;1.5.20 +co.elastic.clients:elasticsearch-java;9.2.0 +co.elastic.clients:elasticsearch-rest5-client;9.2.0 +com.couchbase.client:java-client;3.9.2 +com.datastax.oss:native-protocol;1.5.1 +com.fasterxml.jackson.core:jackson-annotations;2.20 +com.fasterxml.jackson.core:jackson-core;2.20.1 +com.fasterxml.jackson.core:jackson-databind;2.20.1 +com.fasterxml.jackson.dataformat:jackson-dataformat-avro;2.20.1 +com.fasterxml.jackson.dataformat:jackson-dataformat-cbor;2.20.1 +com.fasterxml.jackson.dataformat:jackson-dataformat-csv;2.20.1 +com.fasterxml.jackson.dataformat:jackson-dataformat-ion;2.20.1 +com.fasterxml.jackson.dataformat:jackson-dataformat-properties;2.20.1 +com.fasterxml.jackson.dataformat:jackson-dataformat-protobuf;2.20.1 +com.fasterxml.jackson.dataformat:jackson-dataformat-smile;2.20.1 +com.fasterxml.jackson.dataformat:jackson-dataformat-toml;2.20.1 +com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.20.1 +com.fasterxml.jackson.dataformat:jackson-dataformat-yaml;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-eclipse-collections;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-guava;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-hibernate4;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-hibernate5;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-hibernate5-jakarta;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-hibernate6;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-hibernate7;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-hppc;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-jakarta-jsonp;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-javax-money;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-jaxrs;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-joda;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-joda-money;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-json-org;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-jsr353;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-moneta;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-pcollections;2.20.1 +com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-base;2.20.1 +com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-cbor-provider;2.20.1 +com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-json-provider;2.20.1 +com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-smile-provider;2.20.1 +com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-xml-provider;2.20.1 +com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-yaml-provider;2.20.1 +com.fasterxml.jackson.jaxrs:jackson-jaxrs-base;2.20.1 +com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider;2.20.1 +com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider;2.20.1 +com.fasterxml.jackson.jaxrs:jackson-jaxrs-smile-provider;2.20.1 +com.fasterxml.jackson.jaxrs:jackson-jaxrs-xml-provider;2.20.1 +com.fasterxml.jackson.jaxrs:jackson-jaxrs-yaml-provider;2.20.1 +com.fasterxml.jackson.jr:jackson-jr-all;2.20.1 +com.fasterxml.jackson.jr:jackson-jr-annotation-support;2.20.1 +com.fasterxml.jackson.jr:jackson-jr-extension-javatime;2.20.1 +com.fasterxml.jackson.jr:jackson-jr-objects;2.20.1 +com.fasterxml.jackson.jr:jackson-jr-retrofit2;2.20.1 +com.fasterxml.jackson.jr:jackson-jr-stree;2.20.1 +com.fasterxml.jackson.module:jackson-module-afterburner;2.20.1 +com.fasterxml.jackson.module:jackson-module-android-record;2.20.1 +com.fasterxml.jackson.module:jackson-module-blackbird;2.20.1 +com.fasterxml.jackson.module:jackson-module-guice;2.20.1 +com.fasterxml.jackson.module:jackson-module-guice7;2.20.1 +com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations;2.20.1 +com.fasterxml.jackson.module:jackson-module-jaxb-annotations;2.20.1 +com.fasterxml.jackson.module:jackson-module-jsonSchema;2.20.1 +com.fasterxml.jackson.module:jackson-module-jsonSchema-jakarta;2.20.1 +com.fasterxml.jackson.module:jackson-module-kotlin;2.20.1 +com.fasterxml.jackson.module:jackson-module-mrbean;2.20.1 +com.fasterxml.jackson.module:jackson-module-no-ctor-deser;2.20.1 +com.fasterxml.jackson.module:jackson-module-osgi;2.20.1 +com.fasterxml.jackson.module:jackson-module-parameter-names;2.20.1 +com.fasterxml.jackson.module:jackson-module-paranamer;2.20.1 +com.fasterxml.jackson.module:jackson-module-scala_2.11;2.20.1 +com.fasterxml.jackson.module:jackson-module-scala_2.12;2.20.1 +com.fasterxml.jackson.module:jackson-module-scala_2.13;2.20.1 +com.fasterxml.jackson.module:jackson-module-scala_3;2.20.1 +com.fasterxml.jackson:jackson-bom;2.20.1 +com.fasterxml:classmate;1.7.1 +com.github.ben-manes.caffeine:caffeine;3.2.3 +com.github.ben-manes.caffeine:guava;3.2.3 +com.github.ben-manes.caffeine:jcache;3.2.3 +com.github.ben-manes.caffeine:simulator;3.2.3 +com.github.mxab.thymeleaf.extras:thymeleaf-extras-data-attribute;2.0.1 +com.google.code.gson:gson;2.13.2 +com.graphql-java:graphql-java;25.0.beta-9 +com.h2database:h2;2.4.240 +com.hazelcast:hazelcast;5.5.0 +com.hazelcast:hazelcast-spring;5.5.0 +com.ibm.db2:jcc;12.1.2.0 +com.jayway.jsonpath:json-path;2.9.0 +com.jayway.jsonpath:json-path-assert;2.9.0 +com.microsoft.sqlserver:mssql-jdbc;13.2.1.jre11 +com.mysql:mysql-connector-j;9.4.0 +com.oracle.database.ha:ons;23.9.0.25.07 +com.oracle.database.ha:simplefan;23.9.0.25.07 +com.oracle.database.jdbc:ojdbc11;23.9.0.25.07 +com.oracle.database.jdbc:ojdbc11-production;23.9.0.25.07 +com.oracle.database.jdbc:ojdbc17;23.9.0.25.07 +com.oracle.database.jdbc:ojdbc17-production;23.9.0.25.07 +com.oracle.database.jdbc:ojdbc8;23.9.0.25.07 +com.oracle.database.jdbc:ojdbc8-production;23.9.0.25.07 +com.oracle.database.jdbc:rsi;23.9.0.25.07 +com.oracle.database.jdbc:ucp;23.9.0.25.07 +com.oracle.database.jdbc:ucp11;23.9.0.25.07 +com.oracle.database.jdbc:ucp17;23.9.0.25.07 +com.oracle.database.nls:orai18n;23.9.0.25.07 +com.oracle.database.r2dbc:oracle-r2dbc;1.3.0 +com.oracle.database.security:oraclepki;23.9.0.25.07 +com.oracle.database.xml:xdb;23.9.0.25.07 +com.oracle.database.xml:xmlparserv2;23.9.0.25.07 +com.querydsl:codegen-utils;5.1.0 +com.querydsl:querydsl-apt;5.1.0 +com.querydsl:querydsl-bom;5.1.0 +com.querydsl:querydsl-codegen;5.1.0 +com.querydsl:querydsl-collections;5.1.0 +com.querydsl:querydsl-core;5.1.0 +com.querydsl:querydsl-guava;5.1.0 +com.querydsl:querydsl-hibernate-search;5.1.0 +com.querydsl:querydsl-jdo;5.1.0 +com.querydsl:querydsl-jpa;5.1.0 +com.querydsl:querydsl-jpa-codegen;5.1.0 +com.querydsl:querydsl-kotlin;5.1.0 +com.querydsl:querydsl-kotlin-codegen;5.1.0 +com.querydsl:querydsl-lucene3;5.1.0 +com.querydsl:querydsl-lucene4;5.1.0 +com.querydsl:querydsl-lucene5;5.1.0 +com.querydsl:querydsl-mongodb;5.1.0 +com.querydsl:querydsl-scala;5.1.0 +com.querydsl:querydsl-spatial;5.1.0 +com.querydsl:querydsl-sql;5.1.0 +com.querydsl:querydsl-sql-codegen;5.1.0 +com.querydsl:querydsl-sql-spatial;5.1.0 +com.querydsl:querydsl-sql-spring;5.1.0 +com.rabbitmq:amqp-client;5.27.1 +com.rabbitmq:stream-client;0.23.0 +com.redis:testcontainers-redis;2.2.4 +com.samskivert:jmustache;1.16 +com.sendgrid:sendgrid-java;4.10.3 +com.sun.xml.bind:jaxb-core;4.0.6 +com.sun.xml.bind:jaxb-impl;4.0.6 +com.sun.xml.bind:jaxb-jxc;4.0.6 +com.sun.xml.bind:jaxb-osgi;4.0.6 +com.sun.xml.bind:jaxb-xjc;4.0.6 +com.sun.xml.messaging.saaj:saaj-impl;3.0.4 +com.unboundid:unboundid-ldapsdk;7.0.3 +com.zaxxer:HikariCP;7.0.2 +commons-codec:commons-codec;1.19.0 +commons-logging:commons-logging;1.3.5 +commons-pool:commons-pool;1.6 +io.asyncer:r2dbc-mysql;1.4.1 +io.github.git-commit-id:git-commit-id-maven-plugin;9.0.2 +io.lettuce:lettuce-core;6.8.1.RELEASE +io.micrometer:micrometer-bom;1.16.0-RC1 +io.micrometer:micrometer-registry-stackdriver;1.16.0-RC1 +io.micrometer:micrometer-tracing-bom;1.6.0-RC1 +io.netty:netty-all;4.2.7.Final +io.netty:netty-bom;4.2.7.Final +io.netty:netty-buffer;4.2.7.Final +io.netty:netty-codec;4.2.7.Final +io.netty:netty-codec-base;4.2.7.Final +io.netty:netty-codec-classes-quic;4.2.7.Final +io.netty:netty-codec-compression;4.2.7.Final +io.netty:netty-codec-dns;4.2.7.Final +io.netty:netty-codec-haproxy;4.2.7.Final +io.netty:netty-codec-http;4.2.7.Final +io.netty:netty-codec-http2;4.2.7.Final +io.netty:netty-codec-http3;4.2.7.Final +io.netty:netty-codec-marshalling;4.2.7.Final +io.netty:netty-codec-memcache;4.2.7.Final +io.netty:netty-codec-mqtt;4.2.7.Final +io.netty:netty-codec-native-quic;4.2.7.Final +io.netty:netty-codec-protobuf;4.2.7.Final +io.netty:netty-codec-redis;4.2.7.Final +io.netty:netty-codec-smtp;4.2.7.Final +io.netty:netty-codec-socks;4.2.7.Final +io.netty:netty-codec-stomp;4.2.7.Final +io.netty:netty-codec-xml;4.2.7.Final +io.netty:netty-common;4.2.7.Final +io.netty:netty-dev-tools;4.2.7.Final +io.netty:netty-handler;4.2.7.Final +io.netty:netty-handler-proxy;4.2.7.Final +io.netty:netty-handler-ssl-ocsp;4.2.7.Final +io.netty:netty-pkitesting;4.2.7.Final +io.netty:netty-resolver;4.2.7.Final +io.netty:netty-resolver-dns;4.2.7.Final +io.netty:netty-resolver-dns-classes-macos;4.2.7.Final +io.netty:netty-resolver-dns-native-macos;4.2.7.Final +io.netty:netty-tcnative;2.0.74.Final +io.netty:netty-tcnative-boringssl-static;2.0.74.Final +io.netty:netty-tcnative-classes;2.0.74.Final +io.netty:netty-transport;4.2.7.Final +io.netty:netty-transport-classes-epoll;4.2.7.Final +io.netty:netty-transport-classes-io_uring;4.2.7.Final +io.netty:netty-transport-classes-kqueue;4.2.7.Final +io.netty:netty-transport-native-epoll;4.2.7.Final +io.netty:netty-transport-native-io_uring;4.2.7.Final +io.netty:netty-transport-native-kqueue;4.2.7.Final +io.netty:netty-transport-native-unix-common;4.2.7.Final +io.netty:netty-transport-rxtx;4.2.7.Final +io.netty:netty-transport-sctp;4.2.7.Final +io.netty:netty-transport-udt;4.2.7.Final +io.opentelemetry:opentelemetry-api;1.55.0 +io.opentelemetry:opentelemetry-bom;1.55.0 +io.opentelemetry:opentelemetry-common;1.55.0 +io.opentelemetry:opentelemetry-context;1.55.0 +io.opentelemetry:opentelemetry-exporter-common;1.55.0 +io.opentelemetry:opentelemetry-exporter-logging;1.55.0 +io.opentelemetry:opentelemetry-exporter-logging-otlp;1.55.0 +io.opentelemetry:opentelemetry-exporter-otlp;1.55.0 +io.opentelemetry:opentelemetry-exporter-otlp-common;1.55.0 +io.opentelemetry:opentelemetry-exporter-sender-grpc-managed-channel;1.55.0 +io.opentelemetry:opentelemetry-exporter-sender-jdk;1.55.0 +io.opentelemetry:opentelemetry-exporter-sender-okhttp;1.55.0 +io.opentelemetry:opentelemetry-exporter-zipkin;1.55.0 +io.opentelemetry:opentelemetry-extension-kotlin;1.55.0 +io.opentelemetry:opentelemetry-extension-trace-propagators;1.55.0 +io.opentelemetry:opentelemetry-opentracing-shim;1.55.0 +io.opentelemetry:opentelemetry-sdk;1.55.0 +io.opentelemetry:opentelemetry-sdk-common;1.55.0 +io.opentelemetry:opentelemetry-sdk-extension-autoconfigure;1.55.0 +io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi;1.55.0 +io.opentelemetry:opentelemetry-sdk-extension-jaeger-remote-sampler;1.55.0 +io.opentelemetry:opentelemetry-sdk-logs;1.55.0 +io.opentelemetry:opentelemetry-sdk-metrics;1.55.0 +io.opentelemetry:opentelemetry-sdk-testing;1.55.0 +io.opentelemetry:opentelemetry-sdk-trace;1.55.0 +io.projectreactor.addons:reactor-adapter;3.6.0-RC6 +io.projectreactor.addons:reactor-extra;3.6.0-RC6 +io.projectreactor.addons:reactor-pool;1.2.0-RC1 +io.projectreactor.addons:reactor-pool-micrometer;0.3.0-RC1 +io.projectreactor.kotlin:reactor-kotlin-extensions;1.3.0-RC5 +io.projectreactor.netty:reactor-netty;1.3.0-RC1 +io.projectreactor.netty:reactor-netty-core;1.3.0-RC1 +io.projectreactor.netty:reactor-netty-http;1.3.0-RC1 +io.projectreactor.netty:reactor-netty-http-brave;1.3.0-RC1 +io.projectreactor.netty:reactor-netty-quic;1.0.0-RC1 +io.projectreactor:reactor-bom;2025.0.0-RC1 +io.projectreactor:reactor-core;3.8.0-RC1 +io.projectreactor:reactor-core-micrometer;1.3.0-RC1 +io.projectreactor:reactor-test;3.8.0-RC1 +io.projectreactor:reactor-tools;3.8.0-RC1 +io.prometheus:prometheus-metrics-bom;1.4.2 +io.prometheus:prometheus-metrics-config;1.4.2 +io.prometheus:prometheus-metrics-core;1.4.2 +io.prometheus:prometheus-metrics-exporter-common;1.4.2 +io.prometheus:prometheus-metrics-exporter-httpserver;1.4.2 +io.prometheus:prometheus-metrics-exporter-opentelemetry;1.4.2 +io.prometheus:prometheus-metrics-exporter-opentelemetry-no-otel;1.4.2 +io.prometheus:prometheus-metrics-exporter-opentelemetry-otel-agent-resources;1.4.2 +io.prometheus:prometheus-metrics-exporter-pushgateway;1.4.2 +io.prometheus:prometheus-metrics-exporter-servlet-jakarta;1.4.2 +io.prometheus:prometheus-metrics-exporter-servlet-javax;1.4.2 +io.prometheus:prometheus-metrics-exposition-formats;1.4.2 +io.prometheus:prometheus-metrics-exposition-formats-no-protobuf;1.4.2 +io.prometheus:prometheus-metrics-exposition-textformats;1.4.2 +io.prometheus:prometheus-metrics-instrumentation-caffeine;1.4.2 +io.prometheus:prometheus-metrics-instrumentation-dropwizard;1.4.2 +io.prometheus:prometheus-metrics-instrumentation-dropwizard5;1.4.2 +io.prometheus:prometheus-metrics-instrumentation-guava;1.4.2 +io.prometheus:prometheus-metrics-instrumentation-jvm;1.4.2 +io.prometheus:prometheus-metrics-model;1.4.2 +io.prometheus:prometheus-metrics-simpleclient-bridge;1.4.2 +io.prometheus:prometheus-metrics-tracer;1.4.2 +io.prometheus:prometheus-metrics-tracer-common;1.4.2 +io.prometheus:prometheus-metrics-tracer-initializer;1.4.2 +io.prometheus:prometheus-metrics-tracer-otel;1.4.2 +io.prometheus:prometheus-metrics-tracer-otel-agent;1.4.2 +io.prometheus:simpleclient;0.16.0 +io.prometheus:simpleclient_bom;0.16.0 +io.prometheus:simpleclient_caffeine;0.16.0 +io.prometheus:simpleclient_common;0.16.0 +io.prometheus:simpleclient_dropwizard;0.16.0 +io.prometheus:simpleclient_graphite_bridge;0.16.0 +io.prometheus:simpleclient_guava;0.16.0 +io.prometheus:simpleclient_hibernate;0.16.0 +io.prometheus:simpleclient_hotspot;0.16.0 +io.prometheus:simpleclient_httpserver;0.16.0 +io.prometheus:simpleclient_jetty;0.16.0 +io.prometheus:simpleclient_jetty_jdk8;0.16.0 +io.prometheus:simpleclient_log4j;0.16.0 +io.prometheus:simpleclient_log4j2;0.16.0 +io.prometheus:simpleclient_logback;0.16.0 +io.prometheus:simpleclient_pushgateway;0.16.0 +io.prometheus:simpleclient_servlet;0.16.0 +io.prometheus:simpleclient_servlet_jakarta;0.16.0 +io.prometheus:simpleclient_spring_boot;0.16.0 +io.prometheus:simpleclient_spring_web;0.16.0 +io.prometheus:simpleclient_tracer_common;0.16.0 +io.prometheus:simpleclient_tracer_otel;0.16.0 +io.prometheus:simpleclient_tracer_otel_agent;0.16.0 +io.prometheus:simpleclient_vertx;0.16.0 +io.r2dbc:r2dbc-h2;1.1.0.RELEASE +io.r2dbc:r2dbc-mssql;1.0.3.RELEASE +io.r2dbc:r2dbc-pool;1.0.2.RELEASE +io.r2dbc:r2dbc-proxy;1.1.6.RELEASE +io.r2dbc:r2dbc-spi;1.0.0.RELEASE +io.reactivex.rxjava3:rxjava;3.1.12 +io.rsocket:rsocket-bom;1.1.5 +io.rsocket:rsocket-core;1.1.5 +io.rsocket:rsocket-load-balancer;1.1.5 +io.rsocket:rsocket-micrometer;1.1.5 +io.rsocket:rsocket-test;1.1.5 +io.rsocket:rsocket-transport-local;1.1.5 +io.rsocket:rsocket-transport-netty;1.1.5 +io.spring.gradle:dependency-management-plugin;1.1.7 +io.zipkin.brave:brave;6.3.0 +io.zipkin.brave:brave-bom;6.3.0 +io.zipkin.brave:brave-context-jfr;6.3.0 +io.zipkin.brave:brave-context-log4j12;6.3.0 +io.zipkin.brave:brave-context-log4j2;6.3.0 +io.zipkin.brave:brave-context-slf4j;6.3.0 +io.zipkin.brave:brave-instrumentation-dubbo;6.3.0 +io.zipkin.brave:brave-instrumentation-grpc;6.3.0 +io.zipkin.brave:brave-instrumentation-http;6.3.0 +io.zipkin.brave:brave-instrumentation-http-tests;6.3.0 +io.zipkin.brave:brave-instrumentation-http-tests-jakarta;6.3.0 +io.zipkin.brave:brave-instrumentation-httpasyncclient;6.3.0 +io.zipkin.brave:brave-instrumentation-httpclient;6.3.0 +io.zipkin.brave:brave-instrumentation-httpclient5;6.3.0 +io.zipkin.brave:brave-instrumentation-jakarta-jms;6.3.0 +io.zipkin.brave:brave-instrumentation-jaxrs2;6.3.0 +io.zipkin.brave:brave-instrumentation-jdbi3;6.3.0 +io.zipkin.brave:brave-instrumentation-jersey-server;6.3.0 +io.zipkin.brave:brave-instrumentation-jersey-server-jakarta;6.3.0 +io.zipkin.brave:brave-instrumentation-jms;6.3.0 +io.zipkin.brave:brave-instrumentation-jms-jakarta;6.3.0 +io.zipkin.brave:brave-instrumentation-kafka-clients;6.3.0 +io.zipkin.brave:brave-instrumentation-kafka-streams;6.3.0 +io.zipkin.brave:brave-instrumentation-messaging;6.3.0 +io.zipkin.brave:brave-instrumentation-mongodb;6.3.0 +io.zipkin.brave:brave-instrumentation-mysql;6.3.0 +io.zipkin.brave:brave-instrumentation-mysql6;6.3.0 +io.zipkin.brave:brave-instrumentation-mysql8;6.3.0 +io.zipkin.brave:brave-instrumentation-netty-codec-http;6.3.0 +io.zipkin.brave:brave-instrumentation-okhttp3;6.3.0 +io.zipkin.brave:brave-instrumentation-rocketmq-client;6.3.0 +io.zipkin.brave:brave-instrumentation-rpc;6.3.0 +io.zipkin.brave:brave-instrumentation-servlet;6.3.0 +io.zipkin.brave:brave-instrumentation-servlet-jakarta;6.3.0 +io.zipkin.brave:brave-instrumentation-spring-rabbit;6.3.0 +io.zipkin.brave:brave-instrumentation-spring-web;6.3.0 +io.zipkin.brave:brave-instrumentation-spring-webmvc;6.3.0 +io.zipkin.brave:brave-instrumentation-vertx-web;6.3.0 +io.zipkin.brave:brave-spring-beans;6.3.0 +io.zipkin.brave:brave-tests;6.3.0 +io.zipkin.reporter2:zipkin-reporter;3.5.1 +io.zipkin.reporter2:zipkin-reporter-bom;3.5.1 +io.zipkin.reporter2:zipkin-reporter-brave;3.5.1 +io.zipkin.reporter2:zipkin-reporter-metrics-micrometer;3.5.1 +io.zipkin.reporter2:zipkin-reporter-spring-beans;3.5.1 +io.zipkin.reporter2:zipkin-sender-activemq-client;3.5.1 +io.zipkin.reporter2:zipkin-sender-amqp-client;3.5.1 +io.zipkin.reporter2:zipkin-sender-kafka;3.5.1 +io.zipkin.reporter2:zipkin-sender-libthrift;3.5.1 +io.zipkin.reporter2:zipkin-sender-okhttp3;3.5.1 +io.zipkin.reporter2:zipkin-sender-pulsar-client;3.5.1 +io.zipkin.reporter2:zipkin-sender-urlconnection;3.5.1 +jakarta.activation:jakarta.activation-api;2.1.4 +jakarta.annotation:jakarta.annotation-api;3.0.0 +jakarta.inject:jakarta.inject-api;2.0.1 +jakarta.jms:jakarta.jms-api;3.1.0 +jakarta.json.bind:jakarta.json.bind-api;3.0.1 +jakarta.json:jakarta.json-api;2.1.3 +jakarta.mail:jakarta.mail-api;2.1.5 +jakarta.management.j2ee:jakarta.management.j2ee-api;1.1.4 +jakarta.persistence:jakarta.persistence-api;3.2.0 +jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api;3.0.2 +jakarta.servlet:jakarta.servlet-api;6.1.0 +jakarta.transaction:jakarta.transaction-api;2.0.1 +jakarta.validation:jakarta.validation-api;3.1.1 +jakarta.websocket:jakarta.websocket-api;2.2.0 +jakarta.websocket:jakarta.websocket-client-api;2.2.0 +jakarta.ws.rs:jakarta.ws.rs-api;4.0.0 +jakarta.xml.bind:jakarta.xml.bind-api;4.0.4 +jakarta.xml.soap:jakarta.xml.soap-api;3.0.2 +jakarta.xml.ws:jakarta.xml.ws-api;4.0.2 +javax.cache:cache-api;1.1.1 +javax.money:money-api;1.1 +jaxen:jaxen;2.0.0 +junit:junit;4.13.2 +net.bytebuddy:byte-buddy;1.17.8 +net.bytebuddy:byte-buddy-agent;1.17.8 +net.minidev:json-smart;2.6.0 +net.sourceforge.jtds:jtds;1.3.1 +net.sourceforge.nekohtml:nekohtml;1.9.22 +nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect;3.4.0 +org.apache.activemq:activemq-all;6.1.8 +org.apache.activemq:activemq-amqp;6.1.8 +org.apache.activemq:activemq-blueprint;6.1.8 +org.apache.activemq:activemq-bom;6.1.8 +org.apache.activemq:activemq-broker;6.1.8 +org.apache.activemq:activemq-client;6.1.8 +org.apache.activemq:activemq-console;6.1.8 +org.apache.activemq:activemq-http;6.1.8 +org.apache.activemq:activemq-jaas;6.1.8 +org.apache.activemq:activemq-jdbc-store;6.1.8 +org.apache.activemq:activemq-jms-pool;6.1.8 +org.apache.activemq:activemq-kahadb-store;6.1.8 +org.apache.activemq:activemq-karaf;6.1.8 +org.apache.activemq:activemq-log4j-appender;6.1.8 +org.apache.activemq:activemq-mqtt;6.1.8 +org.apache.activemq:activemq-openwire-generator;6.1.8 +org.apache.activemq:activemq-openwire-legacy;6.1.8 +org.apache.activemq:activemq-osgi;6.1.8 +org.apache.activemq:activemq-pool;6.1.8 +org.apache.activemq:activemq-ra;6.1.8 +org.apache.activemq:activemq-rar;6.1.8 +org.apache.activemq:activemq-run;6.1.8 +org.apache.activemq:activemq-runtime-config;6.1.8 +org.apache.activemq:activemq-shiro;6.1.8 +org.apache.activemq:activemq-spring;6.1.8 +org.apache.activemq:activemq-stomp;6.1.8 +org.apache.activemq:activemq-web;6.1.8 +org.apache.activemq:activemq-web-console;6.1.8 +org.apache.activemq:activemq-web-demo;6.1.8 +org.apache.activemq:artemis-amqp-protocol;2.43.0 +org.apache.activemq:artemis-bom;2.43.0 +org.apache.activemq:artemis-boot;2.43.0 +org.apache.activemq:artemis-cdi-client;2.43.0 +org.apache.activemq:artemis-cli;2.43.0 +org.apache.activemq:artemis-commons;2.43.0 +org.apache.activemq:artemis-console;2.43.0 +org.apache.activemq:artemis-core-client;2.43.0 +org.apache.activemq:artemis-core-client-all;2.43.0 +org.apache.activemq:artemis-core-client-osgi;2.43.0 +org.apache.activemq:artemis-dto;2.43.0 +org.apache.activemq:artemis-features;2.43.0 +org.apache.activemq:artemis-hornetq-protocol;2.43.0 +org.apache.activemq:artemis-hqclient-protocol;2.43.0 +org.apache.activemq:artemis-jakarta-cdi-client;2.43.0 +org.apache.activemq:artemis-jakarta-client;2.43.0 +org.apache.activemq:artemis-jakarta-client-all;2.43.0 +org.apache.activemq:artemis-jakarta-openwire-protocol;2.43.0 +org.apache.activemq:artemis-jakarta-ra;2.43.0 +org.apache.activemq:artemis-jakarta-server;2.43.0 +org.apache.activemq:artemis-jakarta-service-extensions;2.43.0 +org.apache.activemq:artemis-jdbc-store;2.43.0 +org.apache.activemq:artemis-jms-client;2.43.0 +org.apache.activemq:artemis-jms-client-all;2.43.0 +org.apache.activemq:artemis-jms-client-osgi;2.43.0 +org.apache.activemq:artemis-jms-server;2.43.0 +org.apache.activemq:artemis-journal;2.43.0 +org.apache.activemq:artemis-lockmanager-api;2.43.0 +org.apache.activemq:artemis-lockmanager-ri;2.43.0 +org.apache.activemq:artemis-mqtt-protocol;2.43.0 +org.apache.activemq:artemis-openwire-protocol;2.43.0 +org.apache.activemq:artemis-ra;2.43.0 +org.apache.activemq:artemis-selector;2.43.0 +org.apache.activemq:artemis-server;2.43.0 +org.apache.activemq:artemis-server-osgi;2.43.0 +org.apache.activemq:artemis-service-extensions;2.43.0 +org.apache.activemq:artemis-stomp-protocol;2.43.0 +org.apache.activemq:artemis-web;2.43.0 +org.apache.activemq:artemis-website;2.43.0 +org.apache.cassandra:java-driver-bom;4.19.0 +org.apache.cassandra:java-driver-core;4.19.0 +org.apache.cassandra:java-driver-core-shaded;4.19.0 +org.apache.cassandra:java-driver-guava-shaded;4.19.0 +org.apache.cassandra:java-driver-mapper-processor;4.19.0 +org.apache.cassandra:java-driver-mapper-runtime;4.19.0 +org.apache.cassandra:java-driver-metrics-micrometer;4.19.0 +org.apache.cassandra:java-driver-metrics-microprofile;4.19.0 +org.apache.cassandra:java-driver-query-builder;4.19.0 +org.apache.cassandra:java-driver-test-infra;4.19.0 +org.apache.commons:commons-dbcp2;2.13.0 +org.apache.commons:commons-lang3;3.19.0 +org.apache.commons:commons-pool2;2.12.1 +org.apache.derby:derby;10.16.1.1 +org.apache.derby:derbyclient;10.16.1.1 +org.apache.derby:derbynet;10.16.1.1 +org.apache.derby:derbyoptionaltools;10.16.1.1 +org.apache.derby:derbyshared;10.16.1.1 +org.apache.derby:derbytools;10.16.1.1 +org.apache.groovy:groovy;5.0.2 +org.apache.groovy:groovy-ant;5.0.2 +org.apache.groovy:groovy-astbuilder;5.0.2 +org.apache.groovy:groovy-bom;5.0.2 +org.apache.groovy:groovy-cli-commons;5.0.2 +org.apache.groovy:groovy-cli-picocli;5.0.2 +org.apache.groovy:groovy-console;5.0.2 +org.apache.groovy:groovy-contracts;5.0.2 +org.apache.groovy:groovy-datetime;5.0.2 +org.apache.groovy:groovy-dateutil;5.0.2 +org.apache.groovy:groovy-docgenerator;5.0.2 +org.apache.groovy:groovy-ginq;5.0.2 +org.apache.groovy:groovy-groovydoc;5.0.2 +org.apache.groovy:groovy-groovysh;5.0.2 +org.apache.groovy:groovy-jmx;5.0.2 +org.apache.groovy:groovy-json;5.0.2 +org.apache.groovy:groovy-jsr223;5.0.2 +org.apache.groovy:groovy-macro;5.0.2 +org.apache.groovy:groovy-macro-library;5.0.2 +org.apache.groovy:groovy-nio;5.0.2 +org.apache.groovy:groovy-servlet;5.0.2 +org.apache.groovy:groovy-sql;5.0.2 +org.apache.groovy:groovy-swing;5.0.2 +org.apache.groovy:groovy-templates;5.0.2 +org.apache.groovy:groovy-test;5.0.2 +org.apache.groovy:groovy-test-junit5;5.0.2 +org.apache.groovy:groovy-testng;5.0.2 +org.apache.groovy:groovy-toml;5.0.2 +org.apache.groovy:groovy-typecheckers;5.0.2 +org.apache.groovy:groovy-xml;5.0.2 +org.apache.groovy:groovy-yaml;5.0.2 +org.apache.httpcomponents.client5:httpclient5;5.5.1 +org.apache.httpcomponents.client5:httpclient5-cache;5.5.1 +org.apache.httpcomponents.client5:httpclient5-fluent;5.5.1 +org.apache.httpcomponents.core5:httpcore5;5.3.6 +org.apache.httpcomponents.core5:httpcore5-h2;5.3.6 +org.apache.httpcomponents.core5:httpcore5-reactive;5.3.6 +org.apache.httpcomponents:httpasyncclient;4.1.5 +org.apache.httpcomponents:httpcore;4.4.16 +org.apache.httpcomponents:httpcore-nio;4.4.16 +org.apache.kafka:connect;4.1.0 +org.apache.kafka:connect-api;4.1.0 +org.apache.kafka:connect-basic-auth-extension;4.1.0 +org.apache.kafka:connect-file;4.1.0 +org.apache.kafka:connect-json;4.1.0 +org.apache.kafka:connect-mirror;4.1.0 +org.apache.kafka:connect-mirror-client;4.1.0 +org.apache.kafka:connect-runtime;4.1.0 +org.apache.kafka:connect-transforms;4.1.0 +org.apache.kafka:generator;4.1.0 +org.apache.kafka:kafka-clients;4.1.0 +org.apache.kafka:kafka-log4j-appender;4.1.0 +org.apache.kafka:kafka-metadata;4.1.0 +org.apache.kafka:kafka-raft;4.1.0 +org.apache.kafka:kafka-server;4.1.0 +org.apache.kafka:kafka-server-common;4.1.0 +org.apache.kafka:kafka-shell;4.1.0 +org.apache.kafka:kafka-storage;4.1.0 +org.apache.kafka:kafka-storage-api;4.1.0 +org.apache.kafka:kafka-streams;4.1.0 +org.apache.kafka:kafka-streams-scala_2.12;4.1.0 +org.apache.kafka:kafka-streams-scala_2.13;4.1.0 +org.apache.kafka:kafka-streams-test-utils;4.1.0 +org.apache.kafka:kafka-tools;4.1.0 +org.apache.kafka:kafka_2.12;4.1.0 +org.apache.kafka:kafka_2.13;4.1.0 +org.apache.kafka:trogdor;4.1.0 +org.apache.logging.log4j:log4j-1.2-api;2.25.2 +org.apache.logging.log4j:log4j-api;2.25.2 +org.apache.logging.log4j:log4j-api-test;2.25.2 +org.apache.logging.log4j:log4j-appserver;2.25.2 +org.apache.logging.log4j:log4j-bom;2.25.2 +org.apache.logging.log4j:log4j-cassandra;2.25.2 +org.apache.logging.log4j:log4j-core;2.25.2 +org.apache.logging.log4j:log4j-core-test;2.25.2 +org.apache.logging.log4j:log4j-couchdb;2.25.2 +org.apache.logging.log4j:log4j-docker;2.25.2 +org.apache.logging.log4j:log4j-flume-ng;2.23.1 +org.apache.logging.log4j:log4j-iostreams;2.25.2 +org.apache.logging.log4j:log4j-jakarta-jms;2.25.2 +org.apache.logging.log4j:log4j-jakarta-smtp;2.25.2 +org.apache.logging.log4j:log4j-jakarta-web;2.25.2 +org.apache.logging.log4j:log4j-jcl;2.25.2 +org.apache.logging.log4j:log4j-jpa;2.25.2 +org.apache.logging.log4j:log4j-jpl;2.25.2 +org.apache.logging.log4j:log4j-jul;2.25.2 +org.apache.logging.log4j:log4j-layout-template-json;2.25.2 +org.apache.logging.log4j:log4j-mongodb;2.25.2 +org.apache.logging.log4j:log4j-mongodb4;2.25.2 +org.apache.logging.log4j:log4j-slf4j-impl;2.25.2 +org.apache.logging.log4j:log4j-slf4j2-impl;2.25.2 +org.apache.logging.log4j:log4j-spring-boot;2.25.2 +org.apache.logging.log4j:log4j-spring-cloud-config-client;2.25.2 +org.apache.logging.log4j:log4j-taglib;2.25.2 +org.apache.logging.log4j:log4j-to-jul;2.25.2 +org.apache.logging.log4j:log4j-to-slf4j;2.25.2 +org.apache.logging.log4j:log4j-web;2.25.2 +org.apache.maven.plugins:maven-antrun-plugin;3.2.0 +org.apache.maven.plugins:maven-assembly-plugin;3.7.1 +org.apache.maven.plugins:maven-clean-plugin;3.5.0 +org.apache.maven.plugins:maven-compiler-plugin;3.14.1 +org.apache.maven.plugins:maven-dependency-plugin;3.9.0 +org.apache.maven.plugins:maven-deploy-plugin;3.1.4 +org.apache.maven.plugins:maven-enforcer-plugin;3.6.2 +org.apache.maven.plugins:maven-failsafe-plugin;3.5.4 +org.apache.maven.plugins:maven-help-plugin;3.5.1 +org.apache.maven.plugins:maven-install-plugin;3.1.4 +org.apache.maven.plugins:maven-invoker-plugin;3.9.1 +org.apache.maven.plugins:maven-jar-plugin;3.4.2 +org.apache.maven.plugins:maven-javadoc-plugin;3.12.0 +org.apache.maven.plugins:maven-resources-plugin;3.3.1 +org.apache.maven.plugins:maven-shade-plugin;3.6.1 +org.apache.maven.plugins:maven-source-plugin;3.3.1 +org.apache.maven.plugins:maven-surefire-plugin;3.5.4 +org.apache.maven.plugins:maven-war-plugin;3.4.0 +org.apache.pulsar:bouncy-castle-bc;4.1.1 +org.apache.pulsar:bouncy-castle-bcfips;4.1.1 +org.apache.pulsar:bouncy-castle-parent;4.1.1 +org.apache.pulsar:buildtools;4.1.1 +org.apache.pulsar:distribution;4.1.1 +org.apache.pulsar:docker-images;4.1.1 +org.apache.pulsar:jclouds-shaded;4.1.1 +org.apache.pulsar:managed-ledger;4.1.1 +org.apache.pulsar:pulsar;4.1.1 +org.apache.pulsar:pulsar-all-docker-image;4.1.1 +org.apache.pulsar:pulsar-bom;4.1.1 +org.apache.pulsar:pulsar-broker;4.1.1 +org.apache.pulsar:pulsar-broker-auth-athenz;4.1.1 +org.apache.pulsar:pulsar-broker-auth-oidc;4.1.1 +org.apache.pulsar:pulsar-broker-auth-sasl;4.1.1 +org.apache.pulsar:pulsar-broker-common;4.1.1 +org.apache.pulsar:pulsar-cli-utils;4.1.1 +org.apache.pulsar:pulsar-client;4.1.1 +org.apache.pulsar:pulsar-client-admin;4.1.1 +org.apache.pulsar:pulsar-client-admin-api;4.1.1 +org.apache.pulsar:pulsar-client-admin-original;4.1.1 +org.apache.pulsar:pulsar-client-all;4.1.1 +org.apache.pulsar:pulsar-client-api;4.1.1 +org.apache.pulsar:pulsar-client-auth-athenz;4.1.1 +org.apache.pulsar:pulsar-client-auth-sasl;4.1.1 +org.apache.pulsar:pulsar-client-messagecrypto-bc;4.1.1 +org.apache.pulsar:pulsar-client-original;4.1.1 +org.apache.pulsar:pulsar-client-tools;4.1.1 +org.apache.pulsar:pulsar-client-tools-api;4.1.1 +org.apache.pulsar:pulsar-common;4.1.1 +org.apache.pulsar:pulsar-config-validation;4.1.1 +org.apache.pulsar:pulsar-docker-image;4.1.1 +org.apache.pulsar:pulsar-docs-tools;4.1.1 +org.apache.pulsar:pulsar-functions;4.1.1 +org.apache.pulsar:pulsar-functions-api;4.1.1 +org.apache.pulsar:pulsar-functions-api-examples;4.1.1 +org.apache.pulsar:pulsar-functions-api-examples-builtin;4.1.1 +org.apache.pulsar:pulsar-functions-instance;4.1.1 +org.apache.pulsar:pulsar-functions-local-runner;4.1.1 +org.apache.pulsar:pulsar-functions-local-runner-original;4.1.1 +org.apache.pulsar:pulsar-functions-proto;4.1.1 +org.apache.pulsar:pulsar-functions-runtime;4.1.1 +org.apache.pulsar:pulsar-functions-runtime-all;4.1.1 +org.apache.pulsar:pulsar-functions-secrets;4.1.1 +org.apache.pulsar:pulsar-functions-utils;4.1.1 +org.apache.pulsar:pulsar-functions-worker;4.1.1 +org.apache.pulsar:pulsar-io;4.1.1 +org.apache.pulsar:pulsar-io-aerospike;4.1.1 +org.apache.pulsar:pulsar-io-alluxio;4.1.1 +org.apache.pulsar:pulsar-io-aws;4.1.1 +org.apache.pulsar:pulsar-io-batch-data-generator;4.1.1 +org.apache.pulsar:pulsar-io-batch-discovery-triggerers;4.1.1 +org.apache.pulsar:pulsar-io-canal;4.1.1 +org.apache.pulsar:pulsar-io-cassandra;4.1.1 +org.apache.pulsar:pulsar-io-common;4.1.1 +org.apache.pulsar:pulsar-io-core;4.1.1 +org.apache.pulsar:pulsar-io-data-generator;4.1.1 +org.apache.pulsar:pulsar-io-debezium;4.1.1 +org.apache.pulsar:pulsar-io-debezium-core;4.1.1 +org.apache.pulsar:pulsar-io-debezium-mongodb;4.1.1 +org.apache.pulsar:pulsar-io-debezium-mssql;4.1.1 +org.apache.pulsar:pulsar-io-debezium-mysql;4.1.1 +org.apache.pulsar:pulsar-io-debezium-oracle;4.1.1 +org.apache.pulsar:pulsar-io-debezium-postgres;4.1.1 +org.apache.pulsar:pulsar-io-distribution;4.1.1 +org.apache.pulsar:pulsar-io-docs;4.1.1 +org.apache.pulsar:pulsar-io-dynamodb;4.1.1 +org.apache.pulsar:pulsar-io-elastic-search;4.1.1 +org.apache.pulsar:pulsar-io-file;4.1.1 +org.apache.pulsar:pulsar-io-flume;4.1.1 +org.apache.pulsar:pulsar-io-hbase;4.1.1 +org.apache.pulsar:pulsar-io-hdfs3;4.1.1 +org.apache.pulsar:pulsar-io-http;4.1.1 +org.apache.pulsar:pulsar-io-influxdb;4.1.1 +org.apache.pulsar:pulsar-io-jdbc;4.1.1 +org.apache.pulsar:pulsar-io-jdbc-clickhouse;4.1.1 +org.apache.pulsar:pulsar-io-jdbc-core;4.1.1 +org.apache.pulsar:pulsar-io-jdbc-mariadb;4.1.1 +org.apache.pulsar:pulsar-io-jdbc-openmldb;4.1.1 +org.apache.pulsar:pulsar-io-jdbc-postgres;4.1.1 +org.apache.pulsar:pulsar-io-jdbc-sqlite;4.1.1 +org.apache.pulsar:pulsar-io-kafka;4.1.1 +org.apache.pulsar:pulsar-io-kafka-connect-adaptor;4.1.1 +org.apache.pulsar:pulsar-io-kafka-connect-adaptor-nar;4.1.1 +org.apache.pulsar:pulsar-io-kinesis;4.1.1 +org.apache.pulsar:pulsar-io-mongo;4.1.1 +org.apache.pulsar:pulsar-io-netty;4.1.1 +org.apache.pulsar:pulsar-io-nsq;4.1.1 +org.apache.pulsar:pulsar-io-rabbitmq;4.1.1 +org.apache.pulsar:pulsar-io-redis;4.1.1 +org.apache.pulsar:pulsar-io-solr;4.1.1 +org.apache.pulsar:pulsar-io-twitter;4.1.1 +org.apache.pulsar:pulsar-metadata;4.1.1 +org.apache.pulsar:pulsar-offloader-distribution;4.1.1 +org.apache.pulsar:pulsar-package-bookkeeper-storage;4.1.1 +org.apache.pulsar:pulsar-package-core;4.1.1 +org.apache.pulsar:pulsar-package-filesystem-storage;4.1.1 +org.apache.pulsar:pulsar-package-management;4.1.1 +org.apache.pulsar:pulsar-proxy;4.1.1 +org.apache.pulsar:pulsar-server-distribution;4.1.1 +org.apache.pulsar:pulsar-shell-distribution;4.1.1 +org.apache.pulsar:pulsar-testclient;4.1.1 +org.apache.pulsar:pulsar-transaction-common;4.1.1 +org.apache.pulsar:pulsar-transaction-coordinator;4.1.1 +org.apache.pulsar:pulsar-transaction-parent;4.1.1 +org.apache.pulsar:pulsar-websocket;4.1.1 +org.apache.pulsar:structured-event-log;4.1.1 +org.apache.pulsar:testmocks;4.1.1 +org.apache.pulsar:tiered-storage-file-system;4.1.1 +org.apache.pulsar:tiered-storage-jcloud;4.1.1 +org.apache.pulsar:tiered-storage-parent;4.1.1 +org.apache.tomcat.embed:tomcat-embed-core;11.0.13 +org.apache.tomcat.embed:tomcat-embed-el;11.0.13 +org.apache.tomcat.embed:tomcat-embed-jasper;11.0.13 +org.apache.tomcat.embed:tomcat-embed-websocket;11.0.13 +org.apache.tomcat:tomcat-annotations-api;11.0.13 +org.apache.tomcat:tomcat-jdbc;11.0.13 +org.apache.tomcat:tomcat-jsp-api;11.0.13 +org.aspectj:aspectjrt;1.9.25 +org.aspectj:aspectjtools;1.9.25 +org.aspectj:aspectjweaver;1.9.25 +org.assertj:assertj-bom;3.27.6 +org.assertj:assertj-core;3.27.6 +org.assertj:assertj-guava;3.27.6 +org.awaitility:awaitility;4.3.0 +org.awaitility:awaitility-groovy;4.3.0 +org.awaitility:awaitility-kotlin;4.3.0 +org.awaitility:awaitility-scala;4.3.0 +org.cache2k:cache2k-api;2.6.1.Final +org.cache2k:cache2k-config;2.6.1.Final +org.cache2k:cache2k-core;2.6.1.Final +org.cache2k:cache2k-jcache;2.6.1.Final +org.cache2k:cache2k-micrometer;2.6.1.Final +org.cache2k:cache2k-spring;2.6.1.Final +org.codehaus.janino:commons-compiler;3.1.12 +org.codehaus.janino:commons-compiler-jdk;3.1.12 +org.codehaus.janino:janino;3.1.12 +org.codehaus.mojo:build-helper-maven-plugin;3.6.1 +org.codehaus.mojo:versions-maven-plugin;2.19.1 +org.codehaus.mojo:xml-maven-plugin;1.2.0 +org.crac:crac;1.5.0 +org.cyclonedx:cyclonedx-maven-plugin;2.9.1 +org.eclipse.angus:angus-core;2.0.5 +org.eclipse.angus:angus-mail;2.0.5 +org.eclipse.angus:dsn;2.0.5 +org.eclipse.angus:gimap;2.0.5 +org.eclipse.angus:imap;2.0.5 +org.eclipse.angus:jakarta.mail;2.0.5 +org.eclipse.angus:logging-mailhandler;2.0.5 +org.eclipse.angus:pop3;2.0.5 +org.eclipse.angus:smtp;2.0.5 +org.eclipse.jetty.compression:jetty-compression-brotli;12.1.3 +org.eclipse.jetty.compression:jetty-compression-common;12.1.3 +org.eclipse.jetty.compression:jetty-compression-gzip;12.1.3 +org.eclipse.jetty.compression:jetty-compression-server;12.1.3 +org.eclipse.jetty.compression:jetty-compression-zstandard;12.1.3 +org.eclipse.jetty.demos:jetty-core-demo-handler;12.1.3 +org.eclipse.jetty.ee11.osgi:jetty-ee11-osgi-alpn;12.1.3 +org.eclipse.jetty.ee11.osgi:jetty-ee11-osgi-boot;12.1.3 +org.eclipse.jetty.ee11.osgi:jetty-ee11-osgi-boot-jsp;12.1.3 +org.eclipse.jetty.ee11.websocket:jetty-ee11-websocket-jakarta-client;12.1.3 +org.eclipse.jetty.ee11.websocket:jetty-ee11-websocket-jakarta-client-webapp;12.1.3 +org.eclipse.jetty.ee11.websocket:jetty-ee11-websocket-jakarta-common;12.1.3 +org.eclipse.jetty.ee11.websocket:jetty-ee11-websocket-jakarta-server;12.1.3 +org.eclipse.jetty.ee11.websocket:jetty-ee11-websocket-jetty-client-webapp;12.1.3 +org.eclipse.jetty.ee11.websocket:jetty-ee11-websocket-jetty-server;12.1.3 +org.eclipse.jetty.ee11.websocket:jetty-ee11-websocket-servlet;12.1.3 +org.eclipse.jetty.ee11:jetty-ee11-annotations;12.1.3 +org.eclipse.jetty.ee11:jetty-ee11-apache-jsp;12.1.3 +org.eclipse.jetty.ee11:jetty-ee11-bom;12.1.3 +org.eclipse.jetty.ee11:jetty-ee11-cdi;12.1.3 +org.eclipse.jetty.ee11:jetty-ee11-fcgi-proxy;12.1.3 +org.eclipse.jetty.ee11:jetty-ee11-glassfish-jstl;12.1.3 +org.eclipse.jetty.ee11:jetty-ee11-jaspi;12.1.3 +org.eclipse.jetty.ee11:jetty-ee11-jndi;12.1.3 +org.eclipse.jetty.ee11:jetty-ee11-jspc-maven-plugin;12.1.3 +org.eclipse.jetty.ee11:jetty-ee11-maven-plugin;12.1.3 +org.eclipse.jetty.ee11:jetty-ee11-plus;12.1.3 +org.eclipse.jetty.ee11:jetty-ee11-proxy;12.1.3 +org.eclipse.jetty.ee11:jetty-ee11-quickstart;12.1.3 +org.eclipse.jetty.ee11:jetty-ee11-servlet;12.1.3 +org.eclipse.jetty.ee11:jetty-ee11-servlets;12.1.3 +org.eclipse.jetty.ee11:jetty-ee11-webapp;12.1.3 +org.eclipse.jetty.ee:jetty-ee-webapp;12.1.3 +org.eclipse.jetty.fcgi:jetty-fcgi-client;12.1.3 +org.eclipse.jetty.fcgi:jetty-fcgi-proxy;12.1.3 +org.eclipse.jetty.fcgi:jetty-fcgi-server;12.1.3 +org.eclipse.jetty.http2:jetty-http2-client;12.1.3 +org.eclipse.jetty.http2:jetty-http2-client-transport;12.1.3 +org.eclipse.jetty.http2:jetty-http2-common;12.1.3 +org.eclipse.jetty.http2:jetty-http2-hpack;12.1.3 +org.eclipse.jetty.http2:jetty-http2-server;12.1.3 +org.eclipse.jetty.http3:jetty-http3-client;12.1.3 +org.eclipse.jetty.http3:jetty-http3-client-transport;12.1.3 +org.eclipse.jetty.http3:jetty-http3-common;12.1.3 +org.eclipse.jetty.http3:jetty-http3-qpack;12.1.3 +org.eclipse.jetty.http3:jetty-http3-server;12.1.3 +org.eclipse.jetty.quic:jetty-quic-common;12.1.3 +org.eclipse.jetty.quic:jetty-quic-quiche-client;12.1.3 +org.eclipse.jetty.quic:jetty-quic-quiche-common;12.1.3 +org.eclipse.jetty.quic:jetty-quic-quiche-foreign;12.1.3 +org.eclipse.jetty.quic:jetty-quic-quiche-jna;12.1.3 +org.eclipse.jetty.quic:jetty-quic-server;12.1.3 +org.eclipse.jetty.websocket:jetty-websocket-core-client;12.1.3 +org.eclipse.jetty.websocket:jetty-websocket-core-common;12.1.3 +org.eclipse.jetty.websocket:jetty-websocket-core-server;12.1.3 +org.eclipse.jetty.websocket:jetty-websocket-jetty-api;12.1.3 +org.eclipse.jetty.websocket:jetty-websocket-jetty-client;12.1.3 +org.eclipse.jetty.websocket:jetty-websocket-jetty-common;12.1.3 +org.eclipse.jetty.websocket:jetty-websocket-jetty-server;12.1.3 +org.eclipse.jetty:jetty-alpn-client;12.1.3 +org.eclipse.jetty:jetty-alpn-conscrypt-client;12.1.3 +org.eclipse.jetty:jetty-alpn-conscrypt-server;12.1.3 +org.eclipse.jetty:jetty-alpn-java-client;12.1.3 +org.eclipse.jetty:jetty-alpn-java-server;12.1.3 +org.eclipse.jetty:jetty-alpn-server;12.1.3 +org.eclipse.jetty:jetty-bom;12.1.3 +org.eclipse.jetty:jetty-client;12.1.3 +org.eclipse.jetty:jetty-coreapp;12.1.3 +org.eclipse.jetty:jetty-deploy;12.1.3 +org.eclipse.jetty:jetty-ethereum;12.1.3 +org.eclipse.jetty:jetty-http;12.1.3 +org.eclipse.jetty:jetty-http-spi;12.1.3 +org.eclipse.jetty:jetty-http-tools;12.1.3 +org.eclipse.jetty:jetty-io;12.1.3 +org.eclipse.jetty:jetty-jmx;12.1.3 +org.eclipse.jetty:jetty-jndi;12.1.3 +org.eclipse.jetty:jetty-keystore;12.1.3 +org.eclipse.jetty:jetty-openid;12.1.3 +org.eclipse.jetty:jetty-osgi;12.1.3 +org.eclipse.jetty:jetty-plus;12.1.3 +org.eclipse.jetty:jetty-proxy;12.1.3 +org.eclipse.jetty:jetty-reactive-httpclient;4.1.0 +org.eclipse.jetty:jetty-rewrite;12.1.3 +org.eclipse.jetty:jetty-security;12.1.3 +org.eclipse.jetty:jetty-server;12.1.3 +org.eclipse.jetty:jetty-session;12.1.3 +org.eclipse.jetty:jetty-slf4j-impl;12.1.3 +org.eclipse.jetty:jetty-start;12.1.3 +org.eclipse.jetty:jetty-staticapp;12.1.3 +org.eclipse.jetty:jetty-unixdomain-server;12.1.3 +org.eclipse.jetty:jetty-util;12.1.3 +org.eclipse.jetty:jetty-util-ajax;12.1.3 +org.eclipse.jetty:jetty-xml;12.1.3 +org.eclipse:yasson;3.0.4 +org.ehcache:ehcache;3.11.1 +org.ehcache:ehcache-clustered;3.11.1 +org.ehcache:ehcache-transactions;3.11.1 +org.firebirdsql.jdbc:jaybird;6.0.3 +org.flywaydb:flyway-commandline;11.14.1 +org.flywaydb:flyway-core;11.14.1 +org.flywaydb:flyway-database-cassandra;11.14.1 +org.flywaydb:flyway-database-db2;11.14.1 +org.flywaydb:flyway-database-derby;11.14.1 +org.flywaydb:flyway-database-hsqldb;11.14.1 +org.flywaydb:flyway-database-informix;11.14.1 +org.flywaydb:flyway-database-mongodb;11.14.1 +org.flywaydb:flyway-database-oracle;11.14.1 +org.flywaydb:flyway-database-postgresql;11.14.1 +org.flywaydb:flyway-database-redshift;11.14.1 +org.flywaydb:flyway-database-saphana;11.14.1 +org.flywaydb:flyway-database-snowflake;11.14.1 +org.flywaydb:flyway-database-sybasease;11.14.1 +org.flywaydb:flyway-firebird;11.14.1 +org.flywaydb:flyway-gcp-bigquery;11.14.1 +org.flywaydb:flyway-gcp-spanner;11.14.1 +org.flywaydb:flyway-maven-plugin;11.14.1 +org.flywaydb:flyway-mysql;11.14.1 +org.flywaydb:flyway-singlestore;11.14.1 +org.flywaydb:flyway-sqlserver;11.14.1 +org.freemarker:freemarker;2.3.34 +org.glassfish.jaxb:codemodel;4.0.6 +org.glassfish.jaxb:jaxb-core;4.0.6 +org.glassfish.jaxb:jaxb-jxc;4.0.6 +org.glassfish.jaxb:jaxb-runtime;4.0.6 +org.glassfish.jaxb:jaxb-xjc;4.0.6 +org.glassfish.jaxb:txw2;4.0.6 +org.glassfish.jaxb:xsom;4.0.6 +org.glassfish.jersey.connectors:jersey-apache5-connector;4.0.0 +org.glassfish.jersey.connectors:jersey-grizzly-connector;4.0.0 +org.glassfish.jersey.connectors:jersey-helidon-connector;4.0.0 +org.glassfish.jersey.connectors:jersey-jdk-connector;4.0.0 +org.glassfish.jersey.connectors:jersey-jetty-connector;4.0.0 +org.glassfish.jersey.connectors:jersey-jetty-http2-connector;4.0.0 +org.glassfish.jersey.connectors:jersey-jnh-connector;4.0.0 +org.glassfish.jersey.connectors:jersey-netty-connector;4.0.0 +org.glassfish.jersey.containers.glassfish:jersey-gf-ejb;4.0.0 +org.glassfish.jersey.containers:jersey-container-grizzly2-http;4.0.0 +org.glassfish.jersey.containers:jersey-container-grizzly2-servlet;4.0.0 +org.glassfish.jersey.containers:jersey-container-helidon-http;4.0.0 +org.glassfish.jersey.containers:jersey-container-jdk-http;4.0.0 +org.glassfish.jersey.containers:jersey-container-jetty-http;4.0.0 +org.glassfish.jersey.containers:jersey-container-jetty-http2;4.0.0 +org.glassfish.jersey.containers:jersey-container-jetty-servlet;4.0.0 +org.glassfish.jersey.containers:jersey-container-netty-http;4.0.0 +org.glassfish.jersey.containers:jersey-container-servlet;4.0.0 +org.glassfish.jersey.core:jersey-client;4.0.0 +org.glassfish.jersey.core:jersey-common;4.0.0 +org.glassfish.jersey.core:jersey-server;4.0.0 +org.glassfish.jersey.ext.cdi:jersey-cdi-rs-inject;4.0.0 +org.glassfish.jersey.ext.cdi:jersey-cdi1x;4.0.0 +org.glassfish.jersey.ext.cdi:jersey-cdi1x-ban-custom-hk2-binding;4.0.0 +org.glassfish.jersey.ext.cdi:jersey-cdi1x-servlet;4.0.0 +org.glassfish.jersey.ext.cdi:jersey-cdi1x-transaction;4.0.0 +org.glassfish.jersey.ext.cdi:jersey-cdi1x-validation;4.0.0 +org.glassfish.jersey.ext.cdi:jersey-weld2-se;4.0.0 +org.glassfish.jersey.ext.microprofile:jersey-mp-config;4.0.0 +org.glassfish.jersey.ext.microprofile:jersey-mp-rest-client;4.0.0 +org.glassfish.jersey.ext.rx:jersey-rx-client-guava;4.0.0 +org.glassfish.jersey.ext.rx:jersey-rx-client-rxjava;4.0.0 +org.glassfish.jersey.ext.rx:jersey-rx-client-rxjava2;4.0.0 +org.glassfish.jersey.ext:jersey-bean-validation;4.0.0 +org.glassfish.jersey.ext:jersey-constants;4.0.0 +org.glassfish.jersey.ext:jersey-declarative-linking;4.0.0 +org.glassfish.jersey.ext:jersey-entity-filtering;4.0.0 +org.glassfish.jersey.ext:jersey-metainf-services;4.0.0 +org.glassfish.jersey.ext:jersey-micrometer;4.0.0 +org.glassfish.jersey.ext:jersey-mvc;4.0.0 +org.glassfish.jersey.ext:jersey-mvc-bean-validation;4.0.0 +org.glassfish.jersey.ext:jersey-mvc-freemarker;4.0.0 +org.glassfish.jersey.ext:jersey-mvc-jsp;4.0.0 +org.glassfish.jersey.ext:jersey-mvc-mustache;4.0.0 +org.glassfish.jersey.ext:jersey-proxy-client;4.0.0 +org.glassfish.jersey.ext:jersey-spring6;4.0.0 +org.glassfish.jersey.ext:jersey-wadl-doclet;4.0.0 +org.glassfish.jersey.inject:jersey-cdi2-se;4.0.0 +org.glassfish.jersey.inject:jersey-hk2;4.0.0 +org.glassfish.jersey.media:jersey-media-jaxb;4.0.0 +org.glassfish.jersey.media:jersey-media-json-binding;4.0.0 +org.glassfish.jersey.media:jersey-media-json-gson;4.0.0 +org.glassfish.jersey.media:jersey-media-json-jackson;4.0.0 +org.glassfish.jersey.media:jersey-media-json-jettison;4.0.0 +org.glassfish.jersey.media:jersey-media-json-processing;4.0.0 +org.glassfish.jersey.media:jersey-media-kryo;4.0.0 +org.glassfish.jersey.media:jersey-media-moxy;4.0.0 +org.glassfish.jersey.media:jersey-media-multipart;4.0.0 +org.glassfish.jersey.media:jersey-media-sse;4.0.0 +org.glassfish.jersey.security:oauth1-client;4.0.0 +org.glassfish.jersey.security:oauth1-server;4.0.0 +org.glassfish.jersey.security:oauth1-signature;4.0.0 +org.glassfish.jersey.security:oauth2-client;4.0.0 +org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-bundle;4.0.0 +org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-external;4.0.0 +org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2;4.0.0 +org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-helidon;4.0.0 +org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-inmemory;4.0.0 +org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jdk-http;4.0.0 +org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jetty;4.0.0 +org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jetty-http2;4.0.0 +org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-netty;4.0.0 +org.glassfish.jersey.test-framework:jersey-test-framework-core;4.0.0 +org.glassfish.jersey.test-framework:jersey-test-framework-util;4.0.0 +org.glassfish.jersey:jersey-bom;4.0.0 +org.glassfish.web:jakarta.servlet.jsp.jstl;3.0.1 +org.graalvm.buildtools:native-maven-plugin;0.11.2 +org.hamcrest:hamcrest;3.0 +org.hamcrest:hamcrest-core;3.0 +org.hamcrest:hamcrest-library;3.0 +org.hibernate.orm:hibernate-agroal;7.1.6.Final +org.hibernate.orm:hibernate-ant;7.1.6.Final +org.hibernate.orm:hibernate-c3p0;7.1.6.Final +org.hibernate.orm:hibernate-community-dialects;7.1.6.Final +org.hibernate.orm:hibernate-core;7.1.6.Final +org.hibernate.orm:hibernate-envers;7.1.6.Final +org.hibernate.orm:hibernate-graalvm;7.1.6.Final +org.hibernate.orm:hibernate-hikaricp;7.1.6.Final +org.hibernate.orm:hibernate-jcache;7.1.6.Final +org.hibernate.orm:hibernate-micrometer;7.1.6.Final +org.hibernate.orm:hibernate-processor;7.1.6.Final +org.hibernate.orm:hibernate-scan-jandex;7.1.6.Final +org.hibernate.orm:hibernate-spatial;7.1.6.Final +org.hibernate.orm:hibernate-testing;7.1.6.Final +org.hibernate.orm:hibernate-vector;7.1.6.Final +org.hibernate.validator:hibernate-validator;9.0.1.Final +org.hibernate.validator:hibernate-validator-annotation-processor;9.0.1.Final +org.hsqldb:hsqldb;2.7.3 +org.htmlunit:htmlunit;4.17.0 +org.infinispan.protostream:protostream;5.0.13.Final +org.infinispan.protostream:protostream-processor;5.0.13.Final +org.infinispan.protostream:protostream-types;5.0.13.Final +org.infinispan:infinispan-anchored-keys;15.2.6.Final +org.infinispan:infinispan-api;15.2.6.Final +org.infinispan:infinispan-bom;15.2.6.Final +org.infinispan:infinispan-cachestore-jdbc;15.2.6.Final +org.infinispan:infinispan-cachestore-jdbc-common;15.2.6.Final +org.infinispan:infinispan-cachestore-remote;15.2.6.Final +org.infinispan:infinispan-cachestore-rocksdb;15.2.6.Final +org.infinispan:infinispan-cachestore-sql;15.2.6.Final +org.infinispan:infinispan-cdi-common;15.2.6.Final +org.infinispan:infinispan-cdi-embedded;15.2.6.Final +org.infinispan:infinispan-cdi-remote;15.2.6.Final +org.infinispan:infinispan-checkstyle;15.2.6.Final +org.infinispan:infinispan-cli-client;15.2.6.Final +org.infinispan:infinispan-client-hotrod;15.2.6.Final +org.infinispan:infinispan-client-hotrod-legacy;15.2.6.Final +org.infinispan:infinispan-client-rest;15.2.6.Final +org.infinispan:infinispan-clustered-counter;15.2.6.Final +org.infinispan:infinispan-clustered-lock;15.2.6.Final +org.infinispan:infinispan-commons;15.2.6.Final +org.infinispan:infinispan-commons-graalvm;15.2.6.Final +org.infinispan:infinispan-commons-spi;15.2.6.Final +org.infinispan:infinispan-commons-test;15.2.6.Final +org.infinispan:infinispan-component-annotations;15.2.6.Final +org.infinispan:infinispan-component-processor;15.2.6.Final +org.infinispan:infinispan-console;15.2.1.Final +org.infinispan:infinispan-core;15.2.6.Final +org.infinispan:infinispan-core-graalvm;15.2.6.Final +org.infinispan:infinispan-counter-api;15.2.6.Final +org.infinispan:infinispan-hibernate-cache-commons;15.2.6.Final +org.infinispan:infinispan-hibernate-cache-spi;15.2.6.Final +org.infinispan:infinispan-hibernate-cache-v62;15.2.6.Final +org.infinispan:infinispan-jboss-marshalling;15.2.6.Final +org.infinispan:infinispan-jcache;15.2.6.Final +org.infinispan:infinispan-jcache-commons;15.2.6.Final +org.infinispan:infinispan-jcache-remote;15.2.6.Final +org.infinispan:infinispan-key-value-store-client;15.2.6.Final +org.infinispan:infinispan-logging-annotations;15.2.6.Final +org.infinispan:infinispan-logging-processor;15.2.6.Final +org.infinispan:infinispan-multimap;15.2.6.Final +org.infinispan:infinispan-objectfilter;15.2.6.Final +org.infinispan:infinispan-query;15.2.6.Final +org.infinispan:infinispan-query-core;15.2.6.Final +org.infinispan:infinispan-query-dsl;15.2.6.Final +org.infinispan:infinispan-remote-query-client;15.2.6.Final +org.infinispan:infinispan-remote-query-server;15.2.6.Final +org.infinispan:infinispan-scripting;15.2.6.Final +org.infinispan:infinispan-server-core;15.2.6.Final +org.infinispan:infinispan-server-hotrod;15.2.6.Final +org.infinispan:infinispan-server-memcached;15.2.6.Final +org.infinispan:infinispan-server-resp;15.2.6.Final +org.infinispan:infinispan-server-rest;15.2.6.Final +org.infinispan:infinispan-server-router;15.2.6.Final +org.infinispan:infinispan-server-runtime;15.2.6.Final +org.infinispan:infinispan-server-testdriver-core;15.2.6.Final +org.infinispan:infinispan-server-testdriver-junit4;15.2.6.Final +org.infinispan:infinispan-server-testdriver-junit5;15.2.6.Final +org.infinispan:infinispan-spring-boot3-starter-embedded;15.2.6.Final +org.infinispan:infinispan-spring-boot3-starter-remote;15.2.6.Final +org.infinispan:infinispan-spring6-common;15.2.6.Final +org.infinispan:infinispan-spring6-embedded;15.2.6.Final +org.infinispan:infinispan-spring6-remote;15.2.6.Final +org.infinispan:infinispan-tasks;15.2.6.Final +org.infinispan:infinispan-tasks-api;15.2.6.Final +org.infinispan:infinispan-tools;15.2.6.Final +org.influxdb:influxdb-java;2.25 +org.jboss.logging:jboss-logging;3.6.1.Final +org.jdom:jdom2;2.0.6.1 +org.jetbrains.kotlin:kotlin-bom;2.2.21 +org.jetbrains.kotlin:kotlin-compiler;2.2.21 +org.jetbrains.kotlin:kotlin-compiler-embeddable;2.2.21 +org.jetbrains.kotlin:kotlin-daemon-client;2.2.21 +org.jetbrains.kotlin:kotlin-main-kts;2.2.21 +org.jetbrains.kotlin:kotlin-maven-plugin;2.2.21 +org.jetbrains.kotlin:kotlin-osgi-bundle;2.2.21 +org.jetbrains.kotlin:kotlin-reflect;2.2.21 +org.jetbrains.kotlin:kotlin-script-runtime;2.2.21 +org.jetbrains.kotlin:kotlin-scripting-common;2.2.21 +org.jetbrains.kotlin:kotlin-scripting-ide-services;2.2.21 +org.jetbrains.kotlin:kotlin-scripting-jvm;2.2.21 +org.jetbrains.kotlin:kotlin-scripting-jvm-host;2.2.21 +org.jetbrains.kotlin:kotlin-stdlib;2.2.21 +org.jetbrains.kotlin:kotlin-stdlib-common;2.2.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk7;2.2.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk8;2.2.21 +org.jetbrains.kotlin:kotlin-stdlib-js;2.2.21 +org.jetbrains.kotlin:kotlin-test;2.2.21 +org.jetbrains.kotlin:kotlin-test-annotations-common;2.2.21 +org.jetbrains.kotlin:kotlin-test-common;2.2.21 +org.jetbrains.kotlin:kotlin-test-js;2.2.21 +org.jetbrains.kotlin:kotlin-test-junit;2.2.21 +org.jetbrains.kotlin:kotlin-test-junit5;2.2.21 +org.jetbrains.kotlin:kotlin-test-testng;2.2.21 +org.jetbrains.kotlinx:kotlinx-coroutines-android;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-bom;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-core;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-debug;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-guava;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-javafx;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-jdk8;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-jdk9;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-play-services;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-reactive;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-reactor;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-rx2;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-rx3;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-slf4j;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-swing;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-test;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-test-jvm;1.10.2 +org.jetbrains.kotlinx:kotlinx-serialization-bom;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-cbor;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-cbor-jvm;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-core;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-core-jvm;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-hocon;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-json;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-json-io;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-json-io-jvm;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-json-jvm;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-json-okio;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-json-okio-jvm;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-properties;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-properties-jvm;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-protobuf;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-protobuf-jvm;1.9.0 +org.jooq:jooq;3.19.27 +org.jooq:jooq-bom;3.19.27 +org.jooq:jooq-checker;3.19.27 +org.jooq:jooq-codegen;3.19.27 +org.jooq:jooq-codegen-gradle;3.19.27 +org.jooq:jooq-codegen-maven;3.19.27 +org.jooq:jooq-jackson-extensions;3.19.27 +org.jooq:jooq-kotlin;3.19.27 +org.jooq:jooq-kotlin-coroutines;3.19.27 +org.jooq:jooq-meta;3.19.27 +org.jooq:jooq-meta-extensions;3.19.27 +org.jooq:jooq-meta-extensions-hibernate;3.19.27 +org.jooq:jooq-meta-extensions-liquibase;3.19.27 +org.jooq:jooq-meta-kotlin;3.19.27 +org.jooq:jooq-migrations;3.19.27 +org.jooq:jooq-migrations-maven;3.19.27 +org.jooq:jooq-postgres-extensions;3.19.27 +org.jooq:jooq-scala_2.13;3.19.27 +org.jooq:jooq-xtend;3.19.27 +org.jspecify:jspecify;1.0.0 +org.junit.jupiter:junit-jupiter;6.0.1 +org.junit.jupiter:junit-jupiter-api;6.0.1 +org.junit.jupiter:junit-jupiter-engine;6.0.1 +org.junit.jupiter:junit-jupiter-migrationsupport;6.0.1 +org.junit.jupiter:junit-jupiter-params;6.0.1 +org.junit.platform:junit-platform-commons;6.0.1 +org.junit.platform:junit-platform-console;6.0.1 +org.junit.platform:junit-platform-engine;6.0.1 +org.junit.platform:junit-platform-launcher;6.0.1 +org.junit.platform:junit-platform-reporting;6.0.1 +org.junit.platform:junit-platform-suite;6.0.1 +org.junit.platform:junit-platform-suite-api;6.0.1 +org.junit.platform:junit-platform-suite-engine;6.0.1 +org.junit.platform:junit-platform-testkit;6.0.1 +org.junit.vintage:junit-vintage-engine;6.0.1 +org.junit:junit-bom;6.0.1 +org.liquibase:liquibase-cdi;5.0.1 +org.liquibase:liquibase-core;5.0.1 +org.liquibase:liquibase-maven-plugin;5.0.1 +org.mariadb.jdbc:mariadb-java-client;3.5.6 +org.mariadb:r2dbc-mariadb;1.3.0 +org.messaginghub:pooled-jms;3.1.7 +org.mockito:mockito-android;5.20.0 +org.mockito:mockito-bom;5.20.0 +org.mockito:mockito-core;5.20.0 +org.mockito:mockito-errorprone;5.20.0 +org.mockito:mockito-junit-jupiter;5.20.0 +org.mockito:mockito-proxy;5.20.0 +org.mockito:mockito-subclass;5.20.0 +org.mongodb.scala:mongo-scala-bson_2.11;5.6.1 +org.mongodb.scala:mongo-scala-bson_2.12;5.6.1 +org.mongodb.scala:mongo-scala-bson_2.13;5.6.1 +org.mongodb.scala:mongo-scala-driver_2.11;5.6.1 +org.mongodb.scala:mongo-scala-driver_2.12;5.6.1 +org.mongodb.scala:mongo-scala-driver_2.13;5.6.1 +org.mongodb:bson;5.6.1 +org.mongodb:bson-kotlin;5.6.1 +org.mongodb:bson-kotlinx;5.6.1 +org.mongodb:bson-record-codec;5.6.1 +org.mongodb:mongodb-crypt;5.6.1 +org.mongodb:mongodb-driver-bom;5.6.1 +org.mongodb:mongodb-driver-core;5.6.1 +org.mongodb:mongodb-driver-kotlin-coroutine;5.6.1 +org.mongodb:mongodb-driver-kotlin-extensions;5.6.1 +org.mongodb:mongodb-driver-kotlin-sync;5.6.1 +org.mongodb:mongodb-driver-reactivestreams;5.6.1 +org.mongodb:mongodb-driver-sync;5.6.1 +org.neo4j.bolt:neo4j-bolt-connection;10.0.1 +org.neo4j.bolt:neo4j-bolt-connection-bom;10.0.1 +org.neo4j.bolt:neo4j-bolt-connection-netty;10.0.1 +org.neo4j.bolt:neo4j-bolt-connection-pooled;10.0.1 +org.neo4j.bolt:neo4j-bolt-connection-query-api;10.0.1 +org.neo4j.bolt:neo4j-bolt-connection-routed;10.0.1 +org.neo4j.driver:neo4j-java-driver;6.0.1 +org.neo4j.driver:neo4j-java-driver-all;6.0.1 +org.neo4j.driver:neo4j-java-driver-bom;6.0.1 +org.neo4j.driver:neo4j-java-driver-observation-metrics;6.0.1 +org.neo4j.driver:neo4j-java-driver-observation-micrometer;6.0.1 +org.postgresql:postgresql;42.7.8 +org.postgresql:r2dbc-postgresql;1.1.1.RELEASE +org.projectlombok:lombok;1.18.42 +org.quartz-scheduler:quartz;2.5.1 +org.quartz-scheduler:quartz-jobs;2.5.1 +org.reactivestreams:reactive-streams;1.0.4 +org.seleniumhq.selenium:htmlunit3-driver;4.36.1 +org.seleniumhq.selenium:selenium-api;4.37.0 +org.seleniumhq.selenium:selenium-bom;4.37.0 +org.seleniumhq.selenium:selenium-chrome-driver;4.37.0 +org.seleniumhq.selenium:selenium-chromium-driver;4.37.0 +org.seleniumhq.selenium:selenium-devtools-v139;4.37.0 +org.seleniumhq.selenium:selenium-devtools-v140;4.37.0 +org.seleniumhq.selenium:selenium-devtools-v141;4.37.0 +org.seleniumhq.selenium:selenium-edge-driver;4.37.0 +org.seleniumhq.selenium:selenium-firefox-driver;4.37.0 +org.seleniumhq.selenium:selenium-grid;4.37.0 +org.seleniumhq.selenium:selenium-http;4.37.0 +org.seleniumhq.selenium:selenium-ie-driver;4.37.0 +org.seleniumhq.selenium:selenium-java;4.37.0 +org.seleniumhq.selenium:selenium-json;4.37.0 +org.seleniumhq.selenium:selenium-manager;4.37.0 +org.seleniumhq.selenium:selenium-remote-driver;4.37.0 +org.seleniumhq.selenium:selenium-safari-driver;4.37.0 +org.seleniumhq.selenium:selenium-session-map-jdbc;4.37.0 +org.seleniumhq.selenium:selenium-session-map-redis;4.37.0 +org.seleniumhq.selenium:selenium-support;4.37.0 +org.skyscreamer:jsonassert;1.5.3 +org.slf4j:jcl-over-slf4j;2.0.17 +org.slf4j:jul-to-slf4j;2.0.17 +org.slf4j:log4j-over-slf4j;2.0.17 +org.slf4j:slf4j-api;2.0.17 +org.slf4j:slf4j-ext;2.0.17 +org.slf4j:slf4j-jdk-platform-logging;2.0.17 +org.slf4j:slf4j-jdk14;2.0.17 +org.slf4j:slf4j-log4j12;2.0.17 +org.slf4j:slf4j-nop;2.0.17 +org.slf4j:slf4j-reload4j;2.0.17 +org.slf4j:slf4j-simple;2.0.17 +org.springframework.amqp:spring-amqp;4.0.0-RC1 +org.springframework.amqp:spring-amqp-bom;4.0.0-RC1 +org.springframework.amqp:spring-rabbit;4.0.0-RC1 +org.springframework.amqp:spring-rabbit-junit;4.0.0-RC1 +org.springframework.amqp:spring-rabbit-stream;4.0.0-RC1 +org.springframework.amqp:spring-rabbit-test;4.0.0-RC1 +org.springframework.amqp:spring-rabbitmq-client;4.0.0-RC1 +org.springframework.batch:spring-batch-bom;6.0.0-RC2 +org.springframework.boot:spring-boot;4.0.0-RC2 +org.springframework.boot:spring-boot-activemq;4.0.0-RC2 +org.springframework.boot:spring-boot-actuator;4.0.0-RC2 +org.springframework.boot:spring-boot-actuator-autoconfigure;4.0.0-RC2 +org.springframework.boot:spring-boot-amqp;4.0.0-RC2 +org.springframework.boot:spring-boot-artemis;4.0.0-RC2 +org.springframework.boot:spring-boot-autoconfigure;4.0.0-RC2 +org.springframework.boot:spring-boot-autoconfigure-classic;4.0.0-RC2 +org.springframework.boot:spring-boot-autoconfigure-classic-modules;4.0.0-RC2 +org.springframework.boot:spring-boot-autoconfigure-processor;4.0.0-RC2 +org.springframework.boot:spring-boot-batch;4.0.0-RC2 +org.springframework.boot:spring-boot-batch-jdbc;4.0.0-RC2 +org.springframework.boot:spring-boot-buildpack-platform;4.0.0-RC2 +org.springframework.boot:spring-boot-cache;4.0.0-RC2 +org.springframework.boot:spring-boot-cache-test;4.0.0-RC2 +org.springframework.boot:spring-boot-cassandra;4.0.0-RC2 +org.springframework.boot:spring-boot-cloudfoundry;4.0.0-RC2 +org.springframework.boot:spring-boot-configuration-metadata;4.0.0-RC2 +org.springframework.boot:spring-boot-configuration-processor;4.0.0-RC2 +org.springframework.boot:spring-boot-couchbase;4.0.0-RC2 +org.springframework.boot:spring-boot-data-cassandra;4.0.0-RC2 +org.springframework.boot:spring-boot-data-cassandra-test;4.0.0-RC2 +org.springframework.boot:spring-boot-data-commons;4.0.0-RC2 +org.springframework.boot:spring-boot-data-couchbase;4.0.0-RC2 +org.springframework.boot:spring-boot-data-couchbase-test;4.0.0-RC2 +org.springframework.boot:spring-boot-data-elasticsearch;4.0.0-RC2 +org.springframework.boot:spring-boot-data-elasticsearch-test;4.0.0-RC2 +org.springframework.boot:spring-boot-data-jdbc;4.0.0-RC2 +org.springframework.boot:spring-boot-data-jdbc-test;4.0.0-RC2 +org.springframework.boot:spring-boot-data-jpa;4.0.0-RC2 +org.springframework.boot:spring-boot-data-jpa-test;4.0.0-RC2 +org.springframework.boot:spring-boot-data-ldap;4.0.0-RC2 +org.springframework.boot:spring-boot-data-ldap-test;4.0.0-RC2 +org.springframework.boot:spring-boot-data-mongodb;4.0.0-RC2 +org.springframework.boot:spring-boot-data-mongodb-test;4.0.0-RC2 +org.springframework.boot:spring-boot-data-neo4j;4.0.0-RC2 +org.springframework.boot:spring-boot-data-neo4j-test;4.0.0-RC2 +org.springframework.boot:spring-boot-data-r2dbc;4.0.0-RC2 +org.springframework.boot:spring-boot-data-r2dbc-test;4.0.0-RC2 +org.springframework.boot:spring-boot-data-redis;4.0.0-RC2 +org.springframework.boot:spring-boot-data-redis-test;4.0.0-RC2 +org.springframework.boot:spring-boot-data-rest;4.0.0-RC2 +org.springframework.boot:spring-boot-dependencies;4.0.0-RC2 +org.springframework.boot:spring-boot-devtools;4.0.0-RC2 +org.springframework.boot:spring-boot-docker-compose;4.0.0-RC2 +org.springframework.boot:spring-boot-elasticsearch;4.0.0-RC2 +org.springframework.boot:spring-boot-flyway;4.0.0-RC2 +org.springframework.boot:spring-boot-freemarker;4.0.0-RC2 +org.springframework.boot:spring-boot-graphql;4.0.0-RC2 +org.springframework.boot:spring-boot-graphql-test;4.0.0-RC2 +org.springframework.boot:spring-boot-groovy-templates;4.0.0-RC2 +org.springframework.boot:spring-boot-gson;4.0.0-RC2 +org.springframework.boot:spring-boot-h2console;4.0.0-RC2 +org.springframework.boot:spring-boot-hateoas;4.0.0-RC2 +org.springframework.boot:spring-boot-hazelcast;4.0.0-RC2 +org.springframework.boot:spring-boot-health;4.0.0-RC2 +org.springframework.boot:spring-boot-hibernate;4.0.0-RC2 +org.springframework.boot:spring-boot-http-client;4.0.0-RC2 +org.springframework.boot:spring-boot-http-codec;4.0.0-RC2 +org.springframework.boot:spring-boot-http-converter;4.0.0-RC2 +org.springframework.boot:spring-boot-integration;4.0.0-RC2 +org.springframework.boot:spring-boot-jackson;4.0.0-RC2 +org.springframework.boot:spring-boot-jackson2;4.0.0-RC2 +org.springframework.boot:spring-boot-jarmode-tools;4.0.0-RC2 +org.springframework.boot:spring-boot-jdbc;4.0.0-RC2 +org.springframework.boot:spring-boot-jdbc-test;4.0.0-RC2 +org.springframework.boot:spring-boot-jersey;4.0.0-RC2 +org.springframework.boot:spring-boot-jetty;4.0.0-RC2 +org.springframework.boot:spring-boot-jetty-runtime;4.0.0-RC2 +org.springframework.boot:spring-boot-jms;4.0.0-RC2 +org.springframework.boot:spring-boot-jooq;4.0.0-RC2 +org.springframework.boot:spring-boot-jooq-test;4.0.0-RC2 +org.springframework.boot:spring-boot-jpa;4.0.0-RC2 +org.springframework.boot:spring-boot-jpa-test;4.0.0-RC2 +org.springframework.boot:spring-boot-jsonb;4.0.0-RC2 +org.springframework.boot:spring-boot-kafka;4.0.0-RC2 +org.springframework.boot:spring-boot-kotlin-serialization;4.0.0-RC2 +org.springframework.boot:spring-boot-ldap;4.0.0-RC2 +org.springframework.boot:spring-boot-liquibase;4.0.0-RC2 +org.springframework.boot:spring-boot-loader;4.0.0-RC2 +org.springframework.boot:spring-boot-mail;4.0.0-RC2 +org.springframework.boot:spring-boot-maven-plugin;4.0.0-RC2 +org.springframework.boot:spring-boot-micrometer-metrics;4.0.0-RC2 +org.springframework.boot:spring-boot-micrometer-metrics-test;4.0.0-RC2 +org.springframework.boot:spring-boot-micrometer-observation;4.0.0-RC2 +org.springframework.boot:spring-boot-micrometer-tracing;4.0.0-RC2 +org.springframework.boot:spring-boot-micrometer-tracing-brave;4.0.0-RC2 +org.springframework.boot:spring-boot-micrometer-tracing-opentelemetry;4.0.0-RC2 +org.springframework.boot:spring-boot-micrometer-tracing-test;4.0.0-RC2 +org.springframework.boot:spring-boot-mongodb;4.0.0-RC2 +org.springframework.boot:spring-boot-mustache;4.0.0-RC2 +org.springframework.boot:spring-boot-neo4j;4.0.0-RC2 +org.springframework.boot:spring-boot-netty;4.0.0-RC2 +org.springframework.boot:spring-boot-opentelemetry;4.0.0-RC2 +org.springframework.boot:spring-boot-persistence;4.0.0-RC2 +org.springframework.boot:spring-boot-properties-migrator;4.0.0-RC2 +org.springframework.boot:spring-boot-pulsar;4.0.0-RC2 +org.springframework.boot:spring-boot-quartz;4.0.0-RC2 +org.springframework.boot:spring-boot-r2dbc;4.0.0-RC2 +org.springframework.boot:spring-boot-reactor;4.0.0-RC2 +org.springframework.boot:spring-boot-reactor-netty;4.0.0-RC2 +org.springframework.boot:spring-boot-restclient;4.0.0-RC2 +org.springframework.boot:spring-boot-restclient-test;4.0.0-RC2 +org.springframework.boot:spring-boot-restdocs;4.0.0-RC2 +org.springframework.boot:spring-boot-resttestclient;4.0.0-RC2 +org.springframework.boot:spring-boot-rsocket;4.0.0-RC2 +org.springframework.boot:spring-boot-rsocket-test;4.0.0-RC2 +org.springframework.boot:spring-boot-security;4.0.0-RC2 +org.springframework.boot:spring-boot-security-oauth2-authorization-server;4.0.0-RC2 +org.springframework.boot:spring-boot-security-oauth2-client;4.0.0-RC2 +org.springframework.boot:spring-boot-security-oauth2-resource-server;4.0.0-RC2 +org.springframework.boot:spring-boot-security-saml2;4.0.0-RC2 +org.springframework.boot:spring-boot-security-test;4.0.0-RC2 +org.springframework.boot:spring-boot-sendgrid;4.0.0-RC2 +org.springframework.boot:spring-boot-servlet;4.0.0-RC2 +org.springframework.boot:spring-boot-session;4.0.0-RC2 +org.springframework.boot:spring-boot-session-data-redis;4.0.0-RC2 +org.springframework.boot:spring-boot-session-jdbc;4.0.0-RC2 +org.springframework.boot:spring-boot-sql;4.0.0-RC2 +org.springframework.boot:spring-boot-starter;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-activemq;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-activemq-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-actuator;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-actuator-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-amqp;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-amqp-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-artemis;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-artemis-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-aspectj;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-aspectj-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-batch;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-batch-jdbc;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-batch-jdbc-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-batch-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-cache;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-cache-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-cassandra;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-cassandra-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-classic;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-cloudfoundry;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-cloudfoundry-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-couchbase;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-couchbase-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-data-cassandra;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-data-cassandra-reactive;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-data-cassandra-reactive-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-data-cassandra-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-data-couchbase;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-data-couchbase-reactive;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-data-couchbase-reactive-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-data-couchbase-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-data-elasticsearch;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-data-elasticsearch-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-data-jdbc;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-data-jdbc-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-data-jpa;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-data-jpa-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-data-ldap;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-data-ldap-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-data-mongodb;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-data-mongodb-reactive;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-data-mongodb-reactive-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-data-mongodb-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-data-neo4j;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-data-neo4j-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-data-r2dbc;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-data-r2dbc-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-data-redis;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-data-redis-reactive;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-data-redis-reactive-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-data-redis-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-data-rest;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-data-rest-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-elasticsearch;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-elasticsearch-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-flyway;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-flyway-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-freemarker;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-freemarker-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-graphql;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-graphql-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-groovy-templates;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-groovy-templates-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-gson;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-gson-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-hateoas;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-hateoas-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-hazelcast;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-hazelcast-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-integration;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-integration-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-jackson;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-jackson-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-jdbc;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-jdbc-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-jersey;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-jersey-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-jetty;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-jms;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-jms-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-jooq;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-jooq-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-json;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-jsonb;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-jsonb-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-kafka;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-kafka-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-kotlin-serialization;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-kotlin-serialization-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-ldap;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-ldap-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-liquibase;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-liquibase-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-log4j2;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-logback;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-logging;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-mail;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-mail-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-mongodb;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-mongodb-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-mustache;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-mustache-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-neo4j;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-neo4j-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-oauth2-authorization-server;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-oauth2-client;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-oauth2-resource-server;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-opentelemetry;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-opentelemetry-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-parent;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-pulsar;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-pulsar-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-quartz;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-quartz-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-r2dbc;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-r2dbc-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-reactor-netty;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-restclient;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-restclient-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-rsocket;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-rsocket-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-security;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-security-oauth2-authorization-server;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-security-oauth2-authorization-server-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-security-oauth2-client;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-security-oauth2-client-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-security-oauth2-resource-server;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-security-oauth2-resource-server-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-security-saml2;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-security-saml2-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-security-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-sendgrid;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-sendgrid-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-session-data-redis;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-session-data-redis-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-session-jdbc;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-session-jdbc-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-test-classic;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-thymeleaf;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-thymeleaf-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-tomcat;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-validation;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-validation-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-web;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-web-services;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-webclient;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-webclient-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-webflux;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-webflux-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-webmvc;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-webmvc-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-webservices;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-webservices-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-websocket;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-websocket-test;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-zipkin;4.0.0-RC2 +org.springframework.boot:spring-boot-starter-zipkin-test;4.0.0-RC2 +org.springframework.boot:spring-boot-test;4.0.0-RC2 +org.springframework.boot:spring-boot-test-autoconfigure;4.0.0-RC2 +org.springframework.boot:spring-boot-test-classic-modules;4.0.0-RC2 +org.springframework.boot:spring-boot-testcontainers;4.0.0-RC2 +org.springframework.boot:spring-boot-thymeleaf;4.0.0-RC2 +org.springframework.boot:spring-boot-tomcat;4.0.0-RC2 +org.springframework.boot:spring-boot-tomcat-runtime;4.0.0-RC2 +org.springframework.boot:spring-boot-transaction;4.0.0-RC2 +org.springframework.boot:spring-boot-validation;4.0.0-RC2 +org.springframework.boot:spring-boot-web-server;4.0.0-RC2 +org.springframework.boot:spring-boot-webclient;4.0.0-RC2 +org.springframework.boot:spring-boot-webclient-test;4.0.0-RC2 +org.springframework.boot:spring-boot-webflux;4.0.0-RC2 +org.springframework.boot:spring-boot-webflux-test;4.0.0-RC2 +org.springframework.boot:spring-boot-webmvc;4.0.0-RC2 +org.springframework.boot:spring-boot-webmvc-test;4.0.0-RC2 +org.springframework.boot:spring-boot-webservices;4.0.0-RC2 +org.springframework.boot:spring-boot-webservices-test;4.0.0-RC2 +org.springframework.boot:spring-boot-websocket;4.0.0-RC2 +org.springframework.boot:spring-boot-webtestclient;4.0.0-RC2 +org.springframework.boot:spring-boot-zipkin;4.0.0-RC2 +org.springframework.cloud:spring-cloud-dependencies;2025.1.0-M4 +org.springframework.data:spring-data-bom;2025.1.0-RC2 +org.springframework.graphql:spring-graphql;2.0.0-RC2 +org.springframework.graphql:spring-graphql-test;2.0.0-RC2 +org.springframework.hateoas:spring-hateoas;3.0.0-RC2 +org.springframework.integration:spring-integration-amqp;7.0.0-RC2 +org.springframework.integration:spring-integration-bom;7.0.0-RC2 +org.springframework.integration:spring-integration-camel;7.0.0-RC2 +org.springframework.integration:spring-integration-cassandra;7.0.0-RC2 +org.springframework.integration:spring-integration-core;7.0.0-RC2 +org.springframework.integration:spring-integration-debezium;7.0.0-RC2 +org.springframework.integration:spring-integration-event;7.0.0-RC2 +org.springframework.integration:spring-integration-feed;7.0.0-RC2 +org.springframework.integration:spring-integration-file;7.0.0-RC2 +org.springframework.integration:spring-integration-ftp;7.0.0-RC2 +org.springframework.integration:spring-integration-graphql;7.0.0-RC2 +org.springframework.integration:spring-integration-groovy;7.0.0-RC2 +org.springframework.integration:spring-integration-hazelcast;7.0.0-RC2 +org.springframework.integration:spring-integration-http;7.0.0-RC2 +org.springframework.integration:spring-integration-ip;7.0.0-RC2 +org.springframework.integration:spring-integration-jdbc;7.0.0-RC2 +org.springframework.integration:spring-integration-jms;7.0.0-RC2 +org.springframework.integration:spring-integration-jmx;7.0.0-RC2 +org.springframework.integration:spring-integration-jpa;7.0.0-RC2 +org.springframework.integration:spring-integration-kafka;7.0.0-RC2 +org.springframework.integration:spring-integration-mail;7.0.0-RC2 +org.springframework.integration:spring-integration-mongodb;7.0.0-RC2 +org.springframework.integration:spring-integration-mqtt;7.0.0-RC2 +org.springframework.integration:spring-integration-r2dbc;7.0.0-RC2 +org.springframework.integration:spring-integration-redis;7.0.0-RC2 +org.springframework.integration:spring-integration-rsocket;7.0.0-RC2 +org.springframework.integration:spring-integration-scripting;7.0.0-RC2 +org.springframework.integration:spring-integration-sftp;7.0.0-RC2 +org.springframework.integration:spring-integration-smb;7.0.0-RC2 +org.springframework.integration:spring-integration-stomp;7.0.0-RC2 +org.springframework.integration:spring-integration-stream;7.0.0-RC2 +org.springframework.integration:spring-integration-syslog;7.0.0-RC2 +org.springframework.integration:spring-integration-test;7.0.0-RC2 +org.springframework.integration:spring-integration-test-support;7.0.0-RC2 +org.springframework.integration:spring-integration-webflux;7.0.0-RC2 +org.springframework.integration:spring-integration-websocket;7.0.0-RC2 +org.springframework.integration:spring-integration-ws;7.0.0-RC2 +org.springframework.integration:spring-integration-xml;7.0.0-RC2 +org.springframework.integration:spring-integration-xmpp;7.0.0-RC2 +org.springframework.integration:spring-integration-zeromq;7.0.0-RC2 +org.springframework.integration:spring-integration-zip;7.0.0-RC2 +org.springframework.integration:spring-integration-zookeeper;7.0.0-RC2 +org.springframework.kafka:spring-kafka;4.0.0-RC1 +org.springframework.kafka:spring-kafka-test;4.0.0-RC1 +org.springframework.ldap:spring-ldap-core;4.0.0-RC1 +org.springframework.ldap:spring-ldap-ldif-core;4.0.0-RC1 +org.springframework.ldap:spring-ldap-odm;4.0.0-RC1 +org.springframework.ldap:spring-ldap-test;4.0.0-RC1 +org.springframework.pulsar:spring-pulsar-bom;2.0.0-RC1 +org.springframework.restdocs:spring-restdocs-asciidoctor;4.0.0-RC1 +org.springframework.restdocs:spring-restdocs-bom;4.0.0-RC1 +org.springframework.restdocs:spring-restdocs-core;4.0.0-RC1 +org.springframework.restdocs:spring-restdocs-mockmvc;4.0.0-RC1 +org.springframework.restdocs:spring-restdocs-webtestclient;4.0.0-RC1 +org.springframework.security:spring-security-bom;7.0.0-RC3 +org.springframework.session:spring-session-bom;4.0.0-RC1 +org.springframework.ws:spring-ws-bom;5.0.0-RC1 +org.springframework.ws:spring-ws-core;5.0.0-RC1 +org.springframework.ws:spring-ws-security;5.0.0-RC1 +org.springframework.ws:spring-ws-support;5.0.0-RC1 +org.springframework.ws:spring-ws-test;5.0.0-RC1 +org.springframework.ws:spring-xml;5.0.0-RC1 +org.springframework:spring-aop;7.0.0-RC3 +org.springframework:spring-aspects;7.0.0-RC3 +org.springframework:spring-beans;7.0.0-RC3 +org.springframework:spring-context;7.0.0-RC3 +org.springframework:spring-context-indexer;7.0.0-RC3 +org.springframework:spring-context-support;7.0.0-RC3 +org.springframework:spring-core;7.0.0-RC3 +org.springframework:spring-core-test;7.0.0-RC3 +org.springframework:spring-expression;7.0.0-RC3 +org.springframework:spring-framework-bom;7.0.0-RC3 +org.springframework:spring-instrument;7.0.0-RC3 +org.springframework:spring-jdbc;7.0.0-RC3 +org.springframework:spring-jms;7.0.0-RC3 +org.springframework:spring-messaging;7.0.0-RC3 +org.springframework:spring-orm;7.0.0-RC3 +org.springframework:spring-oxm;7.0.0-RC3 +org.springframework:spring-r2dbc;7.0.0-RC3 +org.springframework:spring-test;7.0.0-RC3 +org.springframework:spring-tx;7.0.0-RC3 +org.springframework:spring-web;7.0.0-RC3 +org.springframework:spring-webflux;7.0.0-RC3 +org.springframework:spring-webmvc;7.0.0-RC3 +org.springframework:spring-websocket;7.0.0-RC3 +org.testcontainers:testcontainers;2.0.1 +org.testcontainers:testcontainers-activemq;2.0.1 +org.testcontainers:testcontainers-azure;2.0.1 +org.testcontainers:testcontainers-bom;2.0.1 +org.testcontainers:testcontainers-cassandra;2.0.1 +org.testcontainers:testcontainers-chromadb;2.0.1 +org.testcontainers:testcontainers-clickhouse;2.0.1 +org.testcontainers:testcontainers-cockroachdb;2.0.1 +org.testcontainers:testcontainers-consul;2.0.1 +org.testcontainers:testcontainers-couchbase;2.0.1 +org.testcontainers:testcontainers-cratedb;2.0.1 +org.testcontainers:testcontainers-database-commons;2.0.1 +org.testcontainers:testcontainers-databend;2.0.1 +org.testcontainers:testcontainers-db2;2.0.1 +org.testcontainers:testcontainers-elasticsearch;2.0.1 +org.testcontainers:testcontainers-gcloud;2.0.1 +org.testcontainers:testcontainers-grafana;2.0.1 +org.testcontainers:testcontainers-hivemq;2.0.1 +org.testcontainers:testcontainers-influxdb;2.0.1 +org.testcontainers:testcontainers-jdbc;2.0.1 +org.testcontainers:testcontainers-junit-jupiter;2.0.1 +org.testcontainers:testcontainers-k3s;2.0.1 +org.testcontainers:testcontainers-k6;2.0.1 +org.testcontainers:testcontainers-kafka;2.0.1 +org.testcontainers:testcontainers-ldap;2.0.1 +org.testcontainers:testcontainers-localstack;2.0.1 +org.testcontainers:testcontainers-mariadb;2.0.1 +org.testcontainers:testcontainers-milvus;2.0.1 +org.testcontainers:testcontainers-minio;2.0.1 +org.testcontainers:testcontainers-mockserver;2.0.1 +org.testcontainers:testcontainers-mongodb;2.0.1 +org.testcontainers:testcontainers-mssqlserver;2.0.1 +org.testcontainers:testcontainers-mysql;2.0.1 +org.testcontainers:testcontainers-neo4j;2.0.1 +org.testcontainers:testcontainers-nginx;2.0.1 +org.testcontainers:testcontainers-oceanbase;2.0.1 +org.testcontainers:testcontainers-ollama;2.0.1 +org.testcontainers:testcontainers-openfga;2.0.1 +org.testcontainers:testcontainers-oracle-free;2.0.1 +org.testcontainers:testcontainers-oracle-xe;2.0.1 +org.testcontainers:testcontainers-orientdb;2.0.1 +org.testcontainers:testcontainers-pinecone;2.0.1 +org.testcontainers:testcontainers-postgresql;2.0.1 +org.testcontainers:testcontainers-presto;2.0.1 +org.testcontainers:testcontainers-pulsar;2.0.1 +org.testcontainers:testcontainers-qdrant;2.0.1 +org.testcontainers:testcontainers-questdb;2.0.1 +org.testcontainers:testcontainers-r2dbc;2.0.1 +org.testcontainers:testcontainers-rabbitmq;2.0.1 +org.testcontainers:testcontainers-redpanda;2.0.1 +org.testcontainers:testcontainers-scylladb;2.0.1 +org.testcontainers:testcontainers-selenium;2.0.1 +org.testcontainers:testcontainers-solace;2.0.1 +org.testcontainers:testcontainers-solr;2.0.1 +org.testcontainers:testcontainers-spock;2.0.1 +org.testcontainers:testcontainers-tidb;2.0.1 +org.testcontainers:testcontainers-timeplus;2.0.1 +org.testcontainers:testcontainers-toxiproxy;2.0.1 +org.testcontainers:testcontainers-trino;2.0.1 +org.testcontainers:testcontainers-typesense;2.0.1 +org.testcontainers:testcontainers-vault;2.0.1 +org.testcontainers:testcontainers-weaviate;2.0.1 +org.testcontainers:testcontainers-yugabytedb;2.0.1 +org.thymeleaf.extras:thymeleaf-extras-springsecurity6;3.1.3.RELEASE +org.thymeleaf:thymeleaf;3.1.3.RELEASE +org.thymeleaf:thymeleaf-spring6;3.1.3.RELEASE +org.vibur:vibur-dbcp;26.0 +org.vibur:vibur-object-pool;26.0 +org.webjars:webjars-locator-core;0.59 +org.webjars:webjars-locator-lite;1.1.2 +org.xerial:sqlite-jdbc;3.50.3.0 +org.xmlunit:xmlunit-assertj;2.10.4 +org.xmlunit:xmlunit-assertj3;2.10.4 +org.xmlunit:xmlunit-core;2.10.4 +org.xmlunit:xmlunit-jakarta-jaxb-impl;2.10.4 +org.xmlunit:xmlunit-legacy;2.10.4 +org.xmlunit:xmlunit-matchers;2.10.4 +org.xmlunit:xmlunit-placeholders;2.10.4 +org.yaml:snakeyaml;2.5 +redis.clients:jedis;7.0.0 +tools.jackson.core:jackson-core;3.0.1 +tools.jackson.core:jackson-databind;3.0.1 +tools.jackson.dataformat:jackson-dataformat-avro;3.0.1 +tools.jackson.dataformat:jackson-dataformat-cbor;3.0.1 +tools.jackson.dataformat:jackson-dataformat-csv;3.0.1 +tools.jackson.dataformat:jackson-dataformat-ion;3.0.1 +tools.jackson.dataformat:jackson-dataformat-properties;3.0.1 +tools.jackson.dataformat:jackson-dataformat-protobuf;3.0.1 +tools.jackson.dataformat:jackson-dataformat-smile;3.0.1 +tools.jackson.dataformat:jackson-dataformat-toml;3.0.1 +tools.jackson.dataformat:jackson-dataformat-xml;3.0.1 +tools.jackson.dataformat:jackson-dataformat-yaml;3.0.1 +tools.jackson.datatype:jackson-datatype-eclipse-collections;3.0.1 +tools.jackson.datatype:jackson-datatype-guava;3.0.1 +tools.jackson.datatype:jackson-datatype-hppc;3.0.1 +tools.jackson.datatype:jackson-datatype-jakarta-jsonp;3.0.1 +tools.jackson.datatype:jackson-datatype-javax-money;3.0.1 +tools.jackson.datatype:jackson-datatype-jaxrs;3.0.1 +tools.jackson.datatype:jackson-datatype-joda;3.0.1 +tools.jackson.datatype:jackson-datatype-joda-money;3.0.1 +tools.jackson.datatype:jackson-datatype-json-org;3.0.1 +tools.jackson.datatype:jackson-datatype-jsr353;3.0.1 +tools.jackson.datatype:jackson-datatype-moneta;3.0.1 +tools.jackson.datatype:jackson-datatype-pcollections;3.0.1 +tools.jackson.jakarta.rs:jackson-jakarta-rs-base;3.0.1 +tools.jackson.jakarta.rs:jackson-jakarta-rs-cbor-provider;3.0.1 +tools.jackson.jakarta.rs:jackson-jakarta-rs-json-provider;3.0.1 +tools.jackson.jakarta.rs:jackson-jakarta-rs-smile-provider;3.0.1 +tools.jackson.jakarta.rs:jackson-jakarta-rs-xml-provider;3.0.1 +tools.jackson.jakarta.rs:jackson-jakarta-rs-yaml-provider;3.0.1 +tools.jackson.jaxrs:jackson-jaxrs-base;3.0.1 +tools.jackson.jaxrs:jackson-jaxrs-cbor-provider;3.0.1 +tools.jackson.jaxrs:jackson-jaxrs-json-provider;3.0.1 +tools.jackson.jaxrs:jackson-jaxrs-smile-provider;3.0.1 +tools.jackson.jaxrs:jackson-jaxrs-xml-provider;3.0.1 +tools.jackson.jaxrs:jackson-jaxrs-yaml-provider;3.0.1 +tools.jackson.jr:jackson-jr-all;3.0.1 +tools.jackson.jr:jackson-jr-annotation-support;3.0.1 +tools.jackson.jr:jackson-jr-extension-javatime;3.0.1 +tools.jackson.jr:jackson-jr-objects;3.0.1 +tools.jackson.jr:jackson-jr-retrofit2;3.0.1 +tools.jackson.jr:jackson-jr-stree;3.0.1 +tools.jackson.module:jackson-module-afterburner;3.0.1 +tools.jackson.module:jackson-module-android-record;3.0.1 +tools.jackson.module:jackson-module-blackbird;3.0.1 +tools.jackson.module:jackson-module-guice;3.0.1 +tools.jackson.module:jackson-module-guice7;3.0.1 +tools.jackson.module:jackson-module-jakarta-xmlbind-annotations;3.0.1 +tools.jackson.module:jackson-module-jaxb-annotations;3.0.1 +tools.jackson.module:jackson-module-kotlin;3.0.1 +tools.jackson.module:jackson-module-mrbean;3.0.1 +tools.jackson.module:jackson-module-no-ctor-deser;3.0.1 +tools.jackson.module:jackson-module-osgi;3.0.1 +tools.jackson.module:jackson-module-scala_2.12;3.0.1 +tools.jackson.module:jackson-module-scala_2.13;3.0.1 +tools.jackson.module:jackson-module-scala_3;3.0.1 +tools.jackson:jackson-bom;3.0.1 +wsdl4j:wsdl4j;1.6.3 diff --git a/sdk/spring/scripts/version_util.py b/sdk/spring/scripts/version_util.py index a9886a817edb..63583986b32a 100644 --- a/sdk/spring/scripts/version_util.py +++ b/sdk/spring/scripts/version_util.py @@ -11,8 +11,20 @@ def version_greater_than(source_version, target_version): source_version = format_version(source_version, SPECIAL_VERSION_LIST) target_version = format_version(target_version, SPECIAL_VERSION_LIST) - sv = parse(source_version) - tv = parse(target_version) + try: + sv = parse(source_version) + except: + # Handle invalid version formats (e.g., year-based versions with milestones like 2025.1.0-M4) + sv = None + try: + tv = parse(target_version) + except: + # Handle invalid version formats + tv = None + + # If both versions can't be parsed, use special comparison + if sv is None or tv is None: + return special_version_greater_than(source_version, target_version) if sv == tv: return True diff --git a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/pom.xml b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/pom.xml index 526df4456a29..4019e11e7272 100644 --- a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/pom.xml +++ b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/pom.xml @@ -41,13 +41,13 @@ org.springframework.boot spring-boot-actuator-autoconfigure - 3.5.5 + 4.0.0-RC2 compile com.fasterxml.jackson.core jackson-databind - 2.19.2 + 2.20.1 com.azure.spring @@ -128,7 +128,7 @@ org.springframework.boot spring-boot-starter-test - 3.5.5 + 4.0.0-RC2 test @@ -136,7 +136,7 @@ org.mockito mockito-core - 5.17.0 + 5.20.0 test @@ -144,13 +144,13 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test @@ -160,7 +160,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -194,14 +194,14 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.2 - com.fasterxml.jackson.core:jackson-databind:[2.19.2] - org.springframework.boot:spring-boot-actuator:[3.5.5] - org.springframework.boot:spring-boot-actuator-autoconfigure:[3.5.5] + com.fasterxml.jackson.core:jackson-databind:[2.20.1] + org.springframework.boot:spring-boot-actuator:[4.0.0-RC2] + org.springframework.boot:spring-boot-actuator-autoconfigure:[4.0.0-RC2] @@ -255,7 +255,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-actuator/pom.xml b/sdk/spring/spring-cloud-azure-actuator/pom.xml index c97735c55a04..3e3098c929ad 100644 --- a/sdk/spring/spring-cloud-azure-actuator/pom.xml +++ b/sdk/spring/spring-cloud-azure-actuator/pom.xml @@ -45,7 +45,7 @@ org.springframework.boot spring-boot-actuator - 3.5.5 + 4.0.0-RC2 compile @@ -116,7 +116,7 @@ org.springframework.boot spring-boot-starter-test - 3.5.5 + 4.0.0-RC2 test @@ -124,7 +124,7 @@ org.mockito mockito-core - 5.17.0 + 5.20.0 test @@ -132,13 +132,13 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test @@ -148,7 +148,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -179,12 +179,12 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.2 - org.springframework.boot:spring-boot-actuator:[3.5.5] + org.springframework.boot:spring-boot-actuator:[4.0.0-RC2] @@ -238,7 +238,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-appconfiguration-config-web/pom.xml b/sdk/spring/spring-cloud-azure-appconfiguration-config-web/pom.xml index 7ae8e6b847eb..efd911657520 100644 --- a/sdk/spring/spring-cloud-azure-appconfiguration-config-web/pom.xml +++ b/sdk/spring/spring-cloud-azure-appconfiguration-config-web/pom.xml @@ -26,12 +26,12 @@ org.springframework.boot spring-boot-starter-web - 3.5.5 + 4.0.0-RC2 org.springframework.boot spring-boot-starter-actuator - 3.5.5 + 4.0.0-RC2 true @@ -43,7 +43,7 @@ org.springframework.boot spring-boot-starter-test - 3.5.5 + 4.0.0-RC2 test @@ -51,7 +51,7 @@ org.mockito mockito-core - 5.17.0 + 5.20.0 test @@ -59,13 +59,13 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test @@ -74,7 +74,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 -Xlint:deprecation @@ -113,13 +113,13 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.2 - org.springframework.boot:spring-boot-starter-actuator:[3.5.5] - org.springframework.boot:spring-boot-starter-web:[3.5.5] + org.springframework.boot:spring-boot-starter-actuator:[4.0.0-RC2] + org.springframework.boot:spring-boot-starter-web:[4.0.0-RC2] org.springframework.cloud:spring-cloud-bus:[4.3.0] @@ -177,7 +177,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.11.3 + 3.12.0 attach-javadocs @@ -193,7 +193,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-appconfiguration-config/pom.xml b/sdk/spring/spring-cloud-azure-appconfiguration-config/pom.xml index f945d5fed552..d3e6aa095ae0 100644 --- a/sdk/spring/spring-cloud-azure-appconfiguration-config/pom.xml +++ b/sdk/spring/spring-cloud-azure-appconfiguration-config/pom.xml @@ -21,12 +21,12 @@ org.springframework.boot spring-boot-autoconfigure - 3.5.5 + 4.0.0-RC2 org.springframework.boot spring-boot-configuration-processor - 3.5.5 + 4.0.0-RC2 true @@ -37,7 +37,7 @@ org.springframework.boot spring-boot-actuator - 3.5.5 + 4.0.0-RC2 compile @@ -80,7 +80,7 @@ org.springframework.boot spring-boot-starter-test - 3.5.5 + 4.0.0-RC2 test @@ -88,7 +88,7 @@ org.mockito mockito-core - 5.17.0 + 5.20.0 test @@ -96,13 +96,13 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test + 3.14.1 -Xlint:deprecation @@ -172,18 +172,18 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.2 - com.fasterxml.jackson.core:jackson-annotations:[2.19.2] - com.fasterxml.jackson.core:jackson-databind:[2.19.2] - org.springframework.boot:spring-boot-actuator:[3.5.5] - org.springframework.boot:spring-boot-autoconfigure:[3.5.5] + com.fasterxml.jackson.core:jackson-annotations:[2.20] + com.fasterxml.jackson.core:jackson-databind:[2.20.1] + org.springframework.boot:spring-boot-actuator:[4.0.0-RC2] + org.springframework.boot:spring-boot-autoconfigure:[4.0.0-RC2] org.springframework.cloud:spring-cloud-context:[4.3.0] jakarta.annotation:jakarta.annotation-api:[3.0.0] - org.springframework.boot:spring-boot-configuration-processor:[3.5.5] + org.springframework.boot:spring-boot-configuration-processor:[4.0.0-RC2] diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml index b6cdb1aefa60..8da089dc7779 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml +++ b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml @@ -86,7 +86,7 @@ org.springframework.kafka spring-kafka - 3.3.9 + 4.0.0-RC1 true @@ -100,7 +100,7 @@ io.lettuce lettuce-core - 6.6.0.RELEASE + 6.8.1.RELEASE true @@ -112,7 +112,7 @@ org.springframework spring-tx - 6.2.10 + 7.0.0-RC3 true @@ -128,7 +128,7 @@ org.springframework spring-jms - 6.2.10 + 7.0.0-RC3 true @@ -300,25 +300,25 @@ org.springframework.boot spring-boot-autoconfigure - 3.5.5 + 4.0.0-RC2 org.springframework spring-context-support - 6.2.10 + 7.0.0-RC3 true org.springframework.boot spring-boot-actuator-autoconfigure - 3.5.5 + 4.0.0-RC2 true org.springframework.boot spring-boot-configuration-processor - 3.5.5 + 4.0.0-RC2 true @@ -360,20 +360,20 @@ jakarta.servlet jakarta.servlet-api - 6.0.0 + 6.1.0 true org.hibernate.validator hibernate-validator - 8.0.3.Final + 9.0.1.Final true jakarta.validation jakarta.validation-api - 3.0.2 + 3.1.1 @@ -387,37 +387,37 @@ com.fasterxml.jackson.core jackson-databind - 2.19.2 + 2.20.1 true com.fasterxml.jackson.core jackson-core - 2.19.2 + 2.20.1 true com.fasterxml.jackson.core jackson-annotations - 2.19.2 + 2.20 true com.fasterxml.jackson.dataformat jackson-dataformat-xml - 2.19.2 + 2.20.1 true com.fasterxml.jackson.datatype jackson-datatype-jsr310 - 2.19.2 + 2.20.1 true com.fasterxml.jackson.module jackson-module-afterburner - 2.19.2 + 2.20.1 true @@ -425,19 +425,19 @@ org.springframework.boot spring-boot-starter-test - 3.5.5 + 4.0.0-RC2 test org.springframework spring-core-test - 6.2.10 + 7.0.0-RC3 test org.springframework.boot spring-boot-configuration-metadata - 3.5.5 + 4.0.0-RC2 test @@ -445,7 +445,7 @@ org.mockito mockito-core - 5.17.0 + 5.20.0 test @@ -453,13 +453,13 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test @@ -473,14 +473,14 @@ org.postgresql postgresql - 42.7.7 + 42.7.8 test org.springframework spring-jdbc - 6.2.10 + 7.0.0-RC3 test @@ -491,7 +491,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -537,39 +537,39 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.2 com.azure:azure-servicebus-jms:[2.0.0] com.mysql:mysql-connector-j:[9.4.0] - com.fasterxml.jackson.core:jackson-annotations:[2.19.2] - com.fasterxml.jackson.core:jackson-core:[2.19.2] - com.fasterxml.jackson.core:jackson-databind:[2.19.2] - com.fasterxml.jackson.dataformat:jackson-dataformat-xml:[2.19.2] - com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.19.2] - com.fasterxml.jackson.module:jackson-module-afterburner:[2.19.2] - io.lettuce:lettuce-core:[6.6.0.RELEASE] - jakarta.servlet:jakarta.servlet-api:[6.0.0] - jakarta.validation:jakarta.validation-api:[3.0.2] - org.hibernate.validator:hibernate-validator:[8.0.3.Final] + com.fasterxml.jackson.core:jackson-annotations:[2.20] + com.fasterxml.jackson.core:jackson-core:[2.20.1] + com.fasterxml.jackson.core:jackson-databind:[2.20.1] + com.fasterxml.jackson.dataformat:jackson-dataformat-xml:[2.20.1] + com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.20.1] + com.fasterxml.jackson.module:jackson-module-afterburner:[2.20.1] + io.lettuce:lettuce-core:[6.8.1.RELEASE] + jakarta.servlet:jakarta.servlet-api:[6.1.0] + jakarta.validation:jakarta.validation-api:[3.1.1] + org.hibernate.validator:hibernate-validator:[9.0.1.Final] org.messaginghub:pooled-jms:[3.1.7] - org.postgresql:postgresql:[42.7.7] - org.springframework.boot:spring-boot-actuator-autoconfigure:[3.5.5] - org.springframework.boot:spring-boot-autoconfigure:[3.5.5] - org.springframework.boot:spring-boot-configuration-processor:[3.5.5] + org.postgresql:postgresql:[42.7.8] + org.springframework.boot:spring-boot-actuator-autoconfigure:[4.0.0-RC2] + org.springframework.boot:spring-boot-autoconfigure:[4.0.0-RC2] + org.springframework.boot:spring-boot-configuration-processor:[4.0.0-RC2] org.springframework.cloud:spring-cloud-starter-stream-kafka:[4.3.0] org.springframework.data:spring-data-redis:[3.5.3] - org.springframework.kafka:spring-kafka:[3.3.9] + org.springframework.kafka:spring-kafka:[4.0.0-RC1] org.springframework.security:spring-security-config:[6.5.3] org.springframework.security:spring-security-oauth2-client:[6.5.3] org.springframework.security:spring-security-oauth2-jose:[6.5.3] org.springframework.security:spring-security-oauth2-resource-server:[6.5.3] - org.springframework:spring-context-support:[6.2.10] - org.springframework:spring-jdbc:[6.2.10] - org.springframework:spring-jms:[6.2.10] - org.springframework:spring-tx:[6.2.10] + org.springframework:spring-context-support:[7.0.0-RC3] + org.springframework:spring-jdbc:[7.0.0-RC3] + org.springframework:spring-jms:[7.0.0-RC3] + org.springframework:spring-tx:[7.0.0-RC3] diff --git a/sdk/spring/spring-cloud-azure-core/pom.xml b/sdk/spring/spring-cloud-azure-core/pom.xml index f8d30b0f3472..7ef2433b0771 100644 --- a/sdk/spring/spring-cloud-azure-core/pom.xml +++ b/sdk/spring/spring-cloud-azure-core/pom.xml @@ -40,7 +40,7 @@ org.springframework spring-context - 6.2.10 + 7.0.0-RC3 com.azure @@ -98,7 +98,7 @@ org.mockito mockito-core - 5.17.0 + 5.20.0 test @@ -106,25 +106,25 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test org.junit.jupiter junit-jupiter - 5.12.2 + 6.0.1 test org.springframework spring-test - 6.2.10 + 7.0.0-RC3 test @@ -145,7 +145,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -176,12 +176,12 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.2 - org.springframework:spring-context:[6.2.10] + org.springframework:spring-context:[7.0.0-RC3] diff --git a/sdk/spring/spring-cloud-azure-docker-compose/pom.xml b/sdk/spring/spring-cloud-azure-docker-compose/pom.xml index d568e3caca5d..eae1aee6c469 100644 --- a/sdk/spring/spring-cloud-azure-docker-compose/pom.xml +++ b/sdk/spring/spring-cloud-azure-docker-compose/pom.xml @@ -81,7 +81,7 @@ org.springframework.boot spring-boot-docker-compose - 3.5.5 + 4.0.0-RC2 + 4.0.0-RC2 test org.springframework spring-test - 6.2.10 + 7.0.0-RC3 test org.junit.jupiter junit-jupiter - 5.12.2 + 6.0.1 test org.assertj assertj-core - 3.27.4 + 3.27.6 test @@ -124,7 +124,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -155,12 +155,12 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.2 - org.springframework.boot:spring-boot-docker-compose:[3.5.5] + org.springframework.boot:spring-boot-docker-compose:[4.0.0-RC2] @@ -214,7 +214,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-feature-management-web/pom.xml b/sdk/spring/spring-cloud-azure-feature-management-web/pom.xml index e19493d584bd..2647f98dd721 100644 --- a/sdk/spring/spring-cloud-azure-feature-management-web/pom.xml +++ b/sdk/spring/spring-cloud-azure-feature-management-web/pom.xml @@ -29,12 +29,12 @@ org.springframework spring-web - 6.2.10 + 7.0.0-RC3 org.springframework spring-webmvc - 6.2.10 + 7.0.0-RC3 com.azure.spring @@ -44,26 +44,26 @@ jakarta.servlet jakarta.servlet-api - 6.0.0 + 6.1.0 provided org.springframework.boot spring-boot-starter-test - 3.5.5 + 4.0.0-RC2 test net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test @@ -88,7 +88,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -122,15 +122,15 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.2 com.azure.spring:spring-cloud-azure-feature-management:[6.1.0-beta.1] - jakarta.servlet:jakarta.servlet-api:[6.0.0] - org.springframework:spring-web:[6.2.10] - org.springframework:spring-webmvc:[6.2.10] + jakarta.servlet:jakarta.servlet-api:[6.1.0] + org.springframework:spring-web:[7.0.0-RC3] + org.springframework:spring-webmvc:[7.0.0-RC3] diff --git a/sdk/spring/spring-cloud-azure-feature-management/pom.xml b/sdk/spring/spring-cloud-azure-feature-management/pom.xml index 1dbac57ba347..c3e670a71976 100644 --- a/sdk/spring/spring-cloud-azure-feature-management/pom.xml +++ b/sdk/spring/spring-cloud-azure-feature-management/pom.xml @@ -29,12 +29,12 @@ org.springframework spring-context - 6.2.10 + 7.0.0-RC3 org.springframework.boot spring-boot-starter - 3.5.5 + 4.0.0-RC2 ch.qos.logback @@ -45,35 +45,35 @@ org.springframework.boot spring-boot-configuration-processor - 3.5.5 + 4.0.0-RC2 true com.fasterxml.jackson.core jackson-annotations - 2.19.2 + 2.20 com.fasterxml.jackson.core jackson-databind - 2.19.2 + 2.20.1 io.projectreactor.netty reactor-netty - 1.2.9 + 1.3.0-RC1 org.springframework.boot spring-boot-starter-test - 3.5.5 + 4.0.0-RC2 test org.mockito mockito-core - 5.17.0 + 5.20.0 test @@ -81,19 +81,19 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test ch.qos.logback logback-classic - 1.5.18 + 1.5.20 test @@ -118,7 +118,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -161,17 +161,17 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.2 - com.fasterxml.jackson.core:jackson-annotations:[2.19.2] - com.fasterxml.jackson.core:jackson-databind:[2.19.2] - io.projectreactor.netty:reactor-netty:[1.2.9] - org.springframework.boot:spring-boot-configuration-processor:[3.5.5] - org.springframework.boot:spring-boot-starter:[3.5.5] - org.springframework:spring-context:[6.2.10] + com.fasterxml.jackson.core:jackson-annotations:[2.20] + com.fasterxml.jackson.core:jackson-databind:[2.20.1] + io.projectreactor.netty:reactor-netty:[1.3.0-RC1] + org.springframework.boot:spring-boot-configuration-processor:[4.0.0-RC2] + org.springframework.boot:spring-boot-starter:[4.0.0-RC2] + org.springframework:spring-context:[7.0.0-RC3] diff --git a/sdk/spring/spring-cloud-azure-integration-test-appconfiguration-config/pom.xml b/sdk/spring/spring-cloud-azure-integration-test-appconfiguration-config/pom.xml index ddf5dcfe5b5a..033392bcc880 100644 --- a/sdk/spring/spring-cloud-azure-integration-test-appconfiguration-config/pom.xml +++ b/sdk/spring/spring-cloud-azure-integration-test-appconfiguration-config/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 3.5.5 + 4.0.0-RC2 com.azure.spring @@ -30,7 +30,7 @@ org.springframework.boot spring-boot-starter-test - 3.5.5 + 4.0.0-RC2 test @@ -39,7 +39,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.5.3 + 3.5.4 default diff --git a/sdk/spring/spring-cloud-azure-integration-tests/pom.xml b/sdk/spring/spring-cloud-azure-integration-tests/pom.xml index 50dd466d6e25..ffb15b9e3873 100644 --- a/sdk/spring/spring-cloud-azure-integration-tests/pom.xml +++ b/sdk/spring/spring-cloud-azure-integration-tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 3.5.5 + 4.0.0-RC2 @@ -142,7 +142,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.5.3 + 3.5.4 default diff --git a/sdk/spring/spring-cloud-azure-resourcemanager/pom.xml b/sdk/spring/spring-cloud-azure-resourcemanager/pom.xml index dd69cfd3ad9d..9a791d3c427c 100644 --- a/sdk/spring/spring-cloud-azure-resourcemanager/pom.xml +++ b/sdk/spring/spring-cloud-azure-resourcemanager/pom.xml @@ -53,7 +53,7 @@ org.mockito mockito-core - 5.17.0 + 5.20.0 test @@ -61,25 +61,25 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test org.junit.jupiter junit-jupiter - 5.12.2 + 6.0.1 test org.springframework spring-test - 6.2.10 + 7.0.0-RC3 test @@ -100,7 +100,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -176,7 +176,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-service/pom.xml b/sdk/spring/spring-cloud-azure-service/pom.xml index ee1629b16f3c..7ca858176b3b 100644 --- a/sdk/spring/spring-cloud-azure-service/pom.xml +++ b/sdk/spring/spring-cloud-azure-service/pom.xml @@ -116,7 +116,7 @@ org.apache.kafka kafka-clients - 3.9.1 + 4.1.0 true @@ -131,7 +131,7 @@ org.mockito mockito-core - 5.17.0 + 5.20.0 test @@ -139,25 +139,25 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test org.junit.jupiter junit-jupiter - 5.12.2 + 6.0.1 test org.springframework spring-test - 6.2.10 + 7.0.0-RC3 test @@ -178,7 +178,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -209,13 +209,13 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.2 - org.apache.kafka:kafka-clients:[3.9.1] - org.postgresql:postgresql:[42.7.7] + org.apache.kafka:kafka-clients:[4.1.0] + org.postgresql:postgresql:[42.7.8] com.nimbusds:nimbus-jose-jwt:[9.37.3] 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 e1a375b3b6cd..b2c6794df3d4 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 @@ -199,7 +199,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-active-directory/pom.xml b/sdk/spring/spring-cloud-azure-starter-active-directory/pom.xml index 83d3b173637b..56e53c53fc72 100644 --- a/sdk/spring/spring-cloud-azure-starter-active-directory/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-active-directory/pom.xml @@ -193,7 +193,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-actuator/pom.xml b/sdk/spring/spring-cloud-azure-starter-actuator/pom.xml index dcd91568608d..828c133517a8 100644 --- a/sdk/spring/spring-cloud-azure-starter-actuator/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-actuator/pom.xml @@ -99,7 +99,7 @@ org.springframework.boot spring-boot-starter-actuator - 3.5.5 + 4.0.0-RC2 @@ -188,7 +188,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-appconfiguration-config/pom.xml b/sdk/spring/spring-cloud-azure-starter-appconfiguration-config/pom.xml index 992d363e1cf3..a2f2eca6dc8a 100644 --- a/sdk/spring/spring-cloud-azure-starter-appconfiguration-config/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-appconfiguration-config/pom.xml @@ -185,7 +185,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-appconfiguration/pom.xml b/sdk/spring/spring-cloud-azure-starter-appconfiguration/pom.xml index 6288a7c4a79d..5b7e91306713 100644 --- a/sdk/spring/spring-cloud-azure-starter-appconfiguration/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-appconfiguration/pom.xml @@ -183,7 +183,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-cosmos/pom.xml b/sdk/spring/spring-cloud-azure-starter-cosmos/pom.xml index 0e8bc48c4684..c0000d2c500c 100644 --- a/sdk/spring/spring-cloud-azure-starter-cosmos/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-cosmos/pom.xml @@ -183,7 +183,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-data-cosmos/pom.xml b/sdk/spring/spring-cloud-azure-starter-data-cosmos/pom.xml index 74da06815338..4fc0ec3633cb 100644 --- a/sdk/spring/spring-cloud-azure-starter-data-cosmos/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-data-cosmos/pom.xml @@ -183,7 +183,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-data-redis-lettuce/pom.xml b/sdk/spring/spring-cloud-azure-starter-data-redis-lettuce/pom.xml index c285b59cb37a..9f4b6dd42bdb 100644 --- a/sdk/spring/spring-cloud-azure-starter-data-redis-lettuce/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-data-redis-lettuce/pom.xml @@ -101,7 +101,7 @@ io.lettuce lettuce-core - 6.6.0.RELEASE + 6.8.1.RELEASE true @@ -198,7 +198,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-eventgrid/pom.xml b/sdk/spring/spring-cloud-azure-starter-eventgrid/pom.xml index 03cbc37b8bc5..88606ed94052 100644 --- a/sdk/spring/spring-cloud-azure-starter-eventgrid/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-eventgrid/pom.xml @@ -185,7 +185,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-eventhubs/pom.xml b/sdk/spring/spring-cloud-azure-starter-eventhubs/pom.xml index f72f8eb93b07..ba8d2d0e7229 100644 --- a/sdk/spring/spring-cloud-azure-starter-eventhubs/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-eventhubs/pom.xml @@ -191,7 +191,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-integration-eventhubs/pom.xml b/sdk/spring/spring-cloud-azure-starter-integration-eventhubs/pom.xml index bd9f381f0c82..de34805f7a1e 100644 --- a/sdk/spring/spring-cloud-azure-starter-integration-eventhubs/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-integration-eventhubs/pom.xml @@ -95,7 +95,7 @@ org.springframework.boot spring-boot-starter-integration - 3.5.5 + 4.0.0-RC2 com.azure.spring @@ -189,7 +189,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-integration-servicebus/pom.xml b/sdk/spring/spring-cloud-azure-starter-integration-servicebus/pom.xml index ee567efbd380..ea4eba599fd9 100644 --- a/sdk/spring/spring-cloud-azure-starter-integration-servicebus/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-integration-servicebus/pom.xml @@ -95,7 +95,7 @@ org.springframework.boot spring-boot-starter-integration - 3.5.5 + 4.0.0-RC2 com.azure.spring @@ -189,7 +189,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-integration-storage-queue/pom.xml b/sdk/spring/spring-cloud-azure-starter-integration-storage-queue/pom.xml index 78d92988ff65..7e8c9e42328a 100644 --- a/sdk/spring/spring-cloud-azure-starter-integration-storage-queue/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-integration-storage-queue/pom.xml @@ -98,7 +98,7 @@ org.springframework.boot spring-boot-starter-integration - 3.5.5 + 4.0.0-RC2 com.azure.spring @@ -192,7 +192,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-jdbc-mysql/pom.xml b/sdk/spring/spring-cloud-azure-starter-jdbc-mysql/pom.xml index c54afa191e4e..3547883db3e2 100644 --- a/sdk/spring/spring-cloud-azure-starter-jdbc-mysql/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-jdbc-mysql/pom.xml @@ -190,7 +190,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-jdbc-postgresql/pom.xml b/sdk/spring/spring-cloud-azure-starter-jdbc-postgresql/pom.xml index 18bc691036de..fd7e24f31097 100644 --- a/sdk/spring/spring-cloud-azure-starter-jdbc-postgresql/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-jdbc-postgresql/pom.xml @@ -101,7 +101,7 @@ org.postgresql postgresql - 42.7.7 + 42.7.8 @@ -190,7 +190,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-keyvault-certificates/pom.xml b/sdk/spring/spring-cloud-azure-starter-keyvault-certificates/pom.xml index 9a806739e368..4f0fe5b21b93 100644 --- a/sdk/spring/spring-cloud-azure-starter-keyvault-certificates/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-keyvault-certificates/pom.xml @@ -183,7 +183,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-keyvault-jca/pom.xml b/sdk/spring/spring-cloud-azure-starter-keyvault-jca/pom.xml index bb1015417702..80773b472706 100644 --- a/sdk/spring/spring-cloud-azure-starter-keyvault-jca/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-keyvault-jca/pom.xml @@ -183,7 +183,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-keyvault-secrets/pom.xml b/sdk/spring/spring-cloud-azure-starter-keyvault-secrets/pom.xml index a1f6f8560006..cf7fd6ad6fb9 100644 --- a/sdk/spring/spring-cloud-azure-starter-keyvault-secrets/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-keyvault-secrets/pom.xml @@ -183,7 +183,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-keyvault/pom.xml b/sdk/spring/spring-cloud-azure-starter-keyvault/pom.xml index 953acdd9725e..68f2915232ec 100644 --- a/sdk/spring/spring-cloud-azure-starter-keyvault/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-keyvault/pom.xml @@ -188,7 +188,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-monitor-test/pom.xml b/sdk/spring/spring-cloud-azure-starter-monitor-test/pom.xml index 6e3caf25dd87..017427bf8914 100644 --- a/sdk/spring/spring-cloud-azure-starter-monitor-test/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-monitor-test/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 3.5.5 + 4.0.0-RC2 @@ -48,17 +48,17 @@ org.springframework.boot spring-boot-starter-web - 3.5.5 + 4.0.0-RC2 org.springframework.boot spring-boot-starter-data-jdbc - 3.5.5 + 4.0.0-RC2 org.springframework.boot spring-boot-starter-test - 3.5.5 + 4.0.0-RC2 test diff --git a/sdk/spring/spring-cloud-azure-starter-monitor/pom.xml b/sdk/spring/spring-cloud-azure-starter-monitor/pom.xml index bf59ec4a783a..0a385980184f 100644 --- a/sdk/spring/spring-cloud-azure-starter-monitor/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-monitor/pom.xml @@ -87,7 +87,7 @@ org.springframework.boot spring-boot-starter - 3.5.5 + 4.0.0-RC2 provided @@ -166,7 +166,7 @@ org.springframework.boot spring-boot-starter-test - 3.5.5 + 4.0.0-RC2 test @@ -178,7 +178,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -222,7 +222,7 @@ io.opentelemetry:opentelemetry-sdk-metrics:[1.49.0] io.opentelemetry:opentelemetry-sdk-logs:[1.49.0] io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:[1.49.0] - org.springframework.boot:spring-boot-starter:[3.5.5] + org.springframework.boot:spring-boot-starter:[4.0.0-RC2] 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 26566866ec53..4301713ba787 100644 --- a/sdk/spring/spring-cloud-azure-starter-servicebus-jms/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-servicebus-jms/pom.xml @@ -96,7 +96,7 @@ org.springframework spring-jms - 6.2.10 + 7.0.0-RC3 org.messaginghub @@ -136,37 +136,37 @@ currently released version and a lower version is resolved. --> io.netty netty-buffer - 4.1.124.Final + 4.2.7.Final io.netty netty-common - 4.1.124.Final + 4.2.7.Final io.netty netty-handler - 4.1.124.Final + 4.2.7.Final io.netty netty-transport - 4.1.124.Final + 4.2.7.Final io.netty netty-transport-native-epoll - 4.1.124.Final + 4.2.7.Final io.netty netty-transport-native-kqueue - 4.1.124.Final + 4.2.7.Final io.netty netty-codec-http - 4.1.124.Final + 4.2.7.Final com.azure @@ -260,7 +260,7 @@ currently released version and a lower version is resolved. --> org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-servicebus/pom.xml b/sdk/spring/spring-cloud-azure-starter-servicebus/pom.xml index cf7d877b2eec..d28744b094b5 100644 --- a/sdk/spring/spring-cloud-azure-starter-servicebus/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-servicebus/pom.xml @@ -184,7 +184,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-storage-blob/pom.xml b/sdk/spring/spring-cloud-azure-starter-storage-blob/pom.xml index 26fda7327445..2e1f2a760cea 100644 --- a/sdk/spring/spring-cloud-azure-starter-storage-blob/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-storage-blob/pom.xml @@ -184,7 +184,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-storage-file-share/pom.xml b/sdk/spring/spring-cloud-azure-starter-storage-file-share/pom.xml index c951eb3bbb40..1520ec1065ee 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 @@ -184,7 +184,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-storage-queue/pom.xml b/sdk/spring/spring-cloud-azure-starter-storage-queue/pom.xml index 82c6d4af92ab..6662f8aa3c85 100644 --- a/sdk/spring/spring-cloud-azure-starter-storage-queue/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-storage-queue/pom.xml @@ -187,7 +187,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-storage/pom.xml b/sdk/spring/spring-cloud-azure-starter-storage/pom.xml index ad99ae68dd1e..e691d6405a21 100644 --- a/sdk/spring/spring-cloud-azure-starter-storage/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-storage/pom.xml @@ -190,7 +190,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-stream-eventhubs/pom.xml b/sdk/spring/spring-cloud-azure-starter-stream-eventhubs/pom.xml index 72dfac92eec2..2efee45c7ff5 100644 --- a/sdk/spring/spring-cloud-azure-starter-stream-eventhubs/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-stream-eventhubs/pom.xml @@ -179,7 +179,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-stream-servicebus/pom.xml b/sdk/spring/spring-cloud-azure-starter-stream-servicebus/pom.xml index 51c7ae5a084f..20e56584f39a 100644 --- a/sdk/spring/spring-cloud-azure-starter-stream-servicebus/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-stream-servicebus/pom.xml @@ -179,7 +179,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter/pom.xml b/sdk/spring/spring-cloud-azure-starter/pom.xml index d77e7205b5aa..6eb7d159daae 100644 --- a/sdk/spring/spring-cloud-azure-starter/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter/pom.xml @@ -89,7 +89,7 @@ org.springframework.boot spring-boot-starter - 3.5.5 + 4.0.0-RC2 com.azure.spring @@ -192,7 +192,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-stream-binder-eventhubs-core/pom.xml b/sdk/spring/spring-cloud-azure-stream-binder-eventhubs-core/pom.xml index 102164dc9719..4ab14ba21534 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 @@ -59,14 +59,14 @@ org.springframework.boot spring-boot-configuration-processor - 3.5.5 + 4.0.0-RC2 true org.mockito mockito-core - 5.17.0 + 5.20.0 test @@ -74,25 +74,25 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test org.junit.jupiter junit-jupiter - 5.12.2 + 6.0.1 test org.springframework spring-test - 6.2.10 + 7.0.0-RC3 test @@ -108,13 +108,13 @@ org.springframework.boot spring-boot-test - 3.5.5 + 4.0.0-RC2 test org.assertj assertj-core - 3.27.4 + 3.27.6 test @@ -123,7 +123,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -166,12 +166,12 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.2 - org.springframework.boot:spring-boot-configuration-processor:[3.5.5] + org.springframework.boot:spring-boot-configuration-processor:[4.0.0-RC2] org.springframework.cloud:spring-cloud-stream:[4.3.0] 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 e333c8316657..6f1086970efe 100644 --- a/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/pom.xml +++ b/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/pom.xml @@ -57,7 +57,7 @@ org.springframework.boot spring-boot-starter-actuator - 3.5.5 + 4.0.0-RC2 true @@ -82,7 +82,7 @@ org.springframework.boot spring-boot-starter-test - 3.5.5 + 4.0.0-RC2 test @@ -90,13 +90,13 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test + 5.20.0 test @@ -123,7 +123,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -157,12 +157,12 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.2 - org.springframework.boot:spring-boot-starter-actuator:[3.5.5] + org.springframework.boot:spring-boot-starter-actuator:[4.0.0-RC2] 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 320d145b4887..59d45b84a014 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 @@ -57,14 +57,14 @@ org.springframework.boot spring-boot-configuration-processor - 3.5.5 + 4.0.0-RC2 true org.mockito mockito-core - 5.17.0 + 5.20.0 test @@ -72,25 +72,25 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test org.junit.jupiter junit-jupiter - 5.12.2 + 6.0.1 test org.springframework spring-test - 6.2.10 + 7.0.0-RC3 test @@ -106,13 +106,13 @@ org.springframework.boot spring-boot-test - 3.5.5 + 4.0.0-RC2 test org.assertj assertj-core - 3.27.4 + 3.27.6 test @@ -122,7 +122,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -165,12 +165,12 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.2 - org.springframework.boot:spring-boot-configuration-processor:[3.5.5] + org.springframework.boot:spring-boot-configuration-processor:[4.0.0-RC2] org.springframework.cloud:spring-cloud-stream:[4.3.0] 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 8abb638da2f8..62719981c469 100644 --- a/sdk/spring/spring-cloud-azure-stream-binder-servicebus/pom.xml +++ b/sdk/spring/spring-cloud-azure-stream-binder-servicebus/pom.xml @@ -56,7 +56,7 @@ org.springframework.boot spring-boot-starter-actuator - 3.5.5 + 4.0.0-RC2 true + 4.0.0-RC2 test @@ -92,7 +92,7 @@ org.mockito mockito-core - 5.17.0 + 5.20.0 test @@ -100,13 +100,13 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test @@ -116,7 +116,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -150,12 +150,12 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.2 - org.springframework.boot:spring-boot-starter-actuator:[3.5.5] + org.springframework.boot:spring-boot-starter-actuator:[4.0.0-RC2] diff --git a/sdk/spring/spring-cloud-azure-testcontainers/pom.xml b/sdk/spring/spring-cloud-azure-testcontainers/pom.xml index ac014a48e952..7b320ee3eab3 100644 --- a/sdk/spring/spring-cloud-azure-testcontainers/pom.xml +++ b/sdk/spring/spring-cloud-azure-testcontainers/pom.xml @@ -82,7 +82,7 @@ org.springframework.boot spring-boot-testcontainers - 3.5.5 + 4.0.0-RC2 org.testcontainers @@ -103,19 +103,19 @@ org.springframework spring-test - 6.2.10 + 7.0.0-RC3 test org.junit.jupiter junit-jupiter - 5.12.2 + 6.0.1 test org.assertj assertj-core - 3.27.4 + 3.27.6 test @@ -131,7 +131,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -162,12 +162,12 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.2 - org.springframework.boot:spring-boot-testcontainers:[3.5.5] + org.springframework.boot:spring-boot-testcontainers:[4.0.0-RC2] org.testcontainers:azure:[1.21.3] @@ -222,7 +222,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.1.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-integration-azure-core/pom.xml b/sdk/spring/spring-integration-azure-core/pom.xml index 7c9fcd5471a9..4deec95bd658 100644 --- a/sdk/spring/spring-integration-azure-core/pom.xml +++ b/sdk/spring/spring-integration-azure-core/pom.xml @@ -48,7 +48,7 @@ org.springframework.integration spring-integration-core - 6.5.1 + 7.0.0-RC2 + 5.20.0 test @@ -71,31 +71,31 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test org.springframework spring-test - 6.2.10 + 7.0.0-RC3 test org.junit.jupiter junit-jupiter - 5.12.2 + 6.0.1 test org.assertj assertj-core - 3.27.4 + 3.27.6 test @@ -105,7 +105,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -136,12 +136,12 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.2 - org.springframework.integration:spring-integration-core:[6.5.1] + org.springframework.integration:spring-integration-core:[7.0.0-RC2] diff --git a/sdk/spring/spring-integration-azure-eventhubs/pom.xml b/sdk/spring/spring-integration-azure-eventhubs/pom.xml index aaed8b36eeef..e3723b641388 100644 --- a/sdk/spring/spring-integration-azure-eventhubs/pom.xml +++ b/sdk/spring/spring-integration-azure-eventhubs/pom.xml @@ -67,7 +67,7 @@ org.mockito mockito-core - 5.17.0 + 5.20.0 test @@ -75,31 +75,31 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test org.springframework spring-test - 6.2.10 + 7.0.0-RC3 test org.assertj assertj-core - 3.27.4 + 3.27.6 test org.junit.jupiter junit-jupiter - 5.12.2 + 6.0.1 test @@ -109,7 +109,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 diff --git a/sdk/spring/spring-integration-azure-servicebus/pom.xml b/sdk/spring/spring-integration-azure-servicebus/pom.xml index 3b7d07c4d2ad..36e822f69987 100644 --- a/sdk/spring/spring-integration-azure-servicebus/pom.xml +++ b/sdk/spring/spring-integration-azure-servicebus/pom.xml @@ -66,7 +66,7 @@ org.mockito mockito-core - 5.17.0 + 5.20.0 test @@ -74,31 +74,31 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test org.junit.jupiter junit-jupiter - 5.12.2 + 6.0.1 test org.springframework spring-test - 6.2.10 + 7.0.0-RC3 test org.assertj assertj-core - 3.27.4 + 3.27.6 test @@ -108,7 +108,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 diff --git a/sdk/spring/spring-integration-azure-storage-queue/pom.xml b/sdk/spring/spring-integration-azure-storage-queue/pom.xml index 4df92ec46719..ce7a67c5b4cb 100644 --- a/sdk/spring/spring-integration-azure-storage-queue/pom.xml +++ b/sdk/spring/spring-integration-azure-storage-queue/pom.xml @@ -63,7 +63,7 @@ org.mockito mockito-core - 5.17.0 + 5.20.0 test @@ -71,19 +71,19 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test org.junit.jupiter junit-jupiter - 5.12.2 + 6.0.1 test @@ -93,7 +93,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 diff --git a/sdk/spring/spring-messaging-azure-eventhubs/pom.xml b/sdk/spring/spring-messaging-azure-eventhubs/pom.xml index d6f0fdd0b647..276ec4a2a744 100644 --- a/sdk/spring/spring-messaging-azure-eventhubs/pom.xml +++ b/sdk/spring/spring-messaging-azure-eventhubs/pom.xml @@ -59,7 +59,7 @@ org.springframework spring-tx - 6.2.10 + 7.0.0-RC3 true @@ -97,13 +97,13 @@ org.springframework spring-test - 6.2.10 + 7.0.0-RC3 test org.mockito mockito-core - 5.17.0 + 5.20.0 test @@ -111,25 +111,25 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test org.junit.jupiter junit-jupiter - 5.12.2 + 6.0.1 test io.projectreactor reactor-test - 3.7.9 + 3.8.0-RC1 test @@ -138,7 +138,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -169,13 +169,13 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.2 io.micrometer:micrometer-core:[1.15.3] - org.springframework:spring-tx:[6.2.10] + org.springframework:spring-tx:[7.0.0-RC3] org.springframework.retry:spring-retry:[2.0.12] org.springframework.data:spring-data-commons:[3.5.3] diff --git a/sdk/spring/spring-messaging-azure-servicebus/pom.xml b/sdk/spring/spring-messaging-azure-servicebus/pom.xml index a5276a303a73..bad93272f541 100644 --- a/sdk/spring/spring-messaging-azure-servicebus/pom.xml +++ b/sdk/spring/spring-messaging-azure-servicebus/pom.xml @@ -52,7 +52,7 @@ org.springframework spring-tx - 6.2.10 + 7.0.0-RC3 true @@ -82,7 +82,7 @@ org.mockito mockito-core - 5.17.0 + 5.20.0 test @@ -90,19 +90,19 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test org.junit.jupiter junit-jupiter - 5.12.2 + 6.0.1 test @@ -123,7 +123,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -154,13 +154,13 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.2 io.micrometer:micrometer-core:[1.15.3] - org.springframework:spring-tx:[6.2.10] + org.springframework:spring-tx:[7.0.0-RC3] org.springframework.retry:spring-retry:[2.0.12] org.springframework.data:spring-data-commons:[3.5.3] diff --git a/sdk/spring/spring-messaging-azure-storage-queue/pom.xml b/sdk/spring/spring-messaging-azure-storage-queue/pom.xml index 1bd81586c23f..e19d826595f9 100644 --- a/sdk/spring/spring-messaging-azure-storage-queue/pom.xml +++ b/sdk/spring/spring-messaging-azure-storage-queue/pom.xml @@ -52,7 +52,7 @@ org.mockito mockito-core - 5.17.0 + 5.20.0 test @@ -60,25 +60,25 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test org.junit.jupiter junit-jupiter - 5.12.2 + 6.0.1 test org.springframework.boot spring-boot-starter-test - 3.5.5 + 4.0.0-RC2 test @@ -100,7 +100,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 diff --git a/sdk/spring/spring-messaging-azure/pom.xml b/sdk/spring/spring-messaging-azure/pom.xml index 28ab7d3ce151..1f55d805bd41 100644 --- a/sdk/spring/spring-messaging-azure/pom.xml +++ b/sdk/spring/spring-messaging-azure/pom.xml @@ -46,12 +46,12 @@ org.springframework spring-messaging - 6.2.10 + 7.0.0-RC3 org.springframework spring-tx - 6.2.10 + 7.0.0-RC3 true @@ -92,14 +92,14 @@ org.springframework.boot spring-boot-starter-test - 3.5.5 + 4.0.0-RC2 test org.mockito mockito-core - 5.17.0 + 5.20.0 test @@ -107,13 +107,13 @@ net.bytebuddy byte-buddy - 1.17.7 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.7 + 1.17.8 test @@ -123,7 +123,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 @@ -154,15 +154,15 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.2 io.micrometer:micrometer-core:[1.15.3] org.springframework.data:spring-data-commons:[3.5.3] - org.springframework:spring-messaging:[6.2.10] - org.springframework:spring-tx:[6.2.10] + org.springframework:spring-messaging:[7.0.0-RC3] + org.springframework:spring-tx:[7.0.0-RC3] org.springframework.retry:spring-retry:[2.0.12] From 4039c61261449ff4f5acddd68baf57a3cfe572ed Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 13 Nov 2025 08:46:06 +0000 Subject: [PATCH 09/76] fix: suppress deprecation warnings for Spring Framework 7.0 @Nullable/@NonNull annotations Co-authored-by: Netyyyy <92105726+Netyyyy@users.noreply.github.com> --- .../java/com/azure/spring/data/cosmos/common/MacAddress.java | 1 + .../com/azure/spring/data/cosmos/common/PropertyLoader.java | 1 + .../java/com/azure/spring/data/cosmos/core/CosmosTemplate.java | 1 + .../azure/spring/data/cosmos/core/ReactiveCosmosTemplate.java | 2 +- .../spring/data/cosmos/core/ResponseDiagnosticsProcessor.java | 1 + .../data/cosmos/core/generator/AbstractQueryGenerator.java | 1 + .../data/cosmos/core/mapping/event/CosmosMappingEvent.java | 1 + .../com/azure/spring/data/cosmos/core/query/CosmosQuery.java | 1 + .../java/com/azure/spring/data/cosmos/core/query/Criteria.java | 1 + .../com/azure/spring/data/cosmos/core/query/CriteriaType.java | 1 + .../spring/data/cosmos/exception/CosmosAccessException.java | 1 + .../spring/data/cosmos/exception/CosmosBadRequestException.java | 1 + .../spring/data/cosmos/exception/CosmosConflictException.java | 1 + .../spring/data/cosmos/exception/CosmosExceptionUtils.java | 1 + .../spring/data/cosmos/exception/CosmosForbiddenException.java | 1 + .../azure/spring/data/cosmos/exception/CosmosGoneException.java | 1 + .../cosmos/exception/CosmosInternalServerErrorException.java | 1 + .../data/cosmos/exception/CosmosInvalidPartitionException.java | 1 + .../data/cosmos/exception/CosmosMethodNotAllowedException.java | 1 + .../spring/data/cosmos/exception/CosmosNotFoundException.java | 1 + .../cosmos/exception/CosmosOperationCancelledException.java | 1 + .../cosmos/exception/CosmosPartitionIsMigratingException.java | 1 + .../cosmos/exception/CosmosPartitionKeyRangeGoneException.java | 1 + .../exception/CosmosPartitionKeyRangeIsSplittingException.java | 1 + .../cosmos/exception/CosmosPreconditionFailedException.java | 1 + .../cosmos/exception/CosmosRequestEntityTooLargeException.java | 1 + .../cosmos/exception/CosmosRequestRateTooLargeException.java | 1 + .../data/cosmos/exception/CosmosRequestTimeoutException.java | 1 + .../spring/data/cosmos/exception/CosmosRetryWithException.java | 1 + .../cosmos/exception/CosmosServiceUnavailableException.java | 1 + .../data/cosmos/exception/CosmosUnauthorizedException.java | 1 + .../spring/data/cosmos/exception/DatabaseCreationException.java | 1 + .../data/cosmos/exception/IllegalCollectionException.java | 1 + .../spring/data/cosmos/exception/IllegalQueryException.java | 1 + .../spring/data/cosmos/repository/query/CosmosQueryCreator.java | 1 + .../spring/data/cosmos/repository/query/CosmosQueryMethod.java | 1 + .../cosmos/repository/query/ReactiveCosmosQueryCreator.java | 1 + .../data/cosmos/repository/query/ReactiveCosmosQueryMethod.java | 1 + .../data/cosmos/repository/support/CosmosEntityInformation.java | 1 + .../data/cosmos/repository/support/SimpleCosmosRepository.java | 1 + .../repository/support/SimpleReactiveCosmosRepository.java | 1 + .../java/com/azure/spring/data/cosmos/AppConfiguration.java | 1 + .../azure/spring/data/cosmos/AppConfigurationCodeSnippet.java | 1 + .../azure/spring/data/cosmos/UserRepositoryConfiguration.java | 1 + .../cosmos/repository/integration/CustomerRepositoryIT.java | 1 + .../data/cosmos/repository/integration/ProjectRepositoryIT.java | 1 + .../pullrefresh/AppConfigurationEventListener.java | 1 + .../pushbusrefresh/AppConfigurationBusRefreshEventListener.java | 1 + .../pushrefresh/AppConfigurationRefreshEndpoint.java | 1 + .../pushrefresh/AppConfigurationRefreshEventListener.java | 1 + .../implementation/jdbc/JdbcConnectionStringEnhancer.java | 1 + .../keyvault/environment/KeyVaultPropertySource.java | 1 + .../core/implementation/connectionstring/ConnectionString.java | 1 + .../converter/AzureHttpRetryOptionsConverter.java | 1 + .../azure/spring/cloud/core/resource/AzureStorageResource.java | 1 + .../feature/management/FeatureManagementConfiguration.java | 1 + .../cloud/feature/management/models/FeatureDefinition.java | 1 + .../implementation/crud/AbstractResourceCrud.java | 1 + .../implementation/crud/ServiceBusNamespaceCrud.java | 1 + .../implementation/crud/ServiceBusQueueCrud.java | 1 + .../implementation/crud/ServiceBusTopicCrud.java | 1 + .../implementation/crud/ServiceBusTopicSubscriptionCrud.java | 1 + .../storage/AzureStorageRetryOptionsConverter.java | 1 + .../EventHubsChannelResourceManagerProvisioner.java | 1 + .../ServiceBusChannelResourceManagerProvisioner.java | 1 + .../spring/integration/core/handler/DefaultMessageHandler.java | 1 + .../core/DefaultEventHubsNamespaceProcessorFactory.java | 1 + .../core/DefaultEventHubsNamespaceProducerFactory.java | 1 + .../core/config/MethodEventHubsListenerEndpoint.java | 1 + .../core/DefaultServiceBusNamespaceConsumerFactory.java | 1 + .../core/DefaultServiceBusNamespaceProcessorFactory.java | 1 + .../core/DefaultServiceBusNamespaceProducerFactory.java | 1 + .../spring/messaging/servicebus/core/ServiceBusTemplate.java | 1 + .../core/config/MethodServiceBusListenerEndpoint.java | 1 + .../messaging/storage/queue/core/StorageQueueTemplate.java | 1 + .../factory/DefaultStorageQueueClientFactory.java | 1 + .../azure/spring/messaging/converter/AzureMessageConverter.java | 1 + .../AzureListenerAnnotationBeanPostProcessorAdapter.java | 1 + .../messaging/implementation/checkpoint/AzureCheckpointer.java | 1 + .../implementation/config/AbstractAzureListenerEndpoint.java | 1 + .../implementation/config/AzureListenerEndpointRegistrar.java | 1 + .../implementation/config/AzureListenerEndpointRegistry.java | 1 + .../implementation/config/MethodAzureListenerEndpoint.java | 1 + .../converter/AbstractJacksonAzureMessageConverter.java | 1 + .../listener/adapter/MessagingMessageListenerAdapter.java | 1 + .../endpoint/MethodAzureListenerTestEndpoint.java | 1 + 86 files changed, 86 insertions(+), 1 deletion(-) diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/common/MacAddress.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/common/MacAddress.java index 41ff8997e186..4c8ce721f0a4 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/common/MacAddress.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/common/MacAddress.java @@ -29,6 +29,7 @@ /** * Mac address class to transfer mac address to hash mac address. */ +@SuppressWarnings("deprecation") public final class MacAddress { private static final String UNKNOWN_MAC_ADDRESS = "Unknown-Mac-Address"; diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/common/PropertyLoader.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/common/PropertyLoader.java index 57265332dc44..8d8761445c93 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/common/PropertyLoader.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/common/PropertyLoader.java @@ -11,6 +11,7 @@ /** * Load properties from files */ +@SuppressWarnings("deprecation") public final class PropertyLoader { private static final String PROJECT_PROPERTY_FILE = "/azure-spring-data-cosmos.properties"; diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/CosmosTemplate.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/CosmosTemplate.java index 9bea4d7322a0..357ba09107d9 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/CosmosTemplate.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/CosmosTemplate.java @@ -82,6 +82,7 @@ /** * Template class for cosmos db */ +@SuppressWarnings("deprecation") public class CosmosTemplate implements CosmosOperations, ApplicationContextAware { private static final Logger LOGGER = LoggerFactory.getLogger(CosmosTemplate.class); diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplate.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplate.java index da0b587cf076..0ef821d8c42d 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplate.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplate.java @@ -69,7 +69,7 @@ /** * Template class of reactive cosmos */ -@SuppressWarnings("unchecked") +@SuppressWarnings({"unchecked", "deprecation"}) public class ReactiveCosmosTemplate implements ReactiveCosmosOperations, ApplicationContextAware { private static final Logger LOGGER = LoggerFactory.getLogger(ReactiveCosmosTemplate.class); diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/ResponseDiagnosticsProcessor.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/ResponseDiagnosticsProcessor.java index 15e2c09e7543..4c0bd6a8f04b 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/ResponseDiagnosticsProcessor.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/ResponseDiagnosticsProcessor.java @@ -8,6 +8,7 @@ /** * Interface for processing cosmosDB response */ +@SuppressWarnings("deprecation") public interface ResponseDiagnosticsProcessor { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/generator/AbstractQueryGenerator.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/generator/AbstractQueryGenerator.java index 0f67e77cf890..ab634521548e 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/generator/AbstractQueryGenerator.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/generator/AbstractQueryGenerator.java @@ -26,6 +26,7 @@ /** * Base class for generating sql query */ +@SuppressWarnings("deprecation") public abstract class AbstractQueryGenerator { private static String tableName = ""; diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/event/CosmosMappingEvent.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/event/CosmosMappingEvent.java index f60b8ba62eb7..cf9186fbf674 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/event/CosmosMappingEvent.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/event/CosmosMappingEvent.java @@ -14,6 +14,7 @@ * * @param the type of the event. */ +@SuppressWarnings("deprecation") public class CosmosMappingEvent extends ApplicationEvent { private static final long serialVersionUID = 1L; diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/query/CosmosQuery.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/query/CosmosQuery.java index 24412c33559a..2d0e51a6c7fc 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/query/CosmosQuery.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/query/CosmosQuery.java @@ -17,6 +17,7 @@ /** * Class for cosmos query */ +@SuppressWarnings("deprecation") public class CosmosQuery { private final Criteria criteria; diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/query/Criteria.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/query/Criteria.java index d95ad67a4130..a822de941d23 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/query/Criteria.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/query/Criteria.java @@ -11,6 +11,7 @@ /** * Class of criteria */ +@SuppressWarnings("deprecation") public final class Criteria { private String subject; diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/query/CriteriaType.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/query/CriteriaType.java index 50e2354b9171..6a36ec2ab70b 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/query/CriteriaType.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/query/CriteriaType.java @@ -13,6 +13,7 @@ /** * Enum of criteria type */ +@SuppressWarnings("deprecation") public enum CriteriaType { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosAccessException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosAccessException.java index a7f96013e0c3..44e4de6d766c 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosAccessException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosAccessException.java @@ -17,6 +17,7 @@ * rely on innerException for any retriable logic, or for more details on the failure of * the operation. */ +@SuppressWarnings("deprecation") public class CosmosAccessException extends DataAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosBadRequestException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosBadRequestException.java index ca3e5d87969e..f72ab0ba0dfb 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosBadRequestException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosBadRequestException.java @@ -7,6 +7,7 @@ /** * Exception for Cosmos Bad Request Exception. */ +@SuppressWarnings("deprecation") public final class CosmosBadRequestException extends CosmosAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosConflictException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosConflictException.java index fb89ba633791..a95a64d4edc5 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosConflictException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosConflictException.java @@ -7,6 +7,7 @@ /** * Exception for Cosmos Conflict Exception. */ +@SuppressWarnings("deprecation") public final class CosmosConflictException extends CosmosAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosExceptionUtils.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosExceptionUtils.java index d0f1fa090de3..56a439e23482 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosExceptionUtils.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosExceptionUtils.java @@ -13,6 +13,7 @@ /** * To handle and throw a cosmos db exception when access the database */ +@SuppressWarnings("deprecation") public class CosmosExceptionUtils { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosForbiddenException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosForbiddenException.java index bb132d43a388..860bc15b2506 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosForbiddenException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosForbiddenException.java @@ -7,6 +7,7 @@ /** * Exception for Cosmos Forbidden Exception. */ +@SuppressWarnings("deprecation") public final class CosmosForbiddenException extends CosmosAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosGoneException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosGoneException.java index 993dd709a927..9cfe2f4f93d2 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosGoneException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosGoneException.java @@ -7,6 +7,7 @@ /** * Exception for Cosmos Gone Exception. */ +@SuppressWarnings("deprecation") public final class CosmosGoneException extends CosmosAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosInternalServerErrorException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosInternalServerErrorException.java index d85631e06c51..a28d95b9e768 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosInternalServerErrorException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosInternalServerErrorException.java @@ -7,6 +7,7 @@ /** * Exception for Cosmos Internal Server Error Exception. */ +@SuppressWarnings("deprecation") public final class CosmosInternalServerErrorException extends CosmosAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosInvalidPartitionException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosInvalidPartitionException.java index eb3151ad92c7..16449c709a4c 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosInvalidPartitionException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosInvalidPartitionException.java @@ -7,6 +7,7 @@ /** * Exception for Cosmos Invalid Partition Exception. */ +@SuppressWarnings("deprecation") public final class CosmosInvalidPartitionException extends CosmosAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosMethodNotAllowedException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosMethodNotAllowedException.java index 1f2d7c03f41c..99088d151120 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosMethodNotAllowedException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosMethodNotAllowedException.java @@ -7,6 +7,7 @@ /** * Exception for Cosmos Method Not Allowed Exception. */ +@SuppressWarnings("deprecation") public final class CosmosMethodNotAllowedException extends CosmosAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosNotFoundException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosNotFoundException.java index 6ea9f396d8f9..791fa295c174 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosNotFoundException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosNotFoundException.java @@ -7,6 +7,7 @@ /** * Exception for Cosmos Not Found Exception. */ +@SuppressWarnings("deprecation") public final class CosmosNotFoundException extends CosmosAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosOperationCancelledException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosOperationCancelledException.java index 797dea283db8..c6ed3560a504 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosOperationCancelledException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosOperationCancelledException.java @@ -7,6 +7,7 @@ /** * Exception for Cosmos Operation Cancelled Exception. */ +@SuppressWarnings("deprecation") public final class CosmosOperationCancelledException extends CosmosAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosPartitionIsMigratingException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosPartitionIsMigratingException.java index eb088b7e2949..5aaa462e8d1c 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosPartitionIsMigratingException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosPartitionIsMigratingException.java @@ -7,6 +7,7 @@ /** * Exception for Cosmos Partition Is Migrating Exception. */ +@SuppressWarnings("deprecation") public final class CosmosPartitionIsMigratingException extends CosmosAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosPartitionKeyRangeGoneException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosPartitionKeyRangeGoneException.java index 0e72035b115a..baec7789b0d5 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosPartitionKeyRangeGoneException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosPartitionKeyRangeGoneException.java @@ -7,6 +7,7 @@ /** * Exception for Cosmos Partition Key Range Gone Exception. */ +@SuppressWarnings("deprecation") public final class CosmosPartitionKeyRangeGoneException extends CosmosAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosPartitionKeyRangeIsSplittingException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosPartitionKeyRangeIsSplittingException.java index a20e039f7db8..045b77d884d3 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosPartitionKeyRangeIsSplittingException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosPartitionKeyRangeIsSplittingException.java @@ -7,6 +7,7 @@ /** * Exception for Cosmos Key Range Is Splitting Exception. */ +@SuppressWarnings("deprecation") public final class CosmosPartitionKeyRangeIsSplittingException extends CosmosAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosPreconditionFailedException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosPreconditionFailedException.java index 03da7ea593e8..e77ac33eeb24 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosPreconditionFailedException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosPreconditionFailedException.java @@ -7,6 +7,7 @@ /** * Exception for Cosmos Precondition Failed Exception. */ +@SuppressWarnings("deprecation") public final class CosmosPreconditionFailedException extends CosmosAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosRequestEntityTooLargeException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosRequestEntityTooLargeException.java index 68272e00c35e..ef37e7411e16 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosRequestEntityTooLargeException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosRequestEntityTooLargeException.java @@ -7,6 +7,7 @@ /** * Exception for Cosmos Request Entity Too Large Exception. */ +@SuppressWarnings("deprecation") public final class CosmosRequestEntityTooLargeException extends CosmosAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosRequestRateTooLargeException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosRequestRateTooLargeException.java index 1685a38aa0fa..bc8e2e7657db 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosRequestRateTooLargeException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosRequestRateTooLargeException.java @@ -7,6 +7,7 @@ /** * Exception for Cosmos Request Rate Too Large Exception. */ +@SuppressWarnings("deprecation") public final class CosmosRequestRateTooLargeException extends CosmosAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosRequestTimeoutException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosRequestTimeoutException.java index de9b987005e5..ff0ee33ae262 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosRequestTimeoutException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosRequestTimeoutException.java @@ -7,6 +7,7 @@ /** * Exception for Cosmos Request Timeout Exception. */ +@SuppressWarnings("deprecation") public final class CosmosRequestTimeoutException extends CosmosAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosRetryWithException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosRetryWithException.java index 196b03ab7974..29f2f7dab7da 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosRetryWithException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosRetryWithException.java @@ -7,6 +7,7 @@ /** * Exception for Cosmos Retry With Exception. */ +@SuppressWarnings("deprecation") public final class CosmosRetryWithException extends CosmosAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosServiceUnavailableException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosServiceUnavailableException.java index 8599a95fc6a2..45ade5d204b1 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosServiceUnavailableException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosServiceUnavailableException.java @@ -7,6 +7,7 @@ /** * Exception for Cosmos Service Unavailable Exception. */ +@SuppressWarnings("deprecation") public final class CosmosServiceUnavailableException extends CosmosAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosUnauthorizedException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosUnauthorizedException.java index 23af773683ef..876a3fc678fe 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosUnauthorizedException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/CosmosUnauthorizedException.java @@ -7,6 +7,7 @@ /** * Exception for Cosmos Unauthorized Exception. */ +@SuppressWarnings("deprecation") public final class CosmosUnauthorizedException extends CosmosAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/DatabaseCreationException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/DatabaseCreationException.java index 6b42de838600..b6f4702fe49f 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/DatabaseCreationException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/DatabaseCreationException.java @@ -8,6 +8,7 @@ /** * General exception for illegal creation of cosmos db */ +@SuppressWarnings("deprecation") public class DatabaseCreationException extends DataAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/IllegalCollectionException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/IllegalCollectionException.java index 991338998643..e732a847377d 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/IllegalCollectionException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/IllegalCollectionException.java @@ -8,6 +8,7 @@ /** * General exception for illegal collection of cosmos db */ +@SuppressWarnings("deprecation") public class IllegalCollectionException extends DataAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/IllegalQueryException.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/IllegalQueryException.java index e1027f879cc3..6c6bc271c227 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/IllegalQueryException.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/exception/IllegalQueryException.java @@ -8,6 +8,7 @@ /** * General exception for illegal query of cosmos db */ +@SuppressWarnings("deprecation") public class IllegalQueryException extends DataAccessException { /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosQueryCreator.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosQueryCreator.java index 65c3f25f0cb8..02aa35b05b0c 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosQueryCreator.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosQueryCreator.java @@ -25,6 +25,7 @@ * How to bind values to the query. if CosmosDb already has binding capability, if not we would have to do it here in * some creative way.query creator are associated with part tree queries, */ +@SuppressWarnings("deprecation") public class CosmosQueryCreator extends AbstractQueryCreator { private final MappingContext mappingContext; diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosQueryMethod.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosQueryMethod.java index 3ab770dd8509..d6cfdc0e0f21 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosQueryMethod.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosQueryMethod.java @@ -64,6 +64,7 @@ public boolean hasAnnotatedQuery() { * * @return the query string or null */ + @SuppressWarnings("deprecation") @Nullable public String getQueryAnnotation() { return annotatedQueryValue; diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/ReactiveCosmosQueryCreator.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/ReactiveCosmosQueryCreator.java index a7c6cd5bc9f5..d2495e9c6eab 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/ReactiveCosmosQueryCreator.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/ReactiveCosmosQueryCreator.java @@ -23,6 +23,7 @@ /** * Class for reactive cosmos query creators that create criteria based queries from a {@link PartTree}. */ +@SuppressWarnings("deprecation") public class ReactiveCosmosQueryCreator extends AbstractQueryCreator { private final MappingContext mappingContext; diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/ReactiveCosmosQueryMethod.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/ReactiveCosmosQueryMethod.java index 7b9c5b5dc839..191688725481 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/ReactiveCosmosQueryMethod.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/ReactiveCosmosQueryMethod.java @@ -77,6 +77,7 @@ public boolean hasAnnotatedQuery() { * Gets the annotated query or returns null * @return the annotated query String or null */ + @SuppressWarnings("deprecation") @Nullable public String getQueryAnnotation() { return annotatedQueryValue; diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/CosmosEntityInformation.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/CosmosEntityInformation.java index 7d462a7c5ceb..dd1c02c62272 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/CosmosEntityInformation.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/CosmosEntityInformation.java @@ -49,6 +49,7 @@ * @param domain type. * @param id type. */ +@SuppressWarnings("deprecation") public class CosmosEntityInformation extends AbstractEntityInformation { private static final Function, CosmosEntityInformation> ENTITY_INFORMATION_CREATOR = diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/SimpleCosmosRepository.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/SimpleCosmosRepository.java index 43c8aa4f143d..4f95ec668832 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/SimpleCosmosRepository.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/SimpleCosmosRepository.java @@ -34,6 +34,7 @@ * @param domain type. * @param id type. */ +@SuppressWarnings("deprecation") public class SimpleCosmosRepository implements CosmosRepository { private final CosmosOperations operation; diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/SimpleReactiveCosmosRepository.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/SimpleReactiveCosmosRepository.java index d1a1caab659b..e5b2b6760ffe 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/SimpleReactiveCosmosRepository.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/SimpleReactiveCosmosRepository.java @@ -30,6 +30,7 @@ * @param the type of the domain class managed by this repository. * @param the type of the id of the domain class managed by this repository. */ +@SuppressWarnings("deprecation") public class SimpleReactiveCosmosRepository implements ReactiveCosmosRepository { private final CosmosEntityInformation entityInformation; diff --git a/sdk/spring/azure-spring-data-cosmos/src/samples/java/com/azure/spring/data/cosmos/AppConfiguration.java b/sdk/spring/azure-spring-data-cosmos/src/samples/java/com/azure/spring/data/cosmos/AppConfiguration.java index 8cd043070c01..cc8886325c6f 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/samples/java/com/azure/spring/data/cosmos/AppConfiguration.java +++ b/sdk/spring/azure-spring-data-cosmos/src/samples/java/com/azure/spring/data/cosmos/AppConfiguration.java @@ -26,6 +26,7 @@ // BEGIN: readme-sample-AppConfiguration @Configuration @EnableCosmosRepositories +@SuppressWarnings("deprecation") public class AppConfiguration extends AbstractCosmosConfiguration { private static final Logger LOGGER = LoggerFactory.getLogger(AppConfiguration.class); diff --git a/sdk/spring/azure-spring-data-cosmos/src/samples/java/com/azure/spring/data/cosmos/AppConfigurationCodeSnippet.java b/sdk/spring/azure-spring-data-cosmos/src/samples/java/com/azure/spring/data/cosmos/AppConfigurationCodeSnippet.java index b6bf291860fe..701bad9d457d 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/samples/java/com/azure/spring/data/cosmos/AppConfigurationCodeSnippet.java +++ b/sdk/spring/azure-spring-data-cosmos/src/samples/java/com/azure/spring/data/cosmos/AppConfigurationCodeSnippet.java @@ -24,6 +24,7 @@ @Configuration @EnableCosmosRepositories +@SuppressWarnings("deprecation") public class AppConfigurationCodeSnippet extends AbstractCosmosConfiguration { private static final Logger LOGGER = LoggerFactory.getLogger(AppConfigurationCodeSnippet.class); diff --git a/sdk/spring/azure-spring-data-cosmos/src/samples/java/com/azure/spring/data/cosmos/UserRepositoryConfiguration.java b/sdk/spring/azure-spring-data-cosmos/src/samples/java/com/azure/spring/data/cosmos/UserRepositoryConfiguration.java index 0faf6a673960..096896168471 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/samples/java/com/azure/spring/data/cosmos/UserRepositoryConfiguration.java +++ b/sdk/spring/azure-spring-data-cosmos/src/samples/java/com/azure/spring/data/cosmos/UserRepositoryConfiguration.java @@ -27,6 +27,7 @@ @EnableConfigurationProperties(CosmosProperties.class) @EnableReactiveCosmosRepositories @PropertySource("classpath:application.properties") +@SuppressWarnings("deprecation") public class UserRepositoryConfiguration extends AbstractCosmosConfiguration { private static final Logger LOGGER = LoggerFactory.getLogger(UserRepositoryConfiguration.class); diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/CustomerRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/CustomerRepositoryIT.java index eea90caa27bf..6c4932c62d98 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/CustomerRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/CustomerRepositoryIT.java @@ -26,6 +26,7 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) +@SuppressWarnings("deprecation") public class CustomerRepositoryIT { private static final String USER_NAME_0 = "username-0"; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ProjectRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ProjectRepositoryIT.java index 78a1bba4a862..85e7c32b40ad 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ProjectRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ProjectRepositoryIT.java @@ -31,6 +31,7 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) +@SuppressWarnings("deprecation") public class ProjectRepositoryIT { private static final String ID_0 = "id-0"; diff --git a/sdk/spring/spring-cloud-azure-appconfiguration-config-web/src/main/java/com/azure/spring/cloud/appconfiguration/config/web/implementation/pullrefresh/AppConfigurationEventListener.java b/sdk/spring/spring-cloud-azure-appconfiguration-config-web/src/main/java/com/azure/spring/cloud/appconfiguration/config/web/implementation/pullrefresh/AppConfigurationEventListener.java index 8fafe59374a6..54962d6d0765 100644 --- a/sdk/spring/spring-cloud-azure-appconfiguration-config-web/src/main/java/com/azure/spring/cloud/appconfiguration/config/web/implementation/pullrefresh/AppConfigurationEventListener.java +++ b/sdk/spring/spring-cloud-azure-appconfiguration-config-web/src/main/java/com/azure/spring/cloud/appconfiguration/config/web/implementation/pullrefresh/AppConfigurationEventListener.java @@ -17,6 +17,7 @@ /** * Listens for ServletRequestHandledEvents to check if the configurations need to be updated. */ +@SuppressWarnings("deprecation") public final class AppConfigurationEventListener implements ApplicationListener { private static final Logger LOGGER = LoggerFactory.getLogger(AppConfigurationEventListener.class); diff --git a/sdk/spring/spring-cloud-azure-appconfiguration-config-web/src/main/java/com/azure/spring/cloud/appconfiguration/config/web/implementation/pushbusrefresh/AppConfigurationBusRefreshEventListener.java b/sdk/spring/spring-cloud-azure-appconfiguration-config-web/src/main/java/com/azure/spring/cloud/appconfiguration/config/web/implementation/pushbusrefresh/AppConfigurationBusRefreshEventListener.java index 296f554f51ec..bdc86fe534f0 100644 --- a/sdk/spring/spring-cloud-azure-appconfiguration-config-web/src/main/java/com/azure/spring/cloud/appconfiguration/config/web/implementation/pushbusrefresh/AppConfigurationBusRefreshEventListener.java +++ b/sdk/spring/spring-cloud-azure-appconfiguration-config-web/src/main/java/com/azure/spring/cloud/appconfiguration/config/web/implementation/pushbusrefresh/AppConfigurationBusRefreshEventListener.java @@ -12,6 +12,7 @@ /** * Listens for AppConfigurationBusRefreshEvents and sets the App Configuration watch interval to zero. */ +@SuppressWarnings("deprecation") public final class AppConfigurationBusRefreshEventListener implements ApplicationListener { private static final Logger LOGGER = LoggerFactory.getLogger(AppConfigurationBusRefreshEventListener.class); diff --git a/sdk/spring/spring-cloud-azure-appconfiguration-config-web/src/main/java/com/azure/spring/cloud/appconfiguration/config/web/implementation/pushrefresh/AppConfigurationRefreshEndpoint.java b/sdk/spring/spring-cloud-azure-appconfiguration-config-web/src/main/java/com/azure/spring/cloud/appconfiguration/config/web/implementation/pushrefresh/AppConfigurationRefreshEndpoint.java index 1a97678e0cd9..913bbfadd5ab 100644 --- a/sdk/spring/spring-cloud-azure-appconfiguration-config-web/src/main/java/com/azure/spring/cloud/appconfiguration/config/web/implementation/pushrefresh/AppConfigurationRefreshEndpoint.java +++ b/sdk/spring/spring-cloud-azure-appconfiguration-config-web/src/main/java/com/azure/spring/cloud/appconfiguration/config/web/implementation/pushrefresh/AppConfigurationRefreshEndpoint.java @@ -31,6 +31,7 @@ * Endpoint for requesting new configurations to be loaded. */ @Endpoint(id = APPCONFIGURATION_REFRESH) +@SuppressWarnings("deprecation") public class AppConfigurationRefreshEndpoint implements ApplicationEventPublisherAware { private static final Logger LOGGER = LoggerFactory.getLogger(AppConfigurationRefreshEndpoint.class); diff --git a/sdk/spring/spring-cloud-azure-appconfiguration-config-web/src/main/java/com/azure/spring/cloud/appconfiguration/config/web/implementation/pushrefresh/AppConfigurationRefreshEventListener.java b/sdk/spring/spring-cloud-azure-appconfiguration-config-web/src/main/java/com/azure/spring/cloud/appconfiguration/config/web/implementation/pushrefresh/AppConfigurationRefreshEventListener.java index cfaf05050bc9..3a4836319df3 100644 --- a/sdk/spring/spring-cloud-azure-appconfiguration-config-web/src/main/java/com/azure/spring/cloud/appconfiguration/config/web/implementation/pushrefresh/AppConfigurationRefreshEventListener.java +++ b/sdk/spring/spring-cloud-azure-appconfiguration-config-web/src/main/java/com/azure/spring/cloud/appconfiguration/config/web/implementation/pushrefresh/AppConfigurationRefreshEventListener.java @@ -12,6 +12,7 @@ /** * Listens for AppConfigurationRefreshEvents and sets the App Configuration watch interval to zero. */ +@SuppressWarnings("deprecation") public final class AppConfigurationRefreshEventListener implements ApplicationListener { private static final Logger LOGGER = LoggerFactory.getLogger(AppConfigurationRefreshEventListener.class); diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/JdbcConnectionStringEnhancer.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/JdbcConnectionStringEnhancer.java index 1df3ce2349fc..d9fecd8b7f17 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/JdbcConnectionStringEnhancer.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/JdbcConnectionStringEnhancer.java @@ -22,6 +22,7 @@ * append more attributes value to an existing property. An enhanced JDBC URL can be * built from this enhancer. */ +@SuppressWarnings("deprecation") public final class JdbcConnectionStringEnhancer { private static final Logger LOGGER = LoggerFactory.getLogger(JdbcConnectionStringEnhancer.class); diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/keyvault/environment/KeyVaultPropertySource.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/keyvault/environment/KeyVaultPropertySource.java index da693d288af1..6686fe22cf9f 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/keyvault/environment/KeyVaultPropertySource.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/keyvault/environment/KeyVaultPropertySource.java @@ -24,6 +24,7 @@ * * @since 4.0.0 */ +@SuppressWarnings("deprecation") public class KeyVaultPropertySource extends EnumerablePropertySource { /** diff --git a/sdk/spring/spring-cloud-azure-core/src/main/java/com/azure/spring/cloud/core/implementation/connectionstring/ConnectionString.java b/sdk/spring/spring-cloud-azure-core/src/main/java/com/azure/spring/cloud/core/implementation/connectionstring/ConnectionString.java index 74d0b6e53636..3798e783095d 100644 --- a/sdk/spring/spring-cloud-azure-core/src/main/java/com/azure/spring/cloud/core/implementation/connectionstring/ConnectionString.java +++ b/sdk/spring/spring-cloud-azure-core/src/main/java/com/azure/spring/cloud/core/implementation/connectionstring/ConnectionString.java @@ -23,6 +23,7 @@ import static com.azure.spring.cloud.core.implementation.connectionstring.ConnectionStringSegments.ENDPOINT; +@SuppressWarnings("deprecation") class ConnectionString { private static final Logger LOGGER = LoggerFactory.getLogger(ConnectionString.class); diff --git a/sdk/spring/spring-cloud-azure-core/src/main/java/com/azure/spring/cloud/core/implementation/converter/AzureHttpRetryOptionsConverter.java b/sdk/spring/spring-cloud-azure-core/src/main/java/com/azure/spring/cloud/core/implementation/converter/AzureHttpRetryOptionsConverter.java index b409dbfca1a9..7033a6ce0ad6 100644 --- a/sdk/spring/spring-cloud-azure-core/src/main/java/com/azure/spring/cloud/core/implementation/converter/AzureHttpRetryOptionsConverter.java +++ b/sdk/spring/spring-cloud-azure-core/src/main/java/com/azure/spring/cloud/core/implementation/converter/AzureHttpRetryOptionsConverter.java @@ -15,6 +15,7 @@ /** * Converts a {@link RetryOptionsProvider.RetryOptions} to a {@link RetryOptions}. */ +@SuppressWarnings("deprecation") public final class AzureHttpRetryOptionsConverter implements Converter { private static final Logger LOGGER = LoggerFactory.getLogger(AzureHttpRetryOptionsConverter.class); diff --git a/sdk/spring/spring-cloud-azure-core/src/main/java/com/azure/spring/cloud/core/resource/AzureStorageResource.java b/sdk/spring/spring-cloud-azure-core/src/main/java/com/azure/spring/cloud/core/resource/AzureStorageResource.java index 1446f01a6d54..b6e8960ea0f8 100644 --- a/sdk/spring/spring-cloud-azure-core/src/main/java/com/azure/spring/cloud/core/resource/AzureStorageResource.java +++ b/sdk/spring/spring-cloud-azure-core/src/main/java/com/azure/spring/cloud/core/resource/AzureStorageResource.java @@ -16,6 +16,7 @@ * Abstract implementation of {@link WritableResource} for reading and writing objects in Azure StorageAccount. * */ +@SuppressWarnings("deprecation") abstract class AzureStorageResource extends AbstractResource implements WritableResource { private static final String PATH_DELIMITER = "/"; diff --git a/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/FeatureManagementConfiguration.java b/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/FeatureManagementConfiguration.java index 9096856a8082..3ba7bacbcc0b 100644 --- a/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/FeatureManagementConfiguration.java +++ b/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/FeatureManagementConfiguration.java @@ -29,6 +29,7 @@ */ @Configuration @EnableConfigurationProperties({ FeatureManagementConfigProperties.class, FeatureManagementProperties.class }) +@SuppressWarnings("deprecation") class FeatureManagementConfiguration implements ApplicationContextAware { private ApplicationContext appContext; diff --git a/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/models/FeatureDefinition.java b/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/models/FeatureDefinition.java index 7905f652e13d..3b99c38f47ad 100644 --- a/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/models/FeatureDefinition.java +++ b/sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/models/FeatureDefinition.java @@ -16,6 +16,7 @@ * and variant references for feature flags that support multiple variations. */ @JsonIgnoreProperties(ignoreUnknown = true) +@SuppressWarnings("deprecation") public class FeatureDefinition { /** diff --git a/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/com/azure/spring/cloud/resourcemanager/implementation/crud/AbstractResourceCrud.java b/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/com/azure/spring/cloud/resourcemanager/implementation/crud/AbstractResourceCrud.java index 932c3a560cd3..752e52f91106 100644 --- a/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/com/azure/spring/cloud/resourcemanager/implementation/crud/AbstractResourceCrud.java +++ b/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/com/azure/spring/cloud/resourcemanager/implementation/crud/AbstractResourceCrud.java @@ -19,6 +19,7 @@ * @param The type of resource key. * @param

Azure resource properties. */ +@SuppressWarnings("deprecation") public abstract class AbstractResourceCrud implements ResourceCrud { private static final Logger LOGGER = LoggerFactory.getLogger(AbstractResourceCrud.class); diff --git a/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/com/azure/spring/cloud/resourcemanager/implementation/crud/ServiceBusNamespaceCrud.java b/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/com/azure/spring/cloud/resourcemanager/implementation/crud/ServiceBusNamespaceCrud.java index 469cfd467dc8..7bd58516c408 100644 --- a/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/com/azure/spring/cloud/resourcemanager/implementation/crud/ServiceBusNamespaceCrud.java +++ b/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/com/azure/spring/cloud/resourcemanager/implementation/crud/ServiceBusNamespaceCrud.java @@ -12,6 +12,7 @@ /** * Resource manager for Service Bus namespace. */ +@SuppressWarnings("deprecation") public class ServiceBusNamespaceCrud extends AbstractResourceCrud { public ServiceBusNamespaceCrud(@NonNull AzureResourceManager azureResourceManager, diff --git a/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/com/azure/spring/cloud/resourcemanager/implementation/crud/ServiceBusQueueCrud.java b/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/com/azure/spring/cloud/resourcemanager/implementation/crud/ServiceBusQueueCrud.java index f480b774a2b9..a563bcaa7ee9 100644 --- a/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/com/azure/spring/cloud/resourcemanager/implementation/crud/ServiceBusQueueCrud.java +++ b/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/com/azure/spring/cloud/resourcemanager/implementation/crud/ServiceBusQueueCrud.java @@ -16,6 +16,7 @@ /** * Resource manager for Service Bus queue. */ +@SuppressWarnings("deprecation") public class ServiceBusQueueCrud extends AbstractResourceCrud, ServiceBusQueueProperties> { diff --git a/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/com/azure/spring/cloud/resourcemanager/implementation/crud/ServiceBusTopicCrud.java b/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/com/azure/spring/cloud/resourcemanager/implementation/crud/ServiceBusTopicCrud.java index 9215a7c23612..3f026d56647e 100644 --- a/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/com/azure/spring/cloud/resourcemanager/implementation/crud/ServiceBusTopicCrud.java +++ b/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/com/azure/spring/cloud/resourcemanager/implementation/crud/ServiceBusTopicCrud.java @@ -16,6 +16,7 @@ /** * Resource manager for Service Bus topic. */ +@SuppressWarnings("deprecation") public class ServiceBusTopicCrud extends AbstractResourceCrud, ServiceBusTopicProperties> { public ServiceBusTopicCrud(AzureResourceManager azureResourceManager, AzureResourceMetadata azureResourceMetadata) { diff --git a/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/com/azure/spring/cloud/resourcemanager/implementation/crud/ServiceBusTopicSubscriptionCrud.java b/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/com/azure/spring/cloud/resourcemanager/implementation/crud/ServiceBusTopicSubscriptionCrud.java index 4bd7bdf98e35..c925e7d52db1 100644 --- a/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/com/azure/spring/cloud/resourcemanager/implementation/crud/ServiceBusTopicSubscriptionCrud.java +++ b/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/com/azure/spring/cloud/resourcemanager/implementation/crud/ServiceBusTopicSubscriptionCrud.java @@ -16,6 +16,7 @@ /** * Resource manager for Service Bus topic subscription. */ +@SuppressWarnings("deprecation") public class ServiceBusTopicSubscriptionCrud extends AbstractResourceCrud, ServiceBusTopicProperties> { diff --git a/sdk/spring/spring-cloud-azure-service/src/main/java/com/azure/spring/cloud/service/implementation/storage/AzureStorageRetryOptionsConverter.java b/sdk/spring/spring-cloud-azure-service/src/main/java/com/azure/spring/cloud/service/implementation/storage/AzureStorageRetryOptionsConverter.java index 2d4099e99e0e..34c26a4c2b5f 100644 --- a/sdk/spring/spring-cloud-azure-service/src/main/java/com/azure/spring/cloud/service/implementation/storage/AzureStorageRetryOptionsConverter.java +++ b/sdk/spring/spring-cloud-azure-service/src/main/java/com/azure/spring/cloud/service/implementation/storage/AzureStorageRetryOptionsConverter.java @@ -18,6 +18,7 @@ /** * Converts a {@link StorageRetry} to a {@link RequestRetryOptions}. */ +@SuppressWarnings("deprecation") public final class AzureStorageRetryOptionsConverter implements Converter { public static final AzureStorageRetryOptionsConverter STORAGE_RETRY_CONVERTER = new AzureStorageRetryOptionsConverter(); diff --git a/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/src/main/java/com/azure/spring/cloud/stream/binder/eventhubs/implementation/provisioning/EventHubsChannelResourceManagerProvisioner.java b/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/src/main/java/com/azure/spring/cloud/stream/binder/eventhubs/implementation/provisioning/EventHubsChannelResourceManagerProvisioner.java index ed33006b0ed7..5b60941550af 100644 --- a/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/src/main/java/com/azure/spring/cloud/stream/binder/eventhubs/implementation/provisioning/EventHubsChannelResourceManagerProvisioner.java +++ b/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/src/main/java/com/azure/spring/cloud/stream/binder/eventhubs/implementation/provisioning/EventHubsChannelResourceManagerProvisioner.java @@ -11,6 +11,7 @@ /** * */ +@SuppressWarnings("deprecation") public class EventHubsChannelResourceManagerProvisioner extends EventHubsChannelProvisioner { private final String namespace; diff --git a/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/main/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/provisioning/ServiceBusChannelResourceManagerProvisioner.java b/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/main/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/provisioning/ServiceBusChannelResourceManagerProvisioner.java index dcdaef375dde..e9176a2fef17 100644 --- a/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/main/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/provisioning/ServiceBusChannelResourceManagerProvisioner.java +++ b/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/main/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/provisioning/ServiceBusChannelResourceManagerProvisioner.java @@ -26,6 +26,7 @@ /** * */ +@SuppressWarnings("deprecation") public class ServiceBusChannelResourceManagerProvisioner extends ServiceBusChannelProvisioner { private final String namespace; diff --git a/sdk/spring/spring-integration-azure-core/src/main/java/com/azure/spring/integration/core/handler/DefaultMessageHandler.java b/sdk/spring/spring-integration-azure-core/src/main/java/com/azure/spring/integration/core/handler/DefaultMessageHandler.java index f05d310d7a0c..e63b672b2627 100644 --- a/sdk/spring/spring-integration-azure-core/src/main/java/com/azure/spring/integration/core/handler/DefaultMessageHandler.java +++ b/sdk/spring/spring-integration-azure-core/src/main/java/com/azure/spring/integration/core/handler/DefaultMessageHandler.java @@ -43,6 +43,7 @@ *

* It delegates real operation to {@link SendOperation} which supports synchronous and asynchronous sending. */ +@SuppressWarnings("deprecation") public class DefaultMessageHandler extends AbstractMessageProducingHandler { private static final Logger LOGGER = LoggerFactory.getLogger(DefaultMessageHandler.class); private static final long DEFAULT_SEND_TIMEOUT = 10000; diff --git a/sdk/spring/spring-messaging-azure-eventhubs/src/main/java/com/azure/spring/messaging/eventhubs/core/DefaultEventHubsNamespaceProcessorFactory.java b/sdk/spring/spring-messaging-azure-eventhubs/src/main/java/com/azure/spring/messaging/eventhubs/core/DefaultEventHubsNamespaceProcessorFactory.java index 6b63c9d0536b..fe1b5355bdc3 100644 --- a/sdk/spring/spring-messaging-azure-eventhubs/src/main/java/com/azure/spring/messaging/eventhubs/core/DefaultEventHubsNamespaceProcessorFactory.java +++ b/sdk/spring/spring-messaging-azure-eventhubs/src/main/java/com/azure/spring/messaging/eventhubs/core/DefaultEventHubsNamespaceProcessorFactory.java @@ -50,6 +50,7 @@ * advantage. *

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

*/ +@SuppressWarnings("deprecation") public final class DefaultEventHubsNamespaceProducerFactory implements EventHubsProducerFactory, DisposableBean { private final List listeners = new ArrayList<>(); diff --git a/sdk/spring/spring-messaging-azure-eventhubs/src/main/java/com/azure/spring/messaging/eventhubs/implementation/core/config/MethodEventHubsListenerEndpoint.java b/sdk/spring/spring-messaging-azure-eventhubs/src/main/java/com/azure/spring/messaging/eventhubs/implementation/core/config/MethodEventHubsListenerEndpoint.java index 83adc1d605cd..391488fd06bc 100644 --- a/sdk/spring/spring-messaging-azure-eventhubs/src/main/java/com/azure/spring/messaging/eventhubs/implementation/core/config/MethodEventHubsListenerEndpoint.java +++ b/sdk/spring/spring-messaging-azure-eventhubs/src/main/java/com/azure/spring/messaging/eventhubs/implementation/core/config/MethodEventHubsListenerEndpoint.java @@ -28,6 +28,7 @@ * an incoming message for this endpoint. * */ +@SuppressWarnings("deprecation") public class MethodEventHubsListenerEndpoint extends AbstractEventHubsListenerEndpoint implements MethodAzureListenerEndpoint { diff --git a/sdk/spring/spring-messaging-azure-servicebus/src/main/java/com/azure/spring/messaging/servicebus/core/DefaultServiceBusNamespaceConsumerFactory.java b/sdk/spring/spring-messaging-azure-servicebus/src/main/java/com/azure/spring/messaging/servicebus/core/DefaultServiceBusNamespaceConsumerFactory.java index 1f907cae13f9..3b6d23a785c9 100644 --- a/sdk/spring/spring-messaging-azure-servicebus/src/main/java/com/azure/spring/messaging/servicebus/core/DefaultServiceBusNamespaceConsumerFactory.java +++ b/sdk/spring/spring-messaging-azure-servicebus/src/main/java/com/azure/spring/messaging/servicebus/core/DefaultServiceBusNamespaceConsumerFactory.java @@ -39,6 +39,7 @@ *

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

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

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

*/ +@SuppressWarnings("deprecation") public class ServiceBusTemplate implements SendOperation { private static final Logger LOGGER = LoggerFactory.getLogger(ServiceBusTemplate.class); private static final ServiceBusMessageConverter DEFAULT_CONVERTER = new ServiceBusMessageConverter(); diff --git a/sdk/spring/spring-messaging-azure-servicebus/src/main/java/com/azure/spring/messaging/servicebus/implementation/core/config/MethodServiceBusListenerEndpoint.java b/sdk/spring/spring-messaging-azure-servicebus/src/main/java/com/azure/spring/messaging/servicebus/implementation/core/config/MethodServiceBusListenerEndpoint.java index 5f7a4cf07257..6700289b778e 100644 --- a/sdk/spring/spring-messaging-azure-servicebus/src/main/java/com/azure/spring/messaging/servicebus/implementation/core/config/MethodServiceBusListenerEndpoint.java +++ b/sdk/spring/spring-messaging-azure-servicebus/src/main/java/com/azure/spring/messaging/servicebus/implementation/core/config/MethodServiceBusListenerEndpoint.java @@ -27,6 +27,7 @@ * an incoming message for this endpoint. * */ +@SuppressWarnings("deprecation") public class MethodServiceBusListenerEndpoint extends AbstractAzureListenerEndpoint implements MethodAzureListenerEndpoint { diff --git a/sdk/spring/spring-messaging-azure-storage-queue/src/main/java/com/azure/spring/messaging/storage/queue/core/StorageQueueTemplate.java b/sdk/spring/spring-messaging-azure-storage-queue/src/main/java/com/azure/spring/messaging/storage/queue/core/StorageQueueTemplate.java index 383f34d8d2b5..7eb9becabf5c 100644 --- a/sdk/spring/spring-messaging-azure-storage-queue/src/main/java/com/azure/spring/messaging/storage/queue/core/StorageQueueTemplate.java +++ b/sdk/spring/spring-messaging-azure-storage-queue/src/main/java/com/azure/spring/messaging/storage/queue/core/StorageQueueTemplate.java @@ -31,6 +31,7 @@ * You should checkpoint if message has been processed successfully, otherwise it will be visible again after certain * time specified by {@link #receiveAsync(String, Duration)} }. */ +@SuppressWarnings("deprecation") public class StorageQueueTemplate implements SendOperation { private static final Logger LOG = LoggerFactory.getLogger(StorageQueueTemplate.class); private static final String MSG_FAIL_CHECKPOINT = "Failed to checkpoint %s in storage queue '%s'"; diff --git a/sdk/spring/spring-messaging-azure-storage-queue/src/main/java/com/azure/spring/messaging/storage/queue/implementation/factory/DefaultStorageQueueClientFactory.java b/sdk/spring/spring-messaging-azure-storage-queue/src/main/java/com/azure/spring/messaging/storage/queue/implementation/factory/DefaultStorageQueueClientFactory.java index 3be2568070a3..9034267adf8b 100644 --- a/sdk/spring/spring-messaging-azure-storage-queue/src/main/java/com/azure/spring/messaging/storage/queue/implementation/factory/DefaultStorageQueueClientFactory.java +++ b/sdk/spring/spring-messaging-azure-storage-queue/src/main/java/com/azure/spring/messaging/storage/queue/implementation/factory/DefaultStorageQueueClientFactory.java @@ -21,6 +21,7 @@ * The {@link StorageQueueClientFactory} implementation to produce new {@link QueueAsyncClient} instances * for provided {@link QueueServiceAsyncClient} on each {@link #createQueueClient} invocation. */ +@SuppressWarnings("deprecation") public final class DefaultStorageQueueClientFactory implements StorageQueueClientFactory, DisposableBean { private final List listeners = new ArrayList<>(); diff --git a/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/converter/AzureMessageConverter.java b/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/converter/AzureMessageConverter.java index c48629154d47..ff2665739817 100644 --- a/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/converter/AzureMessageConverter.java +++ b/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/converter/AzureMessageConverter.java @@ -17,6 +17,7 @@ * @param The Azure message type when sending to the broker using Azure SDK. * @param The Azure message type when receiving from the broker using Azure SDK. */ +@SuppressWarnings("deprecation") public interface AzureMessageConverter { /** diff --git a/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/annotation/AzureListenerAnnotationBeanPostProcessorAdapter.java b/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/annotation/AzureListenerAnnotationBeanPostProcessorAdapter.java index 2ccd3f16deff..1fd2dd427f22 100644 --- a/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/annotation/AzureListenerAnnotationBeanPostProcessorAdapter.java +++ b/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/annotation/AzureListenerAnnotationBeanPostProcessorAdapter.java @@ -63,6 +63,7 @@ * @see AzureListenerEndpointRegistrar * @see AzureListenerEndpointRegistry */ +@SuppressWarnings("deprecation") public abstract class AzureListenerAnnotationBeanPostProcessorAdapter implements MergedBeanDefinitionPostProcessor, Ordered, BeanFactoryAware, SmartInitializingSingleton { diff --git a/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/checkpoint/AzureCheckpointer.java b/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/checkpoint/AzureCheckpointer.java index 66d85e7cfbc0..30bd63dccfd9 100644 --- a/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/checkpoint/AzureCheckpointer.java +++ b/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/checkpoint/AzureCheckpointer.java @@ -12,6 +12,7 @@ /** * Azure implementation for check point callback. */ +@SuppressWarnings("deprecation") public class AzureCheckpointer implements Checkpointer { private final Supplier> success; diff --git a/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/config/AbstractAzureListenerEndpoint.java b/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/config/AbstractAzureListenerEndpoint.java index 62ec9f88ed8f..dc1286e4b2f4 100644 --- a/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/config/AbstractAzureListenerEndpoint.java +++ b/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/config/AbstractAzureListenerEndpoint.java @@ -13,6 +13,7 @@ * Base model for a Azure listener endpoint. * */ +@SuppressWarnings("deprecation") public abstract class AbstractAzureListenerEndpoint implements AzureListenerEndpoint { protected String id = ""; diff --git a/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/config/AzureListenerEndpointRegistrar.java b/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/config/AzureListenerEndpointRegistrar.java index a3e38ee19bfb..a326b22428ac 100644 --- a/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/config/AzureListenerEndpointRegistrar.java +++ b/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/config/AzureListenerEndpointRegistrar.java @@ -19,6 +19,7 @@ * Helper bean for registering {@link AzureListenerEndpoint} with a {@link AzureListenerEndpointRegistry}. * */ +@SuppressWarnings("deprecation") public class AzureListenerEndpointRegistrar implements BeanFactoryAware, InitializingBean { private final List endpointDescriptors = new ArrayList<>(); diff --git a/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/config/AzureListenerEndpointRegistry.java b/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/config/AzureListenerEndpointRegistry.java index 6c841e0d6347..7a7c05e99578 100644 --- a/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/config/AzureListenerEndpointRegistry.java +++ b/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/config/AzureListenerEndpointRegistry.java @@ -40,6 +40,7 @@ * @see MessageListenerContainer * @see MessageListenerContainerFactory */ +@SuppressWarnings("deprecation") public class AzureListenerEndpointRegistry implements DisposableBean, SmartLifecycle, ApplicationContextAware, ApplicationListener { diff --git a/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/config/MethodAzureListenerEndpoint.java b/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/config/MethodAzureListenerEndpoint.java index 23821a6e2184..1a3d7783db07 100644 --- a/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/config/MethodAzureListenerEndpoint.java +++ b/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/config/MethodAzureListenerEndpoint.java @@ -16,6 +16,7 @@ * Model for a method Azure listener endpoint. * */ +@SuppressWarnings("deprecation") public interface MethodAzureListenerEndpoint extends BeanFactoryAware, AzureListenerEndpoint { /** diff --git a/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/converter/AbstractJacksonAzureMessageConverter.java b/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/converter/AbstractJacksonAzureMessageConverter.java index f4fcb36fa7f1..6e0d806f3442 100644 --- a/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/converter/AbstractJacksonAzureMessageConverter.java +++ b/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/converter/AbstractJacksonAzureMessageConverter.java @@ -23,6 +23,7 @@ * Abstract class handles common conversion logic between <T> and {@link Message} * */ +@SuppressWarnings("deprecation") public abstract class AbstractJacksonAzureMessageConverter implements AzureMessageConverter { /** diff --git a/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/listener/adapter/MessagingMessageListenerAdapter.java b/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/listener/adapter/MessagingMessageListenerAdapter.java index 2f76f3214a69..1fa503e56634 100644 --- a/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/listener/adapter/MessagingMessageListenerAdapter.java +++ b/sdk/spring/spring-messaging-azure/src/main/java/com/azure/spring/messaging/implementation/listener/adapter/MessagingMessageListenerAdapter.java @@ -17,6 +17,7 @@ * Azure message headers using a configurable {@link com.azure.spring.messaging.converter.AzureMessageConverter}. * */ +@SuppressWarnings("deprecation") public abstract class MessagingMessageListenerAdapter { @Nullable diff --git a/sdk/spring/spring-messaging-azure/src/test/java/com/azure/spring/messaging/implementation/endpoint/MethodAzureListenerTestEndpoint.java b/sdk/spring/spring-messaging-azure/src/test/java/com/azure/spring/messaging/implementation/endpoint/MethodAzureListenerTestEndpoint.java index b18fbd9ecc75..dff75a9e46e0 100644 --- a/sdk/spring/spring-messaging-azure/src/test/java/com/azure/spring/messaging/implementation/endpoint/MethodAzureListenerTestEndpoint.java +++ b/sdk/spring/spring-messaging-azure/src/test/java/com/azure/spring/messaging/implementation/endpoint/MethodAzureListenerTestEndpoint.java @@ -20,6 +20,7 @@ import java.lang.reflect.Method; +@SuppressWarnings("deprecation") public class MethodAzureListenerTestEndpoint extends AbstractAzureListenerEndpoint implements MethodAzureListenerEndpoint { From de5beaf0ac86cc9336074a15ad5c30bb584981a6 Mon Sep 17 00:00:00 2001 From: muyao Date: Wed, 10 Sep 2025 09:03:15 +0800 Subject: [PATCH 10/76] replace ListenableFutureCallback --- .../core/handler/DefaultMessageHandler.java | 49 ++++++++++--------- .../InstrumentationSendCallback.java | 21 ++++---- .../handler/DefaultMessageHandlerTests.java | 13 ++--- 3 files changed, 39 insertions(+), 44 deletions(-) diff --git a/sdk/spring/spring-integration-azure-core/src/main/java/com/azure/spring/integration/core/handler/DefaultMessageHandler.java b/sdk/spring/spring-integration-azure-core/src/main/java/com/azure/spring/integration/core/handler/DefaultMessageHandler.java index e63b672b2627..cd772b49a577 100644 --- a/sdk/spring/spring-integration-azure-core/src/main/java/com/azure/spring/integration/core/handler/DefaultMessageHandler.java +++ b/sdk/spring/spring-integration-azure-core/src/main/java/com/azure/spring/integration/core/handler/DefaultMessageHandler.java @@ -23,7 +23,6 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageDeliveryException; import org.springframework.util.Assert; -import org.springframework.util.concurrent.ListenableFutureCallback; import reactor.core.publisher.Mono; import reactor.core.scheduler.Schedulers; @@ -32,7 +31,9 @@ import java.util.HashMap; import java.util.Map; import java.util.Optional; +import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeoutException; +import java.util.function.BiConsumer; import static com.azure.spring.messaging.AzureHeaders.PARTITION_ID; import static com.azure.spring.messaging.AzureHeaders.PARTITION_KEY; @@ -51,8 +52,7 @@ public class DefaultMessageHandler extends AbstractMessageProducingHandler { private final SendOperation sendOperation; private boolean sync = false; - @SuppressWarnings("removal") - private ListenableFutureCallback sendCallback; + private BiConsumer sendCallback; private EvaluationContext evaluationContext; private Expression sendTimeoutExpression = new ValueExpression<>(DEFAULT_SEND_TIMEOUT); private ErrorMessageStrategy errorMessageStrategy = new DefaultErrorMessageStrategy(); @@ -109,28 +109,30 @@ protected void handleMessageInternal(Message message) { } - @SuppressWarnings("removal") private void handleSendResponseAsync(Mono mono, Message message) { - mono.doOnError(ex -> { - if (LOGGER.isWarnEnabled()) { - LOGGER.warn("{} sent failed in async mode due to {}", message, ex.getMessage()); - } - if (this.sendCallback != null) { - this.sendCallback.onFailure(ex); - } + CompletableFuture future = mono.toFuture(); + future.whenComplete((t, ex) -> { + if (ex != null) { + if (LOGGER.isWarnEnabled()) { + LOGGER.warn("{} sent failed in async mode due to {}", message, ex.getMessage()); + } + if (this.sendCallback != null) { + this.sendCallback.accept(null, ex); + } - if (getSendFailureChannel() != null) { - this.messagingTemplate.send(getSendFailureChannel(), getErrorMessageStrategy() - .buildErrorMessage(new AzureSendFailureException(message, ex), null)); - } - }).doOnSuccess(t -> { - if (LOGGER.isDebugEnabled()) { - LOGGER.debug("{} sent successfully in async mode", message); - } - if (this.sendCallback != null) { - this.sendCallback.onSuccess((Void) t); + if (getSendFailureChannel() != null) { + this.messagingTemplate.send(getSendFailureChannel(), getErrorMessageStrategy() + .buildErrorMessage(new AzureSendFailureException(message, ex), null)); + } + } else { + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("{} sent successfully in async mode", message); + } + if (this.sendCallback != null) { + this.sendCallback.accept(null, null); + } } - }).subscribe(); + }); } private void waitingSendResponse(Mono mono, Message message) { @@ -265,8 +267,7 @@ private Map buildPropertiesMap() { * * @param callback the call back */ - @SuppressWarnings("removal") - public void setSendCallback(ListenableFutureCallback callback) { + public void setSendCallback(BiConsumer callback) { this.sendCallback = callback; } diff --git a/sdk/spring/spring-integration-azure-core/src/main/java/com/azure/spring/integration/core/implementation/instrumentation/InstrumentationSendCallback.java b/sdk/spring/spring-integration-azure-core/src/main/java/com/azure/spring/integration/core/implementation/instrumentation/InstrumentationSendCallback.java index 1ded138c1d89..58598bd018d2 100644 --- a/sdk/spring/spring-integration-azure-core/src/main/java/com/azure/spring/integration/core/implementation/instrumentation/InstrumentationSendCallback.java +++ b/sdk/spring/spring-integration-azure-core/src/main/java/com/azure/spring/integration/core/implementation/instrumentation/InstrumentationSendCallback.java @@ -5,13 +5,12 @@ import com.azure.spring.integration.core.instrumentation.Instrumentation; import com.azure.spring.integration.core.instrumentation.InstrumentationManager; -import org.springframework.util.concurrent.ListenableFutureCallback; +import java.util.function.BiConsumer; /** * */ -@SuppressWarnings({"deprecation", "removal"}) -public class InstrumentationSendCallback implements ListenableFutureCallback { +public class InstrumentationSendCallback implements BiConsumer { private final InstrumentationManager instrumentationManager; @@ -29,13 +28,13 @@ public InstrumentationSendCallback(String instrumentationId, InstrumentationMana } @Override - public void onFailure(Throwable ex) { - this.instrumentationManager.getHealthInstrumentation(instrumentationId) - .setStatus(Instrumentation.Status.DOWN, ex); - } - - @Override - public void onSuccess(Void result) { - this.instrumentationManager.getHealthInstrumentation(instrumentationId).setStatus(Instrumentation.Status.UP); + public void accept(Void result, Throwable ex) { + if (ex != null) { + instrumentationManager.getHealthInstrumentation(instrumentationId) + .setStatus(Instrumentation.Status.DOWN, ex); + } else { + instrumentationManager.getHealthInstrumentation(instrumentationId) + .setStatus(Instrumentation.Status.UP); + } } } diff --git a/sdk/spring/spring-integration-azure-core/src/test/java/com/azure/spring/integration/core/handler/DefaultMessageHandlerTests.java b/sdk/spring/spring-integration-azure-core/src/test/java/com/azure/spring/integration/core/handler/DefaultMessageHandlerTests.java index 4a7046abf615..b869c60578cc 100644 --- a/sdk/spring/spring-integration-azure-core/src/test/java/com/azure/spring/integration/core/handler/DefaultMessageHandlerTests.java +++ b/sdk/spring/spring-integration-azure-core/src/test/java/com/azure/spring/integration/core/handler/DefaultMessageHandlerTests.java @@ -16,13 +16,13 @@ import org.springframework.messaging.Message; import org.springframework.messaging.support.GenericMessage; import org.springframework.test.util.ReflectionTestUtils; -import org.springframework.util.concurrent.ListenableFutureCallback; import reactor.core.publisher.Mono; import java.nio.charset.StandardCharsets; import java.util.Collections; import java.util.HashMap; import java.util.Map; +import java.util.function.BiConsumer; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -70,15 +70,10 @@ public void testSend() { } @Test - @SuppressWarnings({"deprecation", "removal"}) public void testSendCallback() { - ListenableFutureCallback callbackSpy = spy(new ListenableFutureCallback() { + BiConsumer callbackSpy = spy(new BiConsumer() { @Override - public void onFailure(Throwable ex) { - } - - @Override - public void onSuccess(Void v) { + public void accept(Void v, Throwable ex) { } }); @@ -86,7 +81,7 @@ public void onSuccess(Void v) { this.handler.handleMessage(this.message); - verify(callbackSpy, times(1)).onSuccess(eq(null)); + verify(callbackSpy, times(1)).accept(eq(null), eq(null)); } @Test From 0991f9731a8a1096883058725d4e38223480a50d Mon Sep 17 00:00:00 2001 From: muyao Date: Fri, 14 Nov 2025 10:38:39 +0800 Subject: [PATCH 11/76] add spring-boot-persistence and replace --- eng/versioning/external_dependencies.txt | 1 + sdk/spring/azure-spring-data-cosmos/pom.xml | 5 +++++ .../com/azure/spring/data/cosmos/core/CosmosTemplateIT.java | 2 +- .../spring/data/cosmos/core/CosmosTemplatePartitionIT.java | 2 +- .../cosmos/core/MultiTenantContainerCosmosFactoryIT.java | 2 +- .../data/cosmos/core/MultiTenantDBCosmosFactoryIT.java | 2 +- .../spring/data/cosmos/core/ReactiveCosmosTemplateIT.java | 2 +- .../data/cosmos/core/ReactiveCosmosTemplatePartitionIT.java | 2 +- .../core/ReactiveMultiTenantContainerCosmosFactoryIT.java | 2 +- .../cosmos/core/ReactiveMultiTenantDBCosmosFactoryIT.java | 2 +- 10 files changed, 14 insertions(+), 8 deletions(-) diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index cbcc0991487b..8327c5e27a89 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -370,6 +370,7 @@ springboot3_org.springframework.boot:spring-boot-autoconfigure;4.0.0-RC2 springboot3_org.springframework.boot:spring-boot-configuration-metadata;4.0.0-RC2 springboot3_org.springframework.boot:spring-boot-configuration-processor;4.0.0-RC2 springboot3_org.springframework.boot:spring-boot-docker-compose;4.0.0-RC2 +springboot3_org.springframework.boot:spring-boot-persistence;4.0.0-RC2 springboot3_org.springframework.boot:spring-boot-starter-actuator;4.0.0-RC2 springboot3_org.springframework.boot:spring-boot-starter-data-jdbc;4.0.0-RC2 springboot3_org.springframework.boot:spring-boot-starter-integration;4.0.0-RC2 diff --git a/sdk/spring/azure-spring-data-cosmos/pom.xml b/sdk/spring/azure-spring-data-cosmos/pom.xml index c853393f446f..f735b234e66b 100644 --- a/sdk/spring/azure-spring-data-cosmos/pom.xml +++ b/sdk/spring/azure-spring-data-cosmos/pom.xml @@ -97,6 +97,11 @@ spring-expression 7.0.0-RC3 + + org.springframework.boot + spring-boot-persistence + 4.0.0-RC2 + com.azure azure-cosmos diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIT.java index f0939fae596a..8a7c9a7c1bac 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIT.java @@ -52,7 +52,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.domain.EntityScanner; +import org.springframework.boot.persistence.autoconfigure.EntityScanner; import org.springframework.context.ApplicationContext; import org.springframework.data.annotation.Persistent; import org.springframework.data.auditing.IsNewAwareAuditingHandler; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplatePartitionIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplatePartitionIT.java index ad9cf498a005..08b744b9a2ba 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplatePartitionIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplatePartitionIT.java @@ -27,7 +27,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.domain.EntityScanner; +import org.springframework.boot.persistence.autoconfigure.EntityScanner; import org.springframework.context.ApplicationContext; import org.springframework.data.annotation.Persistent; import org.springframework.data.domain.Page; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantContainerCosmosFactoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantContainerCosmosFactoryIT.java index a301a7d65e97..580a0d4b0f4b 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantContainerCosmosFactoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantContainerCosmosFactoryIT.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.domain.EntityScanner; +import org.springframework.boot.persistence.autoconfigure.EntityScanner; import org.springframework.context.ApplicationContext; import org.springframework.data.annotation.Persistent; import org.springframework.test.context.ContextConfiguration; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantDBCosmosFactoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantDBCosmosFactoryIT.java index dc16252d651a..6cf5a2bb9b79 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantDBCosmosFactoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantDBCosmosFactoryIT.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.domain.EntityScanner; +import org.springframework.boot.persistence.autoconfigure.EntityScanner; import org.springframework.context.ApplicationContext; import org.springframework.data.annotation.Persistent; import org.springframework.test.context.ContextConfiguration; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplateIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplateIT.java index 98e4f466400c..65f1525e6a24 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplateIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplateIT.java @@ -55,7 +55,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.autoconfigure.domain.EntityScanner; +import org.springframework.boot.persistence.autoconfigure.EntityScanner; import org.springframework.context.ApplicationContext; import org.springframework.data.annotation.Persistent; import org.springframework.data.auditing.IsNewAwareAuditingHandler; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplatePartitionIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplatePartitionIT.java index dcc7bd8a1e46..4f7d9c226ac3 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplatePartitionIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplatePartitionIT.java @@ -25,7 +25,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.domain.EntityScanner; +import org.springframework.boot.persistence.autoconfigure.EntityScanner; import org.springframework.context.ApplicationContext; import org.springframework.data.annotation.Persistent; import org.springframework.data.repository.query.parser.Part; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantContainerCosmosFactoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantContainerCosmosFactoryIT.java index 88b78a9e9ade..c45551dc24d2 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantContainerCosmosFactoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantContainerCosmosFactoryIT.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.domain.EntityScanner; +import org.springframework.boot.persistence.autoconfigure.EntityScanner; import org.springframework.context.ApplicationContext; import org.springframework.data.annotation.Persistent; import org.springframework.test.context.ContextConfiguration; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantDBCosmosFactoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantDBCosmosFactoryIT.java index a865e65a1a07..d716681b485f 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantDBCosmosFactoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantDBCosmosFactoryIT.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.domain.EntityScanner; +import org.springframework.boot.persistence.autoconfigure.EntityScanner; import org.springframework.context.ApplicationContext; import org.springframework.data.annotation.Persistent; import org.springframework.test.context.ContextConfiguration; From 304dce174d0b3213079f5e2cdadd2b2d29fbfe20 Mon Sep 17 00:00:00 2001 From: muyao Date: Mon, 17 Nov 2025 10:38:51 +0800 Subject: [PATCH 12/76] suppress warnings --- .../test/java/com/azure/spring/data/cosmos/ContainerLockIT.java | 2 +- .../java/com/azure/spring/data/cosmos/CosmosFactoryTestIT.java | 1 + .../com/azure/spring/data/cosmos/core/CosmosTemplateIT.java | 1 + .../spring/data/cosmos/core/CosmosTemplatePartitionIT.java | 1 + .../data/cosmos/core/MultiTenantContainerCosmosFactoryIT.java | 1 + .../spring/data/cosmos/core/MultiTenantDBCosmosFactoryIT.java | 1 + .../azure/spring/data/cosmos/core/ReactiveCosmosTemplateIT.java | 1 + .../data/cosmos/core/ReactiveCosmosTemplatePartitionIT.java | 1 + .../core/ReactiveMultiTenantContainerCosmosFactoryIT.java | 1 + .../data/cosmos/core/ReactiveMultiTenantDBCosmosFactoryIT.java | 1 + .../core/mapping/event/ApplicationContextEventErrorIT.java | 1 + .../mapping/event/ApplicationContextEventErrorReactiveIT.java | 1 + .../cosmos/core/mapping/event/ApplicationContextEventIT.java | 1 + .../core/mapping/event/ApplicationContextEventReactiveIT.java | 1 + .../spring/data/cosmos/exception/CosmosExceptionUtilsTest.java | 1 + .../spring/data/cosmos/repository/EntityImplRepositoryIT.java | 1 + .../spring/data/cosmos/repository/MultiCosmosTemplateIT.java | 1 + .../cosmos/repository/ReactiveUUIDIdDomainRepositoryIT.java | 1 + .../data/cosmos/repository/integration/AddressRepositoryIT.java | 1 + .../repository/integration/AddressRepositoryNoMetricsIT.java | 1 + .../data/cosmos/repository/integration/AnnotatedQueryIT.java | 1 + .../spring/data/cosmos/repository/integration/AuditableIT.java | 1 + .../cosmos/repository/integration/BasicItemRepositoryIT.java | 1 + .../data/cosmos/repository/integration/BigTypeRepositoryIT.java | 1 + .../data/cosmos/repository/integration/CompositeIndexIT.java | 1 + .../data/cosmos/repository/integration/ContactRepositoryIT.java | 1 + .../data/cosmos/repository/integration/CosmosAnnotationIT.java | 1 + .../spring/data/cosmos/repository/integration/CountIT.java | 1 + .../azure/spring/data/cosmos/repository/integration/EtagIT.java | 1 + .../integration/HierarchicalPartitionKeyRepositoryIT.java | 1 + .../data/cosmos/repository/integration/IndexPolicyUpdateIT.java | 1 + .../repository/integration/IntegerIdDomainRepositoryIT.java | 1 + .../cosmos/repository/integration/LongIdDomainRepositoryIT.java | 1 + .../data/cosmos/repository/integration/MemoRepositoryIT.java | 1 + .../repository/integration/NestedPartitionKeyRepositoryIT.java | 1 + .../repository/integration/PageableAddressRepositoryIT.java | 1 + .../cosmos/repository/integration/PageableMemoRepositoryIT.java | 1 + .../repository/integration/PageablePersonRepositoryIT.java | 1 + .../data/cosmos/repository/integration/PersistableIT.java | 1 + .../cosmos/repository/integration/PersonCrossPartitionIT.java | 1 + .../cosmos/repository/integration/ProjectRepositorySortIT.java | 1 + .../cosmos/repository/integration/QuestionRepositoryIT.java | 1 + .../data/cosmos/repository/integration/ReactiveAuditableIT.java | 1 + .../repository/integration/ReactiveCourseRepositoryIT.java | 1 + .../integration/ReactiveCourseRepositoryNoMetricsIT.java | 1 + .../data/cosmos/repository/integration/ReactiveEtagIT.java | 1 + .../ReactiveHierarchicalPartitionKeyRepositoryIT.java | 1 + .../repository/integration/ReactiveIndexPolicyUpdateIT.java | 1 + .../ReactiveLongIdDomainPartitionPartitionRepositoryIT.java | 1 + .../integration/ReactiveNestedPartitionKeyRepositoryIT.java | 1 + .../cosmos/repository/integration/ReactiveRoleRepositoryIT.java | 1 + .../repository/integration/ReactiveTeacherRepositoryIT.java | 1 + .../cosmos/repository/integration/SpELCosmosAnnotationIT.java | 1 + .../data/cosmos/repository/integration/SquareRepositoryIT.java | 1 + .../data/cosmos/repository/integration/StudentRepositoryIT.java | 1 + .../data/cosmos/repository/integration/TeacherRepositoryIT.java | 1 + .../cosmos/repository/integration/UUIDIdDomainRepositoryIT.java | 1 + .../data/cosmos/repository/integration/UniqueKeyPolicyIT.java | 1 + 58 files changed, 58 insertions(+), 1 deletion(-) diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/ContainerLockIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/ContainerLockIT.java index 38e28ada4d18..de89e28d7cc5 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/ContainerLockIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/ContainerLockIT.java @@ -22,7 +22,7 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) -@SuppressWarnings({"rawtypes", "unchecked"}) +@SuppressWarnings({"rawtypes", "unchecked", "deprecation"}) public class ContainerLockIT { private static final Duration SHORT_LEASE_DURATION = Duration.ofSeconds(3); diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/CosmosFactoryTestIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/CosmosFactoryTestIT.java index 12cb621cf85a..32700ec603a4 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/CosmosFactoryTestIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/CosmosFactoryTestIT.java @@ -15,6 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class CosmosFactoryTestIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIT.java index 8a7c9a7c1bac..1eecb3455ec4 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIT.java @@ -107,6 +107,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class CosmosTemplateIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplatePartitionIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplatePartitionIT.java index 08b744b9a2ba..eb4816e5fd4c 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplatePartitionIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplatePartitionIT.java @@ -61,6 +61,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.springframework.data.domain.Sort.Direction.ASC; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class CosmosTemplatePartitionIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantContainerCosmosFactoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantContainerCosmosFactoryIT.java index 580a0d4b0f4b..d2b50d9e9a36 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantContainerCosmosFactoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantContainerCosmosFactoryIT.java @@ -42,6 +42,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = MultiTenantTestRepositoryConfig.class) public class MultiTenantContainerCosmosFactoryIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantDBCosmosFactoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantDBCosmosFactoryIT.java index 6cf5a2bb9b79..c3194aabca05 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantDBCosmosFactoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantDBCosmosFactoryIT.java @@ -42,6 +42,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = MultiTenantTestRepositoryConfig.class) public class MultiTenantDBCosmosFactoryIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplateIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplateIT.java index 65f1525e6a24..7b7af5273812 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplateIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplateIT.java @@ -99,6 +99,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class ReactiveCosmosTemplateIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplatePartitionIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplatePartitionIT.java index 4f7d9c226ac3..a0c94f82100a 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplatePartitionIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplatePartitionIT.java @@ -42,6 +42,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class ReactiveCosmosTemplatePartitionIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantContainerCosmosFactoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantContainerCosmosFactoryIT.java index c45551dc24d2..3bcaca81a3fc 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantContainerCosmosFactoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantContainerCosmosFactoryIT.java @@ -44,6 +44,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = MultiTenantTestRepositoryConfig.class) public class ReactiveMultiTenantContainerCosmosFactoryIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantDBCosmosFactoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantDBCosmosFactoryIT.java index d716681b485f..32619f94c101 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantDBCosmosFactoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantDBCosmosFactoryIT.java @@ -44,6 +44,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = MultiTenantTestRepositoryConfig.class) public class ReactiveMultiTenantDBCosmosFactoryIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/event/ApplicationContextEventErrorIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/event/ApplicationContextEventErrorIT.java index ff4f63e10c08..e2e6ef889a99 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/event/ApplicationContextEventErrorIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/event/ApplicationContextEventErrorIT.java @@ -20,6 +20,7 @@ import static com.azure.spring.data.cosmos.domain.Address.TEST_ADDRESS1_PARTITION1; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = {TestRepositoryConfig.class, ErrorEventListenerConfig.class}) public class ApplicationContextEventErrorIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/event/ApplicationContextEventErrorReactiveIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/event/ApplicationContextEventErrorReactiveIT.java index 6f833a984b6f..95fc0f2d2af6 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/event/ApplicationContextEventErrorReactiveIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/event/ApplicationContextEventErrorReactiveIT.java @@ -20,6 +20,7 @@ import static com.azure.spring.data.cosmos.domain.Address.TEST_ADDRESS1_PARTITION1; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = {TestRepositoryConfig.class, ErrorEventListenerConfig.class}) public class ApplicationContextEventErrorReactiveIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/event/ApplicationContextEventIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/event/ApplicationContextEventIT.java index 91654aee2bb6..173de249f221 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/event/ApplicationContextEventIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/event/ApplicationContextEventIT.java @@ -30,6 +30,7 @@ import static com.azure.spring.data.cosmos.domain.Address.TEST_ADDRESS4_PARTITION3; import static org.assertj.core.api.Assertions.assertThat; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class ApplicationContextEventIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/event/ApplicationContextEventReactiveIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/event/ApplicationContextEventReactiveIT.java index 9ce320cb6a46..8a3e88ac1395 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/event/ApplicationContextEventReactiveIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/event/ApplicationContextEventReactiveIT.java @@ -29,6 +29,7 @@ import static com.azure.spring.data.cosmos.domain.Address.TEST_ADDRESS4_PARTITION3; import static org.assertj.core.api.Assertions.assertThat; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class ApplicationContextEventReactiveIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/exception/CosmosExceptionUtilsTest.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/exception/CosmosExceptionUtilsTest.java index 334e3a2a7b54..0ff893eeea00 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/exception/CosmosExceptionUtilsTest.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/exception/CosmosExceptionUtilsTest.java @@ -133,6 +133,7 @@ public void testPreconditionFailedException() { } @Test + @SuppressWarnings("deprecation") public void testRequestEntityTooLargeException() { CosmosException cosmosException = BridgeInternal.createCosmosException(HttpStatus.PAYLOAD_TOO_LARGE.value(), "Request Entity Too Large Exception"); assertThrows(CosmosRequestEntityTooLargeException.class, () -> { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/EntityImplRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/EntityImplRepositoryIT.java index c97650b779cd..c78d31b87851 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/EntityImplRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/EntityImplRepositoryIT.java @@ -24,6 +24,7 @@ import static org.assertj.core.api.Assertions.assertThat; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class EntityImplRepositoryIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/MultiCosmosTemplateIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/MultiCosmosTemplateIT.java index 87703fac276a..dd6f85c54679 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/MultiCosmosTemplateIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/MultiCosmosTemplateIT.java @@ -25,6 +25,7 @@ import static com.azure.spring.data.cosmos.common.TestConstants.AGE; import static com.azure.spring.data.cosmos.common.TestConstants.PASSPORT_IDS_BY_COUNTRY; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = {TestRepositoryConfig.class, SecondaryTestRepositoryConfig.class}) public class MultiCosmosTemplateIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/ReactiveUUIDIdDomainRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/ReactiveUUIDIdDomainRepositoryIT.java index c6dbb5ca5fbb..6d45b92fd2c8 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/ReactiveUUIDIdDomainRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/ReactiveUUIDIdDomainRepositoryIT.java @@ -24,6 +24,7 @@ import java.util.Objects; import java.util.UUID; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class ReactiveUUIDIdDomainRepositoryIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/AddressRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/AddressRepositoryIT.java index 7f6b0f0de5ec..4dc0bf9260bb 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/AddressRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/AddressRepositoryIT.java @@ -41,6 +41,7 @@ import static org.assertj.core.api.Assertions.fail; import static org.junit.jupiter.api.Assertions.assertNull; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class AddressRepositoryIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/AddressRepositoryNoMetricsIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/AddressRepositoryNoMetricsIT.java index acc313a92d9c..def09ae4b120 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/AddressRepositoryNoMetricsIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/AddressRepositoryNoMetricsIT.java @@ -27,6 +27,7 @@ import static com.azure.spring.data.cosmos.domain.Address.TEST_ADDRESS4_PARTITION3; import static org.assertj.core.api.Assertions.assertThat; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryNoMetricsConfig.class) public class AddressRepositoryNoMetricsIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/AnnotatedQueryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/AnnotatedQueryIT.java index 671058c9a776..d7d36742504a 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/AnnotatedQueryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/AnnotatedQueryIT.java @@ -38,6 +38,7 @@ import static com.azure.spring.data.cosmos.common.TestConstants.PAGE_SIZE_2; import static org.assertj.core.api.Assertions.assertThat; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class AnnotatedQueryIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/AuditableIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/AuditableIT.java index d09a15bb22e5..906ceb2a3300 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/AuditableIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/AuditableIT.java @@ -38,6 +38,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class AuditableIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/BasicItemRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/BasicItemRepositoryIT.java index 583f9f7b6a20..4250a3263a22 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/BasicItemRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/BasicItemRepositoryIT.java @@ -28,6 +28,7 @@ import static com.azure.spring.data.cosmos.common.TestConstants.ID_1; import static com.azure.spring.data.cosmos.common.TestConstants.ID_2; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class BasicItemRepositoryIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/BigTypeRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/BigTypeRepositoryIT.java index d5f7a23b642a..154687740a8f 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/BigTypeRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/BigTypeRepositoryIT.java @@ -25,6 +25,7 @@ import static org.assertj.core.api.Assertions.assertThat; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class BigTypeRepositoryIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/CompositeIndexIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/CompositeIndexIT.java index e61587d96271..33bd3def7a7e 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/CompositeIndexIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/CompositeIndexIT.java @@ -30,6 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class CompositeIndexIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ContactRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ContactRepositoryIT.java index c10af40ed10a..c8705ef53fbd 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ContactRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ContactRepositoryIT.java @@ -28,6 +28,7 @@ import static org.assertj.core.api.Assertions.assertThat; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class ContactRepositoryIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/CosmosAnnotationIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/CosmosAnnotationIT.java index a4311294d30b..03f30ae80758 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/CosmosAnnotationIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/CosmosAnnotationIT.java @@ -31,6 +31,7 @@ import static org.assertj.core.api.Assertions.assertThat; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class CosmosAnnotationIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/CountIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/CountIT.java index 5f8211521f1e..a154dd599f8e 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/CountIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/CountIT.java @@ -20,6 +20,7 @@ import java.util.Arrays; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class CountIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/EtagIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/EtagIT.java index 174f1cb6e5be..3924291cc67b 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/EtagIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/EtagIT.java @@ -33,6 +33,7 @@ import static com.azure.spring.data.cosmos.common.TestConstants.HOBBIES; import static com.azure.spring.data.cosmos.common.TestConstants.LAST_NAME; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class EtagIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/HierarchicalPartitionKeyRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/HierarchicalPartitionKeyRepositoryIT.java index 8049dd4d5add..b217670c1a67 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/HierarchicalPartitionKeyRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/HierarchicalPartitionKeyRepositoryIT.java @@ -27,6 +27,7 @@ import static org.assertj.core.api.Assertions.assertThat; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class HierarchicalPartitionKeyRepositoryIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/IndexPolicyUpdateIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/IndexPolicyUpdateIT.java index c1a4287b1b27..59bf9e27d8b4 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/IndexPolicyUpdateIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/IndexPolicyUpdateIT.java @@ -30,6 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class IndexPolicyUpdateIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/IntegerIdDomainRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/IntegerIdDomainRepositoryIT.java index b65aa5f73ef9..66cb22d25815 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/IntegerIdDomainRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/IntegerIdDomainRepositoryIT.java @@ -30,6 +30,7 @@ import java.util.stream.Collectors; import java.util.stream.StreamSupport; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class IntegerIdDomainRepositoryIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/LongIdDomainRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/LongIdDomainRepositoryIT.java index d3524bbe7d80..c001d11210eb 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/LongIdDomainRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/LongIdDomainRepositoryIT.java @@ -34,6 +34,7 @@ import java.util.stream.Stream; import java.util.stream.StreamSupport; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class LongIdDomainRepositoryIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/MemoRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/MemoRepositoryIT.java index a032499c9979..3199d1fba522 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/MemoRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/MemoRepositoryIT.java @@ -32,6 +32,7 @@ import static org.assertj.core.api.Assertions.assertThat; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class MemoRepositoryIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/NestedPartitionKeyRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/NestedPartitionKeyRepositoryIT.java index 331228967015..757875a494fc 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/NestedPartitionKeyRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/NestedPartitionKeyRepositoryIT.java @@ -25,6 +25,7 @@ import static org.assertj.core.api.Assertions.assertThat; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class NestedPartitionKeyRepositoryIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PageableAddressRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PageableAddressRepositoryIT.java index 18707edbe276..29d86241abe5 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PageableAddressRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PageableAddressRepositoryIT.java @@ -39,6 +39,7 @@ import static com.azure.spring.data.cosmos.domain.Address.TEST_ADDRESS4_PARTITION3; import static org.assertj.core.api.Assertions.assertThat; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class PageableAddressRepositoryIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PageableMemoRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PageableMemoRepositoryIT.java index 7cf66204ec4e..800fc5248244 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PageableMemoRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PageableMemoRepositoryIT.java @@ -38,6 +38,7 @@ import static org.assertj.core.api.Assertions.assertThat; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class PageableMemoRepositoryIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PageablePersonRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PageablePersonRepositoryIT.java index e28702e04731..a89c9fae9ab0 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PageablePersonRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PageablePersonRepositoryIT.java @@ -28,6 +28,7 @@ import static org.assertj.core.api.Assertions.assertThat; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class PageablePersonRepositoryIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PersistableIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PersistableIT.java index d693ee84f421..0bd8bb183a6e 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PersistableIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PersistableIT.java @@ -30,6 +30,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class PersistableIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PersonCrossPartitionIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PersonCrossPartitionIT.java index 472807cc2e02..50a608b13ffd 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PersonCrossPartitionIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PersonCrossPartitionIT.java @@ -43,6 +43,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.data.domain.Sort.Direction.ASC; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class PersonCrossPartitionIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ProjectRepositorySortIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ProjectRepositorySortIT.java index 00c5a3a5e514..52ccfde1bad2 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ProjectRepositorySortIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ProjectRepositorySortIT.java @@ -31,6 +31,7 @@ import static com.azure.spring.data.cosmos.common.PageTestUtils.validateLastPage; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class ProjectRepositorySortIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/QuestionRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/QuestionRepositoryIT.java index 36c4e6005318..db79727bac88 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/QuestionRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/QuestionRepositoryIT.java @@ -24,6 +24,7 @@ import static org.assertj.core.api.Assertions.assertThat; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class QuestionRepositoryIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveAuditableIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveAuditableIT.java index 4f3890d341cc..bf676b9f002c 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveAuditableIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveAuditableIT.java @@ -30,6 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class ReactiveAuditableIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveCourseRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveCourseRepositoryIT.java index 276d5423a7a7..70a4c57a26f4 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveCourseRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveCourseRepositoryIT.java @@ -41,6 +41,7 @@ import static org.assertj.core.api.Assertions.assertThat; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class ReactiveCourseRepositoryIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveCourseRepositoryNoMetricsIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveCourseRepositoryNoMetricsIT.java index 50670aa0fc2b..2b4e346afff0 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveCourseRepositoryNoMetricsIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveCourseRepositoryNoMetricsIT.java @@ -24,6 +24,7 @@ import static org.assertj.core.api.Assertions.assertThat; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryNoMetricsConfig.class) public class ReactiveCourseRepositoryNoMetricsIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveEtagIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveEtagIT.java index 098071c630d7..10ef86050958 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveEtagIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveEtagIT.java @@ -28,6 +28,7 @@ import static com.azure.spring.data.cosmos.common.TestConstants.COURSE_NAME; import static com.azure.spring.data.cosmos.common.TestConstants.DEPARTMENT; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class ReactiveEtagIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveHierarchicalPartitionKeyRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveHierarchicalPartitionKeyRepositoryIT.java index 1a2ce6c59280..74040c3b77fd 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveHierarchicalPartitionKeyRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveHierarchicalPartitionKeyRepositoryIT.java @@ -28,6 +28,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class ReactiveHierarchicalPartitionKeyRepositoryIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveIndexPolicyUpdateIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveIndexPolicyUpdateIT.java index c40a9d9304d3..5fdba53b7a4b 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveIndexPolicyUpdateIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveIndexPolicyUpdateIT.java @@ -30,6 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class ReactiveIndexPolicyUpdateIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveLongIdDomainPartitionPartitionRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveLongIdDomainPartitionPartitionRepositoryIT.java index c5bef428dbac..649a1821c5da 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveLongIdDomainPartitionPartitionRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveLongIdDomainPartitionPartitionRepositoryIT.java @@ -25,6 +25,7 @@ import java.util.Arrays; import java.util.Objects; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class ReactiveLongIdDomainPartitionPartitionRepositoryIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveNestedPartitionKeyRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveNestedPartitionKeyRepositoryIT.java index 09e676d1b0fa..81c0faa585cb 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveNestedPartitionKeyRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveNestedPartitionKeyRepositoryIT.java @@ -27,6 +27,7 @@ import static org.assertj.core.api.Assertions.assertThat; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class ReactiveNestedPartitionKeyRepositoryIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveRoleRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveRoleRepositoryIT.java index add0b943acd4..6a91bab9ccb8 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveRoleRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveRoleRepositoryIT.java @@ -25,6 +25,7 @@ import java.util.List; import java.util.Optional; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class ReactiveRoleRepositoryIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveTeacherRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveTeacherRepositoryIT.java index f9cd828a8aff..e6b4a53374f6 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveTeacherRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveTeacherRepositoryIT.java @@ -24,6 +24,7 @@ import java.util.Arrays; import java.util.List; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class ReactiveTeacherRepositoryIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/SpELCosmosAnnotationIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/SpELCosmosAnnotationIT.java index 9505ca395342..ab4d88dd872c 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/SpELCosmosAnnotationIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/SpELCosmosAnnotationIT.java @@ -20,6 +20,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositorySpELConfig.class) public class SpELCosmosAnnotationIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/SquareRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/SquareRepositoryIT.java index f4cf427b14b9..ccc0397c97e9 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/SquareRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/SquareRepositoryIT.java @@ -21,6 +21,7 @@ import static org.assertj.core.api.Assertions.assertThat; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class SquareRepositoryIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/StudentRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/StudentRepositoryIT.java index f0c714da7a29..2781d1d540df 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/StudentRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/StudentRepositoryIT.java @@ -26,6 +26,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class StudentRepositoryIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/TeacherRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/TeacherRepositoryIT.java index 7dfbdd764de8..0355f28fbbbd 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/TeacherRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/TeacherRepositoryIT.java @@ -26,6 +26,7 @@ import static org.junit.Assert.assertTrue; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class TeacherRepositoryIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/UUIDIdDomainRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/UUIDIdDomainRepositoryIT.java index 89cc50b85d40..a6ae8c2aa10b 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/UUIDIdDomainRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/UUIDIdDomainRepositoryIT.java @@ -32,6 +32,7 @@ import java.util.stream.Stream; import java.util.stream.StreamSupport; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class UUIDIdDomainRepositoryIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/UniqueKeyPolicyIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/UniqueKeyPolicyIT.java index 728ee227e207..ade372efaf72 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/UniqueKeyPolicyIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/UniqueKeyPolicyIT.java @@ -34,6 +34,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; +@SuppressWarnings("deprecation") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class UniqueKeyPolicyIT { From f3b4862104bae932de45d54e22bd2cb8e6d33086 Mon Sep 17 00:00:00 2001 From: muyao Date: Mon, 17 Nov 2025 14:35:40 +0800 Subject: [PATCH 13/76] fix ConfigurableBootstrapContext/EnvironmentPostProcessor path --- .../AzureGlobalConfigurationEnvironmentPostProcessor.java | 2 +- .../environment/KeyVaultEnvironmentPostProcessor.java | 4 ++-- .../src/main/resources/META-INF/spring.factories | 2 +- ...AzureGlobalConfigurationEnvironmentPostProcessorTests.java | 2 +- .../environment/KeyVaultEnvironmentPostProcessorTests.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/context/AzureGlobalConfigurationEnvironmentPostProcessor.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/context/AzureGlobalConfigurationEnvironmentPostProcessor.java index b7342a2dc7bc..a15158401714 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/context/AzureGlobalConfigurationEnvironmentPostProcessor.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/context/AzureGlobalConfigurationEnvironmentPostProcessor.java @@ -5,7 +5,7 @@ import org.apache.commons.logging.Log; import org.springframework.boot.SpringApplication; -import org.springframework.boot.env.EnvironmentPostProcessor; +import org.springframework.boot.EnvironmentPostProcessor; import org.springframework.boot.logging.DeferredLog; import org.springframework.core.Ordered; import org.springframework.core.env.ConfigurableEnvironment; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/keyvault/environment/KeyVaultEnvironmentPostProcessor.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/keyvault/environment/KeyVaultEnvironmentPostProcessor.java index 734fffc13211..8fc6b848c5e6 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/keyvault/environment/KeyVaultEnvironmentPostProcessor.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/keyvault/environment/KeyVaultEnvironmentPostProcessor.java @@ -13,12 +13,12 @@ import com.azure.spring.cloud.core.implementation.util.AzureSpringIdentifier; import com.azure.spring.cloud.service.implementation.keyvault.secrets.SecretClientBuilderFactory; import org.apache.commons.logging.Log; -import org.springframework.boot.ConfigurableBootstrapContext; +import org.springframework.boot.bootstrap.ConfigurableBootstrapContext; import org.springframework.boot.SpringApplication; import org.springframework.boot.context.config.ConfigDataEnvironmentPostProcessor; import org.springframework.boot.context.properties.bind.Bindable; import org.springframework.boot.context.properties.bind.Binder; -import org.springframework.boot.env.EnvironmentPostProcessor; +import org.springframework.boot.EnvironmentPostProcessor; import org.springframework.boot.logging.DeferredLogFactory; import org.springframework.core.Ordered; import org.springframework.core.env.ConfigurableEnvironment; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/resources/META-INF/spring.factories b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/resources/META-INF/spring.factories index c095ef164a17..92e50809d002 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/resources/META-INF/spring.factories +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/resources/META-INF/spring.factories @@ -1,4 +1,4 @@ -org.springframework.boot.env.EnvironmentPostProcessor=\ +org.springframework.boot.EnvironmentPostProcessor=\ com.azure.spring.cloud.autoconfigure.implementation.context.AzureGlobalConfigurationEnvironmentPostProcessor,\ com.azure.spring.cloud.autoconfigure.implementation.keyvault.environment.KeyVaultEnvironmentPostProcessor diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/context/AzureGlobalConfigurationEnvironmentPostProcessorTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/context/AzureGlobalConfigurationEnvironmentPostProcessorTests.java index e72a5c8443e5..8b6ba59e8ef8 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/context/AzureGlobalConfigurationEnvironmentPostProcessorTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/context/AzureGlobalConfigurationEnvironmentPostProcessorTests.java @@ -10,7 +10,7 @@ import com.azure.spring.cloud.core.provider.AzureProfileOptionsProvider; import org.junit.jupiter.api.Test; import org.springframework.boot.context.properties.bind.Binder; -import org.springframework.boot.env.EnvironmentPostProcessor; +import org.springframework.boot.EnvironmentPostProcessor; import org.springframework.boot.logging.DeferredLog; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.PropertiesPropertySource; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/keyvault/environment/KeyVaultEnvironmentPostProcessorTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/keyvault/environment/KeyVaultEnvironmentPostProcessorTests.java index 29f223be86b6..cfee276d1a73 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/keyvault/environment/KeyVaultEnvironmentPostProcessorTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/keyvault/environment/KeyVaultEnvironmentPostProcessorTests.java @@ -11,7 +11,7 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.mockito.MockedStatic; -import org.springframework.boot.ConfigurableBootstrapContext; +import org.springframework.boot.bootstrap.ConfigurableBootstrapContext; import org.springframework.boot.SpringApplication; import org.springframework.boot.logging.DeferredLogs; import org.springframework.core.env.MutablePropertySources; From 6b69885ffc5874bd2c1cbff144fa287bd6c98914 Mon Sep 17 00:00:00 2001 From: muyao Date: Mon, 17 Nov 2025 16:33:23 +0800 Subject: [PATCH 14/76] suppress warning --- .../implementation/jdbc/PasswordlessRuntimeHints.java | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/PasswordlessRuntimeHints.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/PasswordlessRuntimeHints.java index 9778643b82f9..2936b240e992 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/PasswordlessRuntimeHints.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/PasswordlessRuntimeHints.java @@ -12,6 +12,7 @@ class PasswordlessRuntimeHints implements RuntimeHintsRegistrar { @Override + @SuppressWarnings("removal") public void registerHints(RuntimeHints hints, ClassLoader classLoader) { BindableRuntimeHintsRegistrar.forTypes(AzurePasswordlessProperties.class) .registerHints(hints); From d5992ab66f449fa59c02d403d4001da69bb9acab Mon Sep 17 00:00:00 2001 From: muyao Date: Tue, 18 Nov 2025 09:47:48 +0800 Subject: [PATCH 15/76] replace with spring-boot-kafka --- eng/versioning/external_dependencies.txt | 2 +- sdk/spring/spring-cloud-azure-autoconfigure/pom.xml | 10 +++++----- .../kafka/KafkaPropertiesBeanPostProcessor.java | 2 +- .../AbstractKafkaPropertiesBeanPostProcessor.java | 2 +- ...BinderConfigurationPropertiesBeanPostProcessor.java | 2 +- .../kafka/KafkaPropertiesBeanPostProcessor.java | 2 +- .../AzureKafkaOAuth2BinderConfigurationTests.java | 4 ++-- .../kafka/AzureKafkaOAuth2BootConfigurationTests.java | 4 ++-- .../kafka/KafkaPropertiesBeanPostProcessorTest.java | 2 +- .../implementation/util/TestCompatibilityUtils.java | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index 8327c5e27a89..bddc2836a002 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -388,7 +388,7 @@ springboot3_org.springframework.cloud:spring-cloud-stream;4.3.0 springboot3_org.springframework.data:spring-data-commons;3.5.3 springboot3_org.springframework.data:spring-data-redis;3.5.3 springboot3_org.springframework.integration:spring-integration-core;7.0.0-RC2 -springboot3_org.springframework.kafka:spring-kafka;4.0.0-RC1 +springboot3_org.springframework.boot:spring-boot-kafka;4.0.0-RC2 springboot3_org.springframework.retry:spring-retry;2.0.12 springboot3_org.springframework.security:spring-security-config;6.5.3 springboot3_org.springframework.security:spring-security-oauth2-client;6.5.3 diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml index 8da089dc7779..21c2f79f1b19 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml +++ b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml @@ -84,15 +84,15 @@ - org.springframework.kafka - spring-kafka - 4.0.0-RC1 + org.springframework.boot + spring-boot-kafka + 4.0.0-RC2 true org.springframework.cloud spring-cloud-starter-stream-kafka - 4.3.0 + 5.0.0-RC1 true @@ -561,7 +561,7 @@ org.springframework.boot:spring-boot-configuration-processor:[4.0.0-RC2] org.springframework.cloud:spring-cloud-starter-stream-kafka:[4.3.0] org.springframework.data:spring-data-redis:[3.5.3] - org.springframework.kafka:spring-kafka:[4.0.0-RC1] + org.springframework.kafka:spring-boot-kafka:[4.0.0-RC2] org.springframework.security:spring-security-config:[6.5.3] org.springframework.security:spring-security-oauth2-client:[6.5.3] org.springframework.security:spring-security-oauth2-jose:[6.5.3] diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/kafka/KafkaPropertiesBeanPostProcessor.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/kafka/KafkaPropertiesBeanPostProcessor.java index b8e0e0fef93e..a1bf6c6754a3 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/kafka/KafkaPropertiesBeanPostProcessor.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/kafka/KafkaPropertiesBeanPostProcessor.java @@ -10,7 +10,7 @@ import org.springframework.beans.BeansException; import org.springframework.beans.factory.ObjectProvider; import org.springframework.beans.factory.config.BeanPostProcessor; -import org.springframework.boot.autoconfigure.kafka.KafkaProperties; +import org.springframework.boot.kafka.autoconfigure.KafkaProperties; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.core.ResolvableType; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/AbstractKafkaPropertiesBeanPostProcessor.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/AbstractKafkaPropertiesBeanPostProcessor.java index 2dfb2f6ab0ce..950c4d1816b5 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/AbstractKafkaPropertiesBeanPostProcessor.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/AbstractKafkaPropertiesBeanPostProcessor.java @@ -17,7 +17,7 @@ import org.springframework.beans.BeansException; import org.springframework.beans.factory.ObjectProvider; import org.springframework.beans.factory.config.BeanPostProcessor; -import org.springframework.boot.autoconfigure.kafka.KafkaProperties; +import org.springframework.boot.kafka.autoconfigure.KafkaProperties; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.util.ReflectionUtils; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/KafkaBinderConfigurationPropertiesBeanPostProcessor.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/KafkaBinderConfigurationPropertiesBeanPostProcessor.java index c93ad1aa1016..9c9aece92f2a 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/KafkaBinderConfigurationPropertiesBeanPostProcessor.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/KafkaBinderConfigurationPropertiesBeanPostProcessor.java @@ -7,7 +7,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.config.BeanPostProcessor; -import org.springframework.boot.autoconfigure.kafka.KafkaProperties; +import org.springframework.boot.kafka.autoconfigure.KafkaProperties; import org.springframework.cloud.stream.binder.kafka.properties.KafkaBinderConfigurationProperties; import java.util.HashMap; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/KafkaPropertiesBeanPostProcessor.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/KafkaPropertiesBeanPostProcessor.java index fffbd5885a18..d320b22ac3d7 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/KafkaPropertiesBeanPostProcessor.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/KafkaPropertiesBeanPostProcessor.java @@ -4,7 +4,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.boot.autoconfigure.kafka.KafkaProperties; +import org.springframework.boot.kafka.autoconfigure.KafkaProperties; import java.util.Map; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/AzureKafkaOAuth2BinderConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/AzureKafkaOAuth2BinderConfigurationTests.java index 14b9cbee0bce..5315b310a5ce 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/AzureKafkaOAuth2BinderConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/AzureKafkaOAuth2BinderConfigurationTests.java @@ -14,8 +14,8 @@ import org.apache.kafka.common.config.types.Password; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.autoconfigure.kafka.KafkaAutoConfiguration; -import org.springframework.boot.autoconfigure.kafka.KafkaProperties; +import org.springframework.boot.kafka.autoconfigure.KafkaAutoConfiguration; +import org.springframework.boot.kafka.autoconfigure.KafkaProperties; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.cloud.stream.binder.kafka.KafkaMessageChannelBinder; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/AzureKafkaOAuth2BootConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/AzureKafkaOAuth2BootConfigurationTests.java index 797e6dde7b20..6f612db8a20c 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/AzureKafkaOAuth2BootConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/AzureKafkaOAuth2BootConfigurationTests.java @@ -15,8 +15,8 @@ import org.apache.kafka.common.config.types.Password; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.autoconfigure.kafka.KafkaAutoConfiguration; -import org.springframework.boot.autoconfigure.kafka.KafkaProperties; +import org.springframework.boot.kafka.autoconfigure.KafkaAutoConfiguration; +import org.springframework.boot.kafka.autoconfigure.KafkaProperties; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.context.ApplicationContext; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/KafkaPropertiesBeanPostProcessorTest.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/KafkaPropertiesBeanPostProcessorTest.java index 7f9838bf7014..c6067e719ff3 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/KafkaPropertiesBeanPostProcessorTest.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/kafka/KafkaPropertiesBeanPostProcessorTest.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. package com.azure.spring.cloud.autoconfigure.implementation.kafka; -import org.springframework.boot.autoconfigure.kafka.KafkaProperties; +import org.springframework.boot.kafka.autoconfigure.KafkaProperties; class KafkaPropertiesBeanPostProcessorTest extends AbstractKafkaPropertiesBeanPostProcessorTest { diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/util/TestCompatibilityUtils.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/util/TestCompatibilityUtils.java index d2af6ee01f07..1a84aafa460f 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/util/TestCompatibilityUtils.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/util/TestCompatibilityUtils.java @@ -3,7 +3,7 @@ package com.azure.spring.cloud.autoconfigure.implementation.util; -import org.springframework.boot.autoconfigure.kafka.KafkaProperties; +import org.springframework.boot.kafka.autoconfigure.KafkaProperties; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; From ee56cc09dc7d9c03665879244c2016186facb857 Mon Sep 17 00:00:00 2001 From: muyao Date: Tue, 18 Nov 2025 10:27:07 +0800 Subject: [PATCH 16/76] replace alwaysApplyingWhenNonNull() with always() --- ...eEventHubsConsumerClientConfiguration.java | 6 +- .../properties/AzureEventHubsProperties.java | 90 ++++++------- .../properties/AzureServiceBusProperties.java | 118 +++++++++--------- 3 files changed, 107 insertions(+), 107 deletions(-) diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/AzureEventHubsConsumerClientConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/AzureEventHubsConsumerClientConfiguration.java index f1a8bc145d36..957abf7303c6 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/AzureEventHubsConsumerClientConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/AzureEventHubsConsumerClientConfiguration.java @@ -51,9 +51,9 @@ static class SharedConsumerConnectionConfiguration { SharedConsumerConnectionConfiguration(AzureEventHubsProperties properties, EventHubClientBuilder builder) { this.builder = builder; - PropertyMapper mapper = PropertyMapper.get().alwaysApplyingWhenNonNull(); - mapper.from(properties.getConsumer().getConsumerGroup()).to(builder::consumerGroup); - mapper.from(properties.getConsumer().getPrefetchCount()).to(builder::prefetchCount); + PropertyMapper mapper = PropertyMapper.get(); + mapper.from(properties.getConsumer().getConsumerGroup()).always().to(builder::consumerGroup); + mapper.from(properties.getConsumer().getPrefetchCount()).always().to(builder::prefetchCount); } @Bean diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/properties/AzureEventHubsProperties.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/properties/AzureEventHubsProperties.java index a0ca762af1e2..d595fe48e8be 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/properties/AzureEventHubsProperties.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/properties/AzureEventHubsProperties.java @@ -44,82 +44,82 @@ public class AzureEventHubsProperties extends AzureEventHubsCommonProperties private final Processor processor = new Processor(); public Producer buildProducerProperties() { - PropertyMapper propertyMapper = PropertyMapper.get().alwaysApplyingWhenNonNull(); + PropertyMapper propertyMapper = PropertyMapper.get(); Producer properties = new Producer(); AzurePropertiesUtils.mergeAzureCommonProperties(this, this.producer, properties); - propertyMapper.from(this.getDomainName()).to(properties::setDomainName); - propertyMapper.from(this.getNamespace()).to(properties::setNamespace); - propertyMapper.from(this.getEventHubName()).to(properties::setEventHubName); - propertyMapper.from(this.getConnectionString()).to(properties::setConnectionString); - propertyMapper.from(this.getCustomEndpointAddress()).to(properties::setCustomEndpointAddress); + propertyMapper.from(this.getDomainName()).always().to(properties::setDomainName); + propertyMapper.from(this.getNamespace()).always().to(properties::setNamespace); + propertyMapper.from(this.getEventHubName()).always().to(properties::setEventHubName); + propertyMapper.from(this.getConnectionString()).always().to(properties::setConnectionString); + propertyMapper.from(this.getCustomEndpointAddress()).always().to(properties::setCustomEndpointAddress); - propertyMapper.from(this.producer.getDomainName()).to(properties::setDomainName); - propertyMapper.from(this.producer.getNamespace()).to(properties::setNamespace); - propertyMapper.from(this.producer.getEventHubName()).to(properties::setEventHubName); - propertyMapper.from(this.producer.getConnectionString()).to(properties::setConnectionString); - propertyMapper.from(this.producer.getCustomEndpointAddress()).to(properties::setCustomEndpointAddress); + propertyMapper.from(this.producer.getDomainName()).always().to(properties::setDomainName); + propertyMapper.from(this.producer.getNamespace()).always().to(properties::setNamespace); + propertyMapper.from(this.producer.getEventHubName()).always().to(properties::setEventHubName); + propertyMapper.from(this.producer.getConnectionString()).always().to(properties::setConnectionString); + propertyMapper.from(this.producer.getCustomEndpointAddress()).always().to(properties::setCustomEndpointAddress); return properties; } public Consumer buildConsumerProperties() { - PropertyMapper propertyMapper = PropertyMapper.get().alwaysApplyingWhenNonNull(); + PropertyMapper propertyMapper = PropertyMapper.get(); Consumer properties = new Consumer(); AzurePropertiesUtils.mergeAzureCommonProperties(this, this.consumer, properties); - propertyMapper.from(this.getDomainName()).to(properties::setDomainName); - propertyMapper.from(this.getNamespace()).to(properties::setNamespace); - propertyMapper.from(this.getEventHubName()).to(properties::setEventHubName); - propertyMapper.from(this.getConnectionString()).to(properties::setConnectionString); - propertyMapper.from(this.getCustomEndpointAddress()).to(properties::setCustomEndpointAddress); + propertyMapper.from(this.getDomainName()).always().to(properties::setDomainName); + propertyMapper.from(this.getNamespace()).always().to(properties::setNamespace); + propertyMapper.from(this.getEventHubName()).always().to(properties::setEventHubName); + propertyMapper.from(this.getConnectionString()).always().to(properties::setConnectionString); + propertyMapper.from(this.getCustomEndpointAddress()).always().to(properties::setCustomEndpointAddress); - propertyMapper.from(this.consumer.getDomainName()).to(properties::setDomainName); - propertyMapper.from(this.consumer.getNamespace()).to(properties::setNamespace); - propertyMapper.from(this.consumer.getEventHubName()).to(properties::setEventHubName); - propertyMapper.from(this.consumer.getConnectionString()).to(properties::setConnectionString); - propertyMapper.from(this.consumer.getCustomEndpointAddress()).to(properties::setCustomEndpointAddress); - propertyMapper.from(this.consumer.getPrefetchCount()).to(properties::setPrefetchCount); - propertyMapper.from(this.consumer.getConsumerGroup()).to(properties::setConsumerGroup); + propertyMapper.from(this.consumer.getDomainName()).always().to(properties::setDomainName); + propertyMapper.from(this.consumer.getNamespace()).always().to(properties::setNamespace); + propertyMapper.from(this.consumer.getEventHubName()).always().to(properties::setEventHubName); + propertyMapper.from(this.consumer.getConnectionString()).always().to(properties::setConnectionString); + propertyMapper.from(this.consumer.getCustomEndpointAddress()).always().to(properties::setCustomEndpointAddress); + propertyMapper.from(this.consumer.getPrefetchCount()).always().to(properties::setPrefetchCount); + propertyMapper.from(this.consumer.getConsumerGroup()).always().to(properties::setConsumerGroup); return properties; } public Processor buildProcessorProperties() { - PropertyMapper propertyMapper = PropertyMapper.get().alwaysApplyingWhenNonNull(); + PropertyMapper propertyMapper = PropertyMapper.get(); Processor properties = new Processor(); AzurePropertiesUtils.mergeAzureCommonProperties(this, this.processor, properties); - propertyMapper.from(this.getDomainName()).to(properties::setDomainName); - propertyMapper.from(this.getNamespace()).to(properties::setNamespace); - propertyMapper.from(this.getEventHubName()).to(properties::setEventHubName); - propertyMapper.from(this.getConnectionString()).to(properties::setConnectionString); - propertyMapper.from(this.getCustomEndpointAddress()).to(properties::setCustomEndpointAddress); - - propertyMapper.from(this.processor.getDomainName()).to(properties::setDomainName); - propertyMapper.from(this.processor.getNamespace()).to(properties::setNamespace); - propertyMapper.from(this.processor.getEventHubName()).to(properties::setEventHubName); - propertyMapper.from(this.processor.getConnectionString()).to(properties::setConnectionString); - propertyMapper.from(this.processor.getCustomEndpointAddress()).to(properties::setCustomEndpointAddress); - propertyMapper.from(this.processor.getPrefetchCount()).to(properties::setPrefetchCount); - propertyMapper.from(this.processor.getConsumerGroup()).to(properties::setConsumerGroup); - - propertyMapper.from(this.processor.trackLastEnqueuedEventProperties).to(properties::setTrackLastEnqueuedEventProperties); + propertyMapper.from(this.getDomainName()).always().to(properties::setDomainName); + propertyMapper.from(this.getNamespace()).always().to(properties::setNamespace); + propertyMapper.from(this.getEventHubName()).always().to(properties::setEventHubName); + propertyMapper.from(this.getConnectionString()).always().to(properties::setConnectionString); + propertyMapper.from(this.getCustomEndpointAddress()).always().to(properties::setCustomEndpointAddress); + + propertyMapper.from(this.processor.getDomainName()).always().to(properties::setDomainName); + propertyMapper.from(this.processor.getNamespace()).always().to(properties::setNamespace); + propertyMapper.from(this.processor.getEventHubName()).always().to(properties::setEventHubName); + propertyMapper.from(this.processor.getConnectionString()).always().to(properties::setConnectionString); + propertyMapper.from(this.processor.getCustomEndpointAddress()).always().to(properties::setCustomEndpointAddress); + propertyMapper.from(this.processor.getPrefetchCount()).always().to(properties::setPrefetchCount); + propertyMapper.from(this.processor.getConsumerGroup()).always().to(properties::setConsumerGroup); + + propertyMapper.from(this.processor.trackLastEnqueuedEventProperties).always().to(properties::setTrackLastEnqueuedEventProperties); propertyMapper.from(this.processor.initialPartitionEventPosition).when(c -> !CollectionUtils.isEmpty(c)) - .to(m -> { + .always().to(m -> { Map eventPositionMap = m.entrySet() .stream() .filter(entry -> entry.getValue() != null) .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); properties.getInitialPartitionEventPosition().putAll(eventPositionMap); }); - propertyMapper.from(this.processor.batch.getMaxSize()).to(properties.batch::setMaxSize); - propertyMapper.from(this.processor.batch.getMaxWaitTime()).to(properties.batch::setMaxWaitTime); - propertyMapper.from(this.processor.loadBalancing.getStrategy()).to(properties.loadBalancing::setStrategy); - propertyMapper.from(this.processor.loadBalancing.getUpdateInterval()).to(properties.loadBalancing::setUpdateInterval); + propertyMapper.from(this.processor.batch.getMaxSize()).always().to(properties.batch::setMaxSize); + propertyMapper.from(this.processor.batch.getMaxWaitTime()).always().to(properties.batch::setMaxWaitTime); + propertyMapper.from(this.processor.loadBalancing.getStrategy()).always().to(properties.loadBalancing::setStrategy); + propertyMapper.from(this.processor.loadBalancing.getUpdateInterval()).always().to(properties.loadBalancing::setUpdateInterval); AzurePropertiesUtils.mergeAzureCommonProperties(properties, this.processor.getCheckpointStore(), properties.checkpointStore); BeanUtils.copyProperties(this.processor.checkpointStore, properties.checkpointStore); diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/servicebus/properties/AzureServiceBusProperties.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/servicebus/properties/AzureServiceBusProperties.java index 780d0168ea0c..f63f951ee087 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/servicebus/properties/AzureServiceBusProperties.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/servicebus/properties/AzureServiceBusProperties.java @@ -57,91 +57,91 @@ public Processor getProcessor() { } public Producer buildProducerProperties() { - PropertyMapper propertyMapper = PropertyMapper.get().alwaysApplyingWhenNonNull(); + PropertyMapper propertyMapper = PropertyMapper.get(); Producer properties = new Producer(); AzurePropertiesUtils.mergeAzureCommonProperties(this, this.producer, properties); - propertyMapper.from(this.getDomainName()).to(properties::setDomainName); - propertyMapper.from(this.getCustomEndpointAddress()).to(properties::setCustomEndpointAddress); - propertyMapper.from(this.getNamespace()).to(properties::setNamespace); - propertyMapper.from(this.getConnectionString()).to(properties::setConnectionString); - propertyMapper.from(this.getEntityName()).to(properties::setEntityName); - propertyMapper.from(this.getEntityType()).to(properties::setEntityType); + propertyMapper.from(this.getDomainName()).always().to(properties::setDomainName); + propertyMapper.from(this.getCustomEndpointAddress()).always().to(properties::setCustomEndpointAddress); + propertyMapper.from(this.getNamespace()).always().to(properties::setNamespace); + propertyMapper.from(this.getConnectionString()).always().to(properties::setConnectionString); + propertyMapper.from(this.getEntityName()).always().to(properties::setEntityName); + propertyMapper.from(this.getEntityType()).always().to(properties::setEntityType); - propertyMapper.from(this.producer.getDomainName()).to(properties::setDomainName); - propertyMapper.from(this.producer.getCustomEndpointAddress()).to(properties::setCustomEndpointAddress); - propertyMapper.from(this.producer.getNamespace()).to(properties::setNamespace); - propertyMapper.from(this.producer.getConnectionString()).to(properties::setConnectionString); - propertyMapper.from(this.producer.getEntityType()).to(properties::setEntityType); - propertyMapper.from(this.producer.getEntityName()).to(properties::setEntityName); + propertyMapper.from(this.producer.getDomainName()).always().to(properties::setDomainName); + propertyMapper.from(this.producer.getCustomEndpointAddress()).always().to(properties::setCustomEndpointAddress); + propertyMapper.from(this.producer.getNamespace()).always().to(properties::setNamespace); + propertyMapper.from(this.producer.getConnectionString()).always().to(properties::setConnectionString); + propertyMapper.from(this.producer.getEntityType()).always().to(properties::setEntityType); + propertyMapper.from(this.producer.getEntityName()).always().to(properties::setEntityName); return properties; } public Consumer buildConsumerProperties() { - PropertyMapper propertyMapper = PropertyMapper.get().alwaysApplyingWhenNonNull(); + PropertyMapper propertyMapper = PropertyMapper.get(); Consumer properties = new Consumer(); AzurePropertiesUtils.mergeAzureCommonProperties(this, this.consumer, properties); - propertyMapper.from(this.getDomainName()).to(properties::setDomainName); - propertyMapper.from(this.getCustomEndpointAddress()).to(properties::setCustomEndpointAddress); - propertyMapper.from(this.getNamespace()).to(properties::setNamespace); - propertyMapper.from(this.getConnectionString()).to(properties::setConnectionString); - propertyMapper.from(this.getEntityName()).to(properties::setEntityName); - propertyMapper.from(this.getEntityType()).to(properties::setEntityType); - - propertyMapper.from(this.consumer.getDomainName()).to(properties::setDomainName); - propertyMapper.from(this.consumer.getCustomEndpointAddress()).to(properties::setCustomEndpointAddress); - propertyMapper.from(this.consumer.getNamespace()).to(properties::setNamespace); - propertyMapper.from(this.consumer.getConnectionString()).to(properties::setConnectionString); - propertyMapper.from(this.consumer.getEntityType()).to(properties::setEntityType); - propertyMapper.from(this.consumer.getEntityName()).to(properties::setEntityName); - - propertyMapper.from(this.consumer.getSessionEnabled()).to(properties::setSessionEnabled); - propertyMapper.from(this.consumer.getAutoComplete()).to(properties::setAutoComplete); - propertyMapper.from(this.consumer.getPrefetchCount()).to(properties::setPrefetchCount); - propertyMapper.from(this.consumer.getSubQueue()).to(properties::setSubQueue); - propertyMapper.from(this.consumer.getReceiveMode()).to(properties::setReceiveMode); - propertyMapper.from(this.consumer.getSubscriptionName()).to(properties::setSubscriptionName); - propertyMapper.from(this.consumer.getMaxAutoLockRenewDuration()).to(properties::setMaxAutoLockRenewDuration); + propertyMapper.from(this.getDomainName()).always().to(properties::setDomainName); + propertyMapper.from(this.getCustomEndpointAddress()).always().to(properties::setCustomEndpointAddress); + propertyMapper.from(this.getNamespace()).always().to(properties::setNamespace); + propertyMapper.from(this.getConnectionString()).always().to(properties::setConnectionString); + propertyMapper.from(this.getEntityName()).always().to(properties::setEntityName); + propertyMapper.from(this.getEntityType()).always().to(properties::setEntityType); + + propertyMapper.from(this.consumer.getDomainName()).always().to(properties::setDomainName); + propertyMapper.from(this.consumer.getCustomEndpointAddress()).always().to(properties::setCustomEndpointAddress); + propertyMapper.from(this.consumer.getNamespace()).always().to(properties::setNamespace); + propertyMapper.from(this.consumer.getConnectionString()).always().to(properties::setConnectionString); + propertyMapper.from(this.consumer.getEntityType()).always().to(properties::setEntityType); + propertyMapper.from(this.consumer.getEntityName()).always().to(properties::setEntityName); + + propertyMapper.from(this.consumer.getSessionEnabled()).always().to(properties::setSessionEnabled); + propertyMapper.from(this.consumer.getAutoComplete()).always().to(properties::setAutoComplete); + propertyMapper.from(this.consumer.getPrefetchCount()).always().to(properties::setPrefetchCount); + propertyMapper.from(this.consumer.getSubQueue()).always().to(properties::setSubQueue); + propertyMapper.from(this.consumer.getReceiveMode()).always().to(properties::setReceiveMode); + propertyMapper.from(this.consumer.getSubscriptionName()).always().to(properties::setSubscriptionName); + propertyMapper.from(this.consumer.getMaxAutoLockRenewDuration()).always().to(properties::setMaxAutoLockRenewDuration); return properties; } public Processor buildProcessorProperties() { - PropertyMapper propertyMapper = PropertyMapper.get().alwaysApplyingWhenNonNull(); + PropertyMapper propertyMapper = PropertyMapper.get(); Processor properties = new Processor(); AzurePropertiesUtils.mergeAzureCommonProperties(this, this.processor, properties); - propertyMapper.from(this.getDomainName()).to(properties::setDomainName); - propertyMapper.from(this.getCustomEndpointAddress()).to(properties::setCustomEndpointAddress); - propertyMapper.from(this.getNamespace()).to(properties::setNamespace); - propertyMapper.from(this.getConnectionString()).to(properties::setConnectionString); - propertyMapper.from(this.getEntityName()).to(properties::setEntityName); - propertyMapper.from(this.getEntityType()).to(properties::setEntityType); - - propertyMapper.from(this.processor.getDomainName()).to(properties::setDomainName); - propertyMapper.from(this.processor.getCustomEndpointAddress()).to(properties::setCustomEndpointAddress); - propertyMapper.from(this.processor.getNamespace()).to(properties::setNamespace); - propertyMapper.from(this.processor.getConnectionString()).to(properties::setConnectionString); - propertyMapper.from(this.processor.getEntityType()).to(properties::setEntityType); - propertyMapper.from(this.processor.getEntityName()).to(properties::setEntityName); - - propertyMapper.from(this.processor.getSessionEnabled()).to(properties::setSessionEnabled); - propertyMapper.from(this.processor.getAutoComplete()).to(properties::setAutoComplete); - propertyMapper.from(this.processor.getPrefetchCount()).to(properties::setPrefetchCount); - propertyMapper.from(this.processor.getSubQueue()).to(properties::setSubQueue); - propertyMapper.from(this.processor.getReceiveMode()).to(properties::setReceiveMode); - propertyMapper.from(this.processor.getSubscriptionName()).to(properties::setSubscriptionName); - propertyMapper.from(this.processor.getMaxAutoLockRenewDuration()).to(properties::setMaxAutoLockRenewDuration); - propertyMapper.from(this.processor.getMaxConcurrentCalls()).to(properties::setMaxConcurrentCalls); - propertyMapper.from(this.processor.getMaxConcurrentSessions()).to(properties::setMaxConcurrentSessions); + propertyMapper.from(this.getDomainName()).always().to(properties::setDomainName); + propertyMapper.from(this.getCustomEndpointAddress()).always().to(properties::setCustomEndpointAddress); + propertyMapper.from(this.getNamespace()).always().to(properties::setNamespace); + propertyMapper.from(this.getConnectionString()).always().to(properties::setConnectionString); + propertyMapper.from(this.getEntityName()).always().to(properties::setEntityName); + propertyMapper.from(this.getEntityType()).always().to(properties::setEntityType); + + propertyMapper.from(this.processor.getDomainName()).always().to(properties::setDomainName); + propertyMapper.from(this.processor.getCustomEndpointAddress()).always().to(properties::setCustomEndpointAddress); + propertyMapper.from(this.processor.getNamespace()).always().to(properties::setNamespace); + propertyMapper.from(this.processor.getConnectionString()).always().to(properties::setConnectionString); + propertyMapper.from(this.processor.getEntityType()).always().to(properties::setEntityType); + propertyMapper.from(this.processor.getEntityName()).always().to(properties::setEntityName); + + propertyMapper.from(this.processor.getSessionEnabled()).always().to(properties::setSessionEnabled); + propertyMapper.from(this.processor.getAutoComplete()).always().to(properties::setAutoComplete); + propertyMapper.from(this.processor.getPrefetchCount()).always().to(properties::setPrefetchCount); + propertyMapper.from(this.processor.getSubQueue()).always().to(properties::setSubQueue); + propertyMapper.from(this.processor.getReceiveMode()).always().to(properties::setReceiveMode); + propertyMapper.from(this.processor.getSubscriptionName()).always().to(properties::setSubscriptionName); + propertyMapper.from(this.processor.getMaxAutoLockRenewDuration()).always().to(properties::setMaxAutoLockRenewDuration); + propertyMapper.from(this.processor.getMaxConcurrentCalls()).always().to(properties::setMaxConcurrentCalls); + propertyMapper.from(this.processor.getMaxConcurrentSessions()).always().to(properties::setMaxConcurrentSessions); return properties; } From b2e5e8b5af1082da3cc64cbcb7ffb8997b8506ac Mon Sep 17 00:00:00 2001 From: muyao Date: Tue, 18 Nov 2025 10:47:57 +0800 Subject: [PATCH 17/76] replace with spring-boot-data-redis --- eng/versioning/external_dependencies.txt | 2 +- .../spring-cloud-azure-autoconfigure/pom.xml | 8 ++++---- .../AzureLettucePasswordlessAutoConfiguration.java | 12 ++++++------ .../redis/AzureRedisAutoConfiguration.java | 14 +++++++------- .../redis/AzureRedisAutoConfigurationTests.java | 12 ++++++------ 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index bddc2836a002..9f094ddee82d 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -386,7 +386,7 @@ springboot3_org.springframework.cloud:spring-cloud-starter-stream-kafka;4.3.0 springboot3_org.springframework.cloud:spring-cloud-stream-test-binder;4.3.0 springboot3_org.springframework.cloud:spring-cloud-stream;4.3.0 springboot3_org.springframework.data:spring-data-commons;3.5.3 -springboot3_org.springframework.data:spring-data-redis;3.5.3 +springboot3_org.springframework.boot:spring-boot-data-redis;4.0.0-RC2 springboot3_org.springframework.integration:spring-integration-core;7.0.0-RC2 springboot3_org.springframework.boot:spring-boot-kafka;4.0.0-RC2 springboot3_org.springframework.retry:spring-retry;2.0.12 diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml index 21c2f79f1b19..613c87128a76 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml +++ b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml @@ -104,9 +104,9 @@ true - org.springframework.data - spring-data-redis - 3.5.3 + org.springframework.boot + spring-boot-data-redis + 4.0.0-RC2 true @@ -560,7 +560,7 @@ org.springframework.boot:spring-boot-autoconfigure:[4.0.0-RC2] org.springframework.boot:spring-boot-configuration-processor:[4.0.0-RC2] org.springframework.cloud:spring-cloud-starter-stream-kafka:[4.3.0] - org.springframework.data:spring-data-redis:[3.5.3] + org.springframework.data:spring-boot-data-redis:[4.0.0-RC2] org.springframework.kafka:spring-boot-kafka:[4.0.0-RC2] org.springframework.security:spring-security-config:[6.5.3] org.springframework.security:spring-security-oauth2-client:[6.5.3] diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/data/redis/AzureLettucePasswordlessAutoConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/data/redis/AzureLettucePasswordlessAutoConfiguration.java index e10df681b455..940c7d30dbf1 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/data/redis/AzureLettucePasswordlessAutoConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/data/redis/AzureLettucePasswordlessAutoConfiguration.java @@ -16,9 +16,9 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.autoconfigure.data.redis.LettuceClientConfigurationBuilderCustomizer; -import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration; -import org.springframework.boot.autoconfigure.data.redis.RedisProperties; +import org.springframework.boot.data.redis.autoconfigure.LettuceClientConfigurationBuilderCustomizer; +import org.springframework.boot.data.redis.autoconfigure.DataRedisAutoConfiguration; +import org.springframework.boot.data.redis.autoconfigure.DataRedisProperties; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -38,9 +38,9 @@ @Configuration(proxyBeanMethods = false) @ConditionalOnClass({LettuceConnection.class, RedisCredentials.class}) @ConditionalOnExpression("${spring.data.redis.azure.passwordless-enabled:false}") -@AutoConfigureBefore(RedisAutoConfiguration.class) +@AutoConfigureBefore(DataRedisAutoConfiguration.class) @ConditionalOnProperty(prefix = "spring.data.redis", name = {"host"}) -@EnableConfigurationProperties(RedisProperties.class) +@EnableConfigurationProperties(DataRedisProperties.class) public class AzureLettucePasswordlessAutoConfiguration { @Bean @@ -51,7 +51,7 @@ AzureRedisPasswordlessProperties redisPasswordlessProperties() { @Bean(name = "azureRedisCredentials") @ConditionalOnMissingBean - AzureRedisCredentials azureRedisCredentials(RedisProperties redisProperties, + AzureRedisCredentials azureRedisCredentials(DataRedisProperties redisProperties, AzureRedisPasswordlessProperties azureRedisPasswordlessProperties, AzureGlobalProperties azureGlobalProperties) { AzureRedisPasswordlessProperties redisPasswordlessProperties = mergeAzureProperties(azureGlobalProperties, azureRedisPasswordlessProperties); diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/redis/AzureRedisAutoConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/redis/AzureRedisAutoConfiguration.java index f43140b3a612..92521c68c3e6 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/redis/AzureRedisAutoConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/redis/AzureRedisAutoConfiguration.java @@ -13,7 +13,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.autoconfigure.data.redis.RedisProperties; +import org.springframework.boot.data.redis.autoconfigure.DataRedisProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -41,7 +41,7 @@ public class AzureRedisAutoConfiguration { @Primary @Bean - RedisProperties redisProperties(AzureRedisProperties azureRedisProperties, + DataRedisProperties redisProperties(AzureRedisProperties azureRedisProperties, AzureResourceManager azureResourceManager) throws InvocationTargetException, IllegalAccessException { String cacheName = azureRedisProperties.getName(); @@ -50,7 +50,7 @@ RedisProperties redisProperties(AzureRedisProperties azureRedisProperties, RedisCache redisCache = azureResourceManager.redisCaches() .getByResourceGroup(resourceGroup, cacheName); - RedisProperties redisProperties = new RedisProperties(); + DataRedisProperties redisProperties = new DataRedisProperties(); boolean useSsl = !redisCache.nonSslPort(); int port = useSsl ? redisCache.sslPort() : redisCache.port(); @@ -58,7 +58,7 @@ RedisProperties redisProperties(AzureRedisProperties azureRedisProperties, boolean isCluster = redisCache.shardCount() > 0; if (isCluster) { - RedisProperties.Cluster cluster = new RedisProperties.Cluster(); + DataRedisProperties.Cluster cluster = new DataRedisProperties.Cluster(); cluster.setNodes(Arrays.asList(redisCache.hostname() + ":" + port)); redisProperties.setCluster(cluster); } else { @@ -67,10 +67,10 @@ RedisProperties redisProperties(AzureRedisProperties azureRedisProperties, } redisProperties.setPassword(redisCache.keys().primaryKey()); - Method setSsl = ReflectionUtils.findMethod(RedisProperties.class, "setSsl", boolean.class); + Method setSsl = ReflectionUtils.findMethod(DataRedisProperties.class, "setSsl", boolean.class); if (setSsl == null) { - Object ssl = ReflectionUtils.findMethod(RedisProperties.class, "getSsl").invoke(redisProperties); - Class[] innerClasses = RedisProperties.class.getDeclaredClasses(); + Object ssl = ReflectionUtils.findMethod(DataRedisProperties.class, "getSsl").invoke(redisProperties); + Class[] innerClasses = DataRedisProperties.class.getDeclaredClasses(); Class targetInnerClass = null; for (Class innerClass : innerClasses) { if (innerClass.getSimpleName().equals("Ssl")) { diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/redis/AzureRedisAutoConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/redis/AzureRedisAutoConfigurationTests.java index 4ee0959d4f53..de666b3ecf9c 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/redis/AzureRedisAutoConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/redis/AzureRedisAutoConfigurationTests.java @@ -10,7 +10,7 @@ import com.azure.spring.cloud.autoconfigure.implementation.redis.properties.AzureRedisProperties; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.autoconfigure.data.redis.RedisProperties; +import org.springframework.boot.data.redis.autoconfigure.DataRedisProperties; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.data.redis.core.RedisOperations; @@ -105,15 +105,15 @@ void shouldConfigureWithNameAndResourceGroupAndResourceManager() { assertThat(azureRedisProperties.getName()).isEqualTo("redis"); assertThat(azureRedisProperties.getResource().getResourceGroup()).isEqualTo("rg"); - assertThat(context).hasSingleBean(RedisProperties.class); - RedisProperties redisProperties = context.getBean(RedisProperties.class); + assertThat(context).hasSingleBean(DataRedisProperties.class); + DataRedisProperties redisProperties = context.getBean(DataRedisProperties.class); assertThat(redisProperties.getPassword()).isEqualTo(KEY); assertThat(redisProperties.getHost()).isEqualTo(HOST); assertThat(redisProperties.getPort()).isEqualTo(PORT); - Method isSsl = ReflectionUtils.findMethod(RedisProperties.class, "isSsl"); + Method isSsl = ReflectionUtils.findMethod(DataRedisProperties.class, "isSsl"); if (isSsl == null) { - Object ssl = ReflectionUtils.findMethod(RedisProperties.class, "getSsl").invoke(redisProperties); - Class[] innerClasses = RedisProperties.class.getDeclaredClasses(); + Object ssl = ReflectionUtils.findMethod(DataRedisProperties.class, "getSsl").invoke(redisProperties); + Class[] innerClasses = DataRedisProperties.class.getDeclaredClasses(); Class targetInnerClass = null; for (Class innerClass : innerClasses) { if (innerClass.getSimpleName().equals("Ssl")) { From d4ba1b47fd8cfdf09049cbf5a0d9f4c6edb10830 Mon Sep 17 00:00:00 2001 From: muyao Date: Tue, 18 Nov 2025 11:07:07 +0800 Subject: [PATCH 18/76] replace with spring-boot-jms --- eng/versioning/external_dependencies.txt | 2 +- sdk/spring/spring-cloud-azure-autoconfigure/pom.xml | 8 ++++---- .../jms/ServiceBusJmsAutoConfiguration.java | 4 ++-- .../jms/ServiceBusJmsConnectionFactoryConfiguration.java | 4 ++-- .../jms/ServiceBusJmsContainerConfiguration.java | 2 +- .../jms/properties/AzureServiceBusJmsProperties.java | 2 +- .../jms/ServiceBusJmsAutoConfigurationTests.java | 6 +++--- .../ServiceBusJmsConnectionFactoryConfigurationTests.java | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index 9f094ddee82d..65c41fb065e3 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -402,7 +402,7 @@ springboot3_org.springframework:spring-core-test;7.0.0-RC3 springboot3_org.springframework:spring-core;7.0.0-RC3 springboot3_org.springframework:spring-expression;7.0.0-RC3 springboot3_org.springframework:spring-jdbc;7.0.0-RC3 -springboot3_org.springframework:spring-jms;7.0.0-RC3 +springboot3_org.springframework.boot:spring-boot-jms;4.0.0-RC2 springboot3_org.springframework:spring-messaging;7.0.0-RC3 springboot3_org.springframework:spring-test;7.0.0-RC3 springboot3_org.springframework:spring-tx;7.0.0-RC3 diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml index 613c87128a76..8d8559f64e95 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml +++ b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml @@ -126,9 +126,9 @@ - org.springframework - spring-jms - 7.0.0-RC3 + org.springframework.boot + spring-boot-jms + 4.0.0-RC2 true @@ -568,7 +568,7 @@ org.springframework.security:spring-security-oauth2-resource-server:[6.5.3] org.springframework:spring-context-support:[7.0.0-RC3] org.springframework:spring-jdbc:[7.0.0-RC3] - org.springframework:spring-jms:[7.0.0-RC3] + org.springframework.boot:spring-boot-jms:[4.0.0-RC2] org.springframework:spring-tx:[7.0.0-RC3] diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsAutoConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsAutoConfiguration.java index 5642251af150..16dd582f6311 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsAutoConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsAutoConfiguration.java @@ -20,8 +20,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.autoconfigure.jms.JmsAutoConfiguration; -import org.springframework.boot.autoconfigure.jms.JndiConnectionFactoryAutoConfiguration; +import org.springframework.boot.jms.autoconfigure.JmsAutoConfiguration; +import org.springframework.boot.jms.autoconfigure.JndiConnectionFactoryAutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsConnectionFactoryConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsConnectionFactoryConfiguration.java index 53e4b15b4f50..678d055d3c3e 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsConnectionFactoryConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsConnectionFactoryConfiguration.java @@ -14,8 +14,8 @@ import org.springframework.beans.factory.ObjectProvider; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.BeanDefinitionRegistry; -import org.springframework.boot.autoconfigure.jms.JmsPoolConnectionFactoryFactory; -import org.springframework.boot.autoconfigure.jms.JmsProperties; +import org.springframework.boot.jms.autoconfigure.JmsPoolConnectionFactoryFactory; +import org.springframework.boot.jms.autoconfigure.JmsProperties; import org.springframework.boot.context.properties.bind.BindResult; import org.springframework.boot.context.properties.bind.Binder; import org.springframework.context.EnvironmentAware; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsContainerConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsContainerConfiguration.java index 1e0cc92b9f60..82bff9332874 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsContainerConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsContainerConfiguration.java @@ -7,7 +7,7 @@ import jakarta.jms.ConnectionFactory; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.boot.autoconfigure.jms.DefaultJmsListenerContainerFactoryConfigurer; +import org.springframework.boot.jms.autoconfigure.DefaultJmsListenerContainerFactoryConfigurer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.jms.annotation.EnableJms; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jms/properties/AzureServiceBusJmsProperties.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jms/properties/AzureServiceBusJmsProperties.java index 4731890b14d4..7bedd219a565 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jms/properties/AzureServiceBusJmsProperties.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jms/properties/AzureServiceBusJmsProperties.java @@ -7,7 +7,7 @@ import com.azure.spring.cloud.autoconfigure.implementation.properties.core.profile.AzureProfileConfigurationProperties; import com.azure.spring.cloud.core.properties.PasswordlessProperties; import org.springframework.beans.factory.InitializingBean; -import org.springframework.boot.autoconfigure.jms.JmsPoolConnectionFactoryProperties; +import org.springframework.boot.jms.autoconfigure.JmsPoolConnectionFactoryProperties; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.NestedConfigurationProperty; import org.springframework.jms.support.QosSettings; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsAutoConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsAutoConfigurationTests.java index 85d2cb7dda4c..5a238e70c5a4 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsAutoConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsAutoConfigurationTests.java @@ -16,9 +16,9 @@ import org.junit.jupiter.params.provider.ValueSource; import org.messaginghub.pooled.jms.JmsPoolConnectionFactory; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.autoconfigure.jms.DefaultJmsListenerContainerFactoryConfigurer; -import org.springframework.boot.autoconfigure.jms.JmsAutoConfiguration; -import org.springframework.boot.autoconfigure.jms.JmsProperties; +import org.springframework.boot.jms.autoconfigure.DefaultJmsListenerContainerFactoryConfigurer; +import org.springframework.boot.jms.autoconfigure.JmsAutoConfiguration; +import org.springframework.boot.jms.autoconfigure.JmsProperties; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.assertj.AssertableApplicationContext; import org.springframework.boot.test.context.runner.ApplicationContextRunner; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsConnectionFactoryConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsConnectionFactoryConfigurationTests.java index 10c9fe284a21..435bace46734 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsConnectionFactoryConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsConnectionFactoryConfigurationTests.java @@ -9,7 +9,7 @@ import org.junit.jupiter.params.provider.ValueSource; import org.messaginghub.pooled.jms.JmsPoolConnectionFactory; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.autoconfigure.jms.JmsAutoConfiguration; +import org.springframework.boot.jms.autoconfigure.JmsAutoConfiguration; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.context.annotation.Configuration; From 1a3185d35776b0cf0ca76b6223dcfd2a59f7e0c4 Mon Sep 17 00:00:00 2001 From: muyao Date: Tue, 18 Nov 2025 11:08:27 +0800 Subject: [PATCH 19/76] replace with --- sdk/spring/spring-cloud-azure-autoconfigure/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml index 8d8559f64e95..66d4d2eb2d90 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml +++ b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml @@ -106,7 +106,7 @@ org.springframework.boot spring-boot-data-redis - 4.0.0-RC2 + 4.0.0-RC2 true @@ -560,8 +560,8 @@ org.springframework.boot:spring-boot-autoconfigure:[4.0.0-RC2] org.springframework.boot:spring-boot-configuration-processor:[4.0.0-RC2] org.springframework.cloud:spring-cloud-starter-stream-kafka:[4.3.0] - org.springframework.data:spring-boot-data-redis:[4.0.0-RC2] - org.springframework.kafka:spring-boot-kafka:[4.0.0-RC2] + org.springframework.boot:spring-boot-data-redis:[4.0.0-RC2] + org.springframework.boot:spring-boot-kafka:[4.0.0-RC2] org.springframework.security:spring-security-config:[6.5.3] org.springframework.security:spring-security-oauth2-client:[6.5.3] org.springframework.security:spring-security-oauth2-jose:[6.5.3] From 351b34157b063939a13b175a6e1147d43d6a1d93 Mon Sep 17 00:00:00 2001 From: muyao Date: Tue, 18 Nov 2025 13:26:20 +0800 Subject: [PATCH 20/76] replace with spring-boot-jdbc --- eng/versioning/external_dependencies.txt | 2 +- .../spring-cloud-azure-autoconfigure/pom.xml | 17 +++++++++-------- .../jdbc/AzureJdbcAutoConfiguration.java | 4 ++-- .../jdbc/JdbcPropertiesBeanPostProcessor.java | 2 +- .../AbstractAzureJdbcAutoConfigurationTest.java | 4 ++-- .../JdbcPropertiesBeanPostProcessorTest.java | 2 +- ...ocessorWithApplicationContextRunnerTest.java | 2 +- .../MySqlAzureJdbcAutoConfigurationTest.java | 2 +- ...ostgreSqlAzureJdbcAutoConfigurationTest.java | 2 +- 9 files changed, 19 insertions(+), 18 deletions(-) diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index 65c41fb065e3..12dc07411b54 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -401,7 +401,7 @@ springboot3_org.springframework:spring-context;7.0.0-RC3 springboot3_org.springframework:spring-core-test;7.0.0-RC3 springboot3_org.springframework:spring-core;7.0.0-RC3 springboot3_org.springframework:spring-expression;7.0.0-RC3 -springboot3_org.springframework:spring-jdbc;7.0.0-RC3 +springboot3_org.springframework.boot:spring-boot-jdbc;4.0.0-RC2 springboot3_org.springframework.boot:spring-boot-jms;4.0.0-RC2 springboot3_org.springframework:spring-messaging;7.0.0-RC3 springboot3_org.springframework:spring-test;7.0.0-RC3 diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml index 66d4d2eb2d90..5ae1cf39ef56 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml +++ b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml @@ -154,6 +154,14 @@ + + + org.springframework.boot + spring-boot-jdbc + 4.0.0-RC2 + true + + @@ -477,13 +485,6 @@ test - - org.springframework - spring-jdbc - 7.0.0-RC3 - test - - @@ -567,7 +568,7 @@ org.springframework.security:spring-security-oauth2-jose:[6.5.3] org.springframework.security:spring-security-oauth2-resource-server:[6.5.3] org.springframework:spring-context-support:[7.0.0-RC3] - org.springframework:spring-jdbc:[7.0.0-RC3] + org.springframework.boot:spring-boot-jdbc:[4.0.0-RC2] org.springframework.boot:spring-boot-jms:[4.0.0-RC2] org.springframework:spring-tx:[7.0.0-RC3] diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/AzureJdbcAutoConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/AzureJdbcAutoConfiguration.java index ac381ec55213..737bef6c12c3 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/AzureJdbcAutoConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/AzureJdbcAutoConfiguration.java @@ -8,8 +8,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; -import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; +import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration; +import org.springframework.boot.jdbc.autoconfigure.DataSourceProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/JdbcPropertiesBeanPostProcessor.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/JdbcPropertiesBeanPostProcessor.java index fe160a3e071b..69b0feb1f19f 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/JdbcPropertiesBeanPostProcessor.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/JdbcPropertiesBeanPostProcessor.java @@ -11,7 +11,7 @@ import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.BeanPostProcessor; -import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; +import org.springframework.boot.jdbc.autoconfigure.DataSourceProperties; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.bind.Binder; import org.springframework.context.ApplicationContext; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/AbstractAzureJdbcAutoConfigurationTest.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/AbstractAzureJdbcAutoConfigurationTest.java index 3937d0aeb9b0..f978f80b60c8 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/AbstractAzureJdbcAutoConfigurationTest.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/AbstractAzureJdbcAutoConfigurationTest.java @@ -15,8 +15,8 @@ import org.mockito.MockedStatic; import org.mockito.Mockito; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; -import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; +import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration; +import org.springframework.boot.jdbc.autoconfigure.DataSourceProperties; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.context.ApplicationContext; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/JdbcPropertiesBeanPostProcessorTest.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/JdbcPropertiesBeanPostProcessorTest.java index b9d54f3beef1..f32493eba87a 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/JdbcPropertiesBeanPostProcessorTest.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/JdbcPropertiesBeanPostProcessorTest.java @@ -15,7 +15,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; +import org.springframework.boot.jdbc.autoconfigure.DataSourceProperties; import org.springframework.context.ApplicationContext; import org.springframework.context.support.GenericApplicationContext; import org.springframework.mock.env.MockEnvironment; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/JdbcPropertiesBeanPostProcessorWithApplicationContextRunnerTest.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/JdbcPropertiesBeanPostProcessorWithApplicationContextRunnerTest.java index 67b662f44ff8..238cf4b10bdd 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/JdbcPropertiesBeanPostProcessorWithApplicationContextRunnerTest.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/JdbcPropertiesBeanPostProcessorWithApplicationContextRunnerTest.java @@ -11,7 +11,7 @@ import com.azure.spring.cloud.autoconfigure.implementation.passwordless.properties.AzureJdbcPasswordlessProperties; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; +import org.springframework.boot.jdbc.autoconfigure.DataSourceProperties; import org.springframework.boot.context.properties.bind.Binder; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.runner.ApplicationContextRunner; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/MySqlAzureJdbcAutoConfigurationTest.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/MySqlAzureJdbcAutoConfigurationTest.java index 80b0c216784c..3e92815771e9 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/MySqlAzureJdbcAutoConfigurationTest.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/MySqlAzureJdbcAutoConfigurationTest.java @@ -6,7 +6,7 @@ import com.azure.identity.extensions.implementation.enums.AuthProperty; import com.azure.spring.cloud.core.implementation.util.AzureSpringIdentifier; import com.azure.spring.cloud.service.implementation.identity.credential.provider.SpringTokenCredentialProvider; -import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; +import org.springframework.boot.jdbc.autoconfigure.DataSourceProperties; import org.springframework.boot.test.context.FilteredClassLoader; import static com.azure.spring.cloud.autoconfigure.implementation.jdbc.JdbcPropertiesBeanPostProcessorTest.MANAGED_IDENTITY_ENABLED_DEFAULT; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/PostgreSqlAzureJdbcAutoConfigurationTest.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/PostgreSqlAzureJdbcAutoConfigurationTest.java index 7ec7353b962e..3ebb45bd2255 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/PostgreSqlAzureJdbcAutoConfigurationTest.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/PostgreSqlAzureJdbcAutoConfigurationTest.java @@ -6,7 +6,7 @@ import com.azure.identity.extensions.implementation.enums.AuthProperty; import com.azure.spring.cloud.core.implementation.util.AzureSpringIdentifier; import com.azure.spring.cloud.service.implementation.identity.credential.provider.SpringTokenCredentialProvider; -import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; +import org.springframework.boot.jdbc.autoconfigure.DataSourceProperties; import org.springframework.boot.test.context.FilteredClassLoader; import static com.azure.spring.cloud.autoconfigure.implementation.jdbc.JdbcPropertiesBeanPostProcessorTest.MANAGED_IDENTITY_ENABLED_DEFAULT; From 7895c09e865ae2a13b73b5d860496234e129b46d Mon Sep 17 00:00:00 2001 From: muyao Date: Tue, 18 Nov 2025 14:42:15 +0800 Subject: [PATCH 21/76] add spring-boot-restclient --- eng/versioning/external_dependencies.txt | 1 + .../spring-cloud-azure-autoconfigure/pom.xml | 15 ++++++++++++--- .../AadAuthenticationFilterAutoConfiguration.java | 2 +- .../AadOAuth2ClientConfiguration.java | 2 +- .../AadResourceServerConfiguration.java | 2 +- .../AadWebApplicationConfiguration.java | 2 +- .../aad/filter/AadAuthenticationFilter.java | 2 +- .../implementation/aad/filter/AadGraphClient.java | 2 +- .../aad/security/AadOAuth2UserService.java | 2 +- .../AadWebApplicationHttpSecurityConfigurer.java | 2 +- .../aad/security/graph/GraphClient.java | 2 +- .../jose/RestOperationsResourceRetriever.java | 2 +- .../aad/security/jwt/AadIssuerJwsKeySelector.java | 2 +- .../aad/utils/AadRestTemplateCreator.java | 2 +- .../configuration/AadB2cAutoConfiguration.java | 2 +- .../AadB2cOAuth2ClientConfiguration.java | 2 +- .../AadB2cResourceServerAutoConfiguration.java | 2 +- .../security/AadB2cOidcLoginConfigurer.java | 2 +- .../aad/WebApplicationContextRunnerUtils.java | 2 +- .../AadOAuth2ClientConfigurationTests.java | 2 +- .../AadResourceServerConfigurationTests.java | 2 +- .../AadWebApplicationConfigurationTests.java | 2 +- .../aad/filter/AadAuthenticationFilterTests.java | 4 ++-- .../aad/filter/AadGraphClientTests.java | 2 +- .../aad/filter/ResourceRetrieverTests.java | 2 +- .../filter/UserPrincipalMicrosoftGraphTests.java | 2 +- .../AadAccessTokenGroupRolesExtractionTests.java | 2 +- ...th2UserServiceIdTokenRolesExtractionTests.java | 2 +- .../aad/utils/AadRestTemplateCreatorTest.java | 4 ++-- .../AadB2cAutoConfigurationTests.java | 2 +- ...adB2cResourceServerAutoConfigurationTests.java | 2 +- .../AadB2cAuthorizationRequestResolverTests.java | 2 +- 32 files changed, 45 insertions(+), 35 deletions(-) diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index 12dc07411b54..948d6a069352 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -403,6 +403,7 @@ springboot3_org.springframework:spring-core;7.0.0-RC3 springboot3_org.springframework:spring-expression;7.0.0-RC3 springboot3_org.springframework.boot:spring-boot-jdbc;4.0.0-RC2 springboot3_org.springframework.boot:spring-boot-jms;4.0.0-RC2 +springboot3_org.springframework.boot:spring-boot-restclient;4.0.0-RC2 springboot3_org.springframework:spring-messaging;7.0.0-RC3 springboot3_org.springframework:spring-test;7.0.0-RC3 springboot3_org.springframework:spring-tx;7.0.0-RC3 diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml index 5ae1cf39ef56..cf8bd587c4b6 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml +++ b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml @@ -162,6 +162,14 @@ true + + + org.springframework.boot + spring-boot-restclient + 4.0.0-RC2 + true + + @@ -560,16 +568,17 @@ org.springframework.boot:spring-boot-actuator-autoconfigure:[4.0.0-RC2] org.springframework.boot:spring-boot-autoconfigure:[4.0.0-RC2] org.springframework.boot:spring-boot-configuration-processor:[4.0.0-RC2] - org.springframework.cloud:spring-cloud-starter-stream-kafka:[4.3.0] org.springframework.boot:spring-boot-data-redis:[4.0.0-RC2] org.springframework.boot:spring-boot-kafka:[4.0.0-RC2] + org.springframework.boot:spring-boot-jdbc:[4.0.0-RC2] + org.springframework.boot:spring-boot-jms:[4.0.0-RC2] + org.springframework.boot:spring-boot-restclient:[4.0.0-RC2] + org.springframework.cloud:spring-cloud-starter-stream-kafka:[4.3.0] org.springframework.security:spring-security-config:[6.5.3] org.springframework.security:spring-security-oauth2-client:[6.5.3] org.springframework.security:spring-security-oauth2-jose:[6.5.3] org.springframework.security:spring-security-oauth2-resource-server:[6.5.3] org.springframework:spring-context-support:[7.0.0-RC3] - org.springframework.boot:spring-boot-jdbc:[4.0.0-RC2] - org.springframework.boot:spring-boot-jms:[4.0.0-RC2] org.springframework:spring-tx:[7.0.0-RC3] diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadAuthenticationFilterAutoConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadAuthenticationFilterAutoConfiguration.java index 651a0cee6eff..38bf21cf8ee0 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadAuthenticationFilterAutoConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadAuthenticationFilterAutoConfiguration.java @@ -19,7 +19,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadOAuth2ClientConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadOAuth2ClientConfiguration.java index 421b0cd6d7cc..6f99b6491cfa 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadOAuth2ClientConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadOAuth2ClientConfiguration.java @@ -18,7 +18,7 @@ import com.azure.spring.cloud.autoconfigure.implementation.aad.configuration.properties.AadProfileProperties; import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadResourceServerConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadResourceServerConfiguration.java index 671b8f9bb457..9315d4d16e99 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadResourceServerConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadResourceServerConfiguration.java @@ -13,7 +13,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.security.ConditionalOnDefaultWebSecurity; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadWebApplicationConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadWebApplicationConfiguration.java index 4771c94a0863..5c74241c7fb2 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadWebApplicationConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadWebApplicationConfiguration.java @@ -9,7 +9,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.security.ConditionalOnDefaultWebSecurity; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/AadAuthenticationFilter.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/AadAuthenticationFilter.java index 0d5460f2d010..d1d55f186b2f 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/AadAuthenticationFilter.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/AadAuthenticationFilter.java @@ -19,7 +19,7 @@ import jakarta.servlet.http.HttpSession; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.security.core.Authentication; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/AadGraphClient.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/AadGraphClient.java index 294cf4e28bfe..fe52cb63f35b 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/AadGraphClient.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/AadGraphClient.java @@ -19,7 +19,7 @@ import com.microsoft.aad.msal4j.UserAssertion; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2UserService.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2UserService.java index 580170847f8e..cf6b4ae37088 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2UserService.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2UserService.java @@ -11,7 +11,7 @@ import jakarta.servlet.http.HttpSession; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.security.core.Authentication; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadWebApplicationHttpSecurityConfigurer.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadWebApplicationHttpSecurityConfigurer.java index 61f65944f10b..f332ca3a0959 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadWebApplicationHttpSecurityConfigurer.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadWebApplicationHttpSecurityConfigurer.java @@ -6,7 +6,7 @@ import com.azure.spring.cloud.autoconfigure.implementation.aad.configuration.properties.AadAuthenticationProperties; import jakarta.servlet.Filter; import org.springframework.beans.factory.ObjectProvider; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.context.ApplicationContext; import org.springframework.core.ResolvableType; import org.springframework.security.config.annotation.SecurityConfigurer; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/graph/GraphClient.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/graph/GraphClient.java index ed6e55e2961e..422fee37c3ae 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/graph/GraphClient.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/graph/GraphClient.java @@ -6,7 +6,7 @@ import com.azure.spring.cloud.autoconfigure.implementation.aad.configuration.properties.AadAuthenticationProperties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/jose/RestOperationsResourceRetriever.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/jose/RestOperationsResourceRetriever.java index e8baacc407ac..89a2b6529a74 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/jose/RestOperationsResourceRetriever.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/jose/RestOperationsResourceRetriever.java @@ -5,7 +5,7 @@ import com.nimbusds.jose.util.Resource; import com.nimbusds.jose.util.ResourceRetriever; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.MediaType; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/jwt/AadIssuerJwsKeySelector.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/jwt/AadIssuerJwsKeySelector.java index 366013d1e508..debef6484e4c 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/jwt/AadIssuerJwsKeySelector.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/jwt/AadIssuerJwsKeySelector.java @@ -14,7 +14,7 @@ import com.nimbusds.jose.util.ResourceRetriever; import com.nimbusds.jwt.JWTClaimsSet; import com.nimbusds.jwt.proc.JWTClaimsSetAwareJWSKeySelector; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.web.client.RestOperations; import java.net.URL; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/utils/AadRestTemplateCreator.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/utils/AadRestTemplateCreator.java index ffdd2ee2d5b4..bdd95b5c6aad 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/utils/AadRestTemplateCreator.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/utils/AadRestTemplateCreator.java @@ -3,7 +3,7 @@ package com.azure.spring.cloud.autoconfigure.implementation.aad.utils; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.http.converter.FormHttpMessageConverter; import org.springframework.security.oauth2.client.http.OAuth2ErrorResponseErrorHandler; import org.springframework.security.oauth2.core.http.converter.OAuth2AccessTokenResponseHttpMessageConverter; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cAutoConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cAutoConfiguration.java index ae577e16a327..f4a3efa4a038 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cAutoConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cAutoConfiguration.java @@ -11,7 +11,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cOAuth2ClientConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cOAuth2ClientConfiguration.java index 75d4b5f174d1..cd54f3b9ddcd 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cOAuth2ClientConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cOAuth2ClientConfiguration.java @@ -13,7 +13,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cResourceServerAutoConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cResourceServerAutoConfiguration.java index 11030fd55ac0..a35b2c75065a 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cResourceServerAutoConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cResourceServerAutoConfiguration.java @@ -19,7 +19,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/security/AadB2cOidcLoginConfigurer.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/security/AadB2cOidcLoginConfigurer.java index ad0617029ec7..f39128a972a4 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/security/AadB2cOidcLoginConfigurer.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/security/AadB2cOidcLoginConfigurer.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. package com.azure.spring.cloud.autoconfigure.implementation.aadb2c.security; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; import org.springframework.security.oauth2.client.endpoint.DefaultAuthorizationCodeTokenResponseClient; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/WebApplicationContextRunnerUtils.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/WebApplicationContextRunnerUtils.java index 70abdf1b0b78..133ef3c34812 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/WebApplicationContextRunnerUtils.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/WebApplicationContextRunnerUtils.java @@ -8,7 +8,7 @@ import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration; import org.springframework.boot.autoconfigure.logging.ConditionEvaluationReportLoggingListener; -import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration; +import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.runner.WebApplicationContextRunner; import org.springframework.http.HttpEntity; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadOAuth2ClientConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadOAuth2ClientConfigurationTests.java index cfa6d65b5604..3a6803224d73 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadOAuth2ClientConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadOAuth2ClientConfigurationTests.java @@ -14,7 +14,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration; -import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration; +import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration; import org.springframework.boot.test.context.runner.WebApplicationContextRunner; import org.springframework.core.convert.converter.Converter; import org.springframework.security.oauth2.client.JwtBearerOAuth2AuthorizedClientProvider; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadResourceServerConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadResourceServerConfigurationTests.java index 62dba94aef8b..651284942a0a 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadResourceServerConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadResourceServerConfigurationTests.java @@ -11,7 +11,7 @@ import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration; import org.springframework.boot.autoconfigure.logging.ConditionEvaluationReportLoggingListener; -import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration; +import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration; import org.springframework.boot.logging.LogLevel; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.runner.WebApplicationContextRunner; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadWebApplicationConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadWebApplicationConfigurationTests.java index 2a6af88ca741..8bfd0f5d975f 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadWebApplicationConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadWebApplicationConfigurationTests.java @@ -8,7 +8,7 @@ import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration; import org.springframework.boot.autoconfigure.logging.ConditionEvaluationReportLoggingListener; -import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration; +import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration; import org.springframework.boot.logging.LogLevel; import org.springframework.boot.test.context.runner.WebApplicationContextRunner; import org.springframework.context.annotation.Bean; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/AadAuthenticationFilterTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/AadAuthenticationFilterTests.java index 26382c1c8ba8..9452018aefe1 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/AadAuthenticationFilterTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/AadAuthenticationFilterTests.java @@ -19,9 +19,9 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration; -import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration; +import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration; import org.springframework.boot.test.context.runner.ApplicationContextRunner; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.security.core.Authentication; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.context.SecurityContext; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/AadGraphClientTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/AadGraphClientTests.java index c4e7c3c16130..acb5edb353f6 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/AadGraphClientTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/AadGraphClientTests.java @@ -8,7 +8,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mock; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/ResourceRetrieverTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/ResourceRetrieverTests.java index 8e369f8769f3..8441ac9b3d58 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/ResourceRetrieverTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/ResourceRetrieverTests.java @@ -10,7 +10,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration; -import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration; +import org.springframework.boot..restclient.autoconfigure.RestTemplateAutoConfiguration; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.runner.WebApplicationContextRunner; import org.springframework.security.oauth2.server.resource.authentication.BearerTokenAuthenticationToken; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/UserPrincipalMicrosoftGraphTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/UserPrincipalMicrosoftGraphTests.java index b4189a50f2bb..aa31ed3bb442 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/UserPrincipalMicrosoftGraphTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/UserPrincipalMicrosoftGraphTests.java @@ -14,7 +14,7 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadAccessTokenGroupRolesExtractionTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadAccessTokenGroupRolesExtractionTests.java index a487765d93e0..0251103a61e3 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadAccessTokenGroupRolesExtractionTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadAccessTokenGroupRolesExtractionTests.java @@ -13,7 +13,7 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.security.oauth2.core.OAuth2AccessToken; import java.util.ArrayList; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2UserServiceIdTokenRolesExtractionTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2UserServiceIdTokenRolesExtractionTests.java index 1662e257a9c9..967a7d945a61 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2UserServiceIdTokenRolesExtractionTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2UserServiceIdTokenRolesExtractionTests.java @@ -5,7 +5,7 @@ import com.azure.spring.cloud.autoconfigure.implementation.aad.configuration.properties.AadAuthenticationProperties; import net.minidev.json.JSONArray; import org.junit.jupiter.api.Test; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.security.oauth2.core.oidc.OidcIdToken; import java.util.Collections; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/utils/AadRestTemplateCreatorTest.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/utils/AadRestTemplateCreatorTest.java index 01fa87d77254..203bcc663254 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/utils/AadRestTemplateCreatorTest.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/utils/AadRestTemplateCreatorTest.java @@ -5,9 +5,9 @@ import com.azure.spring.cloud.autoconfigure.implementation.aad.configuration.RestTemplateProxyCustomizerTestConfiguration; import org.junit.jupiter.api.Test; -import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration; +import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration; import org.springframework.boot.test.context.runner.ApplicationContextRunner; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cAutoConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cAutoConfigurationTests.java index 25982b9b01f4..800da6bc3865 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cAutoConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cAutoConfigurationTests.java @@ -19,7 +19,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration; -import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration; +import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.runner.WebApplicationContextRunner; import org.springframework.context.annotation.Bean; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cResourceServerAutoConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cResourceServerAutoConfigurationTests.java index c5374bf2133c..895bc84a8fb4 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cResourceServerAutoConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cResourceServerAutoConfigurationTests.java @@ -20,7 +20,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration; -import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration; +import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.runner.ContextConsumer; import org.springframework.boot.test.context.runner.WebApplicationContextRunner; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/security/AadB2cAuthorizationRequestResolverTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/security/AadB2cAuthorizationRequestResolverTests.java index 7f026ec54a90..b568d4b43d15 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/security/AadB2cAuthorizationRequestResolverTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/security/AadB2cAuthorizationRequestResolverTests.java @@ -11,7 +11,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration; -import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration; +import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.runner.WebApplicationContextRunner; import org.springframework.http.HttpMethod; From eab4621c65739120795cc9eaa59bc678ea3f5a0d Mon Sep 17 00:00:00 2001 From: muyao Date: Tue, 18 Nov 2025 15:21:02 +0800 Subject: [PATCH 22/76] add spring-boot-security --- eng/versioning/external_dependencies.txt | 1 + sdk/spring/spring-cloud-azure-autoconfigure/pom.xml | 8 ++++++++ .../aad/configuration/AadResourceServerConfiguration.java | 2 +- .../aad/configuration/AadWebApplicationConfiguration.java | 2 +- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index 948d6a069352..7bb29ee07d57 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -404,6 +404,7 @@ springboot3_org.springframework:spring-expression;7.0.0-RC3 springboot3_org.springframework.boot:spring-boot-jdbc;4.0.0-RC2 springboot3_org.springframework.boot:spring-boot-jms;4.0.0-RC2 springboot3_org.springframework.boot:spring-boot-restclient;4.0.0-RC2 +springboot3_org.springframework.boot:spring-boot-security;4.0.0-RC2 springboot3_org.springframework:spring-messaging;7.0.0-RC3 springboot3_org.springframework:spring-test;7.0.0-RC3 springboot3_org.springframework:spring-tx;7.0.0-RC3 diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml index cf8bd587c4b6..b2c16cec0ec2 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml +++ b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml @@ -170,6 +170,13 @@ true + + + org.springframework.boot + spring-boot-security + 4.0.0-RC2 + + @@ -573,6 +580,7 @@ org.springframework.boot:spring-boot-jdbc:[4.0.0-RC2] org.springframework.boot:spring-boot-jms:[4.0.0-RC2] org.springframework.boot:spring-boot-restclient:[4.0.0-RC2] + org.springframework.boot:spring-boot-security:[4.0.0-RC2] org.springframework.cloud:spring-cloud-starter-stream-kafka:[4.3.0] org.springframework.security:spring-security-config:[6.5.3] org.springframework.security:spring-security-oauth2-client:[6.5.3] diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadResourceServerConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadResourceServerConfiguration.java index 9315d4d16e99..94b43b0a0a45 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadResourceServerConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadResourceServerConfiguration.java @@ -12,7 +12,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.boot.autoconfigure.security.ConditionalOnDefaultWebSecurity; +import org.springframework.boot.security.autoconfigure.web.servlet.ConditionalOnDefaultWebSecurity; import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Conditional; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadWebApplicationConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadWebApplicationConfiguration.java index 5c74241c7fb2..fa86e54351c2 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadWebApplicationConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadWebApplicationConfiguration.java @@ -8,7 +8,7 @@ import com.azure.spring.cloud.autoconfigure.implementation.aad.security.AadOAuth2UserService; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.boot.autoconfigure.security.ConditionalOnDefaultWebSecurity; +import org.springframework.boot.security.autoconfigure.web.servlet.ConditionalOnDefaultWebSecurity; import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Conditional; From 89bd0f01b81c0b19c90274691fbb344fdb3f3074 Mon Sep 17 00:00:00 2001 From: muyao Date: Tue, 18 Nov 2025 16:20:19 +0800 Subject: [PATCH 23/76] add spring-boot-jackson --- eng/versioning/external_dependencies.txt | 1 + .../spring-cloud-azure-autoconfigure/pom.xml | 59 +++++-------------- ...ntHubsMessagingAutoConfigurationTests.java | 2 +- ...iceBusMessagingAutoConfigurationTests.java | 2 +- ...eQueueMessagingAutoConfigurationTests.java | 2 +- 5 files changed, 20 insertions(+), 46 deletions(-) diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index 7bb29ee07d57..140ee1843c56 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -401,6 +401,7 @@ springboot3_org.springframework:spring-context;7.0.0-RC3 springboot3_org.springframework:spring-core-test;7.0.0-RC3 springboot3_org.springframework:spring-core;7.0.0-RC3 springboot3_org.springframework:spring-expression;7.0.0-RC3 +springboot3_org.springframework.boot:spring-boot-jackson;4.0.0-RC2 springboot3_org.springframework.boot:spring-boot-jdbc;4.0.0-RC2 springboot3_org.springframework.boot:spring-boot-jms;4.0.0-RC2 springboot3_org.springframework.boot:spring-boot-restclient;4.0.0-RC2 diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml index b2c16cec0ec2..58ff30748eb1 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml +++ b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml @@ -175,6 +175,21 @@ org.springframework.boot spring-boot-security 4.0.0-RC2 + true + + + + + org.springframework.boot + spring-boot-jackson + 4.0.0-RC2 + true + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + 2.20.1 + true @@ -406,44 +421,6 @@ true - - - com.fasterxml.jackson.core - jackson-databind - 2.20.1 - true - - - com.fasterxml.jackson.core - jackson-core - 2.20.1 - true - - - com.fasterxml.jackson.core - jackson-annotations - 2.20 - true - - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - 2.20.1 - true - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - 2.20.1 - true - - - com.fasterxml.jackson.module - jackson-module-afterburner - 2.20.1 - true - - org.springframework.boot @@ -560,12 +537,7 @@ com.azure:azure-servicebus-jms:[2.0.0] com.mysql:mysql-connector-j:[9.4.0] - com.fasterxml.jackson.core:jackson-annotations:[2.20] - com.fasterxml.jackson.core:jackson-core:[2.20.1] - com.fasterxml.jackson.core:jackson-databind:[2.20.1] - com.fasterxml.jackson.dataformat:jackson-dataformat-xml:[2.20.1] com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.20.1] - com.fasterxml.jackson.module:jackson-module-afterburner:[2.20.1] io.lettuce:lettuce-core:[6.8.1.RELEASE] jakarta.servlet:jakarta.servlet-api:[6.1.0] jakarta.validation:jakarta.validation-api:[3.1.1] @@ -577,6 +549,7 @@ org.springframework.boot:spring-boot-configuration-processor:[4.0.0-RC2] org.springframework.boot:spring-boot-data-redis:[4.0.0-RC2] org.springframework.boot:spring-boot-kafka:[4.0.0-RC2] + org.springframework.boot:spring-boot-jackson:[4.0.0-RC2] org.springframework.boot:spring-boot-jdbc:[4.0.0-RC2] org.springframework.boot:spring-boot-jms:[4.0.0-RC2] org.springframework.boot:spring-boot-restclient:[4.0.0-RC2] diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/AzureEventHubsMessagingAutoConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/AzureEventHubsMessagingAutoConfigurationTests.java index eea8bec890b2..6dc0da517750 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/AzureEventHubsMessagingAutoConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/AzureEventHubsMessagingAutoConfigurationTests.java @@ -11,7 +11,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; +import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.runner.ApplicationContextRunner; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/servicebus/AzureServiceBusMessagingAutoConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/servicebus/AzureServiceBusMessagingAutoConfigurationTests.java index e1622836b4ad..35c89584c37e 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/servicebus/AzureServiceBusMessagingAutoConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/servicebus/AzureServiceBusMessagingAutoConfigurationTests.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; +import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.runner.ApplicationContextRunner; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/storage/AzureStorageQueueMessagingAutoConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/storage/AzureStorageQueueMessagingAutoConfigurationTests.java index 981d4cd400a1..46fe552e1d0e 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/storage/AzureStorageQueueMessagingAutoConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/storage/AzureStorageQueueMessagingAutoConfigurationTests.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; +import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.runner.ApplicationContextRunner; From 353b405edd5e7baba7f39777f4c909b190fc35d3 Mon Sep 17 00:00:00 2001 From: muyao Date: Tue, 18 Nov 2025 17:07:56 +0800 Subject: [PATCH 24/76] add spring-boot-http-converter --- eng/versioning/external_dependencies.txt | 1 + sdk/spring/spring-cloud-azure-autoconfigure/pom.xml | 7 +++++++ .../aad/WebApplicationContextRunnerUtils.java | 2 +- .../configuration/AadOAuth2ClientConfigurationTests.java | 2 +- .../configuration/AadResourceServerConfigurationTests.java | 2 +- .../configuration/AadWebApplicationConfigurationTests.java | 2 +- .../RestTemplateProxyCustomizerTestConfiguration.java | 2 +- .../aad/filter/AadAuthenticationFilterTests.java | 2 +- .../implementation/aad/filter/ResourceRetrieverTests.java | 4 ++-- .../aadb2c/configuration/AadB2cAutoConfigurationTests.java | 2 +- .../AadB2cResourceServerAutoConfigurationTests.java | 2 +- .../security/AadB2cAuthorizationRequestResolverTests.java | 2 +- 12 files changed, 19 insertions(+), 11 deletions(-) diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index 140ee1843c56..0a110cb10cb7 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -388,6 +388,7 @@ springboot3_org.springframework.cloud:spring-cloud-stream;4.3.0 springboot3_org.springframework.data:spring-data-commons;3.5.3 springboot3_org.springframework.boot:spring-boot-data-redis;4.0.0-RC2 springboot3_org.springframework.integration:spring-integration-core;7.0.0-RC2 +springboot3_org.springframework.boot:spring-boot-http-converter;4.0.0-RC2 springboot3_org.springframework.boot:spring-boot-kafka;4.0.0-RC2 springboot3_org.springframework.retry:spring-retry;2.0.12 springboot3_org.springframework.security:spring-security-config;6.5.3 diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml index 58ff30748eb1..868e31748bec 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml +++ b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml @@ -422,6 +422,12 @@ + + org.springframework.boot + spring-boot-http-converter + 4.0.0-RC2 + test + org.springframework.boot spring-boot-starter-test @@ -548,6 +554,7 @@ org.springframework.boot:spring-boot-autoconfigure:[4.0.0-RC2] org.springframework.boot:spring-boot-configuration-processor:[4.0.0-RC2] org.springframework.boot:spring-boot-data-redis:[4.0.0-RC2] + org.springframework.boot:spring-boot-http-converter:[4.0.0-RC2] org.springframework.boot:spring-boot-kafka:[4.0.0-RC2] org.springframework.boot:spring-boot-jackson:[4.0.0-RC2] org.springframework.boot:spring-boot-jdbc:[4.0.0-RC2] diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/WebApplicationContextRunnerUtils.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/WebApplicationContextRunnerUtils.java index 133ef3c34812..a50d0bbe7bd8 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/WebApplicationContextRunnerUtils.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/WebApplicationContextRunnerUtils.java @@ -6,7 +6,7 @@ import com.azure.spring.cloud.autoconfigure.implementation.aad.configuration.AadAutoConfiguration; import com.azure.spring.cloud.autoconfigure.implementation.context.AzureGlobalPropertiesAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration; +import org.springframework.boot.http.converter.autoconfigure.HttpMessageConvertersAutoConfiguration; import org.springframework.boot.autoconfigure.logging.ConditionEvaluationReportLoggingListener; import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration; import org.springframework.boot.test.context.FilteredClassLoader; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadOAuth2ClientConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadOAuth2ClientConfigurationTests.java index 3a6803224d73..cc2f752f4d40 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadOAuth2ClientConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadOAuth2ClientConfigurationTests.java @@ -13,7 +13,7 @@ import com.nimbusds.jose.util.Base64URL; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration; +import org.springframework.boot.http.converter.autoconfigure.HttpMessageConvertersAutoConfiguration; import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration; import org.springframework.boot.test.context.runner.WebApplicationContextRunner; import org.springframework.core.convert.converter.Converter; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadResourceServerConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadResourceServerConfigurationTests.java index 651284942a0a..53902ba4260e 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadResourceServerConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadResourceServerConfigurationTests.java @@ -9,7 +9,7 @@ import com.nimbusds.jwt.proc.JWTClaimsSetAwareJWSKeySelector; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration; +import org.springframework.boot.http.converter.autoconfigure.HttpMessageConvertersAutoConfiguration; import org.springframework.boot.autoconfigure.logging.ConditionEvaluationReportLoggingListener; import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration; import org.springframework.boot.logging.LogLevel; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadWebApplicationConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadWebApplicationConfigurationTests.java index 8bfd0f5d975f..59d66b9ee79d 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadWebApplicationConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadWebApplicationConfigurationTests.java @@ -6,7 +6,7 @@ import com.azure.spring.cloud.autoconfigure.implementation.context.AzureGlobalPropertiesAutoConfiguration; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration; +import org.springframework.boot.http.converter.autoconfigure.HttpMessageConvertersAutoConfiguration; import org.springframework.boot.autoconfigure.logging.ConditionEvaluationReportLoggingListener; import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration; import org.springframework.boot.logging.LogLevel; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/RestTemplateProxyCustomizerTestConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/RestTemplateProxyCustomizerTestConfiguration.java index abe271cf31a3..f504feb8b1bd 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/RestTemplateProxyCustomizerTestConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/RestTemplateProxyCustomizerTestConfiguration.java @@ -3,7 +3,7 @@ package com.azure.spring.cloud.autoconfigure.implementation.aad.configuration; -import org.springframework.boot.web.client.RestTemplateCustomizer; +import org.springframework.boot.restclient.RestTemplateCustomizer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.client.SimpleClientHttpRequestFactory; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/AadAuthenticationFilterTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/AadAuthenticationFilterTests.java index 9452018aefe1..6a2e629fcf7c 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/AadAuthenticationFilterTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/AadAuthenticationFilterTests.java @@ -18,7 +18,7 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration; +import org.springframework.boot.http.converter.autoconfigure.HttpMessageConvertersAutoConfiguration; import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration; import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.boot.restclient.RestTemplateBuilder; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/ResourceRetrieverTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/ResourceRetrieverTests.java index 8441ac9b3d58..f2277a896a44 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/ResourceRetrieverTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/filter/ResourceRetrieverTests.java @@ -9,8 +9,8 @@ import com.nimbusds.jose.util.ResourceRetriever; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration; -import org.springframework.boot..restclient.autoconfigure.RestTemplateAutoConfiguration; +import org.springframework.boot.http.converter.autoconfigure.HttpMessageConvertersAutoConfiguration; +import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.runner.WebApplicationContextRunner; import org.springframework.security.oauth2.server.resource.authentication.BearerTokenAuthenticationToken; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cAutoConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cAutoConfigurationTests.java index 800da6bc3865..6a0e0026ebfd 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cAutoConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cAutoConfigurationTests.java @@ -18,7 +18,7 @@ import org.mockito.Mockito; import org.springframework.beans.BeanUtils; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration; +import org.springframework.boot.http.converter.autoconfigure.HttpMessageConvertersAutoConfiguration; import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.runner.WebApplicationContextRunner; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cResourceServerAutoConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cResourceServerAutoConfigurationTests.java index 895bc84a8fb4..2418871d3d5d 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cResourceServerAutoConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cResourceServerAutoConfigurationTests.java @@ -19,7 +19,7 @@ import org.mockito.Mockito; import org.springframework.beans.BeanUtils; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration; +import org.springframework.boot.http.converter.autoconfigure.HttpMessageConvertersAutoConfiguration; import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.runner.ContextConsumer; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/security/AadB2cAuthorizationRequestResolverTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/security/AadB2cAuthorizationRequestResolverTests.java index b568d4b43d15..337528561b93 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/security/AadB2cAuthorizationRequestResolverTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/security/AadB2cAuthorizationRequestResolverTests.java @@ -10,7 +10,7 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration; +import org.springframework.boot.http.converter.autoconfigure.HttpMessageConvertersAutoConfiguration; import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.runner.WebApplicationContextRunner; From 0f68f24b98d0823ea436fafa479f58f946653e92 Mon Sep 17 00:00:00 2001 From: muyao Date: Wed, 19 Nov 2025 10:10:51 +0800 Subject: [PATCH 25/76] replace new OAuth2ClientAutoConfiguration --- sdk/spring/spring-cloud-azure-autoconfigure/pom.xml | 6 ++++++ .../aadb2c/configuration/WebOAuth2ClientTestApp.java | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml index 868e31748bec..2f33b351e8ef 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml +++ b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml @@ -422,6 +422,12 @@ + + org.springframework.boot + spring-boot-security-oauth2-client + 4.0.0-RC2 + test + org.springframework.boot spring-boot-http-converter diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/WebOAuth2ClientTestApp.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/WebOAuth2ClientTestApp.java index 7ed90b86aecc..6019cc1699d4 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/WebOAuth2ClientTestApp.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/WebOAuth2ClientTestApp.java @@ -3,12 +3,12 @@ package com.azure.spring.cloud.autoconfigure.implementation.aadb2c.configuration; +import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; import org.springframework.context.annotation.Import; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -@SuppressWarnings({"removal", "deprecation"}) @EnableWebSecurity -@Import(org.springframework.boot.autoconfigure.security.oauth2.client.servlet.OAuth2ClientAutoConfiguration.class) +@Import(OAuth2ClientAutoConfiguration.class) public class WebOAuth2ClientTestApp { } From 180293b3044ec3d277ae8fff5aed1f3e739083c1 Mon Sep 17 00:00:00 2001 From: muyao Date: Wed, 19 Nov 2025 10:55:10 +0800 Subject: [PATCH 26/76] replace containsKey with containsHeader --- ...h2AuthorizationCodeGrantRequestEntityConverterTests.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2AuthorizationCodeGrantRequestEntityConverterTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2AuthorizationCodeGrantRequestEntityConverterTests.java index 53400928a42b..c9d0610e031f 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2AuthorizationCodeGrantRequestEntityConverterTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2AuthorizationCodeGrantRequestEntityConverterTests.java @@ -110,11 +110,11 @@ private HttpHeaders convertedHeaderOf(AadClientRegistrationRepository repository } private void testHttpHeaders(HttpHeaders headers) { - assertTrue(headers.containsKey("x-client-SKU")); + assertTrue(headers.containsHeader("x-client-SKU")); assertEquals(Collections.singletonList(AzureSpringIdentifier.AZURE_SPRING_AAD), headers.get("x-client-SKU")); - assertTrue(headers.containsKey("x-client-VER")); + assertTrue(headers.containsHeader("x-client-VER")); assertEquals(Collections.singletonList(AzureSpringIdentifier.VERSION), headers.get("x-client-VER")); - assertTrue(headers.containsKey("client-request-id")); + assertTrue(headers.containsHeader("client-request-id")); } private MultiValueMap convertedBodyOf(AadClientRegistrationRepository repository, From b9f08791a30a7949097fe0ff7ce1e95018ed36e6 Mon Sep 17 00:00:00 2001 From: muyao Date: Wed, 19 Nov 2025 10:59:39 +0800 Subject: [PATCH 27/76] fix Bootstrap --- .../AppConfigurationWatchAutoConfiguration.java | 2 +- .../AzureAppConfigBoostrapRegistrar.java | 2 +- .../implementation/AzureAppConfigDataLoader.java | 4 ++-- .../AzureAppConfigDataLocationResolver.java | 14 +++++++------- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sdk/spring/spring-cloud-azure-appconfiguration-config/src/main/java/com/azure/spring/cloud/appconfiguration/config/AppConfigurationWatchAutoConfiguration.java b/sdk/spring/spring-cloud-azure-appconfiguration-config/src/main/java/com/azure/spring/cloud/appconfiguration/config/AppConfigurationWatchAutoConfiguration.java index 9b0d4be6c0a0..8c3330ad6826 100644 --- a/sdk/spring/spring-cloud-azure-appconfiguration-config/src/main/java/com/azure/spring/cloud/appconfiguration/config/AppConfigurationWatchAutoConfiguration.java +++ b/sdk/spring/spring-cloud-azure-appconfiguration-config/src/main/java/com/azure/spring/cloud/appconfiguration/config/AppConfigurationWatchAutoConfiguration.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. package com.azure.spring.cloud.appconfiguration.config; -import org.springframework.boot.BootstrapContext; +import org.springframework.boot.bootstrap.BootstrapContext; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/sdk/spring/spring-cloud-azure-appconfiguration-config/src/main/java/com/azure/spring/cloud/appconfiguration/config/implementation/AzureAppConfigBoostrapRegistrar.java b/sdk/spring/spring-cloud-azure-appconfiguration-config/src/main/java/com/azure/spring/cloud/appconfiguration/config/implementation/AzureAppConfigBoostrapRegistrar.java index fb0a090f0910..9f414c0ca37f 100644 --- a/sdk/spring/spring-cloud-azure-appconfiguration-config/src/main/java/com/azure/spring/cloud/appconfiguration/config/implementation/AzureAppConfigBoostrapRegistrar.java +++ b/sdk/spring/spring-cloud-azure-appconfiguration-config/src/main/java/com/azure/spring/cloud/appconfiguration/config/implementation/AzureAppConfigBoostrapRegistrar.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. package com.azure.spring.cloud.appconfiguration.config.implementation; -import org.springframework.boot.BootstrapRegistry.InstanceSupplier; +import org.springframework.boot.bootstrap.BootstrapRegistry.InstanceSupplier; import org.springframework.boot.context.config.ConfigDataLocationResolverContext; import org.springframework.boot.context.properties.bind.Bindable; import org.springframework.boot.context.properties.bind.Binder; diff --git a/sdk/spring/spring-cloud-azure-appconfiguration-config/src/main/java/com/azure/spring/cloud/appconfiguration/config/implementation/AzureAppConfigDataLoader.java b/sdk/spring/spring-cloud-azure-appconfiguration-config/src/main/java/com/azure/spring/cloud/appconfiguration/config/implementation/AzureAppConfigDataLoader.java index 5979d37b7f53..5e2b6f0f6b89 100644 --- a/sdk/spring/spring-cloud-azure-appconfiguration-config/src/main/java/com/azure/spring/cloud/appconfiguration/config/implementation/AzureAppConfigDataLoader.java +++ b/sdk/spring/spring-cloud-azure-appconfiguration-config/src/main/java/com/azure/spring/cloud/appconfiguration/config/implementation/AzureAppConfigDataLoader.java @@ -10,7 +10,7 @@ import java.util.List; import org.apache.commons.logging.Log; -import org.springframework.boot.BootstrapRegistry.InstanceSupplier; +import org.springframework.boot.bootstrap.BootstrapRegistry.InstanceSupplier; import org.springframework.boot.context.config.ConfigData; import org.springframework.boot.context.config.ConfigDataLoader; import org.springframework.boot.context.config.ConfigDataLoaderContext; @@ -30,7 +30,7 @@ /** * Azure App Configuration data loader implementation for Spring Boot's ConfigDataLoader. - * + * * @since 6.0.0 */ diff --git a/sdk/spring/spring-cloud-azure-appconfiguration-config/src/main/java/com/azure/spring/cloud/appconfiguration/config/implementation/AzureAppConfigDataLocationResolver.java b/sdk/spring/spring-cloud-azure-appconfiguration-config/src/main/java/com/azure/spring/cloud/appconfiguration/config/implementation/AzureAppConfigDataLocationResolver.java index b4ecd1b477ba..1baf28093558 100644 --- a/sdk/spring/spring-cloud-azure-appconfiguration-config/src/main/java/com/azure/spring/cloud/appconfiguration/config/implementation/AzureAppConfigDataLocationResolver.java +++ b/sdk/spring/spring-cloud-azure-appconfiguration-config/src/main/java/com/azure/spring/cloud/appconfiguration/config/implementation/AzureAppConfigDataLocationResolver.java @@ -10,7 +10,7 @@ import javax.naming.NamingException; import org.apache.commons.logging.Log; -import org.springframework.boot.BootstrapRegistry.InstanceSupplier; +import org.springframework.boot.bootstrap.BootstrapRegistry.InstanceSupplier; import org.springframework.boot.context.config.ConfigDataLocation; import org.springframework.boot.context.config.ConfigDataLocationNotFoundException; import org.springframework.boot.context.config.ConfigDataLocationResolver; @@ -29,7 +29,7 @@ /** * Resolves Azure App Configuration data locations for Spring Boot's ConfigData API. - * + * * @since 6.0.0 */ @@ -46,7 +46,7 @@ public class AzureAppConfigDataLocationResolver /** * Determines if the given location can be resolved by this resolver. - * + * * @param context the resolver context containing binder and bootstrap information * @param location the configuration data location to check * @return true if this resolver can handle the location, false otherwise @@ -63,7 +63,7 @@ public boolean isResolvable(ConfigDataLocationResolverContext context, ConfigDat /** * Checks if the required configuration properties for Azure App Configuration are present. - * + * * @param binder the binder to check for properties * @return true if at least one of the required properties is present, false otherwise */ @@ -83,7 +83,7 @@ private boolean hasNonEmptyProperty(Binder binder, String propertyPath) { /** * Resolves configuration data resources for the given location. - * + * * @param context the resolver context * @param location the configuration data location * @return empty list of resources @@ -97,7 +97,7 @@ public List resolve(ConfigDataLocationResolverContex /** * Resolves profile-specific configuration data resources. - * + * * @param resolverContext the resolver context * @param location the configuration data location * @param profiles the active Spring profiles @@ -128,7 +128,7 @@ public List resolveProfileSpecific( /** * Loads and validates Azure App Configuration properties from the configuration context. - * + * * @param context the configuration data location resolver context * @return validated Azure App Configuration properties */ From 09fc1d6527a8c87828ec5b6e13a424c00579c059 Mon Sep 17 00:00:00 2001 From: muyao Date: Wed, 19 Nov 2025 11:20:22 +0800 Subject: [PATCH 28/76] fix health --- .../eventhubs/implementation/EventHubsHealthIndicator.java | 4 ++-- .../config/EventHubsBinderHealthIndicatorConfiguration.java | 2 +- .../servicebus/implementation/ServiceBusHealthIndicator.java | 4 ++-- .../config/ServiceBusBinderHealthIndicatorConfiguration.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/src/main/java/com/azure/spring/cloud/stream/binder/eventhubs/implementation/EventHubsHealthIndicator.java b/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/src/main/java/com/azure/spring/cloud/stream/binder/eventhubs/implementation/EventHubsHealthIndicator.java index 08dafd89667e..85c68cd7e397 100644 --- a/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/src/main/java/com/azure/spring/cloud/stream/binder/eventhubs/implementation/EventHubsHealthIndicator.java +++ b/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/src/main/java/com/azure/spring/cloud/stream/binder/eventhubs/implementation/EventHubsHealthIndicator.java @@ -5,8 +5,8 @@ import com.azure.spring.integration.core.instrumentation.Instrumentation; import com.azure.spring.integration.core.instrumentation.InstrumentationManager; -import org.springframework.boot.actuate.health.AbstractHealthIndicator; -import org.springframework.boot.actuate.health.Health; +import org.springframework.boot.health.contributor.AbstractHealthIndicator; +import org.springframework.boot.health.contributor.Health; /** * Health indicator for Event Hubs. diff --git a/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/src/main/java/com/azure/spring/cloud/stream/binder/eventhubs/implementation/config/EventHubsBinderHealthIndicatorConfiguration.java b/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/src/main/java/com/azure/spring/cloud/stream/binder/eventhubs/implementation/config/EventHubsBinderHealthIndicatorConfiguration.java index 3db24821020b..5afea09ab1bd 100644 --- a/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/src/main/java/com/azure/spring/cloud/stream/binder/eventhubs/implementation/config/EventHubsBinderHealthIndicatorConfiguration.java +++ b/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/src/main/java/com/azure/spring/cloud/stream/binder/eventhubs/implementation/config/EventHubsBinderHealthIndicatorConfiguration.java @@ -5,7 +5,7 @@ import com.azure.spring.cloud.stream.binder.eventhubs.implementation.EventHubsHealthIndicator; import com.azure.spring.cloud.stream.binder.eventhubs.implementation.EventHubsMessageChannelBinder; -import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator; +import org.springframework.boot.health.autoconfigure.contributor.ConditionalOnEnabledHealthIndicator; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/main/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/ServiceBusHealthIndicator.java b/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/main/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/ServiceBusHealthIndicator.java index c9e066f25ed8..7bbead2d141e 100644 --- a/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/main/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/ServiceBusHealthIndicator.java +++ b/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/main/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/ServiceBusHealthIndicator.java @@ -4,8 +4,8 @@ import com.azure.spring.integration.core.instrumentation.Instrumentation; import com.azure.spring.integration.core.instrumentation.InstrumentationManager; -import org.springframework.boot.actuate.health.AbstractHealthIndicator; -import org.springframework.boot.actuate.health.Health; +import org.springframework.boot.health.contributor.AbstractHealthIndicator; +import org.springframework.boot.health.contributor.Health; /** * Implementation of a {@link AbstractHealthIndicator} returning status information for diff --git a/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/main/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/config/ServiceBusBinderHealthIndicatorConfiguration.java b/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/main/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/config/ServiceBusBinderHealthIndicatorConfiguration.java index 915a78c0548a..a96b075281c9 100644 --- a/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/main/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/config/ServiceBusBinderHealthIndicatorConfiguration.java +++ b/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/main/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/config/ServiceBusBinderHealthIndicatorConfiguration.java @@ -4,7 +4,7 @@ import com.azure.spring.cloud.stream.binder.servicebus.implementation.ServiceBusHealthIndicator; import com.azure.spring.cloud.stream.binder.servicebus.implementation.ServiceBusMessageChannelBinder; -import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator; +import org.springframework.boot.health.autoconfigure.contributor.ConditionalOnEnabledHealthIndicator; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; From ec9e14e99229a2d4b4c6bf2ad9fbda7398ebf222 Mon Sep 17 00:00:00 2001 From: muyao Date: Wed, 19 Nov 2025 13:31:33 +0800 Subject: [PATCH 29/76] add spring-boot-health --- eng/versioning/external_dependencies.txt | 1 + .../spring-cloud-azure-actuator-autoconfigure/pom.xml | 6 ++++++ .../AppConfigurationConfigHealthConfiguration.java | 4 ++-- .../AppConfigurationHealthConfiguration.java | 4 ++-- .../implementation/cosmos/CosmosHealthConfiguration.java | 4 ++-- .../eventhubs/EventHubsHealthConfiguration.java | 4 ++-- .../keyvault/KeyVaultCertificateHealthConfiguration.java | 4 ++-- .../keyvault/KeyVaultSecretHealthConfiguration.java | 4 ++-- .../storage/StorageBlobHealthConfiguration.java | 4 ++-- .../storage/StorageFileShareHealthConfiguration.java | 4 ++-- .../storage/StorageQueueHealthConfiguration.java | 4 ++-- sdk/spring/spring-cloud-azure-actuator/pom.xml | 6 ++++++ .../AppConfigurationConfigHealthIndicator.java | 4 ++-- .../appconfiguration/AppConfigurationHealthIndicator.java | 4 ++-- .../implementation/cosmos/CosmosHealthIndicator.java | 8 ++++---- .../eventhubs/EventHubsHealthIndicator.java | 4 ++-- .../keyvault/KeyVaultCertificateHealthIndicator.java | 4 ++-- .../keyvault/KeyVaultSecretHealthIndicator.java | 4 ++-- .../storage/StorageBlobHealthIndicator.java | 4 ++-- .../storage/StorageFileShareHealthIndicator.java | 4 ++-- .../implementation/storage/StorageHealthConstants.java | 2 +- .../storage/StorageQueueHealthIndicator.java | 4 ++-- .../AppConfigurationHealthIndicatorTests.java | 4 ++-- .../implementation/cosmos/CosmosHealthIndicatorTests.java | 4 ++-- .../eventhubs/EventHubsHealthIndicatorTests.java | 4 ++-- .../keyvault/KeyVaultCertificateHealthIndicatorTests.java | 4 ++-- .../keyvault/KeyVaultSecretHealthIndicatorTests.java | 4 ++-- .../storage/StorageBlobHealthIndicatorTests.java | 4 ++-- .../storage/StorageFileShareHealthIndicatorTests.java | 4 ++-- .../storage/StorageQueueHealthIndicatorTests.java | 4 ++-- .../EventHubsBinderHealthIndicatorConfiguration.java | 2 +- .../implementation/EventHubsHealthIndicatorTests.java | 4 ++-- .../ServiceBusBinderHealthIndicatorConfiguration.java | 2 +- .../implementation/ServiceBusHealthIndicatorTests.java | 4 ++-- 34 files changed, 74 insertions(+), 61 deletions(-) diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index 0a110cb10cb7..abb728ecb571 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -402,6 +402,7 @@ springboot3_org.springframework:spring-context;7.0.0-RC3 springboot3_org.springframework:spring-core-test;7.0.0-RC3 springboot3_org.springframework:spring-core;7.0.0-RC3 springboot3_org.springframework:spring-expression;7.0.0-RC3 +springboot3_org.springframework.boot:spring-boot-health;4.0.0-RC2 springboot3_org.springframework.boot:spring-boot-jackson;4.0.0-RC2 springboot3_org.springframework.boot:spring-boot-jdbc;4.0.0-RC2 springboot3_org.springframework.boot:spring-boot-jms;4.0.0-RC2 diff --git a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/pom.xml b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/pom.xml index 4019e11e7272..e2a792558e25 100644 --- a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/pom.xml +++ b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/pom.xml @@ -44,6 +44,12 @@ 4.0.0-RC2 compile + + org.springframework.boot + spring-boot-health + 4.0.0-RC2 + true + com.fasterxml.jackson.core jackson-databind diff --git a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/appconfiguration/AppConfigurationConfigHealthConfiguration.java b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/appconfiguration/AppConfigurationConfigHealthConfiguration.java index 976088cbcf9a..8a333c0a61e5 100644 --- a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/appconfiguration/AppConfigurationConfigHealthConfiguration.java +++ b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/appconfiguration/AppConfigurationConfigHealthConfiguration.java @@ -3,8 +3,8 @@ package com.azure.spring.cloud.actuator.autoconfigure.implementation.appconfiguration; -import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator; -import org.springframework.boot.actuate.health.HealthIndicator; +import org.springframework.boot.health.autoconfigure.contributor.ConditionalOnEnabledHealthIndicator; +import org.springframework.boot.health.contributor.HealthIndicator; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/appconfiguration/AppConfigurationHealthConfiguration.java b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/appconfiguration/AppConfigurationHealthConfiguration.java index d633b5e331bf..d6dda6513f4e 100644 --- a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/appconfiguration/AppConfigurationHealthConfiguration.java +++ b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/appconfiguration/AppConfigurationHealthConfiguration.java @@ -6,8 +6,8 @@ import com.azure.data.appconfiguration.ConfigurationAsyncClient; import com.azure.spring.cloud.actuator.implementation.appconfiguration.AppConfigurationHealthIndicator; import com.azure.spring.cloud.autoconfigure.implementation.appconfiguration.AzureAppConfigurationAutoConfiguration; -import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator; -import org.springframework.boot.actuate.health.HealthIndicator; +import org.springframework.boot.health.autoconfigure.contributor.ConditionalOnEnabledHealthIndicator; +import org.springframework.boot.health.contributor.HealthIndicator; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/cosmos/CosmosHealthConfiguration.java b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/cosmos/CosmosHealthConfiguration.java index d26b7a15a877..68992a770b2e 100644 --- a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/cosmos/CosmosHealthConfiguration.java +++ b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/cosmos/CosmosHealthConfiguration.java @@ -7,8 +7,8 @@ import com.azure.spring.cloud.actuator.implementation.cosmos.CosmosHealthIndicator; import com.azure.spring.cloud.autoconfigure.implementation.cosmos.AzureCosmosAutoConfiguration; import com.azure.spring.cloud.autoconfigure.implementation.cosmos.properties.AzureCosmosProperties; -import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator; -import org.springframework.boot.actuate.health.HealthIndicator; +import org.springframework.boot.health.autoconfigure.contributor.ConditionalOnEnabledHealthIndicator; +import org.springframework.boot.health.contributor.HealthIndicator; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/eventhubs/EventHubsHealthConfiguration.java b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/eventhubs/EventHubsHealthConfiguration.java index 048c4318315d..84d3f5f2ea02 100644 --- a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/eventhubs/EventHubsHealthConfiguration.java +++ b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/eventhubs/EventHubsHealthConfiguration.java @@ -9,8 +9,8 @@ import com.azure.spring.cloud.actuator.implementation.eventhubs.EventHubsHealthIndicator; import com.azure.spring.cloud.autoconfigure.implementation.eventhubs.AzureEventHubsAutoConfiguration; import org.springframework.beans.factory.ObjectProvider; -import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator; -import org.springframework.boot.actuate.health.HealthIndicator; +import org.springframework.boot.health.autoconfigure.contributor.ConditionalOnEnabledHealthIndicator; +import org.springframework.boot.health.contributor.HealthIndicator; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/keyvault/KeyVaultCertificateHealthConfiguration.java b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/keyvault/KeyVaultCertificateHealthConfiguration.java index 8958fd052e7e..671ea3f38e40 100644 --- a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/keyvault/KeyVaultCertificateHealthConfiguration.java +++ b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/keyvault/KeyVaultCertificateHealthConfiguration.java @@ -6,8 +6,8 @@ import com.azure.security.keyvault.certificates.CertificateAsyncClient; import com.azure.spring.cloud.actuator.implementation.keyvault.KeyVaultCertificateHealthIndicator; import com.azure.spring.cloud.autoconfigure.implementation.keyvault.certificates.AzureKeyVaultCertificateAutoConfiguration; -import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator; -import org.springframework.boot.actuate.health.HealthIndicator; +import org.springframework.boot.health.autoconfigure.contributor.ConditionalOnEnabledHealthIndicator; +import org.springframework.boot.health.contributor.HealthIndicator; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/keyvault/KeyVaultSecretHealthConfiguration.java b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/keyvault/KeyVaultSecretHealthConfiguration.java index e432b3fd0df0..22c0688daec1 100644 --- a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/keyvault/KeyVaultSecretHealthConfiguration.java +++ b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/keyvault/KeyVaultSecretHealthConfiguration.java @@ -6,8 +6,8 @@ import com.azure.security.keyvault.secrets.SecretAsyncClient; import com.azure.spring.cloud.actuator.implementation.keyvault.KeyVaultSecretHealthIndicator; import com.azure.spring.cloud.autoconfigure.implementation.keyvault.secrets.AzureKeyVaultSecretAutoConfiguration; -import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator; -import org.springframework.boot.actuate.health.HealthIndicator; +import org.springframework.boot.health.autoconfigure.contributor.ConditionalOnEnabledHealthIndicator; +import org.springframework.boot.health.contributor.HealthIndicator; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/storage/StorageBlobHealthConfiguration.java b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/storage/StorageBlobHealthConfiguration.java index 194b23d55303..551735866abc 100644 --- a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/storage/StorageBlobHealthConfiguration.java +++ b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/storage/StorageBlobHealthConfiguration.java @@ -6,8 +6,8 @@ import com.azure.spring.cloud.actuator.implementation.storage.StorageBlobHealthIndicator; import com.azure.spring.cloud.autoconfigure.implementation.storage.blob.AzureStorageBlobAutoConfiguration; import com.azure.storage.blob.BlobServiceAsyncClient; -import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator; -import org.springframework.boot.actuate.health.HealthIndicator; +import org.springframework.boot.health.autoconfigure.contributor.ConditionalOnEnabledHealthIndicator; +import org.springframework.boot.health.contributor.HealthIndicator; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/storage/StorageFileShareHealthConfiguration.java b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/storage/StorageFileShareHealthConfiguration.java index 36bd8867ce73..13c224da607d 100644 --- a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/storage/StorageFileShareHealthConfiguration.java +++ b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/storage/StorageFileShareHealthConfiguration.java @@ -6,8 +6,8 @@ import com.azure.spring.cloud.actuator.implementation.storage.StorageFileShareHealthIndicator; import com.azure.spring.cloud.autoconfigure.implementation.storage.fileshare.AzureStorageFileShareAutoConfiguration; import com.azure.storage.file.share.ShareServiceAsyncClient; -import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator; -import org.springframework.boot.actuate.health.HealthIndicator; +import org.springframework.boot.health.autoconfigure.contributor.ConditionalOnEnabledHealthIndicator; +import org.springframework.boot.health.contributor.HealthIndicator; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/storage/StorageQueueHealthConfiguration.java b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/storage/StorageQueueHealthConfiguration.java index 2458921f9018..4bfe3c08ad1d 100644 --- a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/storage/StorageQueueHealthConfiguration.java +++ b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuator/autoconfigure/implementation/storage/StorageQueueHealthConfiguration.java @@ -6,8 +6,8 @@ import com.azure.spring.cloud.actuator.implementation.storage.StorageQueueHealthIndicator; import com.azure.spring.cloud.autoconfigure.implementation.storage.queue.AzureStorageQueueAutoConfiguration; import com.azure.storage.queue.QueueServiceAsyncClient; -import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator; -import org.springframework.boot.actuate.health.HealthIndicator; +import org.springframework.boot.health.autoconfigure.contributor.ConditionalOnEnabledHealthIndicator; +import org.springframework.boot.health.contributor.HealthIndicator; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/sdk/spring/spring-cloud-azure-actuator/pom.xml b/sdk/spring/spring-cloud-azure-actuator/pom.xml index 3e3098c929ad..38107e5866ea 100644 --- a/sdk/spring/spring-cloud-azure-actuator/pom.xml +++ b/sdk/spring/spring-cloud-azure-actuator/pom.xml @@ -48,6 +48,12 @@ 4.0.0-RC2 compile + + org.springframework.boot + spring-boot-health + 4.0.0-RC2 + true + - 4.0.0-RC2 + spring-boot-persistence + 4.0.0-RC2 com.azure @@ -284,6 +284,7 @@ org.springframework:spring-expression:[7.0.0-RC3] org.springframework:spring-core:[7.0.0-RC3] org.springframework:spring-context:[7.0.0-RC3] + org.springframework.boot:spring-boot-persistence:[4.0.0-RC2] org.springframework.data:spring-data-commons:[3.5.3] org.javatuples:javatuples:[1.2] com.fasterxml.jackson.core:jackson-annotations:[2.20] diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml index 2f33b351e8ef..5d797c7540a9 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml +++ b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml @@ -567,7 +567,7 @@ org.springframework.boot:spring-boot-jms:[4.0.0-RC2] org.springframework.boot:spring-boot-restclient:[4.0.0-RC2] org.springframework.boot:spring-boot-security:[4.0.0-RC2] - org.springframework.cloud:spring-cloud-starter-stream-kafka:[4.3.0] + org.springframework.cloud:spring-cloud-starter-stream-kafka:[5.0.0-RC1] org.springframework.security:spring-security-config:[6.5.3] org.springframework.security:spring-security-oauth2-client:[6.5.3] org.springframework.security:spring-security-oauth2-jose:[6.5.3] diff --git a/sdk/spring/spring-cloud-azure-integration-tests/pom.xml b/sdk/spring/spring-cloud-azure-integration-tests/pom.xml index ffb15b9e3873..c0ab0483a786 100644 --- a/sdk/spring/spring-cloud-azure-integration-tests/pom.xml +++ b/sdk/spring/spring-cloud-azure-integration-tests/pom.xml @@ -107,7 +107,7 @@ org.springframework.cloud spring-cloud-starter-stream-kafka - 4.3.0 + 5.0.0-RC1 org.springframework.boot From e07c2563315ed3e265ac9d9387a65477074b4596 Mon Sep 17 00:00:00 2001 From: muyao Date: Thu, 20 Nov 2025 08:27:40 +0800 Subject: [PATCH 31/76] fix --- eng/versioning/external_dependencies.txt | 3 --- sdk/spring/spring-cloud-azure-actuator/pom.xml | 1 + .../keyvault/secret/TestBootstrapRegistryInitializer.java | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index 0a6b91c9468a..8999c838a926 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -316,12 +316,9 @@ storage_com.microsoft.azure:azure-storage;8.6.6 # sdk\spring\pom.xml modules springboot3_com.diffplug.spotless:spotless-maven-plugin;2.30.0 springboot3_com.fasterxml.jackson.core:jackson-annotations;2.20 -springboot3_com.fasterxml.jackson.core:jackson-core;2.20.1 springboot3_com.fasterxml.jackson.core:jackson-databind;2.20.1 -springboot3_com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.20.1 springboot3_com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.20.1 springboot3_com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.20.1 -springboot3_com.fasterxml.jackson.module:jackson-module-afterburner;2.20.1 springboot3_com.fasterxml.jackson.module:jackson-module-parameter-names;2.20.1 springboot3_com.github.spotbugs:spotbugs-maven-plugin;4.8.2.0 springboot3_com.google.code.findbugs:jsr305;3.0.2 diff --git a/sdk/spring/spring-cloud-azure-actuator/pom.xml b/sdk/spring/spring-cloud-azure-actuator/pom.xml index 38107e5866ea..bc6d1e55d8a0 100644 --- a/sdk/spring/spring-cloud-azure-actuator/pom.xml +++ b/sdk/spring/spring-cloud-azure-actuator/pom.xml @@ -191,6 +191,7 @@ org.springframework.boot:spring-boot-actuator:[4.0.0-RC2] + org.springframework.boot:spring-boot-health:[4.0.0-RC2] diff --git a/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/keyvault/secret/TestBootstrapRegistryInitializer.java b/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/keyvault/secret/TestBootstrapRegistryInitializer.java index 15a384ae7e64..ee03574e33ef 100644 --- a/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/keyvault/secret/TestBootstrapRegistryInitializer.java +++ b/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/keyvault/secret/TestBootstrapRegistryInitializer.java @@ -5,8 +5,8 @@ import com.azure.core.credential.TokenCredential; import com.azure.spring.cloud.integration.tests.util.TestCredentialUtils; -import org.springframework.boot.BootstrapRegistry; -import org.springframework.boot.BootstrapRegistryInitializer; +import org.springframework.boot.bootstrap.BootstrapRegistry; +import org.springframework.boot.bootstrap.BootstrapRegistryInitializer; class TestBootstrapRegistryInitializer implements BootstrapRegistryInitializer { From 663c11a2659155b5f2ee978d72933d7c244630a8 Mon Sep 17 00:00:00 2001 From: muyao Date: Thu, 20 Nov 2025 09:09:40 +0800 Subject: [PATCH 32/76] fix --- sdk/spring/spring-cloud-azure-actuator-autoconfigure/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/pom.xml b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/pom.xml index e2a792558e25..1f54bcb9040a 100644 --- a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/pom.xml +++ b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/pom.xml @@ -208,6 +208,7 @@ com.fasterxml.jackson.core:jackson-databind:[2.20.1] org.springframework.boot:spring-boot-actuator:[4.0.0-RC2] org.springframework.boot:spring-boot-actuator-autoconfigure:[4.0.0-RC2] + org.springframework.boot:spring-boot-health:[4.0.0-RC2] From f22be56e541d8b4eb7676bd719a820e6b848ca13 Mon Sep 17 00:00:00 2001 From: muyao Date: Thu, 20 Nov 2025 09:41:39 +0800 Subject: [PATCH 33/76] fix --- .vscode/cspell.json | 5 +++++ sdk/spring/spring-cloud-azure-starter-monitor-test/pom.xml | 6 ++++++ .../cloud/autoconfigure/monitor/SpringMonitorTest.java | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.vscode/cspell.json b/.vscode/cspell.json index ade9ca3d6b7f..01ff5918b726 100644 --- a/.vscode/cspell.json +++ b/.vscode/cspell.json @@ -1084,6 +1084,7 @@ "itest", "itests", "jaas", + "jandex", "janino", "jaspi", "jaxb", @@ -1103,6 +1104,7 @@ "jooq", "jpamodelgen", "jspc", + "jspecify", "jstl", "jtds", "jvnet", @@ -1184,6 +1186,7 @@ "uberjar", "ultraq", "unboundid", + "uring", "vavr", "vertx", "vibur", @@ -1191,8 +1194,10 @@ "weaviate", "webmvc", "xerial", + "xmlparserv", "xmpp", "xsom", + "xtend", "yasson", "yugabytedb", "zaxxer", diff --git a/sdk/spring/spring-cloud-azure-starter-monitor-test/pom.xml b/sdk/spring/spring-cloud-azure-starter-monitor-test/pom.xml index 017427bf8914..9cece94cf2bc 100644 --- a/sdk/spring/spring-cloud-azure-starter-monitor-test/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-monitor-test/pom.xml @@ -61,6 +61,12 @@ 4.0.0-RC2 test + + org.springframework.boot + spring-boot-resttestclient + 4.0.0-RC2 + test + com.azure azure-core-test diff --git a/sdk/spring/spring-cloud-azure-starter-monitor-test/src/test/java/com/azure/spring/cloud/autoconfigure/monitor/SpringMonitorTest.java b/sdk/spring/spring-cloud-azure-starter-monitor-test/src/test/java/com/azure/spring/cloud/autoconfigure/monitor/SpringMonitorTest.java index 9e31cb5db718..b61c6b207550 100644 --- a/sdk/spring/spring-cloud-azure-starter-monitor-test/src/test/java/com/azure/spring/cloud/autoconfigure/monitor/SpringMonitorTest.java +++ b/sdk/spring/spring-cloud-azure-starter-monitor-test/src/test/java/com/azure/spring/cloud/autoconfigure/monitor/SpringMonitorTest.java @@ -17,7 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.TestConfiguration; -import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.boot.resttestclient.TestRestTemplate; import org.springframework.context.annotation.Bean; import reactor.util.annotation.Nullable; From 31b56e5163d2648644218e308ed0cc29209c9ba9 Mon Sep 17 00:00:00 2001 From: muyao Date: Thu, 20 Nov 2025 10:27:40 +0800 Subject: [PATCH 34/76] replace spring-boot-starter-web with spring-boot-starter-webmvc --- eng/versioning/external_dependencies.txt | 3 ++- .../spring-cloud-azure-appconfiguration-config-web/pom.xml | 6 +++--- .../pom.xml | 2 +- sdk/spring/spring-cloud-azure-starter-monitor-test/pom.xml | 4 ++-- .../cloud/autoconfigure/monitor/SpringMonitorTest.java | 2 ++ 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index 559a8b325d37..ebbace1e7ae8 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -371,7 +371,7 @@ springboot3_org.springframework.boot:spring-boot-starter-data-jdbc;4.0.0-RC2 springboot3_org.springframework.boot:spring-boot-starter-integration;4.0.0-RC2 springboot3_org.springframework.boot:spring-boot-starter-parent;4.0.0-RC2 springboot3_org.springframework.boot:spring-boot-starter-test;4.0.0-RC2 -springboot3_org.springframework.boot:spring-boot-starter-web;4.0.0-RC2 +springboot3_org.springframework.boot:spring-boot-starter-webmvc;4.0.0-RC2 springboot3_org.springframework.boot:spring-boot-starter;4.0.0-RC2 springboot3_org.springframework.boot:spring-boot-test;4.0.0-RC2 springboot3_org.springframework.boot:spring-boot-testcontainers;4.0.0-RC2 @@ -383,6 +383,7 @@ springboot3_org.springframework.cloud:spring-cloud-stream;4.3.0 springboot3_org.springframework.data:spring-data-commons;3.5.3 springboot3_org.springframework.data:spring-data-redis;3.5.3 springboot3_org.springframework.boot:spring-boot-data-redis;4.0.0-RC2 +springboot3_org.springframework.boot:spring-boot-resttestclient;4.0.0-RC2 springboot3_org.springframework.integration:spring-integration-core;7.0.0-RC2 springboot3_org.springframework.boot:spring-boot-http-converter;4.0.0-RC2 springboot3_org.springframework.boot:spring-boot-kafka;4.0.0-RC2 diff --git a/sdk/spring/spring-cloud-azure-appconfiguration-config-web/pom.xml b/sdk/spring/spring-cloud-azure-appconfiguration-config-web/pom.xml index efd911657520..0bd524eb10f0 100644 --- a/sdk/spring/spring-cloud-azure-appconfiguration-config-web/pom.xml +++ b/sdk/spring/spring-cloud-azure-appconfiguration-config-web/pom.xml @@ -25,8 +25,8 @@ org.springframework.boot - spring-boot-starter-web - 4.0.0-RC2 + spring-boot-starter-webmvc + 4.0.0-RC2 org.springframework.boot @@ -119,7 +119,7 @@ org.springframework.boot:spring-boot-starter-actuator:[4.0.0-RC2] - org.springframework.boot:spring-boot-starter-web:[4.0.0-RC2] + org.springframework.boot:spring-boot-starter-webmvc:[4.0.0-RC2] org.springframework.cloud:spring-cloud-bus:[4.3.0] diff --git a/sdk/spring/spring-cloud-azure-integration-test-appconfiguration-config/pom.xml b/sdk/spring/spring-cloud-azure-integration-test-appconfiguration-config/pom.xml index 033392bcc880..aec66b0f6c01 100644 --- a/sdk/spring/spring-cloud-azure-integration-test-appconfiguration-config/pom.xml +++ b/sdk/spring/spring-cloud-azure-integration-test-appconfiguration-config/pom.xml @@ -25,7 +25,7 @@ org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc org.springframework.boot diff --git a/sdk/spring/spring-cloud-azure-starter-monitor-test/pom.xml b/sdk/spring/spring-cloud-azure-starter-monitor-test/pom.xml index 9cece94cf2bc..0ea0ee440840 100644 --- a/sdk/spring/spring-cloud-azure-starter-monitor-test/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-monitor-test/pom.xml @@ -47,8 +47,8 @@ org.springframework.boot - spring-boot-starter-web - 4.0.0-RC2 + spring-boot-starter-webmvc + 4.0.0-RC2 org.springframework.boot diff --git a/sdk/spring/spring-cloud-azure-starter-monitor-test/src/test/java/com/azure/spring/cloud/autoconfigure/monitor/SpringMonitorTest.java b/sdk/spring/spring-cloud-azure-starter-monitor-test/src/test/java/com/azure/spring/cloud/autoconfigure/monitor/SpringMonitorTest.java index b61c6b207550..d2174eba171c 100644 --- a/sdk/spring/spring-cloud-azure-starter-monitor-test/src/test/java/com/azure/spring/cloud/autoconfigure/monitor/SpringMonitorTest.java +++ b/sdk/spring/spring-cloud-azure-starter-monitor-test/src/test/java/com/azure/spring/cloud/autoconfigure/monitor/SpringMonitorTest.java @@ -15,6 +15,7 @@ import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureTestRestTemplate; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.TestConfiguration; import org.springframework.boot.resttestclient.TestRestTemplate; @@ -35,6 +36,7 @@ @SpringBootTest( classes = {Application.class, SpringMonitorTest.TestConfig.class}, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@AutoConfigureTestRestTemplate class SpringMonitorTest { private static CountDownLatch countDownLatch; From c3c173524746f61b96828b48ec41ce691dd57a06 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 21 Nov 2025 07:05:03 +0000 Subject: [PATCH 35/76] chore(spring): update Spring Security to 7.0.0-RC3 Co-authored-by: Netyyyy <92105726+Netyyyy@users.noreply.github.com> --- eng/versioning/external_dependencies.txt | 10 +++++----- ...t_4.0.0-RC2_managed_external_dependencies.txt | 8 ++++++++ .../spring-cloud-azure-autoconfigure/pom.xml | 16 ++++++++-------- .../pom.xml | 8 ++++---- .../pom.xml | 4 ++-- 5 files changed, 27 insertions(+), 19 deletions(-) diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index ebbace1e7ae8..fc764521c324 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -388,11 +388,11 @@ springboot3_org.springframework.integration:spring-integration-core;7.0.0-RC2 springboot3_org.springframework.boot:spring-boot-http-converter;4.0.0-RC2 springboot3_org.springframework.boot:spring-boot-kafka;4.0.0-RC2 springboot3_org.springframework.retry:spring-retry;2.0.12 -springboot3_org.springframework.security:spring-security-config;6.5.3 -springboot3_org.springframework.security:spring-security-oauth2-client;6.5.3 -springboot3_org.springframework.security:spring-security-oauth2-jose;6.5.3 -springboot3_org.springframework.security:spring-security-oauth2-resource-server;6.5.3 -springboot3_org.springframework.security:spring-security-web;6.5.3 +springboot3_org.springframework.security:spring-security-config;7.0.0-RC3 +springboot3_org.springframework.security:spring-security-oauth2-client;7.0.0-RC3 +springboot3_org.springframework.security:spring-security-oauth2-jose;7.0.0-RC3 +springboot3_org.springframework.security:spring-security-oauth2-resource-server;7.0.0-RC3 +springboot3_org.springframework.security:spring-security-web;7.0.0-RC3 springboot3_org.springframework:spring-beans;7.0.0-RC3 springboot3_org.springframework:spring-context-support;7.0.0-RC3 springboot3_org.springframework:spring-context;7.0.0-RC3 diff --git a/sdk/spring/scripts/spring_boot_4.0.0-RC2_managed_external_dependencies.txt b/sdk/spring/scripts/spring_boot_4.0.0-RC2_managed_external_dependencies.txt index 124377731965..0de38df43cfb 100644 --- a/sdk/spring/scripts/spring_boot_4.0.0-RC2_managed_external_dependencies.txt +++ b/sdk/spring/scripts/spring_boot_4.0.0-RC2_managed_external_dependencies.txt @@ -1743,3 +1743,11 @@ tools.jackson.module:jackson-module-scala_2.13;3.0.1 tools.jackson.module:jackson-module-scala_3;3.0.1 tools.jackson:jackson-bom;3.0.1 wsdl4j:wsdl4j;1.6.3 +org.springframework.security:spring-security-config;7.0.0-RC3 +org.springframework.security:spring-security-core;7.0.0-RC3 +org.springframework.security:spring-security-oauth2-client;7.0.0-RC3 +org.springframework.security:spring-security-oauth2-core;7.0.0-RC3 +org.springframework.security:spring-security-oauth2-jose;7.0.0-RC3 +org.springframework.security:spring-security-oauth2-resource-server;7.0.0-RC3 +org.springframework.security:spring-security-web;7.0.0-RC3 +org.springframework.security:spring-security-test;7.0.0-RC3 diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml index 5d797c7540a9..c34a3d802bc4 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml +++ b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml @@ -364,25 +364,25 @@ org.springframework.security spring-security-oauth2-client - 6.5.3 + 7.0.0-RC3 true org.springframework.security spring-security-oauth2-resource-server - 6.5.3 + 7.0.0-RC3 true org.springframework.security spring-security-oauth2-jose - 6.5.3 + 7.0.0-RC3 true org.springframework.security spring-security-config - 6.5.3 + 7.0.0-RC3 true @@ -568,10 +568,10 @@ org.springframework.boot:spring-boot-restclient:[4.0.0-RC2] org.springframework.boot:spring-boot-security:[4.0.0-RC2] org.springframework.cloud:spring-cloud-starter-stream-kafka:[5.0.0-RC1] - org.springframework.security:spring-security-config:[6.5.3] - org.springframework.security:spring-security-oauth2-client:[6.5.3] - org.springframework.security:spring-security-oauth2-jose:[6.5.3] - org.springframework.security:spring-security-oauth2-resource-server:[6.5.3] + org.springframework.security:spring-security-config:[7.0.0-RC3] + org.springframework.security:spring-security-oauth2-client:[7.0.0-RC3] + org.springframework.security:spring-security-oauth2-jose:[7.0.0-RC3] + org.springframework.security:spring-security-oauth2-resource-server:[7.0.0-RC3] org.springframework:spring-context-support:[7.0.0-RC3] org.springframework:spring-tx:[7.0.0-RC3] 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 b2c6794df3d4..176e7e0c84ab 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 @@ -95,22 +95,22 @@ org.springframework.security spring-security-config - 6.5.3 + 7.0.0-RC3 org.springframework.security spring-security-oauth2-client - 6.5.3 + 7.0.0-RC3 org.springframework.security spring-security-oauth2-jose - 6.5.3 + 7.0.0-RC3 org.springframework.security spring-security-oauth2-resource-server - 6.5.3 + 7.0.0-RC3 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 56e53c53fc72..31fc942e4e0c 100644 --- a/sdk/spring/spring-cloud-azure-starter-active-directory/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-active-directory/pom.xml @@ -94,12 +94,12 @@ org.springframework.security spring-security-web - 6.5.3 + 7.0.0-RC3 org.springframework.security spring-security-config - 6.5.3 + 7.0.0-RC3 com.nimbusds From 004c76d2dc513388faac513fdf6e7542f28ed41c Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 21 Nov 2025 07:59:17 +0000 Subject: [PATCH 36/76] chore(spring): upgrade Spring Boot to 4.0.0-RC2 and Spring Cloud to 2025.1.0-M4 (partial) Co-authored-by: Netyyyy <92105726+Netyyyy@users.noreply.github.com> --- .../security/AadResourceServerHttpSecurityConfigurer.java | 8 ++++++-- .../security/AadWebApplicationHttpSecurityConfigurer.java | 8 ++++++-- .../aadb2c/security/AadB2cOidcLoginConfigurer.java | 3 +-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadResourceServerHttpSecurityConfigurer.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadResourceServerHttpSecurityConfigurer.java index be05dc42a27a..4bf969b23754 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadResourceServerHttpSecurityConfigurer.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadResourceServerHttpSecurityConfigurer.java @@ -31,8 +31,12 @@ public class AadResourceServerHttpSecurityConfigurer extends AbstractHttpConfigu private Converter> jwtGrantedAuthoritiesConverter; @Override - public void init(HttpSecurity builder) throws Exception { - super.init(builder); + public void init(HttpSecurity builder) { + try { + super.init(builder); + } catch (Exception e) { + throw new RuntimeException("Failed to initialize AadResourceServerHttpSecurityConfigurer", e); + } ApplicationContext context = builder.getSharedObject(ApplicationContext.class); this.properties = context.getBean(AadResourceServerProperties.class); // @formatter:off diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadWebApplicationHttpSecurityConfigurer.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadWebApplicationHttpSecurityConfigurer.java index f332ca3a0959..2451344fd53d 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadWebApplicationHttpSecurityConfigurer.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadWebApplicationHttpSecurityConfigurer.java @@ -64,8 +64,12 @@ public class AadWebApplicationHttpSecurityConfigurer extends AbstractHttpConfigu private Filter conditionalAccessFilter; @Override - public void init(HttpSecurity builder)throws Exception { - super.init(builder); + public void init(HttpSecurity builder) { + try { + super.init(builder); + } catch (Exception e) { + throw new RuntimeException("Failed to initialize AadWebApplicationHttpSecurityConfigurer", e); + } ApplicationContext context = builder.getSharedObject(ApplicationContext.class); this.repo = context.getBean(ClientRegistrationRepository.class); diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/security/AadB2cOidcLoginConfigurer.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/security/AadB2cOidcLoginConfigurer.java index f39128a972a4..398e415ccc4b 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/security/AadB2cOidcLoginConfigurer.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/security/AadB2cOidcLoginConfigurer.java @@ -74,10 +74,9 @@ public AadB2cOidcLoginConfigurer(LogoutSuccessHandler handler, * Initialize the SecurityBuilder. * * @param http the http - * @throws Exception failed to initialize SecurityBuilder */ @Override - public void init(HttpSecurity http) throws Exception { + public void init(HttpSecurity http) { // @formatter:off http.logout(logout -> logout.logoutSuccessHandler(handler)) .oauth2Login(oauth2 -> oauth2 From e61f7b679cf53f569b18c49625c48c13755b1ff0 Mon Sep 17 00:00:00 2001 From: muyao Date: Tue, 25 Nov 2025 10:21:50 +0800 Subject: [PATCH 37/76] update aad/aadb2c --- .../AadOAuth2ClientConfiguration.java | 47 +++++---------- ...dJwtBearerGrantRequestEntityConverter.java | 26 --------- ...BearerGrantRequestParametersConverter.java | 42 ++++++++++++++ ...ationCodeGrantRequestHeadersConverter.java | 28 +++++++++ ...nCodeGrantRequestParametersConverter.java} | 36 ++++-------- ...dWebApplicationHttpSecurityConfigurer.java | 19 +++--- ...zationCodeGrantRequestEntityConverter.java | 58 ------------------- .../aad/serde/jackson/SerializerUtils.java | 1 + .../AadB2cOAuth2ClientConfiguration.java | 15 +++-- ...zationCodeGrantRequestEntityConverter.java | 19 ------ ...ationCodeGrantRequestHeadersConverter.java | 29 ++++++++++ .../security/AadB2cOidcLoginConfigurer.java | 10 ++-- .../aad/RestTemplateTestUtil.java | 6 +- .../AadOAuth2ClientConfigurationTests.java | 16 ++--- ...earerGrantRequestEntityConverterTests.java | 14 ++--- ...nCodeGrantRequestEntityConverterTests.java | 35 +++++------ 16 files changed, 175 insertions(+), 226 deletions(-) delete mode 100644 sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadJwtBearerGrantRequestEntityConverter.java create mode 100644 sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadJwtBearerGrantRequestParametersConverter.java create mode 100644 sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2AuthorizationCodeGrantRequestHeadersConverter.java rename sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/{AadOAuth2AuthorizationCodeGrantRequestEntityConverter.java => AadOAuth2AuthorizationCodeGrantRequestParametersConverter.java} (65%) delete mode 100644 sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AbstractOAuth2AuthorizationCodeGrantRequestEntityConverter.java delete mode 100644 sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/security/AadB2cOAuth2AuthorizationCodeGrantRequestEntityConverter.java create mode 100644 sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/security/AadB2cOAuth2AuthorizationCodeGrantRequestHeadersConverter.java diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadOAuth2ClientConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadOAuth2ClientConfiguration.java index 6f99b6491cfa..269bd3102c1d 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadOAuth2ClientConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadOAuth2ClientConfiguration.java @@ -3,16 +3,9 @@ package com.azure.spring.cloud.autoconfigure.implementation.aad.configuration; -import com.azure.spring.cloud.autoconfigure.implementation.aad.security.AadClientRegistrationRepository; +import com.azure.spring.cloud.autoconfigure.implementation.aad.security.*; import com.azure.spring.cloud.autoconfigure.implementation.aad.configuration.conditions.ClientCertificatePropertiesCondition; import com.azure.spring.cloud.autoconfigure.implementation.aad.configuration.conditions.ClientRegistrationCondition; -import com.azure.spring.cloud.autoconfigure.implementation.aad.security.AadJwtClientAuthenticationParametersConverter; -import com.azure.spring.cloud.autoconfigure.implementation.aad.security.AadOAuth2ClientAuthenticationJwkResolver; -import com.azure.spring.cloud.autoconfigure.implementation.aad.security.JacksonHttpSessionOAuth2AuthorizedClientRepository; -import com.azure.spring.cloud.autoconfigure.implementation.aad.security.OAuth2ClientAuthenticationJwkResolver; -import com.azure.spring.cloud.autoconfigure.implementation.aad.security.AadJwtBearerGrantRequestEntityConverter; -import com.azure.spring.cloud.autoconfigure.implementation.aad.security.AadAzureDelegatedOAuth2AuthorizedClientProvider; -import com.azure.spring.cloud.autoconfigure.implementation.aad.security.AadOidcIdTokenDecoderFactory; import com.azure.spring.cloud.autoconfigure.implementation.aad.configuration.properties.AadAuthenticationProperties; import com.azure.spring.cloud.autoconfigure.implementation.aad.security.properties.AadAuthorizationServerEndpoints; import com.azure.spring.cloud.autoconfigure.implementation.aad.configuration.properties.AadProfileProperties; @@ -27,16 +20,15 @@ import org.springframework.security.oauth2.client.OAuth2AuthorizedClientProvider; import org.springframework.security.oauth2.client.OAuth2AuthorizedClientProviderBuilder; import org.springframework.security.oauth2.client.RefreshTokenOAuth2AuthorizedClientProvider; -import org.springframework.security.oauth2.client.endpoint.DefaultClientCredentialsTokenResponseClient; -import org.springframework.security.oauth2.client.endpoint.DefaultJwtBearerTokenResponseClient; -import org.springframework.security.oauth2.client.endpoint.DefaultRefreshTokenTokenResponseClient; -import org.springframework.security.oauth2.client.endpoint.OAuth2ClientCredentialsGrantRequestEntityConverter; -import org.springframework.security.oauth2.client.endpoint.OAuth2RefreshTokenGrantRequestEntityConverter; +import org.springframework.security.oauth2.client.endpoint.RestClientClientCredentialsTokenResponseClient; +import org.springframework.security.oauth2.client.endpoint.RestClientJwtBearerTokenResponseClient; +import org.springframework.security.oauth2.client.endpoint.RestClientRefreshTokenTokenResponseClient; import org.springframework.security.oauth2.client.registration.ClientRegistration; import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository; import org.springframework.security.oauth2.client.web.DefaultOAuth2AuthorizedClientManager; import org.springframework.security.oauth2.client.web.OAuth2AuthorizedClientRepository; import org.springframework.security.oauth2.jwt.JwtDecoderFactory; +import org.springframework.web.client.RestClient; import static com.azure.spring.cloud.autoconfigure.implementation.aad.utils.AadRestTemplateCreator.createOAuth2AccessTokenResponseClientRestTemplate; import static com.azure.spring.cloud.autoconfigure.implementation.aad.utils.AadRestTemplateCreator.createRestTemplate; @@ -102,35 +94,30 @@ OAuth2AuthorizedClientManager authorizedClientManager( @Bean @ConditionalOnMissingBean - @SuppressWarnings({"deprecation", "removal"}) JwtBearerOAuth2AuthorizedClientProvider azureAdJwtBearerProvider( ObjectProvider resolvers) { JwtBearerOAuth2AuthorizedClientProvider provider = new JwtBearerOAuth2AuthorizedClientProvider(); OAuth2ClientAuthenticationJwkResolver resolver = resolvers.getIfUnique(); - DefaultJwtBearerTokenResponseClient client = new DefaultJwtBearerTokenResponseClient(); - client.setRestOperations(createOAuth2AccessTokenResponseClientRestTemplate(restTemplateBuilder)); - AadJwtBearerGrantRequestEntityConverter converter = new AadJwtBearerGrantRequestEntityConverter(); + RestClientJwtBearerTokenResponseClient client = new RestClientJwtBearerTokenResponseClient(); + client.setRestClient(RestClient.create(createOAuth2AccessTokenResponseClientRestTemplate(restTemplateBuilder))); + client.addParametersConverter(new AadJwtBearerGrantRequestParametersConverter()); if (resolver != null) { - converter.addParametersConverter(new AadJwtClientAuthenticationParametersConverter<>(resolver::resolve)); + client.addParametersConverter(new AadJwtClientAuthenticationParametersConverter<>(resolver::resolve)); } - client.setRequestEntityConverter(converter); provider.setAccessTokenResponseClient(client); return provider; } @Bean @ConditionalOnMissingBean - @SuppressWarnings({"deprecation", "removal"}) RefreshTokenOAuth2AuthorizedClientProvider azureRefreshTokenProvider( ObjectProvider resolvers) { RefreshTokenOAuth2AuthorizedClientProvider provider = new RefreshTokenOAuth2AuthorizedClientProvider(); OAuth2ClientAuthenticationJwkResolver resolver = resolvers.getIfUnique(); - DefaultRefreshTokenTokenResponseClient client = new DefaultRefreshTokenTokenResponseClient(); - client.setRestOperations(createOAuth2AccessTokenResponseClientRestTemplate(restTemplateBuilder)); + RestClientRefreshTokenTokenResponseClient client = new RestClientRefreshTokenTokenResponseClient(); + client.setRestClient(RestClient.create(createOAuth2AccessTokenResponseClientRestTemplate(restTemplateBuilder))); if (resolver != null) { - OAuth2RefreshTokenGrantRequestEntityConverter converter = new OAuth2RefreshTokenGrantRequestEntityConverter(); - converter.addParametersConverter(new AadJwtClientAuthenticationParametersConverter<>(resolver::resolve)); - client.setRequestEntityConverter(converter); + client.addParametersConverter(new AadJwtClientAuthenticationParametersConverter<>(resolver::resolve)); } provider.setAccessTokenResponseClient(client); return provider; @@ -145,17 +132,13 @@ JwtDecoderFactory azureAdJwtDecoderFactory(AadAuthentication return new AadOidcIdTokenDecoderFactory(endpoints.getJwkSetEndpoint(), createRestTemplate(restTemplateBuilder)); } - @SuppressWarnings({"deprecation", "removal"}) private void clientCredentialsGrantBuilderAccessTokenResponseClientCustomizer( OAuth2AuthorizedClientProviderBuilder.ClientCredentialsGrantBuilder builder, OAuth2ClientAuthenticationJwkResolver resolver) { - DefaultClientCredentialsTokenResponseClient client = new DefaultClientCredentialsTokenResponseClient(); - client.setRestOperations(createOAuth2AccessTokenResponseClientRestTemplate(restTemplateBuilder)); + RestClientClientCredentialsTokenResponseClient client = new RestClientClientCredentialsTokenResponseClient(); + client.setRestClient(RestClient.create(createOAuth2AccessTokenResponseClientRestTemplate(restTemplateBuilder))); if (resolver != null) { - OAuth2ClientCredentialsGrantRequestEntityConverter converter = - new OAuth2ClientCredentialsGrantRequestEntityConverter(); - converter.addParametersConverter(new AadJwtClientAuthenticationParametersConverter<>(resolver::resolve)); - client.setRequestEntityConverter(converter); + client.addParametersConverter(new AadJwtClientAuthenticationParametersConverter<>(resolver::resolve)); } builder.accessTokenResponseClient(client); } diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadJwtBearerGrantRequestEntityConverter.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadJwtBearerGrantRequestEntityConverter.java deleted file mode 100644 index 378b13cfc165..000000000000 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadJwtBearerGrantRequestEntityConverter.java +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -package com.azure.spring.cloud.autoconfigure.implementation.aad.security; - -import org.springframework.security.oauth2.client.endpoint.JwtBearerGrantRequest; -import org.springframework.security.oauth2.client.endpoint.JwtBearerGrantRequestEntityConverter; -import org.springframework.util.MultiValueMap; - -/** - * This is a special JWT Bearer flow implementation for Microsoft identify platform. - * - * @since 4.3.0 - * @see OAuth 2.0 On-Behalf-Of - */ -@SuppressWarnings({"deprecation", "removal"}) -public class AadJwtBearerGrantRequestEntityConverter extends JwtBearerGrantRequestEntityConverter { - - @Override - protected MultiValueMap createParameters(JwtBearerGrantRequest jwtBearerGrantRequest) { - MultiValueMap parameters = super.createParameters(jwtBearerGrantRequest); - parameters.add("requested_token_use", "on_behalf_of"); - return parameters; - } -} - diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadJwtBearerGrantRequestParametersConverter.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadJwtBearerGrantRequestParametersConverter.java new file mode 100644 index 000000000000..2efa9b2441fe --- /dev/null +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadJwtBearerGrantRequestParametersConverter.java @@ -0,0 +1,42 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package com.azure.spring.cloud.autoconfigure.implementation.aad.security; + +import org.springframework.core.convert.converter.Converter; +import org.springframework.security.oauth2.client.endpoint.JwtBearerGrantRequest; +import org.springframework.security.oauth2.client.registration.ClientRegistration; +import org.springframework.security.oauth2.core.ClientAuthenticationMethod; +import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames; +import org.springframework.util.CollectionUtils; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; +import org.springframework.util.StringUtils; + +/** + * This is a special JWT Bearer flow implementation for Microsoft identify platform. + * + * @since 4.3.0 + * @see OAuth 2.0 On-Behalf-Of + */ +public class AadJwtBearerGrantRequestParametersConverter + implements Converter> { + + @Override + public MultiValueMap convert(JwtBearerGrantRequest jwtBearerGrantRequest) { + ClientRegistration clientRegistration = jwtBearerGrantRequest.getClientRegistration(); + MultiValueMap parameters = new LinkedMultiValueMap<>(); + parameters.add(OAuth2ParameterNames.GRANT_TYPE, jwtBearerGrantRequest.getGrantType().getValue()); + parameters.add(OAuth2ParameterNames.ASSERTION, jwtBearerGrantRequest.getJwt().getTokenValue()); + if (!CollectionUtils.isEmpty(clientRegistration.getScopes())) { + parameters.add(OAuth2ParameterNames.SCOPE, + StringUtils.collectionToDelimitedString(clientRegistration.getScopes(), " ")); + } + if (ClientAuthenticationMethod.CLIENT_SECRET_POST.equals(clientRegistration.getClientAuthenticationMethod())) { + parameters.add(OAuth2ParameterNames.CLIENT_ID, clientRegistration.getClientId()); + parameters.add(OAuth2ParameterNames.CLIENT_SECRET, clientRegistration.getClientSecret()); + } + parameters.add("requested_token_use", "on_behalf_of"); + return parameters; + } +} diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2AuthorizationCodeGrantRequestHeadersConverter.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2AuthorizationCodeGrantRequestHeadersConverter.java new file mode 100644 index 000000000000..73a65f200226 --- /dev/null +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2AuthorizationCodeGrantRequestHeadersConverter.java @@ -0,0 +1,28 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package com.azure.spring.cloud.autoconfigure.implementation.aad.security; + +import com.azure.spring.cloud.core.implementation.util.AzureSpringIdentifier; +import org.springframework.core.convert.converter.Converter; +import org.springframework.http.HttpHeaders; +import org.springframework.security.oauth2.client.endpoint.OAuth2AuthorizationCodeGrantRequest; + +import java.util.Collections; +import java.util.UUID; + +/** + * When using "auth-code" in AAD, it's used to expand head parameters of the request. + */ +public class AadOAuth2AuthorizationCodeGrantRequestHeadersConverter + implements Converter { + + @Override + public HttpHeaders convert(OAuth2AuthorizationCodeGrantRequest request) { + HttpHeaders httpHeaders = new HttpHeaders(); + httpHeaders.put("x-client-SKU", Collections.singletonList(AzureSpringIdentifier.AZURE_SPRING_AAD)); + httpHeaders.put("x-client-VER", Collections.singletonList(AzureSpringIdentifier.VERSION)); + httpHeaders.put("client-request-id", Collections.singletonList(UUID.randomUUID().toString())); + return httpHeaders; + } +} diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2AuthorizationCodeGrantRequestEntityConverter.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2AuthorizationCodeGrantRequestParametersConverter.java similarity index 65% rename from sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2AuthorizationCodeGrantRequestEntityConverter.java rename to sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2AuthorizationCodeGrantRequestParametersConverter.java index 40e2469875e6..a723305e7feb 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2AuthorizationCodeGrantRequestEntityConverter.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2AuthorizationCodeGrantRequestParametersConverter.java @@ -3,7 +3,7 @@ package com.azure.spring.cloud.autoconfigure.implementation.aad.security; -import com.azure.spring.cloud.core.implementation.util.AzureSpringIdentifier; +import org.springframework.core.convert.converter.Converter; import org.springframework.security.oauth2.client.endpoint.AbstractOAuth2AuthorizationGrantRequest; import org.springframework.security.oauth2.client.endpoint.OAuth2AuthorizationCodeGrantRequest; import org.springframework.security.oauth2.client.registration.ClientRegistration; @@ -17,46 +17,32 @@ /** * Used to set "scope" parameter when use "auth-code" to get "access_token". - * - * @see AbstractOAuth2AuthorizationCodeGrantRequestEntityConverter */ -public class AadOAuth2AuthorizationCodeGrantRequestEntityConverter - extends AbstractOAuth2AuthorizationCodeGrantRequestEntityConverter { +public class AadOAuth2AuthorizationCodeGrantRequestParametersConverter + implements Converter> { private final Set azureClientAccessTokenScopes; /** - * Creates a new instance of {@link AadOAuth2AuthorizationCodeGrantRequestEntityConverter}. + * Creates a new instance of {@link AadOAuth2AuthorizationCodeGrantRequestParametersConverter}. * * @param azureClientAccessTokenScopes the Azure client access token scopes */ - public AadOAuth2AuthorizationCodeGrantRequestEntityConverter(Set azureClientAccessTokenScopes) { + public AadOAuth2AuthorizationCodeGrantRequestParametersConverter(Set azureClientAccessTokenScopes) { this.azureClientAccessTokenScopes = azureClientAccessTokenScopes; } - /** - * Get application id. - * - * @return application id - */ @Override - protected String getApplicationId() { - return AzureSpringIdentifier.AZURE_SPRING_AAD; - } + public MultiValueMap convert(OAuth2AuthorizationCodeGrantRequest request) { + MultiValueMap parameters = new LinkedMultiValueMap<>(); - /** - * Get http body. - * - * @return http body - */ - @Override - public MultiValueMap getHttpBody(OAuth2AuthorizationCodeGrantRequest request) { - MultiValueMap body = new LinkedMultiValueMap<>(); + // Add custom scope for Azure client String scopes = String.join(" ", isRequestForAzureClient(request) ? azureClientAccessTokenScopes : request.getClientRegistration().getScopes()); - body.add("scope", scopes); - return body; + parameters.add("scope", scopes); + + return parameters; } private boolean isRequestForAzureClient(OAuth2AuthorizationCodeGrantRequest request) { diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadWebApplicationHttpSecurityConfigurer.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadWebApplicationHttpSecurityConfigurer.java index 2451344fd53d..b52f0a359590 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadWebApplicationHttpSecurityConfigurer.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadWebApplicationHttpSecurityConfigurer.java @@ -12,9 +12,9 @@ import org.springframework.security.config.annotation.SecurityConfigurer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; -import org.springframework.security.oauth2.client.endpoint.DefaultAuthorizationCodeTokenResponseClient; import org.springframework.security.oauth2.client.endpoint.OAuth2AccessTokenResponseClient; import org.springframework.security.oauth2.client.endpoint.OAuth2AuthorizationCodeGrantRequest; +import org.springframework.security.oauth2.client.endpoint.RestClientAuthorizationCodeTokenResponseClient; import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserRequest; import org.springframework.security.oauth2.client.oidc.web.logout.OidcClientInitiatedLogoutSuccessHandler; import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository; @@ -24,6 +24,7 @@ import org.springframework.security.oauth2.core.oidc.user.OidcUser; import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; import org.springframework.util.StringUtils; +import org.springframework.web.client.RestClient; import static com.azure.spring.cloud.autoconfigure.implementation.aad.utils.AadRestTemplateCreator.createOAuth2AccessTokenResponseClientRestTemplate; @@ -91,7 +92,7 @@ public void init(HttpSecurity builder) { } @Override - public void configure(HttpSecurity builder) throws Exception { + public void configure(HttpSecurity builder) { if (conditionalAccessFilter != null) { builder.addFilterAfter(conditionalAccessFilter, OAuth2AuthorizationRequestRedirectFilter.class); } @@ -137,19 +138,17 @@ protected LogoutSuccessHandler oidcLogoutSuccessHandler() { * * @return the access token response client */ - @SuppressWarnings("removal") protected OAuth2AccessTokenResponseClient accessTokenResponseClient() { - DefaultAuthorizationCodeTokenResponseClient result = new DefaultAuthorizationCodeTokenResponseClient(); - result.setRestOperations(createOAuth2AccessTokenResponseClientRestTemplate(restTemplateBuilder)); + RestClientAuthorizationCodeTokenResponseClient result = new RestClientAuthorizationCodeTokenResponseClient(); + result.setRestClient(RestClient.create(createOAuth2AccessTokenResponseClientRestTemplate(restTemplateBuilder))); if (repo instanceof AadClientRegistrationRepository) { - AadOAuth2AuthorizationCodeGrantRequestEntityConverter converter = - new AadOAuth2AuthorizationCodeGrantRequestEntityConverter( - ((AadClientRegistrationRepository) repo).getAzureClientAccessTokenScopes()); + result.addHeadersConverter(new AadOAuth2AuthorizationCodeGrantRequestHeadersConverter()); + result.addParametersConverter(new AadOAuth2AuthorizationCodeGrantRequestParametersConverter( + ((AadClientRegistrationRepository) repo).getAzureClientAccessTokenScopes())); OAuth2ClientAuthenticationJwkResolver jwkResolver = jwkResolvers.getIfUnique(); if (jwkResolver != null) { - converter.addParametersConverter(new AadJwtClientAuthenticationParametersConverter<>(jwkResolver::resolve)); + result.addParametersConverter(new AadJwtClientAuthenticationParametersConverter<>(jwkResolver::resolve)); } - result.setRequestEntityConverter(converter); } return result; } diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AbstractOAuth2AuthorizationCodeGrantRequestEntityConverter.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AbstractOAuth2AuthorizationCodeGrantRequestEntityConverter.java deleted file mode 100644 index a75da05ec468..000000000000 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AbstractOAuth2AuthorizationCodeGrantRequestEntityConverter.java +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -package com.azure.spring.cloud.autoconfigure.implementation.aad.security; - -import com.azure.spring.cloud.core.implementation.util.AzureSpringIdentifier; -import org.springframework.http.HttpHeaders; -import org.springframework.security.oauth2.client.endpoint.OAuth2AuthorizationCodeGrantRequest; -import org.springframework.security.oauth2.client.endpoint.OAuth2AuthorizationCodeGrantRequestEntityConverter; -import org.springframework.util.MultiValueMap; -import org.springframework.util.MultiValueMapAdapter; - -import java.util.Collections; -import java.util.UUID; - -/** - * When using "auth-code" in AAD and AAD B2C, it's used to expand head and body parameters of the request. - */ -@SuppressWarnings({"deprecation", "removal"}) -public abstract class AbstractOAuth2AuthorizationCodeGrantRequestEntityConverter - extends OAuth2AuthorizationCodeGrantRequestEntityConverter { - - private static final MultiValueMap EMPTY_MULTI_VALUE_MAP = - new MultiValueMapAdapter<>(Collections.emptyMap()); - - protected AbstractOAuth2AuthorizationCodeGrantRequestEntityConverter() { - addHeadersConverter(this::getHttpHeaders); - addParametersConverter(this::getHttpBody); - } - - /** - * Gets the application ID. - * - * @return the application ID - */ - protected abstract String getApplicationId(); - - /** - * Additional default headers information. - * @return HttpHeaders - */ - protected HttpHeaders getHttpHeaders(OAuth2AuthorizationCodeGrantRequest request) { - HttpHeaders httpHeaders = new HttpHeaders(); - httpHeaders.put("x-client-SKU", Collections.singletonList(getApplicationId())); - httpHeaders.put("x-client-VER", Collections.singletonList(AzureSpringIdentifier.VERSION)); - httpHeaders.put("client-request-id", Collections.singletonList(UUID.randomUUID().toString())); - return httpHeaders; - } - - /** - * Default body of OAuth2AuthorizationCodeGrantRequest. - * @param request OAuth2AuthorizationCodeGrantRequest - * @return MultiValueMap - */ - protected MultiValueMap getHttpBody(OAuth2AuthorizationCodeGrantRequest request) { - return EMPTY_MULTI_VALUE_MAP; - } -} diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/serde/jackson/SerializerUtils.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/serde/jackson/SerializerUtils.java index cb6fb358a3b6..20f17730ac89 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/serde/jackson/SerializerUtils.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/serde/jackson/SerializerUtils.java @@ -13,6 +13,7 @@ import java.util.Collections; import java.util.Map; +@SuppressWarnings("removal") public final class SerializerUtils { private static final ObjectMapper OBJECT_MAPPER; private static final TypeReference> TYPE_REFERENCE = new TypeReference<>() { }; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cOAuth2ClientConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cOAuth2ClientConfiguration.java index cd54f3b9ddcd..7a1f933034f7 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cOAuth2ClientConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/configuration/AadB2cOAuth2ClientConfiguration.java @@ -25,8 +25,8 @@ import org.springframework.security.oauth2.client.OAuth2AuthorizedClientProviderBuilder; import org.springframework.security.oauth2.client.OAuth2AuthorizedClientService; import org.springframework.security.oauth2.client.RefreshTokenOAuth2AuthorizedClientProvider; -import org.springframework.security.oauth2.client.endpoint.DefaultClientCredentialsTokenResponseClient; -import org.springframework.security.oauth2.client.endpoint.DefaultRefreshTokenTokenResponseClient; +import org.springframework.security.oauth2.client.endpoint.RestClientClientCredentialsTokenResponseClient; +import org.springframework.security.oauth2.client.endpoint.RestClientRefreshTokenTokenResponseClient; import org.springframework.security.oauth2.client.registration.ClientRegistration; import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository; import org.springframework.security.oauth2.client.web.AuthenticatedPrincipalOAuth2AuthorizedClientRepository; @@ -35,6 +35,7 @@ import org.springframework.security.oauth2.client.web.OAuth2LoginAuthenticationFilter; import org.springframework.security.oauth2.core.AuthorizationGrantType; import org.springframework.security.oauth2.core.ClientAuthenticationMethod; +import org.springframework.web.client.RestClient; import java.util.List; import java.util.Map; @@ -152,20 +153,18 @@ OAuth2AuthorizedClientManager authorizedClientManager(ClientRegistrationReposito return manager; } - @SuppressWarnings({"deprecation", "removal"}) private RefreshTokenOAuth2AuthorizedClientProvider azureRefreshTokenProvider() { RefreshTokenOAuth2AuthorizedClientProvider provider = new RefreshTokenOAuth2AuthorizedClientProvider(); - DefaultRefreshTokenTokenResponseClient responseClient = new DefaultRefreshTokenTokenResponseClient(); - responseClient.setRestOperations(createOAuth2AccessTokenResponseClientRestTemplate(restTemplateBuilder)); + RestClientRefreshTokenTokenResponseClient responseClient = new RestClientRefreshTokenTokenResponseClient(); + responseClient.setRestClient(RestClient.create(createOAuth2AccessTokenResponseClientRestTemplate(restTemplateBuilder))); provider.setAccessTokenResponseClient(responseClient); return provider; } - @SuppressWarnings({"deprecation", "removal"}) private ClientCredentialsOAuth2AuthorizedClientProvider azureClientCredentialProvider() { ClientCredentialsOAuth2AuthorizedClientProvider provider = new ClientCredentialsOAuth2AuthorizedClientProvider(); - DefaultClientCredentialsTokenResponseClient responseClient = new DefaultClientCredentialsTokenResponseClient(); - responseClient.setRestOperations(createOAuth2AccessTokenResponseClientRestTemplate(restTemplateBuilder)); + RestClientClientCredentialsTokenResponseClient responseClient = new RestClientClientCredentialsTokenResponseClient(); + responseClient.setRestClient(RestClient.create(createOAuth2AccessTokenResponseClientRestTemplate(restTemplateBuilder))); provider.setAccessTokenResponseClient(responseClient); return provider; } diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/security/AadB2cOAuth2AuthorizationCodeGrantRequestEntityConverter.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/security/AadB2cOAuth2AuthorizationCodeGrantRequestEntityConverter.java deleted file mode 100644 index 5588f24a5af4..000000000000 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/security/AadB2cOAuth2AuthorizationCodeGrantRequestEntityConverter.java +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -package com.azure.spring.cloud.autoconfigure.implementation.aadb2c.security; - -import com.azure.spring.cloud.autoconfigure.implementation.aad.security.AbstractOAuth2AuthorizationCodeGrantRequestEntityConverter; -import com.azure.spring.cloud.core.implementation.util.AzureSpringIdentifier; - -/** - * Used to set azure service header tag when use "auth-code" to get "access_token". - */ -public class AadB2cOAuth2AuthorizationCodeGrantRequestEntityConverter - extends AbstractOAuth2AuthorizationCodeGrantRequestEntityConverter { - - @Override - protected String getApplicationId() { - return AzureSpringIdentifier.AZURE_SPRING_B2C; - } -} diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/security/AadB2cOAuth2AuthorizationCodeGrantRequestHeadersConverter.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/security/AadB2cOAuth2AuthorizationCodeGrantRequestHeadersConverter.java new file mode 100644 index 000000000000..bc508366804f --- /dev/null +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/security/AadB2cOAuth2AuthorizationCodeGrantRequestHeadersConverter.java @@ -0,0 +1,29 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package com.azure.spring.cloud.autoconfigure.implementation.aadb2c.security; + +import com.azure.spring.cloud.core.implementation.util.AzureSpringIdentifier; +import org.springframework.core.convert.converter.Converter; +import org.springframework.http.HttpHeaders; +import org.springframework.security.oauth2.client.endpoint.OAuth2AuthorizationCodeGrantRequest; + +import java.util.Collections; +import java.util.UUID; + +/** + * Converter that adds Azure AD B2C specific HTTP headers to authorization code grant requests. + * These headers are used for telemetry and tracking purposes by Azure AD B2C. + */ +public class AadB2cOAuth2AuthorizationCodeGrantRequestHeadersConverter + implements Converter { + + @Override + public HttpHeaders convert(OAuth2AuthorizationCodeGrantRequest request) { + HttpHeaders headers = new HttpHeaders(); + headers.put("x-client-SKU", Collections.singletonList(AzureSpringIdentifier.AZURE_SPRING_B2C)); + headers.put("x-client-VER", Collections.singletonList(AzureSpringIdentifier.VERSION)); + headers.put("client-request-id", Collections.singletonList(UUID.randomUUID().toString())); + return headers; + } +} diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/security/AadB2cOidcLoginConfigurer.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/security/AadB2cOidcLoginConfigurer.java index 398e415ccc4b..4af30a83ec74 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/security/AadB2cOidcLoginConfigurer.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aadb2c/security/AadB2cOidcLoginConfigurer.java @@ -5,11 +5,12 @@ import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; -import org.springframework.security.oauth2.client.endpoint.DefaultAuthorizationCodeTokenResponseClient; import org.springframework.security.oauth2.client.endpoint.OAuth2AccessTokenResponseClient; import org.springframework.security.oauth2.client.endpoint.OAuth2AuthorizationCodeGrantRequest; +import org.springframework.security.oauth2.client.endpoint.RestClientAuthorizationCodeTokenResponseClient; import org.springframework.security.oauth2.client.web.OAuth2AuthorizationRequestResolver; import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; +import org.springframework.web.client.RestClient; import static com.azure.spring.cloud.autoconfigure.implementation.aad.utils.AadRestTemplateCreator.createOAuth2AccessTokenResponseClientRestTemplate; @@ -91,14 +92,13 @@ public void init(HttpSecurity http) { * * @return the access token response client */ - @SuppressWarnings({"deprecation", "removal"}) protected OAuth2AccessTokenResponseClient accessTokenResponseClient() { if (accessTokenResponseClient != null) { return accessTokenResponseClient; } - DefaultAuthorizationCodeTokenResponseClient client = new DefaultAuthorizationCodeTokenResponseClient(); - client.setRequestEntityConverter(new AadB2cOAuth2AuthorizationCodeGrantRequestEntityConverter()); - client.setRestOperations(createOAuth2AccessTokenResponseClientRestTemplate(restTemplateBuilder)); + RestClientAuthorizationCodeTokenResponseClient client = new RestClientAuthorizationCodeTokenResponseClient(); + client.addHeadersConverter(new AadB2cOAuth2AuthorizationCodeGrantRequestHeadersConverter()); + client.setRestClient(RestClient.create(createOAuth2AccessTokenResponseClientRestTemplate(restTemplateBuilder))); return client; } } diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/RestTemplateTestUtil.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/RestTemplateTestUtil.java index 8793efcf690a..cf7aa3ea207c 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/RestTemplateTestUtil.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/RestTemplateTestUtil.java @@ -26,6 +26,7 @@ import org.springframework.security.oauth2.jwt.JwtDecoderFactory; import org.springframework.security.oauth2.jwt.NimbusJwtDecoder; import org.springframework.security.web.FilterChainProxy; +import org.springframework.web.client.RestClient; import org.springframework.web.client.RestTemplate; import java.util.List; @@ -98,8 +99,9 @@ private static List getAllOAuth2AuthorizedClient } private static void assertRestTemplateWellConfiguredInOAuth2AccessTokenResponseClient(OAuth2AccessTokenResponseClient client) { - RestTemplate restTemplate = (RestTemplate) getField(client.getClass(), "restOperations", client); - assertEquals(FACTORY, restTemplate.getRequestFactory()); + RestClient restClient = (RestClient) getField(client.getClass(), "restClient", client); + Object clientRequestFactory = getField(restClient.getClass(), "clientRequestFactory", restClient); + assertEquals(FACTORY, clientRequestFactory); } @SuppressWarnings({"unchecked", "deprecation"}) diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadOAuth2ClientConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadOAuth2ClientConfigurationTests.java index cc2f752f4d40..a8daec063143 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadOAuth2ClientConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadOAuth2ClientConfigurationTests.java @@ -6,7 +6,6 @@ import com.azure.spring.cloud.autoconfigure.implementation.aad.jwk.TestJwks; import com.azure.spring.cloud.autoconfigure.implementation.aad.configuration.properties.AadAuthenticationProperties; import com.azure.spring.cloud.autoconfigure.implementation.aad.security.AadClientRegistrationRepository; -import com.azure.spring.cloud.autoconfigure.implementation.aad.security.AadJwtBearerGrantRequestEntityConverter; import com.azure.spring.cloud.autoconfigure.implementation.aad.security.OAuth2ClientAuthenticationJwkResolver; import com.nimbusds.jose.jwk.JWK; import com.nimbusds.jose.jwk.RSAKey; @@ -18,10 +17,9 @@ import org.springframework.boot.test.context.runner.WebApplicationContextRunner; import org.springframework.core.convert.converter.Converter; import org.springframework.security.oauth2.client.JwtBearerOAuth2AuthorizedClientProvider; -import org.springframework.security.oauth2.client.endpoint.DefaultJwtBearerTokenResponseClient; import org.springframework.security.oauth2.client.endpoint.JwtBearerGrantRequest; -import org.springframework.security.oauth2.client.endpoint.JwtBearerGrantRequestEntityConverter; import org.springframework.security.oauth2.client.endpoint.OAuth2AccessTokenResponseClient; +import org.springframework.security.oauth2.client.endpoint.RestClientJwtBearerTokenResponseClient; import org.springframework.security.oauth2.client.registration.ClientRegistration; import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository; import org.springframework.security.oauth2.client.web.OAuth2AuthorizedClientRepository; @@ -253,19 +251,15 @@ void restTemplateWellConfiguredWhenUsingPrivateKeyJwtMethod() { }); } - @SuppressWarnings({"deprecation", "removal", "unchecked"}) + @SuppressWarnings({"unchecked"}) private MultiValueMap convertParameters(JwtBearerOAuth2AuthorizedClientProvider jwtBearerProvider, ClientRegistrationRepository clientRepository) { OAuth2AccessTokenResponseClient client = - (OAuth2AccessTokenResponseClient) ReflectionTestUtils.getField(jwtBearerProvider, "accessTokenResponseClient"); - assertThat(client.getClass().getSimpleName()).isEqualTo(DefaultJwtBearerTokenResponseClient.class.getSimpleName()); - - JwtBearerGrantRequestEntityConverter requestEntityConverter = - (JwtBearerGrantRequestEntityConverter) ReflectionTestUtils.getField(client, "requestEntityConverter"); - assertThat(requestEntityConverter.getClass().getSimpleName()).isEqualTo(AadJwtBearerGrantRequestEntityConverter.class.getSimpleName()); + (OAuth2AccessTokenResponseClient) ReflectionTestUtils.getField(jwtBearerProvider, "accessTokenResponseClient"); + assertThat(client.getClass().getSimpleName()).isEqualTo(RestClientJwtBearerTokenResponseClient.class.getSimpleName()); Converter> parametersConverter = - (Converter>) ReflectionTestUtils.getField(requestEntityConverter, "parametersConverter"); + (Converter>) ReflectionTestUtils.getField(client, "parametersConverter"); JwtBearerGrantRequest request = new JwtBearerGrantRequest(clientRepository.findByRegistrationId("graph"), mock(Jwt.class)); return parametersConverter.convert(request); } diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadJwtBearerGrantRequestEntityConverterTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadJwtBearerGrantRequestEntityConverterTests.java index ce771c846038..bdeb4fe16707 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadJwtBearerGrantRequestEntityConverterTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadJwtBearerGrantRequestEntityConverterTests.java @@ -3,8 +3,8 @@ package com.azure.spring.cloud.autoconfigure.implementation.aad.security; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.springframework.http.RequestEntity; import org.springframework.security.oauth2.client.endpoint.JwtBearerGrantRequest; import org.springframework.security.oauth2.client.registration.ClientRegistration; import org.springframework.security.oauth2.core.AuthorizationGrantType; @@ -17,9 +17,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -class AadJwtBearerGrantRequestEntityConverterTests { +class AadJwtBearerGrantRequestParametersConverterTests { - @SuppressWarnings("unchecked") @Test void requestedTokenUseParameter() { ClientRegistration clientRegistration = ClientRegistration.withRegistrationId("test") @@ -35,11 +34,10 @@ void requestedTokenUseParameter() { .expiresAt(Instant.ofEpochMilli(Instant.now().plusSeconds(60).toEpochMilli())) .build(); JwtBearerGrantRequest request = new JwtBearerGrantRequest(clientRegistration, jwt); - AadJwtBearerGrantRequestEntityConverter converter = - new AadJwtBearerGrantRequestEntityConverter(); - RequestEntity> entity = - (RequestEntity>) converter.convert(request); - MultiValueMap parameters = entity.getBody(); + AadJwtBearerGrantRequestParametersConverter converter = + new AadJwtBearerGrantRequestParametersConverter(); + MultiValueMap parameters = converter.convert(request); + Assertions.assertNotNull(parameters); assertTrue(parameters.containsKey("requested_token_use")); assertEquals("on_behalf_of", parameters.getFirst("requested_token_use")); } diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2AuthorizationCodeGrantRequestEntityConverterTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2AuthorizationCodeGrantRequestEntityConverterTests.java index c9d0610e031f..4b5573ed99a1 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2AuthorizationCodeGrantRequestEntityConverterTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadOAuth2AuthorizationCodeGrantRequestEntityConverterTests.java @@ -7,9 +7,7 @@ import com.azure.spring.cloud.core.implementation.util.AzureSpringIdentifier; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.runner.WebApplicationContextRunner; -import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; -import org.springframework.http.RequestEntity; import org.springframework.security.oauth2.client.endpoint.OAuth2AuthorizationCodeGrantRequest; import org.springframework.security.oauth2.client.registration.ClientRegistration; import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository; @@ -19,13 +17,12 @@ import org.springframework.util.MultiValueMap; import java.util.Collections; -import java.util.Optional; import static com.azure.spring.cloud.autoconfigure.implementation.aad.security.AadClientRegistrationRepository.AZURE_CLIENT_REGISTRATION_ID; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -class AadOAuth2AuthorizationCodeGrantRequestEntityConverterTests { +class AadOAuth2AuthorizationCodeGrantRequestConvertersTests { private WebApplicationContextRunner getContextRunner() { return WebApplicationContextRunnerUtils @@ -65,14 +62,13 @@ void onlyAddScopeOnceEvenConvertMethodExecutedMultipleTimes() { getContextRunner().run(context -> { AadClientRegistrationRepository repository = (AadClientRegistrationRepository) context.getBean(ClientRegistrationRepository.class); - AadOAuth2AuthorizationCodeGrantRequestEntityConverter converter = - new AadOAuth2AuthorizationCodeGrantRequestEntityConverter(repository.getAzureClientAccessTokenScopes()); + AadOAuth2AuthorizationCodeGrantRequestParametersConverter converter = + new AadOAuth2AuthorizationCodeGrantRequestParametersConverter(repository.getAzureClientAccessTokenScopes()); ClientRegistration azure = repository.findByRegistrationId(AZURE_CLIENT_REGISTRATION_ID); OAuth2AuthorizationCodeGrantRequest request = createCodeGrantRequest(azure); // Convert method execute 2 times converter.convert(request); - RequestEntity entity = converter.convert(request); - MultiValueMap map = WebApplicationContextRunnerUtils.toMultiValueMap(entity); + MultiValueMap map = converter.convert(request); assertEquals(1, map.get("scope").size()); }); } @@ -83,7 +79,7 @@ void addHeadersForAzureClient() { AadClientRegistrationRepository repository = (AadClientRegistrationRepository) context.getBean(ClientRegistrationRepository.class); ClientRegistration azure = repository.findByRegistrationId(AZURE_CLIENT_REGISTRATION_ID); - HttpHeaders httpHeaders = convertedHeaderOf(repository, createCodeGrantRequest(azure)); + HttpHeaders httpHeaders = convertedHeaderOf(createCodeGrantRequest(azure)); testHttpHeaders(httpHeaders); }); } @@ -94,19 +90,15 @@ void addHeadersForAuthorizationCodeClient() { AadClientRegistrationRepository repository = (AadClientRegistrationRepository) context.getBean(ClientRegistrationRepository.class); ClientRegistration arm = repository.findByRegistrationId("arm"); - HttpHeaders httpHeaders = convertedHeaderOf(repository, createCodeGrantRequest(arm)); + HttpHeaders httpHeaders = convertedHeaderOf(createCodeGrantRequest(arm)); testHttpHeaders(httpHeaders); }); } - private HttpHeaders convertedHeaderOf(AadClientRegistrationRepository repository, - OAuth2AuthorizationCodeGrantRequest request) { - AadOAuth2AuthorizationCodeGrantRequestEntityConverter converter = - new AadOAuth2AuthorizationCodeGrantRequestEntityConverter(repository.getAzureClientAccessTokenScopes()); - RequestEntity entity = converter.convert(request); - return Optional.ofNullable(entity) - .map(HttpEntity::getHeaders) - .orElse(null); + private HttpHeaders convertedHeaderOf(OAuth2AuthorizationCodeGrantRequest request) { + AadOAuth2AuthorizationCodeGrantRequestHeadersConverter converter = + new AadOAuth2AuthorizationCodeGrantRequestHeadersConverter(); + return converter.convert(request); } private void testHttpHeaders(HttpHeaders headers) { @@ -119,10 +111,9 @@ private void testHttpHeaders(HttpHeaders headers) { private MultiValueMap convertedBodyOf(AadClientRegistrationRepository repository, OAuth2AuthorizationCodeGrantRequest request) { - AadOAuth2AuthorizationCodeGrantRequestEntityConverter converter = - new AadOAuth2AuthorizationCodeGrantRequestEntityConverter(repository.getAzureClientAccessTokenScopes()); - RequestEntity entity = converter.convert(request); - return WebApplicationContextRunnerUtils.toMultiValueMap(entity); + AadOAuth2AuthorizationCodeGrantRequestParametersConverter converter = + new AadOAuth2AuthorizationCodeGrantRequestParametersConverter(repository.getAzureClientAccessTokenScopes()); + return converter.convert(request); } private OAuth2AuthorizationCodeGrantRequest createCodeGrantRequest(ClientRegistration client) { From 217352495683337aad0b075854a132a409bcd994 Mon Sep 17 00:00:00 2001 From: muyao Date: Wed, 26 Nov 2025 15:53:29 +0800 Subject: [PATCH 38/76] update aad/aadb2c --- .../aad/configuration/AadOAuth2ClientConfiguration.java | 9 ++++++++- .../AadJwtBearerGrantRequestParametersConverter.java | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadOAuth2ClientConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadOAuth2ClientConfiguration.java index 269bd3102c1d..90ad31c7ab0d 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadOAuth2ClientConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadOAuth2ClientConfiguration.java @@ -3,10 +3,17 @@ package com.azure.spring.cloud.autoconfigure.implementation.aad.configuration; -import com.azure.spring.cloud.autoconfigure.implementation.aad.security.*; import com.azure.spring.cloud.autoconfigure.implementation.aad.configuration.conditions.ClientCertificatePropertiesCondition; import com.azure.spring.cloud.autoconfigure.implementation.aad.configuration.conditions.ClientRegistrationCondition; import com.azure.spring.cloud.autoconfigure.implementation.aad.configuration.properties.AadAuthenticationProperties; +import com.azure.spring.cloud.autoconfigure.implementation.aad.security.AadAzureDelegatedOAuth2AuthorizedClientProvider; +import com.azure.spring.cloud.autoconfigure.implementation.aad.security.AadClientRegistrationRepository; +import com.azure.spring.cloud.autoconfigure.implementation.aad.security.AadJwtBearerGrantRequestParametersConverter; +import com.azure.spring.cloud.autoconfigure.implementation.aad.security.AadJwtClientAuthenticationParametersConverter; +import com.azure.spring.cloud.autoconfigure.implementation.aad.security.AadOAuth2ClientAuthenticationJwkResolver; +import com.azure.spring.cloud.autoconfigure.implementation.aad.security.AadOidcIdTokenDecoderFactory; +import com.azure.spring.cloud.autoconfigure.implementation.aad.security.JacksonHttpSessionOAuth2AuthorizedClientRepository; +import com.azure.spring.cloud.autoconfigure.implementation.aad.security.OAuth2ClientAuthenticationJwkResolver; import com.azure.spring.cloud.autoconfigure.implementation.aad.security.properties.AadAuthorizationServerEndpoints; import com.azure.spring.cloud.autoconfigure.implementation.aad.configuration.properties.AadProfileProperties; import org.springframework.beans.factory.ObjectProvider; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadJwtBearerGrantRequestParametersConverter.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadJwtBearerGrantRequestParametersConverter.java index 2efa9b2441fe..3b366b550c18 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadJwtBearerGrantRequestParametersConverter.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadJwtBearerGrantRequestParametersConverter.java @@ -20,7 +20,7 @@ * @see OAuth 2.0 On-Behalf-Of */ public class AadJwtBearerGrantRequestParametersConverter - implements Converter> { + implements Converter> { @Override public MultiValueMap convert(JwtBearerGrantRequest jwtBearerGrantRequest) { From 48df3f3e5e8914036b07cc4411b2a755b3f481e7 Mon Sep 17 00:00:00 2001 From: muyao Date: Wed, 26 Nov 2025 15:57:49 +0800 Subject: [PATCH 39/76] fix replace ListenableFutureCallback --- eng/lintingconfigs/revapi/track2/revapi.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/eng/lintingconfigs/revapi/track2/revapi.json b/eng/lintingconfigs/revapi/track2/revapi.json index 00a4f85ab9a5..ef3c51ce850f 100644 --- a/eng/lintingconfigs/revapi/track2/revapi.json +++ b/eng/lintingconfigs/revapi/track2/revapi.json @@ -340,6 +340,12 @@ "old" : "interface com.azure.spring.cloud.autoconfigure.jms.ServiceBusJmsConnectionFactoryCustomizer", "justification" : "Remove deprecated method" }, + { + "code" : "java.method.parameterTypeChanged", + "old" : "parameter void com.azure.spring.integration.core.handler.DefaultMessageHandler::setSendCallback(===org.springframework.util.concurrent.ListenableFutureCallback===)", + "new" : "parameter void com.azure.spring.integration.core.handler.DefaultMessageHandler::setSendCallback(===java.util.function.BiConsumer===)", + "name" : "Replace deprecated parameterType" + }, { "code": "java.method.numberOfParametersChanged", "old": { From c0b85fd79385b2ad915cc77741fbae7017977bad Mon Sep 17 00:00:00 2001 From: muyao Date: Thu, 27 Nov 2025 13:54:33 +0800 Subject: [PATCH 40/76] fix spring integration ut --- .../core/handler/DefaultMessageHandlerTests.java | 8 +++++++- .../eventhubs/outbound/EventHubsMessageHandlerTests.java | 1 + .../outbound/ServiceBusMessageHandlerTests.java | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/sdk/spring/spring-integration-azure-core/src/test/java/com/azure/spring/integration/core/handler/DefaultMessageHandlerTests.java b/sdk/spring/spring-integration-azure-core/src/test/java/com/azure/spring/integration/core/handler/DefaultMessageHandlerTests.java index b869c60578cc..015cf82c775b 100644 --- a/sdk/spring/spring-integration-azure-core/src/test/java/com/azure/spring/integration/core/handler/DefaultMessageHandlerTests.java +++ b/sdk/spring/spring-integration-azure-core/src/test/java/com/azure/spring/integration/core/handler/DefaultMessageHandlerTests.java @@ -11,7 +11,9 @@ import org.springframework.expression.Expression; import org.springframework.expression.ExpressionParser; import org.springframework.expression.spel.standard.SpelExpressionParser; +import org.springframework.expression.spel.support.StandardEvaluationContext; import org.springframework.integration.MessageTimeoutException; +import org.springframework.integration.context.IntegrationContextUtils; import org.springframework.integration.expression.FunctionExpression; import org.springframework.messaging.Message; import org.springframework.messaging.support.GenericMessage; @@ -60,7 +62,11 @@ public DefaultMessageHandlerTests() { valueMap.put("key2", "value2"); message = new GenericMessage<>("testPayload", valueMap); } - public abstract void setUp(); + public void setUp() { + StandardEvaluationContext sec = new StandardEvaluationContext(); + when(beanFactory.containsBean(IntegrationContextUtils.INTEGRATION_EVALUATION_CONTEXT_BEAN_NAME)).thenReturn(true); + when(beanFactory.getBean(IntegrationContextUtils.INTEGRATION_EVALUATION_CONTEXT_BEAN_NAME, StandardEvaluationContext.class)).thenReturn(sec); + } @Test @SuppressWarnings("unchecked") diff --git a/sdk/spring/spring-integration-azure-eventhubs/src/test/java/com/azure/spring/integration/eventhubs/outbound/EventHubsMessageHandlerTests.java b/sdk/spring/spring-integration-azure-eventhubs/src/test/java/com/azure/spring/integration/eventhubs/outbound/EventHubsMessageHandlerTests.java index 30602b66a56d..594b081d3c59 100644 --- a/sdk/spring/spring-integration-azure-eventhubs/src/test/java/com/azure/spring/integration/eventhubs/outbound/EventHubsMessageHandlerTests.java +++ b/sdk/spring/spring-integration-azure-eventhubs/src/test/java/com/azure/spring/integration/eventhubs/outbound/EventHubsMessageHandlerTests.java @@ -25,6 +25,7 @@ class EventHubsMessageHandlerTests extends DefaultMessageHandlerTests Date: Thu, 27 Nov 2025 16:34:50 +0800 Subject: [PATCH 41/76] fix spring integration ut --- .../EventHubsInboundChannelAdapterTests.java | 14 ++++++++++++++ .../ServiceBusInboundChannelAdapterTests.java | 14 ++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/sdk/spring/spring-integration-azure-eventhubs/src/test/java/com/azure/spring/integration/eventhubs/inbound/EventHubsInboundChannelAdapterTests.java b/sdk/spring/spring-integration-azure-eventhubs/src/test/java/com/azure/spring/integration/eventhubs/inbound/EventHubsInboundChannelAdapterTests.java index ef6dcc33b0ea..6f991a5d5115 100644 --- a/sdk/spring/spring-integration-azure-eventhubs/src/test/java/com/azure/spring/integration/eventhubs/inbound/EventHubsInboundChannelAdapterTests.java +++ b/sdk/spring/spring-integration-azure-eventhubs/src/test/java/com/azure/spring/integration/eventhubs/inbound/EventHubsInboundChannelAdapterTests.java @@ -26,9 +26,13 @@ import com.azure.spring.messaging.eventhubs.implementation.core.listener.adapter.BatchMessagingMessageListenerAdapter; import com.azure.spring.messaging.eventhubs.implementation.support.converter.EventHubsBatchMessageConverter; import com.azure.spring.messaging.eventhubs.implementation.support.converter.EventHubsMessageConverter; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.springframework.beans.factory.BeanFactory; import org.springframework.integration.channel.DirectChannel; import reactor.core.publisher.Mono; @@ -55,12 +59,16 @@ class EventHubsInboundChannelAdapterTests { private EventHubsInboundChannelAdapter adapter; private EventHubsProcessorFactory processorFactory; private EventHubsContainerProperties containerProperties; + @Mock + private BeanFactory beanFactory; + private AutoCloseable closeable; private static final String CONSUMER_GROUP = "group"; private static final String EVENT_HUB = "dest"; @BeforeEach void setUp() { + this.closeable = MockitoAnnotations.openMocks(this); this.processorFactory = mock(EventHubsProcessorFactory.class); when(processorFactory.createProcessor(eq(EVENT_HUB), eq(CONSUMER_GROUP), isA(EventHubsContainerProperties.class))).thenReturn(mock(EventProcessorClient.class)); @@ -72,6 +80,11 @@ void setUp() { new EventHubsMessageListenerContainer(processorFactory, containerProperties)); } + @AfterEach + void close() throws Exception { + closeable.close(); + } + @Test void defaultRecordListenerMode() { EventHubsInboundChannelAdapter channelAdapter = new EventHubsInboundChannelAdapter( @@ -132,6 +145,7 @@ void setBatchMessageConverter() { @Test void setPayloadType() { + this.adapter.setBeanFactory(this.beanFactory); this.adapter.afterPropertiesSet(); assertThat(this.adapter).extracting("recordListener").extracting("payloadType").isEqualTo(byte[].class); this.adapter.setPayloadType(Long.class); diff --git a/sdk/spring/spring-integration-azure-servicebus/src/test/java/com/azure/spring/integration/servicebus/inbound/ServiceBusInboundChannelAdapterTests.java b/sdk/spring/spring-integration-azure-servicebus/src/test/java/com/azure/spring/integration/servicebus/inbound/ServiceBusInboundChannelAdapterTests.java index 2c2f9a31f3bf..bb72a17d3a18 100644 --- a/sdk/spring/spring-integration-azure-servicebus/src/test/java/com/azure/spring/integration/servicebus/inbound/ServiceBusInboundChannelAdapterTests.java +++ b/sdk/spring/spring-integration-azure-servicebus/src/test/java/com/azure/spring/integration/servicebus/inbound/ServiceBusInboundChannelAdapterTests.java @@ -21,9 +21,13 @@ import com.azure.spring.messaging.servicebus.core.listener.ServiceBusMessageListenerContainer; import com.azure.spring.messaging.servicebus.core.properties.ServiceBusContainerProperties; import com.azure.spring.messaging.servicebus.implementation.support.converter.ServiceBusMessageConverter; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.springframework.beans.factory.BeanFactory; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; @@ -57,9 +61,13 @@ class ServiceBusInboundChannelAdapterTests { private List> messages = Arrays.stream(payloads) .map(p -> MessageBuilder.withPayload(p).build()) .collect(Collectors.toList()); + @Mock + private BeanFactory beanFactory; + private AutoCloseable closeable; @BeforeEach public void setUp() { + this.closeable = MockitoAnnotations.openMocks(this); this.processorFactory = mock(ServiceBusProcessorFactory.class); when(processorFactory.createProcessor(eq(destination), eq(subscription), isA(ServiceBusContainerProperties.class))).thenReturn(mock(ServiceBusProcessorClient.class)); @@ -71,6 +79,11 @@ public void setUp() { new ServiceBusMessageListenerContainer(processorFactory, containerProperties)); } + @AfterEach + void close() throws Exception { + closeable.close(); + } + @Test void defaultRecordListenerMode() { ServiceBusInboundChannelAdapter channelAdapter = new ServiceBusInboundChannelAdapter( @@ -110,6 +123,7 @@ void setMessageConverter() { @Test void setPayloadType() { + this.adapter.setBeanFactory(this.beanFactory); this.adapter.afterPropertiesSet(); assertThat(this.adapter).extracting("recordListener").extracting("payloadType").isEqualTo(byte[].class); this.adapter.setPayloadType(Long.class); From 339c49ff76d399524abac18067cba721449a965a Mon Sep 17 00:00:00 2001 From: muyao Date: Thu, 27 Nov 2025 16:35:50 +0800 Subject: [PATCH 42/76] fix --- sdk/spring/azure-spring-data-cosmos/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/spring/azure-spring-data-cosmos/README.md b/sdk/spring/azure-spring-data-cosmos/README.md index 8bc3fb3856db..f18adc76a707 100644 --- a/sdk/spring/azure-spring-data-cosmos/README.md +++ b/sdk/spring/azure-spring-data-cosmos/README.md @@ -131,6 +131,7 @@ Set `pointOperationLatencyThresholdInMS`, `nonPointOperationLatencyThresholdInMS ```java readme-sample-AppConfiguration @Configuration @EnableCosmosRepositories +@SuppressWarnings("deprecation") public class AppConfiguration extends AbstractCosmosConfiguration { private static final Logger LOGGER = LoggerFactory.getLogger(AppConfiguration.class); From 5bc36b468b1646ad59422307bcf641783eeeea00 Mon Sep 17 00:00:00 2001 From: muyao Date: Fri, 28 Nov 2025 12:59:44 +0800 Subject: [PATCH 43/76] version update --- eng/versioning/external_dependencies.txt | 218 +- sdk/spring/CHANGELOG.md | 2 +- sdk/spring/azure-spring-data-cosmos/pom.xml | 92 +- sdk/spring/scripts/_constants.py | 17 +- ....0.0-RC2_managed_external_dependencies.txt | 1753 ------------- ...ot_4.0.0_managed_external_dependencies.txt | 2176 +++++++++++++++++ .../scripts/sync_external_dependencies.py | 6 +- sdk/spring/scripts/version_util.py | 16 +- .../pom.xml | 30 +- .../spring-cloud-azure-actuator/pom.xml | 24 +- .../pom.xml | 30 +- .../pom.xml | 40 +- .../spring-cloud-azure-autoconfigure/pom.xml | 126 +- sdk/spring/spring-cloud-azure-core/pom.xml | 22 +- .../spring-cloud-azure-docker-compose/pom.xml | 22 +- .../pom.xml | 24 +- .../pom.xml | 40 +- .../pom.xml | 6 +- .../pom.xml | 6 +- .../pom.xml | 18 +- sdk/spring/spring-cloud-azure-service/pom.xml | 24 +- .../pom.xml | 18 +- .../pom.xml | 16 +- .../pom.xml | 12 +- .../pom.xml | 10 +- .../pom.xml | 10 +- .../spring-cloud-azure-starter-cosmos/pom.xml | 10 +- .../pom.xml | 10 +- .../pom.xml | 14 +- .../pom.xml | 10 +- .../pom.xml | 10 +- .../pom.xml | 12 +- .../pom.xml | 12 +- .../pom.xml | 12 +- .../pom.xml | 12 +- .../pom.xml | 12 +- .../pom.xml | 10 +- .../pom.xml | 10 +- .../pom.xml | 10 +- .../pom.xml | 10 +- .../pom.xml | 10 +- .../pom.xml | 10 +- .../pom.xml | 28 +- .../pom.xml | 10 +- .../pom.xml | 10 +- .../pom.xml | 10 +- .../pom.xml | 10 +- .../pom.xml | 10 +- .../pom.xml | 10 +- .../pom.xml | 10 +- sdk/spring/spring-cloud-azure-starter/pom.xml | 12 +- .../pom.xml | 30 +- .../pom.xml | 22 +- .../pom.xml | 30 +- .../pom.xml | 22 +- .../spring-cloud-azure-testcontainers/pom.xml | 26 +- .../spring-integration-azure-core/pom.xml | 24 +- .../pom.xml | 18 +- .../pom.xml | 18 +- .../pom.xml | 14 +- .../spring-messaging-azure-eventhubs/pom.xml | 36 +- .../spring-messaging-azure-servicebus/pom.xml | 32 +- .../pom.xml | 16 +- sdk/spring/spring-messaging-azure/pom.xml | 36 +- 64 files changed, 2895 insertions(+), 2471 deletions(-) delete mode 100644 sdk/spring/scripts/spring_boot_4.0.0-RC2_managed_external_dependencies.txt create mode 100644 sdk/spring/scripts/spring_boot_4.0.0_managed_external_dependencies.txt diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index fc764521c324..9731a410f72c 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -312,113 +312,119 @@ resourcemanager_com.jcraft:jsch;0.1.55 storage_com.microsoft.azure:azure-storage;8.6.6 # sdk\spring\pom.xml modules -springboot3_com.diffplug.spotless:spotless-maven-plugin;2.30.0 -springboot3_com.fasterxml.jackson.core:jackson-annotations;2.20 -springboot3_com.fasterxml.jackson.core:jackson-databind;2.20.1 -springboot3_com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.20.1 -springboot3_com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.20.1 -springboot3_com.fasterxml.jackson.module:jackson-module-parameter-names;2.20.1 -springboot3_com.github.spotbugs:spotbugs-maven-plugin;4.8.2.0 -springboot3_com.google.code.findbugs:jsr305;3.0.2 -springboot3_com.mysql:mysql-connector-j;9.4.0 -springboot3_com.nimbusds:nimbus-jose-jwt;9.37.3 -springboot3_io.lettuce:lettuce-core;6.8.1.RELEASE -springboot3_io.micrometer:micrometer-core;1.15.3 -springboot3_io.netty:netty-buffer;4.2.7.Final -springboot3_io.netty:netty-codec-http;4.2.7.Final -springboot3_io.netty:netty-common;4.2.7.Final -springboot3_io.netty:netty-handler;4.2.7.Final -springboot3_io.netty:netty-transport-native-epoll;4.2.7.Final -springboot3_io.netty:netty-transport-native-kqueue;4.2.7.Final -springboot3_io.netty:netty-transport;4.2.7.Final -springboot3_io.projectreactor.netty:reactor-netty;1.3.0-RC1 -springboot3_io.projectreactor:reactor-test;3.8.0-RC1 -springboot3_jakarta.servlet:jakarta.servlet-api;6.1.0 -springboot3_jakarta.validation:jakarta.validation-api;3.1.1 -springboot3_javax.annotation:javax.annotation-api;1.3.2 -springboot3_junit:junit;4.13.2 -springboot3_net.bytebuddy:byte-buddy-agent;1.17.8 -springboot3_net.bytebuddy:byte-buddy;1.17.8 -springboot3_org.apache.commons:commons-lang3;3.19.0 -springboot3_org.apache.kafka:kafka-clients;4.1.0 -springboot3_org.apache.maven.plugins:maven-antrun-plugin;3.2.0 -springboot3_org.apache.maven.plugins:maven-compiler-plugin;3.14.1 -springboot3_org.apache.maven.plugins:maven-enforcer-plugin;3.6.2 -springboot3_org.apache.maven.plugins:maven-failsafe-plugin;3.5.4 -springboot3_org.apache.maven.plugins:maven-jar-plugin;3.4.2 -springboot3_org.apache.maven.plugins:maven-javadoc-plugin;3.12.0 -springboot3_org.apache.maven.plugins:maven-surefire-plugin;3.5.4 -springboot3_org.assertj:assertj-core;3.27.6 -springboot3_org.hibernate.validator:hibernate-validator;9.0.1.Final -springboot3_org.javatuples:javatuples;1.2 -springboot3_org.junit.jupiter:junit-jupiter;6.0.1 -springboot3_org.junit.vintage:junit-vintage-engine;6.0.1 -springboot3_org.messaginghub:pooled-jms;3.1.7 -springboot3_org.mockito:mockito-core;5.20.0 -springboot3_org.postgresql:postgresql;42.7.8 -springboot3_org.revapi:revapi-maven-plugin;0.14.6 -springboot3_org.slf4j:slf4j-api;2.0.17 -springboot3_org.slf4j:slf4j-simple;2.0.17 -springboot3_org.springframework.boot:spring-boot-actuator-autoconfigure;4.0.0-RC2 -springboot3_org.springframework.boot:spring-boot-actuator;4.0.0-RC2 -springboot3_org.springframework.boot:spring-boot-autoconfigure;4.0.0-RC2 -springboot3_org.springframework.boot:spring-boot-configuration-metadata;4.0.0-RC2 -springboot3_org.springframework.boot:spring-boot-configuration-processor;4.0.0-RC2 -springboot3_org.springframework.boot:spring-boot-docker-compose;4.0.0-RC2 -springboot3_org.springframework.boot:spring-boot-persistence;4.0.0-RC2 -springboot3_org.springframework.boot:spring-boot-starter-actuator;4.0.0-RC2 -springboot3_org.springframework.boot:spring-boot-starter-data-jdbc;4.0.0-RC2 -springboot3_org.springframework.boot:spring-boot-starter-integration;4.0.0-RC2 -springboot3_org.springframework.boot:spring-boot-starter-parent;4.0.0-RC2 -springboot3_org.springframework.boot:spring-boot-starter-test;4.0.0-RC2 -springboot3_org.springframework.boot:spring-boot-starter-webmvc;4.0.0-RC2 -springboot3_org.springframework.boot:spring-boot-starter;4.0.0-RC2 -springboot3_org.springframework.boot:spring-boot-test;4.0.0-RC2 -springboot3_org.springframework.boot:spring-boot-testcontainers;4.0.0-RC2 -springboot3_org.springframework.cloud:spring-cloud-bus;4.3.0 -springboot3_org.springframework.cloud:spring-cloud-context;4.3.0 -springboot3_org.springframework.cloud:spring-cloud-starter-stream-kafka;5.0.0-RC1 -springboot3_org.springframework.cloud:spring-cloud-stream-test-binder;4.3.0 -springboot3_org.springframework.cloud:spring-cloud-stream;4.3.0 -springboot3_org.springframework.data:spring-data-commons;3.5.3 -springboot3_org.springframework.data:spring-data-redis;3.5.3 -springboot3_org.springframework.boot:spring-boot-data-redis;4.0.0-RC2 -springboot3_org.springframework.boot:spring-boot-resttestclient;4.0.0-RC2 -springboot3_org.springframework.integration:spring-integration-core;7.0.0-RC2 -springboot3_org.springframework.boot:spring-boot-http-converter;4.0.0-RC2 -springboot3_org.springframework.boot:spring-boot-kafka;4.0.0-RC2 -springboot3_org.springframework.retry:spring-retry;2.0.12 -springboot3_org.springframework.security:spring-security-config;7.0.0-RC3 -springboot3_org.springframework.security:spring-security-oauth2-client;7.0.0-RC3 -springboot3_org.springframework.security:spring-security-oauth2-jose;7.0.0-RC3 -springboot3_org.springframework.security:spring-security-oauth2-resource-server;7.0.0-RC3 -springboot3_org.springframework.security:spring-security-web;7.0.0-RC3 -springboot3_org.springframework:spring-beans;7.0.0-RC3 -springboot3_org.springframework:spring-context-support;7.0.0-RC3 -springboot3_org.springframework:spring-context;7.0.0-RC3 -springboot3_org.springframework:spring-core-test;7.0.0-RC3 -springboot3_org.springframework:spring-core;7.0.0-RC3 -springboot3_org.springframework:spring-expression;7.0.0-RC3 -springboot3_org.springframework.boot:spring-boot-health;4.0.0-RC2 -springboot3_org.springframework.boot:spring-boot-jackson;4.0.0-RC2 -springboot3_org.springframework.boot:spring-boot-jdbc;4.0.0-RC2 -springboot3_org.springframework.boot:spring-boot-jms;4.0.0-RC2 -springboot3_org.springframework.boot:spring-boot-restclient;4.0.0-RC2 -springboot3_org.springframework.boot:spring-boot-security;4.0.0-RC2 -springboot3_org.springframework.boot:spring-boot-security-oauth2-client;4.0.0-RC2 -springboot3_org.springframework:spring-jms;7.0.0-RC3 -springboot3_org.springframework:spring-messaging;7.0.0-RC3 -springboot3_org.springframework:spring-test;7.0.0-RC3 -springboot3_org.springframework:spring-tx;7.0.0-RC3 -springboot3_org.springframework:spring-web;7.0.0-RC3 -springboot3_org.springframework:spring-webmvc;7.0.0-RC3 -springboot3_org.testcontainers:junit-jupiter;1.21.3 -springboot3_org.testcontainers:azure;1.21.3 -springboot3_jakarta.annotation:jakarta.annotation-api;3.0.0 -springboot3_ch.qos.logback:logback-classic;1.5.20 +springboot4_com.diffplug.spotless:spotless-maven-plugin;2.30.0 +springboot4_com.fasterxml.jackson.core:jackson-annotations;2.20 +springboot4_com.fasterxml.jackson.core:jackson-core;2.20.1 +springboot4_com.fasterxml.jackson.core:jackson-databind;2.20.1 +springboot4_com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.20.1 +springboot4_com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.20.1 +springboot4_com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.20.1 +springboot4_com.fasterxml.jackson.module:jackson-module-afterburner;2.20.1 +springboot4_com.fasterxml.jackson.module:jackson-module-parameter-names;2.20.1 +springboot4_com.github.spotbugs:spotbugs-maven-plugin;4.8.2.0 +springboot4_com.google.code.findbugs:jsr305;3.0.2 +springboot4_com.mysql:mysql-connector-j;9.5.0 +springboot4_com.nimbusds:nimbus-jose-jwt;9.37.3 +springboot4_io.lettuce:lettuce-core;6.8.1.RELEASE +springboot4_io.micrometer:micrometer-core;1.16.0 +springboot4_io.netty:netty-buffer;4.2.7.Final +springboot4_io.netty:netty-codec-http;4.2.7.Final +springboot4_io.netty:netty-common;4.2.7.Final +springboot4_io.netty:netty-handler;4.2.7.Final +springboot4_io.netty:netty-transport-native-epoll;4.2.7.Final +springboot4_io.netty:netty-transport-native-kqueue;4.2.7.Final +springboot4_io.netty:netty-transport;4.2.7.Final +springboot4_io.projectreactor.netty:reactor-netty;1.3.0 +springboot4_io.projectreactor:reactor-test;3.8.0 +springboot4_jakarta.servlet:jakarta.servlet-api;6.1.0 +springboot4_jakarta.validation:jakarta.validation-api;3.1.1 +springboot4_javax.annotation:javax.annotation-api;1.3.2 +springboot4_junit:junit;4.13.2 +springboot4_net.bytebuddy:byte-buddy-agent;1.17.8 +springboot4_net.bytebuddy:byte-buddy;1.17.8 +springboot4_org.apache.commons:commons-lang3;3.19.0 +springboot4_org.apache.kafka:kafka-clients;4.1.1 +springboot4_org.apache.maven.plugins:maven-antrun-plugin;3.2.0 +springboot4_org.apache.maven.plugins:maven-compiler-plugin;3.14.1 +springboot4_org.apache.maven.plugins:maven-enforcer-plugin;3.6.2 +springboot4_org.apache.maven.plugins:maven-failsafe-plugin;3.5.4 +springboot4_org.apache.maven.plugins:maven-jar-plugin;3.4.2 +springboot4_org.apache.maven.plugins:maven-javadoc-plugin;3.12.0 +springboot4_org.apache.maven.plugins:maven-surefire-plugin;3.5.4 +springboot4_org.assertj:assertj-core;3.27.6 +springboot4_org.hibernate.validator:hibernate-validator;9.0.1.Final +springboot4_org.javatuples:javatuples;1.2 +springboot4_org.junit.jupiter:junit-jupiter;6.0.1 +springboot4_org.junit.vintage:junit-vintage-engine;6.0.1 +springboot4_org.messaginghub:pooled-jms;3.1.7 +springboot4_org.mockito:mockito-core;5.20.0 +springboot4_org.postgresql:postgresql;42.7.8 +springboot4_org.revapi:revapi-maven-plugin;0.14.6 +springboot4_org.slf4j:slf4j-api;2.0.17 +springboot4_org.slf4j:slf4j-simple;2.0.17 +springboot4_org.springframework.boot:spring-boot-actuator-autoconfigure;4.0.0 +springboot4_org.springframework.boot:spring-boot-actuator;4.0.0 +springboot4_org.springframework.boot:spring-boot-autoconfigure;4.0.0 +springboot4_org.springframework.boot:spring-boot-configuration-metadata;4.0.0 +springboot4_org.springframework.boot:spring-boot-configuration-processor;4.0.0 +springboot4_org.springframework.boot:spring-boot-data-redis;4.0.0 +springboot4_org.springframework.boot:spring-boot-docker-compose;4.0.0 +springboot4_org.springframework.boot:spring-boot-health;4.0.0 +springboot4_org.springframework.boot:spring-boot-http-converter;4.0.0 +springboot4_org.springframework.boot:spring-boot-jackson;4.0.0 +springboot4_org.springframework.boot:spring-boot-jdbc;4.0.0 +springboot4_org.springframework.boot:spring-boot-jms;4.0.0 +springboot4_org.springframework.boot:spring-boot-kafka;4.0.0 +springboot4_org.springframework.boot:spring-boot-persistence;4.0.0 +springboot4_org.springframework.boot:spring-boot-restclient;4.0.0 +springboot4_org.springframework.boot:spring-boot-resttestclient;4.0.0 +springboot4_org.springframework.boot:spring-boot-security;4.0.0 +springboot4_org.springframework.boot:spring-boot-security-oauth2-client;4.0.0 +springboot4_org.springframework.boot:spring-boot-starter-actuator;4.0.0 +springboot4_org.springframework.boot:spring-boot-starter-data-jdbc;4.0.0 +springboot4_org.springframework.boot:spring-boot-starter-integration;4.0.0 +springboot4_org.springframework.boot:spring-boot-starter-parent;4.0.0 +springboot4_org.springframework.boot:spring-boot-starter-test;4.0.0 +springboot4_org.springframework.boot:spring-boot-starter-webmvc;4.0.0 +springboot4_org.springframework.boot:spring-boot-starter-web;4.0.0 +springboot4_org.springframework.boot:spring-boot-starter;4.0.0 +springboot4_org.springframework.boot:spring-boot-test;4.0.0 +springboot4_org.springframework.boot:spring-boot-testcontainers;4.0.0 +springboot4_org.springframework.cloud:spring-cloud-bus;5.0.0 +springboot4_org.springframework.cloud:spring-cloud-context;5.0.0 +springboot4_org.springframework.cloud:spring-cloud-starter-stream-kafka;5.0.0 +springboot4_org.springframework.cloud:spring-cloud-stream-test-binder;5.0.0 +springboot4_org.springframework.cloud:spring-cloud-stream;5.0.0 +springboot4_org.springframework.data:spring-data-commons;4.0.0 +springboot4_org.springframework.data:spring-data-redis;4.0.0 +springboot4_org.springframework.integration:spring-integration-core;7.0.0 +springboot4_org.springframework.kafka:spring-kafka;4.0.0 +springboot4_org.springframework.retry:spring-retry;2.0.12 +springboot4_org.springframework.security:spring-security-config;7.0.0 +springboot4_org.springframework.security:spring-security-oauth2-client;7.0.0 +springboot4_org.springframework.security:spring-security-oauth2-jose;7.0.0 +springboot4_org.springframework.security:spring-security-oauth2-resource-server;7.0.0 +springboot4_org.springframework.security:spring-security-web;7.0.0 +springboot4_org.springframework:spring-beans;7.0.1 +springboot4_org.springframework:spring-context-support;7.0.1 +springboot4_org.springframework:spring-context;7.0.1 +springboot4_org.springframework:spring-core-test;7.0.1 +springboot4_org.springframework:spring-core;7.0.1 +springboot4_org.springframework:spring-expression;7.0.1 +springboot4_org.springframework:spring-jdbc;7.0.1 +springboot4_org.springframework:spring-jms;7.0.1 +springboot4_org.springframework:spring-messaging;7.0.1 +springboot4_org.springframework:spring-test;7.0.1 +springboot4_org.springframework:spring-tx;7.0.1 +springboot4_org.springframework:spring-web;7.0.1 +springboot4_org.springframework:spring-webmvc;7.0.1 +springboot4_org.testcontainers:junit-jupiter;1.21.3 +springboot4_org.testcontainers:azure;1.21.3 +springboot4_jakarta.annotation:jakarta.annotation-api;3.0.0 +springboot4_ch.qos.logback:logback-classic;1.5.21 # Used for Spring version updates -springboot3_org.springframework.boot:spring-boot-dependencies;4.0.0-RC2 -springboot3_org.springframework.cloud:spring-cloud-dependencies;2025.1.0-M4 +springboot4_org.springframework.boot:spring-boot-dependencies;4.0.0 +springboot4_org.springframework.cloud:spring-cloud-dependencies;2025.1.0 # Java 7 support diff --git a/sdk/spring/CHANGELOG.md b/sdk/spring/CHANGELOG.md index cfc275f58b5f..f66a49ccc61f 100644 --- a/sdk/spring/CHANGELOG.md +++ b/sdk/spring/CHANGELOG.md @@ -1,6 +1,6 @@ # Release History # (Unreleased) -Upgrade Spring Boot dependencies version to 4.0.0-RC2 and Spring Cloud dependencies version to 2025.1.0-M4 +Upgrade Spring Boot dependencies version to 4.0.0 and Spring Cloud dependencies version to 2025.1.0 ## 6.0.0 (2025-09-22) - This release is compatible with Spring Boot 3.5.0-3.5.5. (Note: 3.5.x (x>5) should be supported, but they aren't tested with this release.) diff --git a/sdk/spring/azure-spring-data-cosmos/pom.xml b/sdk/spring/azure-spring-data-cosmos/pom.xml index 7c03f09da11c..04a751e7852c 100644 --- a/sdk/spring/azure-spring-data-cosmos/pom.xml +++ b/sdk/spring/azure-spring-data-cosmos/pom.xml @@ -53,7 +53,7 @@ org.springframework spring-core - 7.0.0-RC3 + 7.0.1 commons-logging @@ -64,27 +64,27 @@ org.springframework spring-web - 7.0.0-RC3 + 7.0.1 org.springframework spring-beans - 7.0.0-RC3 + 7.0.1 org.springframework spring-context - 7.0.0-RC3 + 7.0.1 org.springframework spring-tx - 7.0.0-RC3 + 7.0.1 org.springframework.data spring-data-commons - 3.5.3 + 4.0.0 org.slf4j @@ -95,12 +95,12 @@ org.springframework spring-expression - 7.0.0-RC3 + 7.0.1 org.springframework.boot spring-boot-persistence - 4.0.0-RC2 + 4.0.0 com.azure @@ -110,39 +110,39 @@ com.fasterxml.jackson.module jackson-module-parameter-names - 2.20.1 + 2.20.1 com.fasterxml.jackson.datatype jackson-datatype-jdk8 - 2.20.1 + 2.20.1 com.fasterxml.jackson.core jackson-annotations - 2.20 + 2.20 org.javatuples javatuples - 1.2 + 1.2 javax.annotation javax.annotation-api - 1.3.2 + 1.3.2 org.apache.commons commons-lang3 - 3.19.0 + 3.19.0 org.mockito mockito-core - 5.20.0 + 5.20.0 test @@ -150,25 +150,25 @@ net.bytebuddy byte-buddy - 1.17.8 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.8 + 1.17.8 test junit junit - 4.13.2 + 4.13.2 test org.springframework.boot spring-boot-starter-test - 4.0.0-RC2 + 4.0.0 test @@ -180,13 +180,13 @@ io.projectreactor reactor-test - 3.8.0-RC1 + 3.8.0 test org.slf4j slf4j-simple - 2.0.17 + 2.0.17 test + 3.0.2 provided org.slf4j slf4j-api - 2.0.17 + 2.0.17 org.junit.vintage junit-vintage-engine - 6.0.1 + 6.0.1 test @@ -226,7 +226,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.1 + 3.14.1 @@ -273,26 +273,26 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.6.2 + 3.6.2 - org.springframework:spring-beans:[7.0.0-RC3] - org.springframework:spring-web:[7.0.0-RC3] - org.springframework:spring-tx:[7.0.0-RC3] - org.springframework:spring-expression:[7.0.0-RC3] - org.springframework:spring-core:[7.0.0-RC3] - org.springframework:spring-context:[7.0.0-RC3] - org.springframework.boot:spring-boot-persistence:[4.0.0-RC2] - org.springframework.data:spring-data-commons:[3.5.3] - org.javatuples:javatuples:[1.2] - com.fasterxml.jackson.core:jackson-annotations:[2.20] - com.fasterxml.jackson.datatype:jackson-datatype-jdk8:[2.20.1] - com.fasterxml.jackson.module:jackson-module-parameter-names:[2.20.1] - javax.annotation:javax.annotation-api:[1.3.2] - org.apache.commons:commons-lang3:[3.19.0] - org.slf4j:slf4j-api:[2.0.17] + org.springframework:spring-beans:[7.0.1] + org.springframework:spring-web:[7.0.1] + org.springframework:spring-tx:[7.0.1] + org.springframework:spring-expression:[7.0.1] + org.springframework:spring-core:[7.0.1] + org.springframework:spring-context:[7.0.1] + org.springframework.boot:spring-boot-persistence:[4.0.0] + org.springframework.data:spring-data-commons:[4.0.0] + org.javatuples:javatuples:[1.2] + com.fasterxml.jackson.core:jackson-annotations:[2.20] + com.fasterxml.jackson.datatype:jackson-datatype-jdk8:[2.20.1] + com.fasterxml.jackson.module:jackson-module-parameter-names:[2.20.1] + javax.annotation:javax.annotation-api:[1.3.2] + org.apache.commons:commons-lang3:[3.19.0] + org.slf4j:slf4j-api:[2.0.17] @@ -302,7 +302,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.12.0 + 3.12.0 com/azure/spring/data/cosmos/core/mapping/BasicCosmosPersistentProperty.java @@ -320,7 +320,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.5.4 + 3.5.4 src/test/resources/application.properties ${skip.integration.tests} @@ -354,7 +354,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.4 + 3.5.4 @@ -375,7 +375,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.4 + 3.5.4 @@ -395,7 +395,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.5.4 + 3.5.4 diff --git a/sdk/spring/scripts/_constants.py b/sdk/spring/scripts/_constants.py index c54f0ec5f9bf..43ab25b12867 100644 --- a/sdk/spring/scripts/_constants.py +++ b/sdk/spring/scripts/_constants.py @@ -3,14 +3,19 @@ SPRING_BOOT_MAJOR_2_VERSION_TAG_PREFIX = '' SPRING_BOOT_MAJOR_3_VERSION_NAME = '3' SPRING_BOOT_MAJOR_3_VERSION_TAG_PREFIX = 'springboot3_' +SPRING_BOOT_MAJOR_4_VERSION_NAME = '4' +SPRING_BOOT_MAJOR_4_VERSION_TAG_PREFIX = 'springboot4_' SPRING_BOOT_MAJOR_VERSION_PREFIX_DICT = { SPRING_BOOT_MAJOR_2_VERSION_NAME: SPRING_BOOT_MAJOR_2_VERSION_TAG_PREFIX, - SPRING_BOOT_MAJOR_3_VERSION_NAME: SPRING_BOOT_MAJOR_3_VERSION_TAG_PREFIX + SPRING_BOOT_MAJOR_3_VERSION_NAME: SPRING_BOOT_MAJOR_3_VERSION_TAG_PREFIX, + SPRING_BOOT_MAJOR_4_VERSION_NAME: SPRING_BOOT_MAJOR_4_VERSION_TAG_PREFIX } def get_spring_boot_version_tag_prefix(spring_boot_version): - if spring_boot_version.startswith('3.') or spring_boot_version == SPRING_BOOT_MAJOR_3_VERSION_NAME: + if spring_boot_version.startswith('4.') or spring_boot_version == SPRING_BOOT_MAJOR_4_VERSION_NAME: + return SPRING_BOOT_MAJOR_VERSION_PREFIX_DICT[SPRING_BOOT_MAJOR_4_VERSION_NAME] + elif spring_boot_version.startswith('3.') or spring_boot_version == SPRING_BOOT_MAJOR_3_VERSION_NAME: return SPRING_BOOT_MAJOR_VERSION_PREFIX_DICT[SPRING_BOOT_MAJOR_3_VERSION_NAME] elif spring_boot_version.startswith('2.') or spring_boot_version == SPRING_BOOT_MAJOR_2_VERSION_NAME: return SPRING_BOOT_MAJOR_VERSION_PREFIX_DICT[SPRING_BOOT_MAJOR_2_VERSION_NAME] @@ -20,10 +25,10 @@ def get_spring_boot_version_tag_prefix(spring_boot_version): # Since Spring Cloud Azure uses multiple versions of external dependencies managed by Spring Boot, # the modules that still use Spring Boot 2 to manage dependencies will be skipped. -SKIP_ADDING_DEPENDENCY_MANAGEMENT_ARTIFACTS = [ - 'spring-cloud-azure-starter-monitor-test', - 'spring-cloud-azure-starter-monitor' -] +# SKIP_ADDING_DEPENDENCY_MANAGEMENT_ARTIFACTS = [ +# 'spring-cloud-azure-starter-monitor-test', +# 'spring-cloud-azure-starter-monitor' +# ] # Since some features are based on a higher Spring Boot version, it is sufficient to let the modules # corresponding to these special Spring Boot versions use the latest Spring Boot version. SKIP_ADDING_DEPENDENCY_MANAGEMENT_ARTIFACTS_WITH_SPRING_BOOT_VERSION = { diff --git a/sdk/spring/scripts/spring_boot_4.0.0-RC2_managed_external_dependencies.txt b/sdk/spring/scripts/spring_boot_4.0.0-RC2_managed_external_dependencies.txt deleted file mode 100644 index 0de38df43cfb..000000000000 --- a/sdk/spring/scripts/spring_boot_4.0.0-RC2_managed_external_dependencies.txt +++ /dev/null @@ -1,1753 +0,0 @@ -ch.qos.logback:logback-classic;1.5.20 -ch.qos.logback:logback-core;1.5.20 -co.elastic.clients:elasticsearch-java;9.2.0 -co.elastic.clients:elasticsearch-rest5-client;9.2.0 -com.couchbase.client:java-client;3.9.2 -com.datastax.oss:native-protocol;1.5.1 -com.fasterxml.jackson.core:jackson-annotations;2.20 -com.fasterxml.jackson.core:jackson-core;2.20.1 -com.fasterxml.jackson.core:jackson-databind;2.20.1 -com.fasterxml.jackson.dataformat:jackson-dataformat-avro;2.20.1 -com.fasterxml.jackson.dataformat:jackson-dataformat-cbor;2.20.1 -com.fasterxml.jackson.dataformat:jackson-dataformat-csv;2.20.1 -com.fasterxml.jackson.dataformat:jackson-dataformat-ion;2.20.1 -com.fasterxml.jackson.dataformat:jackson-dataformat-properties;2.20.1 -com.fasterxml.jackson.dataformat:jackson-dataformat-protobuf;2.20.1 -com.fasterxml.jackson.dataformat:jackson-dataformat-smile;2.20.1 -com.fasterxml.jackson.dataformat:jackson-dataformat-toml;2.20.1 -com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.20.1 -com.fasterxml.jackson.dataformat:jackson-dataformat-yaml;2.20.1 -com.fasterxml.jackson.datatype:jackson-datatype-eclipse-collections;2.20.1 -com.fasterxml.jackson.datatype:jackson-datatype-guava;2.20.1 -com.fasterxml.jackson.datatype:jackson-datatype-hibernate4;2.20.1 -com.fasterxml.jackson.datatype:jackson-datatype-hibernate5;2.20.1 -com.fasterxml.jackson.datatype:jackson-datatype-hibernate5-jakarta;2.20.1 -com.fasterxml.jackson.datatype:jackson-datatype-hibernate6;2.20.1 -com.fasterxml.jackson.datatype:jackson-datatype-hibernate7;2.20.1 -com.fasterxml.jackson.datatype:jackson-datatype-hppc;2.20.1 -com.fasterxml.jackson.datatype:jackson-datatype-jakarta-jsonp;2.20.1 -com.fasterxml.jackson.datatype:jackson-datatype-javax-money;2.20.1 -com.fasterxml.jackson.datatype:jackson-datatype-jaxrs;2.20.1 -com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.20.1 -com.fasterxml.jackson.datatype:jackson-datatype-joda;2.20.1 -com.fasterxml.jackson.datatype:jackson-datatype-joda-money;2.20.1 -com.fasterxml.jackson.datatype:jackson-datatype-json-org;2.20.1 -com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.20.1 -com.fasterxml.jackson.datatype:jackson-datatype-jsr353;2.20.1 -com.fasterxml.jackson.datatype:jackson-datatype-moneta;2.20.1 -com.fasterxml.jackson.datatype:jackson-datatype-pcollections;2.20.1 -com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-base;2.20.1 -com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-cbor-provider;2.20.1 -com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-json-provider;2.20.1 -com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-smile-provider;2.20.1 -com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-xml-provider;2.20.1 -com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-yaml-provider;2.20.1 -com.fasterxml.jackson.jaxrs:jackson-jaxrs-base;2.20.1 -com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider;2.20.1 -com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider;2.20.1 -com.fasterxml.jackson.jaxrs:jackson-jaxrs-smile-provider;2.20.1 -com.fasterxml.jackson.jaxrs:jackson-jaxrs-xml-provider;2.20.1 -com.fasterxml.jackson.jaxrs:jackson-jaxrs-yaml-provider;2.20.1 -com.fasterxml.jackson.jr:jackson-jr-all;2.20.1 -com.fasterxml.jackson.jr:jackson-jr-annotation-support;2.20.1 -com.fasterxml.jackson.jr:jackson-jr-extension-javatime;2.20.1 -com.fasterxml.jackson.jr:jackson-jr-objects;2.20.1 -com.fasterxml.jackson.jr:jackson-jr-retrofit2;2.20.1 -com.fasterxml.jackson.jr:jackson-jr-stree;2.20.1 -com.fasterxml.jackson.module:jackson-module-afterburner;2.20.1 -com.fasterxml.jackson.module:jackson-module-android-record;2.20.1 -com.fasterxml.jackson.module:jackson-module-blackbird;2.20.1 -com.fasterxml.jackson.module:jackson-module-guice;2.20.1 -com.fasterxml.jackson.module:jackson-module-guice7;2.20.1 -com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations;2.20.1 -com.fasterxml.jackson.module:jackson-module-jaxb-annotations;2.20.1 -com.fasterxml.jackson.module:jackson-module-jsonSchema;2.20.1 -com.fasterxml.jackson.module:jackson-module-jsonSchema-jakarta;2.20.1 -com.fasterxml.jackson.module:jackson-module-kotlin;2.20.1 -com.fasterxml.jackson.module:jackson-module-mrbean;2.20.1 -com.fasterxml.jackson.module:jackson-module-no-ctor-deser;2.20.1 -com.fasterxml.jackson.module:jackson-module-osgi;2.20.1 -com.fasterxml.jackson.module:jackson-module-parameter-names;2.20.1 -com.fasterxml.jackson.module:jackson-module-paranamer;2.20.1 -com.fasterxml.jackson.module:jackson-module-scala_2.11;2.20.1 -com.fasterxml.jackson.module:jackson-module-scala_2.12;2.20.1 -com.fasterxml.jackson.module:jackson-module-scala_2.13;2.20.1 -com.fasterxml.jackson.module:jackson-module-scala_3;2.20.1 -com.fasterxml.jackson:jackson-bom;2.20.1 -com.fasterxml:classmate;1.7.1 -com.github.ben-manes.caffeine:caffeine;3.2.3 -com.github.ben-manes.caffeine:guava;3.2.3 -com.github.ben-manes.caffeine:jcache;3.2.3 -com.github.ben-manes.caffeine:simulator;3.2.3 -com.github.mxab.thymeleaf.extras:thymeleaf-extras-data-attribute;2.0.1 -com.google.code.gson:gson;2.13.2 -com.graphql-java:graphql-java;25.0.beta-9 -com.h2database:h2;2.4.240 -com.hazelcast:hazelcast;5.5.0 -com.hazelcast:hazelcast-spring;5.5.0 -com.ibm.db2:jcc;12.1.2.0 -com.jayway.jsonpath:json-path;2.9.0 -com.jayway.jsonpath:json-path-assert;2.9.0 -com.microsoft.sqlserver:mssql-jdbc;13.2.1.jre11 -com.mysql:mysql-connector-j;9.4.0 -com.oracle.database.ha:ons;23.9.0.25.07 -com.oracle.database.ha:simplefan;23.9.0.25.07 -com.oracle.database.jdbc:ojdbc11;23.9.0.25.07 -com.oracle.database.jdbc:ojdbc11-production;23.9.0.25.07 -com.oracle.database.jdbc:ojdbc17;23.9.0.25.07 -com.oracle.database.jdbc:ojdbc17-production;23.9.0.25.07 -com.oracle.database.jdbc:ojdbc8;23.9.0.25.07 -com.oracle.database.jdbc:ojdbc8-production;23.9.0.25.07 -com.oracle.database.jdbc:rsi;23.9.0.25.07 -com.oracle.database.jdbc:ucp;23.9.0.25.07 -com.oracle.database.jdbc:ucp11;23.9.0.25.07 -com.oracle.database.jdbc:ucp17;23.9.0.25.07 -com.oracle.database.nls:orai18n;23.9.0.25.07 -com.oracle.database.r2dbc:oracle-r2dbc;1.3.0 -com.oracle.database.security:oraclepki;23.9.0.25.07 -com.oracle.database.xml:xdb;23.9.0.25.07 -com.oracle.database.xml:xmlparserv2;23.9.0.25.07 -com.querydsl:codegen-utils;5.1.0 -com.querydsl:querydsl-apt;5.1.0 -com.querydsl:querydsl-bom;5.1.0 -com.querydsl:querydsl-codegen;5.1.0 -com.querydsl:querydsl-collections;5.1.0 -com.querydsl:querydsl-core;5.1.0 -com.querydsl:querydsl-guava;5.1.0 -com.querydsl:querydsl-hibernate-search;5.1.0 -com.querydsl:querydsl-jdo;5.1.0 -com.querydsl:querydsl-jpa;5.1.0 -com.querydsl:querydsl-jpa-codegen;5.1.0 -com.querydsl:querydsl-kotlin;5.1.0 -com.querydsl:querydsl-kotlin-codegen;5.1.0 -com.querydsl:querydsl-lucene3;5.1.0 -com.querydsl:querydsl-lucene4;5.1.0 -com.querydsl:querydsl-lucene5;5.1.0 -com.querydsl:querydsl-mongodb;5.1.0 -com.querydsl:querydsl-scala;5.1.0 -com.querydsl:querydsl-spatial;5.1.0 -com.querydsl:querydsl-sql;5.1.0 -com.querydsl:querydsl-sql-codegen;5.1.0 -com.querydsl:querydsl-sql-spatial;5.1.0 -com.querydsl:querydsl-sql-spring;5.1.0 -com.rabbitmq:amqp-client;5.27.1 -com.rabbitmq:stream-client;0.23.0 -com.redis:testcontainers-redis;2.2.4 -com.samskivert:jmustache;1.16 -com.sendgrid:sendgrid-java;4.10.3 -com.sun.xml.bind:jaxb-core;4.0.6 -com.sun.xml.bind:jaxb-impl;4.0.6 -com.sun.xml.bind:jaxb-jxc;4.0.6 -com.sun.xml.bind:jaxb-osgi;4.0.6 -com.sun.xml.bind:jaxb-xjc;4.0.6 -com.sun.xml.messaging.saaj:saaj-impl;3.0.4 -com.unboundid:unboundid-ldapsdk;7.0.3 -com.zaxxer:HikariCP;7.0.2 -commons-codec:commons-codec;1.19.0 -commons-logging:commons-logging;1.3.5 -commons-pool:commons-pool;1.6 -io.asyncer:r2dbc-mysql;1.4.1 -io.github.git-commit-id:git-commit-id-maven-plugin;9.0.2 -io.lettuce:lettuce-core;6.8.1.RELEASE -io.micrometer:micrometer-bom;1.16.0-RC1 -io.micrometer:micrometer-registry-stackdriver;1.16.0-RC1 -io.micrometer:micrometer-tracing-bom;1.6.0-RC1 -io.netty:netty-all;4.2.7.Final -io.netty:netty-bom;4.2.7.Final -io.netty:netty-buffer;4.2.7.Final -io.netty:netty-codec;4.2.7.Final -io.netty:netty-codec-base;4.2.7.Final -io.netty:netty-codec-classes-quic;4.2.7.Final -io.netty:netty-codec-compression;4.2.7.Final -io.netty:netty-codec-dns;4.2.7.Final -io.netty:netty-codec-haproxy;4.2.7.Final -io.netty:netty-codec-http;4.2.7.Final -io.netty:netty-codec-http2;4.2.7.Final -io.netty:netty-codec-http3;4.2.7.Final -io.netty:netty-codec-marshalling;4.2.7.Final -io.netty:netty-codec-memcache;4.2.7.Final -io.netty:netty-codec-mqtt;4.2.7.Final -io.netty:netty-codec-native-quic;4.2.7.Final -io.netty:netty-codec-protobuf;4.2.7.Final -io.netty:netty-codec-redis;4.2.7.Final -io.netty:netty-codec-smtp;4.2.7.Final -io.netty:netty-codec-socks;4.2.7.Final -io.netty:netty-codec-stomp;4.2.7.Final -io.netty:netty-codec-xml;4.2.7.Final -io.netty:netty-common;4.2.7.Final -io.netty:netty-dev-tools;4.2.7.Final -io.netty:netty-handler;4.2.7.Final -io.netty:netty-handler-proxy;4.2.7.Final -io.netty:netty-handler-ssl-ocsp;4.2.7.Final -io.netty:netty-pkitesting;4.2.7.Final -io.netty:netty-resolver;4.2.7.Final -io.netty:netty-resolver-dns;4.2.7.Final -io.netty:netty-resolver-dns-classes-macos;4.2.7.Final -io.netty:netty-resolver-dns-native-macos;4.2.7.Final -io.netty:netty-tcnative;2.0.74.Final -io.netty:netty-tcnative-boringssl-static;2.0.74.Final -io.netty:netty-tcnative-classes;2.0.74.Final -io.netty:netty-transport;4.2.7.Final -io.netty:netty-transport-classes-epoll;4.2.7.Final -io.netty:netty-transport-classes-io_uring;4.2.7.Final -io.netty:netty-transport-classes-kqueue;4.2.7.Final -io.netty:netty-transport-native-epoll;4.2.7.Final -io.netty:netty-transport-native-io_uring;4.2.7.Final -io.netty:netty-transport-native-kqueue;4.2.7.Final -io.netty:netty-transport-native-unix-common;4.2.7.Final -io.netty:netty-transport-rxtx;4.2.7.Final -io.netty:netty-transport-sctp;4.2.7.Final -io.netty:netty-transport-udt;4.2.7.Final -io.opentelemetry:opentelemetry-api;1.55.0 -io.opentelemetry:opentelemetry-bom;1.55.0 -io.opentelemetry:opentelemetry-common;1.55.0 -io.opentelemetry:opentelemetry-context;1.55.0 -io.opentelemetry:opentelemetry-exporter-common;1.55.0 -io.opentelemetry:opentelemetry-exporter-logging;1.55.0 -io.opentelemetry:opentelemetry-exporter-logging-otlp;1.55.0 -io.opentelemetry:opentelemetry-exporter-otlp;1.55.0 -io.opentelemetry:opentelemetry-exporter-otlp-common;1.55.0 -io.opentelemetry:opentelemetry-exporter-sender-grpc-managed-channel;1.55.0 -io.opentelemetry:opentelemetry-exporter-sender-jdk;1.55.0 -io.opentelemetry:opentelemetry-exporter-sender-okhttp;1.55.0 -io.opentelemetry:opentelemetry-exporter-zipkin;1.55.0 -io.opentelemetry:opentelemetry-extension-kotlin;1.55.0 -io.opentelemetry:opentelemetry-extension-trace-propagators;1.55.0 -io.opentelemetry:opentelemetry-opentracing-shim;1.55.0 -io.opentelemetry:opentelemetry-sdk;1.55.0 -io.opentelemetry:opentelemetry-sdk-common;1.55.0 -io.opentelemetry:opentelemetry-sdk-extension-autoconfigure;1.55.0 -io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi;1.55.0 -io.opentelemetry:opentelemetry-sdk-extension-jaeger-remote-sampler;1.55.0 -io.opentelemetry:opentelemetry-sdk-logs;1.55.0 -io.opentelemetry:opentelemetry-sdk-metrics;1.55.0 -io.opentelemetry:opentelemetry-sdk-testing;1.55.0 -io.opentelemetry:opentelemetry-sdk-trace;1.55.0 -io.projectreactor.addons:reactor-adapter;3.6.0-RC6 -io.projectreactor.addons:reactor-extra;3.6.0-RC6 -io.projectreactor.addons:reactor-pool;1.2.0-RC1 -io.projectreactor.addons:reactor-pool-micrometer;0.3.0-RC1 -io.projectreactor.kotlin:reactor-kotlin-extensions;1.3.0-RC5 -io.projectreactor.netty:reactor-netty;1.3.0-RC1 -io.projectreactor.netty:reactor-netty-core;1.3.0-RC1 -io.projectreactor.netty:reactor-netty-http;1.3.0-RC1 -io.projectreactor.netty:reactor-netty-http-brave;1.3.0-RC1 -io.projectreactor.netty:reactor-netty-quic;1.0.0-RC1 -io.projectreactor:reactor-bom;2025.0.0-RC1 -io.projectreactor:reactor-core;3.8.0-RC1 -io.projectreactor:reactor-core-micrometer;1.3.0-RC1 -io.projectreactor:reactor-test;3.8.0-RC1 -io.projectreactor:reactor-tools;3.8.0-RC1 -io.prometheus:prometheus-metrics-bom;1.4.2 -io.prometheus:prometheus-metrics-config;1.4.2 -io.prometheus:prometheus-metrics-core;1.4.2 -io.prometheus:prometheus-metrics-exporter-common;1.4.2 -io.prometheus:prometheus-metrics-exporter-httpserver;1.4.2 -io.prometheus:prometheus-metrics-exporter-opentelemetry;1.4.2 -io.prometheus:prometheus-metrics-exporter-opentelemetry-no-otel;1.4.2 -io.prometheus:prometheus-metrics-exporter-opentelemetry-otel-agent-resources;1.4.2 -io.prometheus:prometheus-metrics-exporter-pushgateway;1.4.2 -io.prometheus:prometheus-metrics-exporter-servlet-jakarta;1.4.2 -io.prometheus:prometheus-metrics-exporter-servlet-javax;1.4.2 -io.prometheus:prometheus-metrics-exposition-formats;1.4.2 -io.prometheus:prometheus-metrics-exposition-formats-no-protobuf;1.4.2 -io.prometheus:prometheus-metrics-exposition-textformats;1.4.2 -io.prometheus:prometheus-metrics-instrumentation-caffeine;1.4.2 -io.prometheus:prometheus-metrics-instrumentation-dropwizard;1.4.2 -io.prometheus:prometheus-metrics-instrumentation-dropwizard5;1.4.2 -io.prometheus:prometheus-metrics-instrumentation-guava;1.4.2 -io.prometheus:prometheus-metrics-instrumentation-jvm;1.4.2 -io.prometheus:prometheus-metrics-model;1.4.2 -io.prometheus:prometheus-metrics-simpleclient-bridge;1.4.2 -io.prometheus:prometheus-metrics-tracer;1.4.2 -io.prometheus:prometheus-metrics-tracer-common;1.4.2 -io.prometheus:prometheus-metrics-tracer-initializer;1.4.2 -io.prometheus:prometheus-metrics-tracer-otel;1.4.2 -io.prometheus:prometheus-metrics-tracer-otel-agent;1.4.2 -io.prometheus:simpleclient;0.16.0 -io.prometheus:simpleclient_bom;0.16.0 -io.prometheus:simpleclient_caffeine;0.16.0 -io.prometheus:simpleclient_common;0.16.0 -io.prometheus:simpleclient_dropwizard;0.16.0 -io.prometheus:simpleclient_graphite_bridge;0.16.0 -io.prometheus:simpleclient_guava;0.16.0 -io.prometheus:simpleclient_hibernate;0.16.0 -io.prometheus:simpleclient_hotspot;0.16.0 -io.prometheus:simpleclient_httpserver;0.16.0 -io.prometheus:simpleclient_jetty;0.16.0 -io.prometheus:simpleclient_jetty_jdk8;0.16.0 -io.prometheus:simpleclient_log4j;0.16.0 -io.prometheus:simpleclient_log4j2;0.16.0 -io.prometheus:simpleclient_logback;0.16.0 -io.prometheus:simpleclient_pushgateway;0.16.0 -io.prometheus:simpleclient_servlet;0.16.0 -io.prometheus:simpleclient_servlet_jakarta;0.16.0 -io.prometheus:simpleclient_spring_boot;0.16.0 -io.prometheus:simpleclient_spring_web;0.16.0 -io.prometheus:simpleclient_tracer_common;0.16.0 -io.prometheus:simpleclient_tracer_otel;0.16.0 -io.prometheus:simpleclient_tracer_otel_agent;0.16.0 -io.prometheus:simpleclient_vertx;0.16.0 -io.r2dbc:r2dbc-h2;1.1.0.RELEASE -io.r2dbc:r2dbc-mssql;1.0.3.RELEASE -io.r2dbc:r2dbc-pool;1.0.2.RELEASE -io.r2dbc:r2dbc-proxy;1.1.6.RELEASE -io.r2dbc:r2dbc-spi;1.0.0.RELEASE -io.reactivex.rxjava3:rxjava;3.1.12 -io.rsocket:rsocket-bom;1.1.5 -io.rsocket:rsocket-core;1.1.5 -io.rsocket:rsocket-load-balancer;1.1.5 -io.rsocket:rsocket-micrometer;1.1.5 -io.rsocket:rsocket-test;1.1.5 -io.rsocket:rsocket-transport-local;1.1.5 -io.rsocket:rsocket-transport-netty;1.1.5 -io.spring.gradle:dependency-management-plugin;1.1.7 -io.zipkin.brave:brave;6.3.0 -io.zipkin.brave:brave-bom;6.3.0 -io.zipkin.brave:brave-context-jfr;6.3.0 -io.zipkin.brave:brave-context-log4j12;6.3.0 -io.zipkin.brave:brave-context-log4j2;6.3.0 -io.zipkin.brave:brave-context-slf4j;6.3.0 -io.zipkin.brave:brave-instrumentation-dubbo;6.3.0 -io.zipkin.brave:brave-instrumentation-grpc;6.3.0 -io.zipkin.brave:brave-instrumentation-http;6.3.0 -io.zipkin.brave:brave-instrumentation-http-tests;6.3.0 -io.zipkin.brave:brave-instrumentation-http-tests-jakarta;6.3.0 -io.zipkin.brave:brave-instrumentation-httpasyncclient;6.3.0 -io.zipkin.brave:brave-instrumentation-httpclient;6.3.0 -io.zipkin.brave:brave-instrumentation-httpclient5;6.3.0 -io.zipkin.brave:brave-instrumentation-jakarta-jms;6.3.0 -io.zipkin.brave:brave-instrumentation-jaxrs2;6.3.0 -io.zipkin.brave:brave-instrumentation-jdbi3;6.3.0 -io.zipkin.brave:brave-instrumentation-jersey-server;6.3.0 -io.zipkin.brave:brave-instrumentation-jersey-server-jakarta;6.3.0 -io.zipkin.brave:brave-instrumentation-jms;6.3.0 -io.zipkin.brave:brave-instrumentation-jms-jakarta;6.3.0 -io.zipkin.brave:brave-instrumentation-kafka-clients;6.3.0 -io.zipkin.brave:brave-instrumentation-kafka-streams;6.3.0 -io.zipkin.brave:brave-instrumentation-messaging;6.3.0 -io.zipkin.brave:brave-instrumentation-mongodb;6.3.0 -io.zipkin.brave:brave-instrumentation-mysql;6.3.0 -io.zipkin.brave:brave-instrumentation-mysql6;6.3.0 -io.zipkin.brave:brave-instrumentation-mysql8;6.3.0 -io.zipkin.brave:brave-instrumentation-netty-codec-http;6.3.0 -io.zipkin.brave:brave-instrumentation-okhttp3;6.3.0 -io.zipkin.brave:brave-instrumentation-rocketmq-client;6.3.0 -io.zipkin.brave:brave-instrumentation-rpc;6.3.0 -io.zipkin.brave:brave-instrumentation-servlet;6.3.0 -io.zipkin.brave:brave-instrumentation-servlet-jakarta;6.3.0 -io.zipkin.brave:brave-instrumentation-spring-rabbit;6.3.0 -io.zipkin.brave:brave-instrumentation-spring-web;6.3.0 -io.zipkin.brave:brave-instrumentation-spring-webmvc;6.3.0 -io.zipkin.brave:brave-instrumentation-vertx-web;6.3.0 -io.zipkin.brave:brave-spring-beans;6.3.0 -io.zipkin.brave:brave-tests;6.3.0 -io.zipkin.reporter2:zipkin-reporter;3.5.1 -io.zipkin.reporter2:zipkin-reporter-bom;3.5.1 -io.zipkin.reporter2:zipkin-reporter-brave;3.5.1 -io.zipkin.reporter2:zipkin-reporter-metrics-micrometer;3.5.1 -io.zipkin.reporter2:zipkin-reporter-spring-beans;3.5.1 -io.zipkin.reporter2:zipkin-sender-activemq-client;3.5.1 -io.zipkin.reporter2:zipkin-sender-amqp-client;3.5.1 -io.zipkin.reporter2:zipkin-sender-kafka;3.5.1 -io.zipkin.reporter2:zipkin-sender-libthrift;3.5.1 -io.zipkin.reporter2:zipkin-sender-okhttp3;3.5.1 -io.zipkin.reporter2:zipkin-sender-pulsar-client;3.5.1 -io.zipkin.reporter2:zipkin-sender-urlconnection;3.5.1 -jakarta.activation:jakarta.activation-api;2.1.4 -jakarta.annotation:jakarta.annotation-api;3.0.0 -jakarta.inject:jakarta.inject-api;2.0.1 -jakarta.jms:jakarta.jms-api;3.1.0 -jakarta.json.bind:jakarta.json.bind-api;3.0.1 -jakarta.json:jakarta.json-api;2.1.3 -jakarta.mail:jakarta.mail-api;2.1.5 -jakarta.management.j2ee:jakarta.management.j2ee-api;1.1.4 -jakarta.persistence:jakarta.persistence-api;3.2.0 -jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api;3.0.2 -jakarta.servlet:jakarta.servlet-api;6.1.0 -jakarta.transaction:jakarta.transaction-api;2.0.1 -jakarta.validation:jakarta.validation-api;3.1.1 -jakarta.websocket:jakarta.websocket-api;2.2.0 -jakarta.websocket:jakarta.websocket-client-api;2.2.0 -jakarta.ws.rs:jakarta.ws.rs-api;4.0.0 -jakarta.xml.bind:jakarta.xml.bind-api;4.0.4 -jakarta.xml.soap:jakarta.xml.soap-api;3.0.2 -jakarta.xml.ws:jakarta.xml.ws-api;4.0.2 -javax.cache:cache-api;1.1.1 -javax.money:money-api;1.1 -jaxen:jaxen;2.0.0 -junit:junit;4.13.2 -net.bytebuddy:byte-buddy;1.17.8 -net.bytebuddy:byte-buddy-agent;1.17.8 -net.minidev:json-smart;2.6.0 -net.sourceforge.jtds:jtds;1.3.1 -net.sourceforge.nekohtml:nekohtml;1.9.22 -nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect;3.4.0 -org.apache.activemq:activemq-all;6.1.8 -org.apache.activemq:activemq-amqp;6.1.8 -org.apache.activemq:activemq-blueprint;6.1.8 -org.apache.activemq:activemq-bom;6.1.8 -org.apache.activemq:activemq-broker;6.1.8 -org.apache.activemq:activemq-client;6.1.8 -org.apache.activemq:activemq-console;6.1.8 -org.apache.activemq:activemq-http;6.1.8 -org.apache.activemq:activemq-jaas;6.1.8 -org.apache.activemq:activemq-jdbc-store;6.1.8 -org.apache.activemq:activemq-jms-pool;6.1.8 -org.apache.activemq:activemq-kahadb-store;6.1.8 -org.apache.activemq:activemq-karaf;6.1.8 -org.apache.activemq:activemq-log4j-appender;6.1.8 -org.apache.activemq:activemq-mqtt;6.1.8 -org.apache.activemq:activemq-openwire-generator;6.1.8 -org.apache.activemq:activemq-openwire-legacy;6.1.8 -org.apache.activemq:activemq-osgi;6.1.8 -org.apache.activemq:activemq-pool;6.1.8 -org.apache.activemq:activemq-ra;6.1.8 -org.apache.activemq:activemq-rar;6.1.8 -org.apache.activemq:activemq-run;6.1.8 -org.apache.activemq:activemq-runtime-config;6.1.8 -org.apache.activemq:activemq-shiro;6.1.8 -org.apache.activemq:activemq-spring;6.1.8 -org.apache.activemq:activemq-stomp;6.1.8 -org.apache.activemq:activemq-web;6.1.8 -org.apache.activemq:activemq-web-console;6.1.8 -org.apache.activemq:activemq-web-demo;6.1.8 -org.apache.activemq:artemis-amqp-protocol;2.43.0 -org.apache.activemq:artemis-bom;2.43.0 -org.apache.activemq:artemis-boot;2.43.0 -org.apache.activemq:artemis-cdi-client;2.43.0 -org.apache.activemq:artemis-cli;2.43.0 -org.apache.activemq:artemis-commons;2.43.0 -org.apache.activemq:artemis-console;2.43.0 -org.apache.activemq:artemis-core-client;2.43.0 -org.apache.activemq:artemis-core-client-all;2.43.0 -org.apache.activemq:artemis-core-client-osgi;2.43.0 -org.apache.activemq:artemis-dto;2.43.0 -org.apache.activemq:artemis-features;2.43.0 -org.apache.activemq:artemis-hornetq-protocol;2.43.0 -org.apache.activemq:artemis-hqclient-protocol;2.43.0 -org.apache.activemq:artemis-jakarta-cdi-client;2.43.0 -org.apache.activemq:artemis-jakarta-client;2.43.0 -org.apache.activemq:artemis-jakarta-client-all;2.43.0 -org.apache.activemq:artemis-jakarta-openwire-protocol;2.43.0 -org.apache.activemq:artemis-jakarta-ra;2.43.0 -org.apache.activemq:artemis-jakarta-server;2.43.0 -org.apache.activemq:artemis-jakarta-service-extensions;2.43.0 -org.apache.activemq:artemis-jdbc-store;2.43.0 -org.apache.activemq:artemis-jms-client;2.43.0 -org.apache.activemq:artemis-jms-client-all;2.43.0 -org.apache.activemq:artemis-jms-client-osgi;2.43.0 -org.apache.activemq:artemis-jms-server;2.43.0 -org.apache.activemq:artemis-journal;2.43.0 -org.apache.activemq:artemis-lockmanager-api;2.43.0 -org.apache.activemq:artemis-lockmanager-ri;2.43.0 -org.apache.activemq:artemis-mqtt-protocol;2.43.0 -org.apache.activemq:artemis-openwire-protocol;2.43.0 -org.apache.activemq:artemis-ra;2.43.0 -org.apache.activemq:artemis-selector;2.43.0 -org.apache.activemq:artemis-server;2.43.0 -org.apache.activemq:artemis-server-osgi;2.43.0 -org.apache.activemq:artemis-service-extensions;2.43.0 -org.apache.activemq:artemis-stomp-protocol;2.43.0 -org.apache.activemq:artemis-web;2.43.0 -org.apache.activemq:artemis-website;2.43.0 -org.apache.cassandra:java-driver-bom;4.19.0 -org.apache.cassandra:java-driver-core;4.19.0 -org.apache.cassandra:java-driver-core-shaded;4.19.0 -org.apache.cassandra:java-driver-guava-shaded;4.19.0 -org.apache.cassandra:java-driver-mapper-processor;4.19.0 -org.apache.cassandra:java-driver-mapper-runtime;4.19.0 -org.apache.cassandra:java-driver-metrics-micrometer;4.19.0 -org.apache.cassandra:java-driver-metrics-microprofile;4.19.0 -org.apache.cassandra:java-driver-query-builder;4.19.0 -org.apache.cassandra:java-driver-test-infra;4.19.0 -org.apache.commons:commons-dbcp2;2.13.0 -org.apache.commons:commons-lang3;3.19.0 -org.apache.commons:commons-pool2;2.12.1 -org.apache.derby:derby;10.16.1.1 -org.apache.derby:derbyclient;10.16.1.1 -org.apache.derby:derbynet;10.16.1.1 -org.apache.derby:derbyoptionaltools;10.16.1.1 -org.apache.derby:derbyshared;10.16.1.1 -org.apache.derby:derbytools;10.16.1.1 -org.apache.groovy:groovy;5.0.2 -org.apache.groovy:groovy-ant;5.0.2 -org.apache.groovy:groovy-astbuilder;5.0.2 -org.apache.groovy:groovy-bom;5.0.2 -org.apache.groovy:groovy-cli-commons;5.0.2 -org.apache.groovy:groovy-cli-picocli;5.0.2 -org.apache.groovy:groovy-console;5.0.2 -org.apache.groovy:groovy-contracts;5.0.2 -org.apache.groovy:groovy-datetime;5.0.2 -org.apache.groovy:groovy-dateutil;5.0.2 -org.apache.groovy:groovy-docgenerator;5.0.2 -org.apache.groovy:groovy-ginq;5.0.2 -org.apache.groovy:groovy-groovydoc;5.0.2 -org.apache.groovy:groovy-groovysh;5.0.2 -org.apache.groovy:groovy-jmx;5.0.2 -org.apache.groovy:groovy-json;5.0.2 -org.apache.groovy:groovy-jsr223;5.0.2 -org.apache.groovy:groovy-macro;5.0.2 -org.apache.groovy:groovy-macro-library;5.0.2 -org.apache.groovy:groovy-nio;5.0.2 -org.apache.groovy:groovy-servlet;5.0.2 -org.apache.groovy:groovy-sql;5.0.2 -org.apache.groovy:groovy-swing;5.0.2 -org.apache.groovy:groovy-templates;5.0.2 -org.apache.groovy:groovy-test;5.0.2 -org.apache.groovy:groovy-test-junit5;5.0.2 -org.apache.groovy:groovy-testng;5.0.2 -org.apache.groovy:groovy-toml;5.0.2 -org.apache.groovy:groovy-typecheckers;5.0.2 -org.apache.groovy:groovy-xml;5.0.2 -org.apache.groovy:groovy-yaml;5.0.2 -org.apache.httpcomponents.client5:httpclient5;5.5.1 -org.apache.httpcomponents.client5:httpclient5-cache;5.5.1 -org.apache.httpcomponents.client5:httpclient5-fluent;5.5.1 -org.apache.httpcomponents.core5:httpcore5;5.3.6 -org.apache.httpcomponents.core5:httpcore5-h2;5.3.6 -org.apache.httpcomponents.core5:httpcore5-reactive;5.3.6 -org.apache.httpcomponents:httpasyncclient;4.1.5 -org.apache.httpcomponents:httpcore;4.4.16 -org.apache.httpcomponents:httpcore-nio;4.4.16 -org.apache.kafka:connect;4.1.0 -org.apache.kafka:connect-api;4.1.0 -org.apache.kafka:connect-basic-auth-extension;4.1.0 -org.apache.kafka:connect-file;4.1.0 -org.apache.kafka:connect-json;4.1.0 -org.apache.kafka:connect-mirror;4.1.0 -org.apache.kafka:connect-mirror-client;4.1.0 -org.apache.kafka:connect-runtime;4.1.0 -org.apache.kafka:connect-transforms;4.1.0 -org.apache.kafka:generator;4.1.0 -org.apache.kafka:kafka-clients;4.1.0 -org.apache.kafka:kafka-log4j-appender;4.1.0 -org.apache.kafka:kafka-metadata;4.1.0 -org.apache.kafka:kafka-raft;4.1.0 -org.apache.kafka:kafka-server;4.1.0 -org.apache.kafka:kafka-server-common;4.1.0 -org.apache.kafka:kafka-shell;4.1.0 -org.apache.kafka:kafka-storage;4.1.0 -org.apache.kafka:kafka-storage-api;4.1.0 -org.apache.kafka:kafka-streams;4.1.0 -org.apache.kafka:kafka-streams-scala_2.12;4.1.0 -org.apache.kafka:kafka-streams-scala_2.13;4.1.0 -org.apache.kafka:kafka-streams-test-utils;4.1.0 -org.apache.kafka:kafka-tools;4.1.0 -org.apache.kafka:kafka_2.12;4.1.0 -org.apache.kafka:kafka_2.13;4.1.0 -org.apache.kafka:trogdor;4.1.0 -org.apache.logging.log4j:log4j-1.2-api;2.25.2 -org.apache.logging.log4j:log4j-api;2.25.2 -org.apache.logging.log4j:log4j-api-test;2.25.2 -org.apache.logging.log4j:log4j-appserver;2.25.2 -org.apache.logging.log4j:log4j-bom;2.25.2 -org.apache.logging.log4j:log4j-cassandra;2.25.2 -org.apache.logging.log4j:log4j-core;2.25.2 -org.apache.logging.log4j:log4j-core-test;2.25.2 -org.apache.logging.log4j:log4j-couchdb;2.25.2 -org.apache.logging.log4j:log4j-docker;2.25.2 -org.apache.logging.log4j:log4j-flume-ng;2.23.1 -org.apache.logging.log4j:log4j-iostreams;2.25.2 -org.apache.logging.log4j:log4j-jakarta-jms;2.25.2 -org.apache.logging.log4j:log4j-jakarta-smtp;2.25.2 -org.apache.logging.log4j:log4j-jakarta-web;2.25.2 -org.apache.logging.log4j:log4j-jcl;2.25.2 -org.apache.logging.log4j:log4j-jpa;2.25.2 -org.apache.logging.log4j:log4j-jpl;2.25.2 -org.apache.logging.log4j:log4j-jul;2.25.2 -org.apache.logging.log4j:log4j-layout-template-json;2.25.2 -org.apache.logging.log4j:log4j-mongodb;2.25.2 -org.apache.logging.log4j:log4j-mongodb4;2.25.2 -org.apache.logging.log4j:log4j-slf4j-impl;2.25.2 -org.apache.logging.log4j:log4j-slf4j2-impl;2.25.2 -org.apache.logging.log4j:log4j-spring-boot;2.25.2 -org.apache.logging.log4j:log4j-spring-cloud-config-client;2.25.2 -org.apache.logging.log4j:log4j-taglib;2.25.2 -org.apache.logging.log4j:log4j-to-jul;2.25.2 -org.apache.logging.log4j:log4j-to-slf4j;2.25.2 -org.apache.logging.log4j:log4j-web;2.25.2 -org.apache.maven.plugins:maven-antrun-plugin;3.2.0 -org.apache.maven.plugins:maven-assembly-plugin;3.7.1 -org.apache.maven.plugins:maven-clean-plugin;3.5.0 -org.apache.maven.plugins:maven-compiler-plugin;3.14.1 -org.apache.maven.plugins:maven-dependency-plugin;3.9.0 -org.apache.maven.plugins:maven-deploy-plugin;3.1.4 -org.apache.maven.plugins:maven-enforcer-plugin;3.6.2 -org.apache.maven.plugins:maven-failsafe-plugin;3.5.4 -org.apache.maven.plugins:maven-help-plugin;3.5.1 -org.apache.maven.plugins:maven-install-plugin;3.1.4 -org.apache.maven.plugins:maven-invoker-plugin;3.9.1 -org.apache.maven.plugins:maven-jar-plugin;3.4.2 -org.apache.maven.plugins:maven-javadoc-plugin;3.12.0 -org.apache.maven.plugins:maven-resources-plugin;3.3.1 -org.apache.maven.plugins:maven-shade-plugin;3.6.1 -org.apache.maven.plugins:maven-source-plugin;3.3.1 -org.apache.maven.plugins:maven-surefire-plugin;3.5.4 -org.apache.maven.plugins:maven-war-plugin;3.4.0 -org.apache.pulsar:bouncy-castle-bc;4.1.1 -org.apache.pulsar:bouncy-castle-bcfips;4.1.1 -org.apache.pulsar:bouncy-castle-parent;4.1.1 -org.apache.pulsar:buildtools;4.1.1 -org.apache.pulsar:distribution;4.1.1 -org.apache.pulsar:docker-images;4.1.1 -org.apache.pulsar:jclouds-shaded;4.1.1 -org.apache.pulsar:managed-ledger;4.1.1 -org.apache.pulsar:pulsar;4.1.1 -org.apache.pulsar:pulsar-all-docker-image;4.1.1 -org.apache.pulsar:pulsar-bom;4.1.1 -org.apache.pulsar:pulsar-broker;4.1.1 -org.apache.pulsar:pulsar-broker-auth-athenz;4.1.1 -org.apache.pulsar:pulsar-broker-auth-oidc;4.1.1 -org.apache.pulsar:pulsar-broker-auth-sasl;4.1.1 -org.apache.pulsar:pulsar-broker-common;4.1.1 -org.apache.pulsar:pulsar-cli-utils;4.1.1 -org.apache.pulsar:pulsar-client;4.1.1 -org.apache.pulsar:pulsar-client-admin;4.1.1 -org.apache.pulsar:pulsar-client-admin-api;4.1.1 -org.apache.pulsar:pulsar-client-admin-original;4.1.1 -org.apache.pulsar:pulsar-client-all;4.1.1 -org.apache.pulsar:pulsar-client-api;4.1.1 -org.apache.pulsar:pulsar-client-auth-athenz;4.1.1 -org.apache.pulsar:pulsar-client-auth-sasl;4.1.1 -org.apache.pulsar:pulsar-client-messagecrypto-bc;4.1.1 -org.apache.pulsar:pulsar-client-original;4.1.1 -org.apache.pulsar:pulsar-client-tools;4.1.1 -org.apache.pulsar:pulsar-client-tools-api;4.1.1 -org.apache.pulsar:pulsar-common;4.1.1 -org.apache.pulsar:pulsar-config-validation;4.1.1 -org.apache.pulsar:pulsar-docker-image;4.1.1 -org.apache.pulsar:pulsar-docs-tools;4.1.1 -org.apache.pulsar:pulsar-functions;4.1.1 -org.apache.pulsar:pulsar-functions-api;4.1.1 -org.apache.pulsar:pulsar-functions-api-examples;4.1.1 -org.apache.pulsar:pulsar-functions-api-examples-builtin;4.1.1 -org.apache.pulsar:pulsar-functions-instance;4.1.1 -org.apache.pulsar:pulsar-functions-local-runner;4.1.1 -org.apache.pulsar:pulsar-functions-local-runner-original;4.1.1 -org.apache.pulsar:pulsar-functions-proto;4.1.1 -org.apache.pulsar:pulsar-functions-runtime;4.1.1 -org.apache.pulsar:pulsar-functions-runtime-all;4.1.1 -org.apache.pulsar:pulsar-functions-secrets;4.1.1 -org.apache.pulsar:pulsar-functions-utils;4.1.1 -org.apache.pulsar:pulsar-functions-worker;4.1.1 -org.apache.pulsar:pulsar-io;4.1.1 -org.apache.pulsar:pulsar-io-aerospike;4.1.1 -org.apache.pulsar:pulsar-io-alluxio;4.1.1 -org.apache.pulsar:pulsar-io-aws;4.1.1 -org.apache.pulsar:pulsar-io-batch-data-generator;4.1.1 -org.apache.pulsar:pulsar-io-batch-discovery-triggerers;4.1.1 -org.apache.pulsar:pulsar-io-canal;4.1.1 -org.apache.pulsar:pulsar-io-cassandra;4.1.1 -org.apache.pulsar:pulsar-io-common;4.1.1 -org.apache.pulsar:pulsar-io-core;4.1.1 -org.apache.pulsar:pulsar-io-data-generator;4.1.1 -org.apache.pulsar:pulsar-io-debezium;4.1.1 -org.apache.pulsar:pulsar-io-debezium-core;4.1.1 -org.apache.pulsar:pulsar-io-debezium-mongodb;4.1.1 -org.apache.pulsar:pulsar-io-debezium-mssql;4.1.1 -org.apache.pulsar:pulsar-io-debezium-mysql;4.1.1 -org.apache.pulsar:pulsar-io-debezium-oracle;4.1.1 -org.apache.pulsar:pulsar-io-debezium-postgres;4.1.1 -org.apache.pulsar:pulsar-io-distribution;4.1.1 -org.apache.pulsar:pulsar-io-docs;4.1.1 -org.apache.pulsar:pulsar-io-dynamodb;4.1.1 -org.apache.pulsar:pulsar-io-elastic-search;4.1.1 -org.apache.pulsar:pulsar-io-file;4.1.1 -org.apache.pulsar:pulsar-io-flume;4.1.1 -org.apache.pulsar:pulsar-io-hbase;4.1.1 -org.apache.pulsar:pulsar-io-hdfs3;4.1.1 -org.apache.pulsar:pulsar-io-http;4.1.1 -org.apache.pulsar:pulsar-io-influxdb;4.1.1 -org.apache.pulsar:pulsar-io-jdbc;4.1.1 -org.apache.pulsar:pulsar-io-jdbc-clickhouse;4.1.1 -org.apache.pulsar:pulsar-io-jdbc-core;4.1.1 -org.apache.pulsar:pulsar-io-jdbc-mariadb;4.1.1 -org.apache.pulsar:pulsar-io-jdbc-openmldb;4.1.1 -org.apache.pulsar:pulsar-io-jdbc-postgres;4.1.1 -org.apache.pulsar:pulsar-io-jdbc-sqlite;4.1.1 -org.apache.pulsar:pulsar-io-kafka;4.1.1 -org.apache.pulsar:pulsar-io-kafka-connect-adaptor;4.1.1 -org.apache.pulsar:pulsar-io-kafka-connect-adaptor-nar;4.1.1 -org.apache.pulsar:pulsar-io-kinesis;4.1.1 -org.apache.pulsar:pulsar-io-mongo;4.1.1 -org.apache.pulsar:pulsar-io-netty;4.1.1 -org.apache.pulsar:pulsar-io-nsq;4.1.1 -org.apache.pulsar:pulsar-io-rabbitmq;4.1.1 -org.apache.pulsar:pulsar-io-redis;4.1.1 -org.apache.pulsar:pulsar-io-solr;4.1.1 -org.apache.pulsar:pulsar-io-twitter;4.1.1 -org.apache.pulsar:pulsar-metadata;4.1.1 -org.apache.pulsar:pulsar-offloader-distribution;4.1.1 -org.apache.pulsar:pulsar-package-bookkeeper-storage;4.1.1 -org.apache.pulsar:pulsar-package-core;4.1.1 -org.apache.pulsar:pulsar-package-filesystem-storage;4.1.1 -org.apache.pulsar:pulsar-package-management;4.1.1 -org.apache.pulsar:pulsar-proxy;4.1.1 -org.apache.pulsar:pulsar-server-distribution;4.1.1 -org.apache.pulsar:pulsar-shell-distribution;4.1.1 -org.apache.pulsar:pulsar-testclient;4.1.1 -org.apache.pulsar:pulsar-transaction-common;4.1.1 -org.apache.pulsar:pulsar-transaction-coordinator;4.1.1 -org.apache.pulsar:pulsar-transaction-parent;4.1.1 -org.apache.pulsar:pulsar-websocket;4.1.1 -org.apache.pulsar:structured-event-log;4.1.1 -org.apache.pulsar:testmocks;4.1.1 -org.apache.pulsar:tiered-storage-file-system;4.1.1 -org.apache.pulsar:tiered-storage-jcloud;4.1.1 -org.apache.pulsar:tiered-storage-parent;4.1.1 -org.apache.tomcat.embed:tomcat-embed-core;11.0.13 -org.apache.tomcat.embed:tomcat-embed-el;11.0.13 -org.apache.tomcat.embed:tomcat-embed-jasper;11.0.13 -org.apache.tomcat.embed:tomcat-embed-websocket;11.0.13 -org.apache.tomcat:tomcat-annotations-api;11.0.13 -org.apache.tomcat:tomcat-jdbc;11.0.13 -org.apache.tomcat:tomcat-jsp-api;11.0.13 -org.aspectj:aspectjrt;1.9.25 -org.aspectj:aspectjtools;1.9.25 -org.aspectj:aspectjweaver;1.9.25 -org.assertj:assertj-bom;3.27.6 -org.assertj:assertj-core;3.27.6 -org.assertj:assertj-guava;3.27.6 -org.awaitility:awaitility;4.3.0 -org.awaitility:awaitility-groovy;4.3.0 -org.awaitility:awaitility-kotlin;4.3.0 -org.awaitility:awaitility-scala;4.3.0 -org.cache2k:cache2k-api;2.6.1.Final -org.cache2k:cache2k-config;2.6.1.Final -org.cache2k:cache2k-core;2.6.1.Final -org.cache2k:cache2k-jcache;2.6.1.Final -org.cache2k:cache2k-micrometer;2.6.1.Final -org.cache2k:cache2k-spring;2.6.1.Final -org.codehaus.janino:commons-compiler;3.1.12 -org.codehaus.janino:commons-compiler-jdk;3.1.12 -org.codehaus.janino:janino;3.1.12 -org.codehaus.mojo:build-helper-maven-plugin;3.6.1 -org.codehaus.mojo:versions-maven-plugin;2.19.1 -org.codehaus.mojo:xml-maven-plugin;1.2.0 -org.crac:crac;1.5.0 -org.cyclonedx:cyclonedx-maven-plugin;2.9.1 -org.eclipse.angus:angus-core;2.0.5 -org.eclipse.angus:angus-mail;2.0.5 -org.eclipse.angus:dsn;2.0.5 -org.eclipse.angus:gimap;2.0.5 -org.eclipse.angus:imap;2.0.5 -org.eclipse.angus:jakarta.mail;2.0.5 -org.eclipse.angus:logging-mailhandler;2.0.5 -org.eclipse.angus:pop3;2.0.5 -org.eclipse.angus:smtp;2.0.5 -org.eclipse.jetty.compression:jetty-compression-brotli;12.1.3 -org.eclipse.jetty.compression:jetty-compression-common;12.1.3 -org.eclipse.jetty.compression:jetty-compression-gzip;12.1.3 -org.eclipse.jetty.compression:jetty-compression-server;12.1.3 -org.eclipse.jetty.compression:jetty-compression-zstandard;12.1.3 -org.eclipse.jetty.demos:jetty-core-demo-handler;12.1.3 -org.eclipse.jetty.ee11.osgi:jetty-ee11-osgi-alpn;12.1.3 -org.eclipse.jetty.ee11.osgi:jetty-ee11-osgi-boot;12.1.3 -org.eclipse.jetty.ee11.osgi:jetty-ee11-osgi-boot-jsp;12.1.3 -org.eclipse.jetty.ee11.websocket:jetty-ee11-websocket-jakarta-client;12.1.3 -org.eclipse.jetty.ee11.websocket:jetty-ee11-websocket-jakarta-client-webapp;12.1.3 -org.eclipse.jetty.ee11.websocket:jetty-ee11-websocket-jakarta-common;12.1.3 -org.eclipse.jetty.ee11.websocket:jetty-ee11-websocket-jakarta-server;12.1.3 -org.eclipse.jetty.ee11.websocket:jetty-ee11-websocket-jetty-client-webapp;12.1.3 -org.eclipse.jetty.ee11.websocket:jetty-ee11-websocket-jetty-server;12.1.3 -org.eclipse.jetty.ee11.websocket:jetty-ee11-websocket-servlet;12.1.3 -org.eclipse.jetty.ee11:jetty-ee11-annotations;12.1.3 -org.eclipse.jetty.ee11:jetty-ee11-apache-jsp;12.1.3 -org.eclipse.jetty.ee11:jetty-ee11-bom;12.1.3 -org.eclipse.jetty.ee11:jetty-ee11-cdi;12.1.3 -org.eclipse.jetty.ee11:jetty-ee11-fcgi-proxy;12.1.3 -org.eclipse.jetty.ee11:jetty-ee11-glassfish-jstl;12.1.3 -org.eclipse.jetty.ee11:jetty-ee11-jaspi;12.1.3 -org.eclipse.jetty.ee11:jetty-ee11-jndi;12.1.3 -org.eclipse.jetty.ee11:jetty-ee11-jspc-maven-plugin;12.1.3 -org.eclipse.jetty.ee11:jetty-ee11-maven-plugin;12.1.3 -org.eclipse.jetty.ee11:jetty-ee11-plus;12.1.3 -org.eclipse.jetty.ee11:jetty-ee11-proxy;12.1.3 -org.eclipse.jetty.ee11:jetty-ee11-quickstart;12.1.3 -org.eclipse.jetty.ee11:jetty-ee11-servlet;12.1.3 -org.eclipse.jetty.ee11:jetty-ee11-servlets;12.1.3 -org.eclipse.jetty.ee11:jetty-ee11-webapp;12.1.3 -org.eclipse.jetty.ee:jetty-ee-webapp;12.1.3 -org.eclipse.jetty.fcgi:jetty-fcgi-client;12.1.3 -org.eclipse.jetty.fcgi:jetty-fcgi-proxy;12.1.3 -org.eclipse.jetty.fcgi:jetty-fcgi-server;12.1.3 -org.eclipse.jetty.http2:jetty-http2-client;12.1.3 -org.eclipse.jetty.http2:jetty-http2-client-transport;12.1.3 -org.eclipse.jetty.http2:jetty-http2-common;12.1.3 -org.eclipse.jetty.http2:jetty-http2-hpack;12.1.3 -org.eclipse.jetty.http2:jetty-http2-server;12.1.3 -org.eclipse.jetty.http3:jetty-http3-client;12.1.3 -org.eclipse.jetty.http3:jetty-http3-client-transport;12.1.3 -org.eclipse.jetty.http3:jetty-http3-common;12.1.3 -org.eclipse.jetty.http3:jetty-http3-qpack;12.1.3 -org.eclipse.jetty.http3:jetty-http3-server;12.1.3 -org.eclipse.jetty.quic:jetty-quic-common;12.1.3 -org.eclipse.jetty.quic:jetty-quic-quiche-client;12.1.3 -org.eclipse.jetty.quic:jetty-quic-quiche-common;12.1.3 -org.eclipse.jetty.quic:jetty-quic-quiche-foreign;12.1.3 -org.eclipse.jetty.quic:jetty-quic-quiche-jna;12.1.3 -org.eclipse.jetty.quic:jetty-quic-server;12.1.3 -org.eclipse.jetty.websocket:jetty-websocket-core-client;12.1.3 -org.eclipse.jetty.websocket:jetty-websocket-core-common;12.1.3 -org.eclipse.jetty.websocket:jetty-websocket-core-server;12.1.3 -org.eclipse.jetty.websocket:jetty-websocket-jetty-api;12.1.3 -org.eclipse.jetty.websocket:jetty-websocket-jetty-client;12.1.3 -org.eclipse.jetty.websocket:jetty-websocket-jetty-common;12.1.3 -org.eclipse.jetty.websocket:jetty-websocket-jetty-server;12.1.3 -org.eclipse.jetty:jetty-alpn-client;12.1.3 -org.eclipse.jetty:jetty-alpn-conscrypt-client;12.1.3 -org.eclipse.jetty:jetty-alpn-conscrypt-server;12.1.3 -org.eclipse.jetty:jetty-alpn-java-client;12.1.3 -org.eclipse.jetty:jetty-alpn-java-server;12.1.3 -org.eclipse.jetty:jetty-alpn-server;12.1.3 -org.eclipse.jetty:jetty-bom;12.1.3 -org.eclipse.jetty:jetty-client;12.1.3 -org.eclipse.jetty:jetty-coreapp;12.1.3 -org.eclipse.jetty:jetty-deploy;12.1.3 -org.eclipse.jetty:jetty-ethereum;12.1.3 -org.eclipse.jetty:jetty-http;12.1.3 -org.eclipse.jetty:jetty-http-spi;12.1.3 -org.eclipse.jetty:jetty-http-tools;12.1.3 -org.eclipse.jetty:jetty-io;12.1.3 -org.eclipse.jetty:jetty-jmx;12.1.3 -org.eclipse.jetty:jetty-jndi;12.1.3 -org.eclipse.jetty:jetty-keystore;12.1.3 -org.eclipse.jetty:jetty-openid;12.1.3 -org.eclipse.jetty:jetty-osgi;12.1.3 -org.eclipse.jetty:jetty-plus;12.1.3 -org.eclipse.jetty:jetty-proxy;12.1.3 -org.eclipse.jetty:jetty-reactive-httpclient;4.1.0 -org.eclipse.jetty:jetty-rewrite;12.1.3 -org.eclipse.jetty:jetty-security;12.1.3 -org.eclipse.jetty:jetty-server;12.1.3 -org.eclipse.jetty:jetty-session;12.1.3 -org.eclipse.jetty:jetty-slf4j-impl;12.1.3 -org.eclipse.jetty:jetty-start;12.1.3 -org.eclipse.jetty:jetty-staticapp;12.1.3 -org.eclipse.jetty:jetty-unixdomain-server;12.1.3 -org.eclipse.jetty:jetty-util;12.1.3 -org.eclipse.jetty:jetty-util-ajax;12.1.3 -org.eclipse.jetty:jetty-xml;12.1.3 -org.eclipse:yasson;3.0.4 -org.ehcache:ehcache;3.11.1 -org.ehcache:ehcache-clustered;3.11.1 -org.ehcache:ehcache-transactions;3.11.1 -org.firebirdsql.jdbc:jaybird;6.0.3 -org.flywaydb:flyway-commandline;11.14.1 -org.flywaydb:flyway-core;11.14.1 -org.flywaydb:flyway-database-cassandra;11.14.1 -org.flywaydb:flyway-database-db2;11.14.1 -org.flywaydb:flyway-database-derby;11.14.1 -org.flywaydb:flyway-database-hsqldb;11.14.1 -org.flywaydb:flyway-database-informix;11.14.1 -org.flywaydb:flyway-database-mongodb;11.14.1 -org.flywaydb:flyway-database-oracle;11.14.1 -org.flywaydb:flyway-database-postgresql;11.14.1 -org.flywaydb:flyway-database-redshift;11.14.1 -org.flywaydb:flyway-database-saphana;11.14.1 -org.flywaydb:flyway-database-snowflake;11.14.1 -org.flywaydb:flyway-database-sybasease;11.14.1 -org.flywaydb:flyway-firebird;11.14.1 -org.flywaydb:flyway-gcp-bigquery;11.14.1 -org.flywaydb:flyway-gcp-spanner;11.14.1 -org.flywaydb:flyway-maven-plugin;11.14.1 -org.flywaydb:flyway-mysql;11.14.1 -org.flywaydb:flyway-singlestore;11.14.1 -org.flywaydb:flyway-sqlserver;11.14.1 -org.freemarker:freemarker;2.3.34 -org.glassfish.jaxb:codemodel;4.0.6 -org.glassfish.jaxb:jaxb-core;4.0.6 -org.glassfish.jaxb:jaxb-jxc;4.0.6 -org.glassfish.jaxb:jaxb-runtime;4.0.6 -org.glassfish.jaxb:jaxb-xjc;4.0.6 -org.glassfish.jaxb:txw2;4.0.6 -org.glassfish.jaxb:xsom;4.0.6 -org.glassfish.jersey.connectors:jersey-apache5-connector;4.0.0 -org.glassfish.jersey.connectors:jersey-grizzly-connector;4.0.0 -org.glassfish.jersey.connectors:jersey-helidon-connector;4.0.0 -org.glassfish.jersey.connectors:jersey-jdk-connector;4.0.0 -org.glassfish.jersey.connectors:jersey-jetty-connector;4.0.0 -org.glassfish.jersey.connectors:jersey-jetty-http2-connector;4.0.0 -org.glassfish.jersey.connectors:jersey-jnh-connector;4.0.0 -org.glassfish.jersey.connectors:jersey-netty-connector;4.0.0 -org.glassfish.jersey.containers.glassfish:jersey-gf-ejb;4.0.0 -org.glassfish.jersey.containers:jersey-container-grizzly2-http;4.0.0 -org.glassfish.jersey.containers:jersey-container-grizzly2-servlet;4.0.0 -org.glassfish.jersey.containers:jersey-container-helidon-http;4.0.0 -org.glassfish.jersey.containers:jersey-container-jdk-http;4.0.0 -org.glassfish.jersey.containers:jersey-container-jetty-http;4.0.0 -org.glassfish.jersey.containers:jersey-container-jetty-http2;4.0.0 -org.glassfish.jersey.containers:jersey-container-jetty-servlet;4.0.0 -org.glassfish.jersey.containers:jersey-container-netty-http;4.0.0 -org.glassfish.jersey.containers:jersey-container-servlet;4.0.0 -org.glassfish.jersey.core:jersey-client;4.0.0 -org.glassfish.jersey.core:jersey-common;4.0.0 -org.glassfish.jersey.core:jersey-server;4.0.0 -org.glassfish.jersey.ext.cdi:jersey-cdi-rs-inject;4.0.0 -org.glassfish.jersey.ext.cdi:jersey-cdi1x;4.0.0 -org.glassfish.jersey.ext.cdi:jersey-cdi1x-ban-custom-hk2-binding;4.0.0 -org.glassfish.jersey.ext.cdi:jersey-cdi1x-servlet;4.0.0 -org.glassfish.jersey.ext.cdi:jersey-cdi1x-transaction;4.0.0 -org.glassfish.jersey.ext.cdi:jersey-cdi1x-validation;4.0.0 -org.glassfish.jersey.ext.cdi:jersey-weld2-se;4.0.0 -org.glassfish.jersey.ext.microprofile:jersey-mp-config;4.0.0 -org.glassfish.jersey.ext.microprofile:jersey-mp-rest-client;4.0.0 -org.glassfish.jersey.ext.rx:jersey-rx-client-guava;4.0.0 -org.glassfish.jersey.ext.rx:jersey-rx-client-rxjava;4.0.0 -org.glassfish.jersey.ext.rx:jersey-rx-client-rxjava2;4.0.0 -org.glassfish.jersey.ext:jersey-bean-validation;4.0.0 -org.glassfish.jersey.ext:jersey-constants;4.0.0 -org.glassfish.jersey.ext:jersey-declarative-linking;4.0.0 -org.glassfish.jersey.ext:jersey-entity-filtering;4.0.0 -org.glassfish.jersey.ext:jersey-metainf-services;4.0.0 -org.glassfish.jersey.ext:jersey-micrometer;4.0.0 -org.glassfish.jersey.ext:jersey-mvc;4.0.0 -org.glassfish.jersey.ext:jersey-mvc-bean-validation;4.0.0 -org.glassfish.jersey.ext:jersey-mvc-freemarker;4.0.0 -org.glassfish.jersey.ext:jersey-mvc-jsp;4.0.0 -org.glassfish.jersey.ext:jersey-mvc-mustache;4.0.0 -org.glassfish.jersey.ext:jersey-proxy-client;4.0.0 -org.glassfish.jersey.ext:jersey-spring6;4.0.0 -org.glassfish.jersey.ext:jersey-wadl-doclet;4.0.0 -org.glassfish.jersey.inject:jersey-cdi2-se;4.0.0 -org.glassfish.jersey.inject:jersey-hk2;4.0.0 -org.glassfish.jersey.media:jersey-media-jaxb;4.0.0 -org.glassfish.jersey.media:jersey-media-json-binding;4.0.0 -org.glassfish.jersey.media:jersey-media-json-gson;4.0.0 -org.glassfish.jersey.media:jersey-media-json-jackson;4.0.0 -org.glassfish.jersey.media:jersey-media-json-jettison;4.0.0 -org.glassfish.jersey.media:jersey-media-json-processing;4.0.0 -org.glassfish.jersey.media:jersey-media-kryo;4.0.0 -org.glassfish.jersey.media:jersey-media-moxy;4.0.0 -org.glassfish.jersey.media:jersey-media-multipart;4.0.0 -org.glassfish.jersey.media:jersey-media-sse;4.0.0 -org.glassfish.jersey.security:oauth1-client;4.0.0 -org.glassfish.jersey.security:oauth1-server;4.0.0 -org.glassfish.jersey.security:oauth1-signature;4.0.0 -org.glassfish.jersey.security:oauth2-client;4.0.0 -org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-bundle;4.0.0 -org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-external;4.0.0 -org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2;4.0.0 -org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-helidon;4.0.0 -org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-inmemory;4.0.0 -org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jdk-http;4.0.0 -org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jetty;4.0.0 -org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jetty-http2;4.0.0 -org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-netty;4.0.0 -org.glassfish.jersey.test-framework:jersey-test-framework-core;4.0.0 -org.glassfish.jersey.test-framework:jersey-test-framework-util;4.0.0 -org.glassfish.jersey:jersey-bom;4.0.0 -org.glassfish.web:jakarta.servlet.jsp.jstl;3.0.1 -org.graalvm.buildtools:native-maven-plugin;0.11.2 -org.hamcrest:hamcrest;3.0 -org.hamcrest:hamcrest-core;3.0 -org.hamcrest:hamcrest-library;3.0 -org.hibernate.orm:hibernate-agroal;7.1.6.Final -org.hibernate.orm:hibernate-ant;7.1.6.Final -org.hibernate.orm:hibernate-c3p0;7.1.6.Final -org.hibernate.orm:hibernate-community-dialects;7.1.6.Final -org.hibernate.orm:hibernate-core;7.1.6.Final -org.hibernate.orm:hibernate-envers;7.1.6.Final -org.hibernate.orm:hibernate-graalvm;7.1.6.Final -org.hibernate.orm:hibernate-hikaricp;7.1.6.Final -org.hibernate.orm:hibernate-jcache;7.1.6.Final -org.hibernate.orm:hibernate-micrometer;7.1.6.Final -org.hibernate.orm:hibernate-processor;7.1.6.Final -org.hibernate.orm:hibernate-scan-jandex;7.1.6.Final -org.hibernate.orm:hibernate-spatial;7.1.6.Final -org.hibernate.orm:hibernate-testing;7.1.6.Final -org.hibernate.orm:hibernate-vector;7.1.6.Final -org.hibernate.validator:hibernate-validator;9.0.1.Final -org.hibernate.validator:hibernate-validator-annotation-processor;9.0.1.Final -org.hsqldb:hsqldb;2.7.3 -org.htmlunit:htmlunit;4.17.0 -org.infinispan.protostream:protostream;5.0.13.Final -org.infinispan.protostream:protostream-processor;5.0.13.Final -org.infinispan.protostream:protostream-types;5.0.13.Final -org.infinispan:infinispan-anchored-keys;15.2.6.Final -org.infinispan:infinispan-api;15.2.6.Final -org.infinispan:infinispan-bom;15.2.6.Final -org.infinispan:infinispan-cachestore-jdbc;15.2.6.Final -org.infinispan:infinispan-cachestore-jdbc-common;15.2.6.Final -org.infinispan:infinispan-cachestore-remote;15.2.6.Final -org.infinispan:infinispan-cachestore-rocksdb;15.2.6.Final -org.infinispan:infinispan-cachestore-sql;15.2.6.Final -org.infinispan:infinispan-cdi-common;15.2.6.Final -org.infinispan:infinispan-cdi-embedded;15.2.6.Final -org.infinispan:infinispan-cdi-remote;15.2.6.Final -org.infinispan:infinispan-checkstyle;15.2.6.Final -org.infinispan:infinispan-cli-client;15.2.6.Final -org.infinispan:infinispan-client-hotrod;15.2.6.Final -org.infinispan:infinispan-client-hotrod-legacy;15.2.6.Final -org.infinispan:infinispan-client-rest;15.2.6.Final -org.infinispan:infinispan-clustered-counter;15.2.6.Final -org.infinispan:infinispan-clustered-lock;15.2.6.Final -org.infinispan:infinispan-commons;15.2.6.Final -org.infinispan:infinispan-commons-graalvm;15.2.6.Final -org.infinispan:infinispan-commons-spi;15.2.6.Final -org.infinispan:infinispan-commons-test;15.2.6.Final -org.infinispan:infinispan-component-annotations;15.2.6.Final -org.infinispan:infinispan-component-processor;15.2.6.Final -org.infinispan:infinispan-console;15.2.1.Final -org.infinispan:infinispan-core;15.2.6.Final -org.infinispan:infinispan-core-graalvm;15.2.6.Final -org.infinispan:infinispan-counter-api;15.2.6.Final -org.infinispan:infinispan-hibernate-cache-commons;15.2.6.Final -org.infinispan:infinispan-hibernate-cache-spi;15.2.6.Final -org.infinispan:infinispan-hibernate-cache-v62;15.2.6.Final -org.infinispan:infinispan-jboss-marshalling;15.2.6.Final -org.infinispan:infinispan-jcache;15.2.6.Final -org.infinispan:infinispan-jcache-commons;15.2.6.Final -org.infinispan:infinispan-jcache-remote;15.2.6.Final -org.infinispan:infinispan-key-value-store-client;15.2.6.Final -org.infinispan:infinispan-logging-annotations;15.2.6.Final -org.infinispan:infinispan-logging-processor;15.2.6.Final -org.infinispan:infinispan-multimap;15.2.6.Final -org.infinispan:infinispan-objectfilter;15.2.6.Final -org.infinispan:infinispan-query;15.2.6.Final -org.infinispan:infinispan-query-core;15.2.6.Final -org.infinispan:infinispan-query-dsl;15.2.6.Final -org.infinispan:infinispan-remote-query-client;15.2.6.Final -org.infinispan:infinispan-remote-query-server;15.2.6.Final -org.infinispan:infinispan-scripting;15.2.6.Final -org.infinispan:infinispan-server-core;15.2.6.Final -org.infinispan:infinispan-server-hotrod;15.2.6.Final -org.infinispan:infinispan-server-memcached;15.2.6.Final -org.infinispan:infinispan-server-resp;15.2.6.Final -org.infinispan:infinispan-server-rest;15.2.6.Final -org.infinispan:infinispan-server-router;15.2.6.Final -org.infinispan:infinispan-server-runtime;15.2.6.Final -org.infinispan:infinispan-server-testdriver-core;15.2.6.Final -org.infinispan:infinispan-server-testdriver-junit4;15.2.6.Final -org.infinispan:infinispan-server-testdriver-junit5;15.2.6.Final -org.infinispan:infinispan-spring-boot3-starter-embedded;15.2.6.Final -org.infinispan:infinispan-spring-boot3-starter-remote;15.2.6.Final -org.infinispan:infinispan-spring6-common;15.2.6.Final -org.infinispan:infinispan-spring6-embedded;15.2.6.Final -org.infinispan:infinispan-spring6-remote;15.2.6.Final -org.infinispan:infinispan-tasks;15.2.6.Final -org.infinispan:infinispan-tasks-api;15.2.6.Final -org.infinispan:infinispan-tools;15.2.6.Final -org.influxdb:influxdb-java;2.25 -org.jboss.logging:jboss-logging;3.6.1.Final -org.jdom:jdom2;2.0.6.1 -org.jetbrains.kotlin:kotlin-bom;2.2.21 -org.jetbrains.kotlin:kotlin-compiler;2.2.21 -org.jetbrains.kotlin:kotlin-compiler-embeddable;2.2.21 -org.jetbrains.kotlin:kotlin-daemon-client;2.2.21 -org.jetbrains.kotlin:kotlin-main-kts;2.2.21 -org.jetbrains.kotlin:kotlin-maven-plugin;2.2.21 -org.jetbrains.kotlin:kotlin-osgi-bundle;2.2.21 -org.jetbrains.kotlin:kotlin-reflect;2.2.21 -org.jetbrains.kotlin:kotlin-script-runtime;2.2.21 -org.jetbrains.kotlin:kotlin-scripting-common;2.2.21 -org.jetbrains.kotlin:kotlin-scripting-ide-services;2.2.21 -org.jetbrains.kotlin:kotlin-scripting-jvm;2.2.21 -org.jetbrains.kotlin:kotlin-scripting-jvm-host;2.2.21 -org.jetbrains.kotlin:kotlin-stdlib;2.2.21 -org.jetbrains.kotlin:kotlin-stdlib-common;2.2.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk7;2.2.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk8;2.2.21 -org.jetbrains.kotlin:kotlin-stdlib-js;2.2.21 -org.jetbrains.kotlin:kotlin-test;2.2.21 -org.jetbrains.kotlin:kotlin-test-annotations-common;2.2.21 -org.jetbrains.kotlin:kotlin-test-common;2.2.21 -org.jetbrains.kotlin:kotlin-test-js;2.2.21 -org.jetbrains.kotlin:kotlin-test-junit;2.2.21 -org.jetbrains.kotlin:kotlin-test-junit5;2.2.21 -org.jetbrains.kotlin:kotlin-test-testng;2.2.21 -org.jetbrains.kotlinx:kotlinx-coroutines-android;1.10.2 -org.jetbrains.kotlinx:kotlinx-coroutines-bom;1.10.2 -org.jetbrains.kotlinx:kotlinx-coroutines-core;1.10.2 -org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm;1.10.2 -org.jetbrains.kotlinx:kotlinx-coroutines-debug;1.10.2 -org.jetbrains.kotlinx:kotlinx-coroutines-guava;1.10.2 -org.jetbrains.kotlinx:kotlinx-coroutines-javafx;1.10.2 -org.jetbrains.kotlinx:kotlinx-coroutines-jdk8;1.10.2 -org.jetbrains.kotlinx:kotlinx-coroutines-jdk9;1.10.2 -org.jetbrains.kotlinx:kotlinx-coroutines-play-services;1.10.2 -org.jetbrains.kotlinx:kotlinx-coroutines-reactive;1.10.2 -org.jetbrains.kotlinx:kotlinx-coroutines-reactor;1.10.2 -org.jetbrains.kotlinx:kotlinx-coroutines-rx2;1.10.2 -org.jetbrains.kotlinx:kotlinx-coroutines-rx3;1.10.2 -org.jetbrains.kotlinx:kotlinx-coroutines-slf4j;1.10.2 -org.jetbrains.kotlinx:kotlinx-coroutines-swing;1.10.2 -org.jetbrains.kotlinx:kotlinx-coroutines-test;1.10.2 -org.jetbrains.kotlinx:kotlinx-coroutines-test-jvm;1.10.2 -org.jetbrains.kotlinx:kotlinx-serialization-bom;1.9.0 -org.jetbrains.kotlinx:kotlinx-serialization-cbor;1.9.0 -org.jetbrains.kotlinx:kotlinx-serialization-cbor-jvm;1.9.0 -org.jetbrains.kotlinx:kotlinx-serialization-core;1.9.0 -org.jetbrains.kotlinx:kotlinx-serialization-core-jvm;1.9.0 -org.jetbrains.kotlinx:kotlinx-serialization-hocon;1.9.0 -org.jetbrains.kotlinx:kotlinx-serialization-json;1.9.0 -org.jetbrains.kotlinx:kotlinx-serialization-json-io;1.9.0 -org.jetbrains.kotlinx:kotlinx-serialization-json-io-jvm;1.9.0 -org.jetbrains.kotlinx:kotlinx-serialization-json-jvm;1.9.0 -org.jetbrains.kotlinx:kotlinx-serialization-json-okio;1.9.0 -org.jetbrains.kotlinx:kotlinx-serialization-json-okio-jvm;1.9.0 -org.jetbrains.kotlinx:kotlinx-serialization-properties;1.9.0 -org.jetbrains.kotlinx:kotlinx-serialization-properties-jvm;1.9.0 -org.jetbrains.kotlinx:kotlinx-serialization-protobuf;1.9.0 -org.jetbrains.kotlinx:kotlinx-serialization-protobuf-jvm;1.9.0 -org.jooq:jooq;3.19.27 -org.jooq:jooq-bom;3.19.27 -org.jooq:jooq-checker;3.19.27 -org.jooq:jooq-codegen;3.19.27 -org.jooq:jooq-codegen-gradle;3.19.27 -org.jooq:jooq-codegen-maven;3.19.27 -org.jooq:jooq-jackson-extensions;3.19.27 -org.jooq:jooq-kotlin;3.19.27 -org.jooq:jooq-kotlin-coroutines;3.19.27 -org.jooq:jooq-meta;3.19.27 -org.jooq:jooq-meta-extensions;3.19.27 -org.jooq:jooq-meta-extensions-hibernate;3.19.27 -org.jooq:jooq-meta-extensions-liquibase;3.19.27 -org.jooq:jooq-meta-kotlin;3.19.27 -org.jooq:jooq-migrations;3.19.27 -org.jooq:jooq-migrations-maven;3.19.27 -org.jooq:jooq-postgres-extensions;3.19.27 -org.jooq:jooq-scala_2.13;3.19.27 -org.jooq:jooq-xtend;3.19.27 -org.jspecify:jspecify;1.0.0 -org.junit.jupiter:junit-jupiter;6.0.1 -org.junit.jupiter:junit-jupiter-api;6.0.1 -org.junit.jupiter:junit-jupiter-engine;6.0.1 -org.junit.jupiter:junit-jupiter-migrationsupport;6.0.1 -org.junit.jupiter:junit-jupiter-params;6.0.1 -org.junit.platform:junit-platform-commons;6.0.1 -org.junit.platform:junit-platform-console;6.0.1 -org.junit.platform:junit-platform-engine;6.0.1 -org.junit.platform:junit-platform-launcher;6.0.1 -org.junit.platform:junit-platform-reporting;6.0.1 -org.junit.platform:junit-platform-suite;6.0.1 -org.junit.platform:junit-platform-suite-api;6.0.1 -org.junit.platform:junit-platform-suite-engine;6.0.1 -org.junit.platform:junit-platform-testkit;6.0.1 -org.junit.vintage:junit-vintage-engine;6.0.1 -org.junit:junit-bom;6.0.1 -org.liquibase:liquibase-cdi;5.0.1 -org.liquibase:liquibase-core;5.0.1 -org.liquibase:liquibase-maven-plugin;5.0.1 -org.mariadb.jdbc:mariadb-java-client;3.5.6 -org.mariadb:r2dbc-mariadb;1.3.0 -org.messaginghub:pooled-jms;3.1.7 -org.mockito:mockito-android;5.20.0 -org.mockito:mockito-bom;5.20.0 -org.mockito:mockito-core;5.20.0 -org.mockito:mockito-errorprone;5.20.0 -org.mockito:mockito-junit-jupiter;5.20.0 -org.mockito:mockito-proxy;5.20.0 -org.mockito:mockito-subclass;5.20.0 -org.mongodb.scala:mongo-scala-bson_2.11;5.6.1 -org.mongodb.scala:mongo-scala-bson_2.12;5.6.1 -org.mongodb.scala:mongo-scala-bson_2.13;5.6.1 -org.mongodb.scala:mongo-scala-driver_2.11;5.6.1 -org.mongodb.scala:mongo-scala-driver_2.12;5.6.1 -org.mongodb.scala:mongo-scala-driver_2.13;5.6.1 -org.mongodb:bson;5.6.1 -org.mongodb:bson-kotlin;5.6.1 -org.mongodb:bson-kotlinx;5.6.1 -org.mongodb:bson-record-codec;5.6.1 -org.mongodb:mongodb-crypt;5.6.1 -org.mongodb:mongodb-driver-bom;5.6.1 -org.mongodb:mongodb-driver-core;5.6.1 -org.mongodb:mongodb-driver-kotlin-coroutine;5.6.1 -org.mongodb:mongodb-driver-kotlin-extensions;5.6.1 -org.mongodb:mongodb-driver-kotlin-sync;5.6.1 -org.mongodb:mongodb-driver-reactivestreams;5.6.1 -org.mongodb:mongodb-driver-sync;5.6.1 -org.neo4j.bolt:neo4j-bolt-connection;10.0.1 -org.neo4j.bolt:neo4j-bolt-connection-bom;10.0.1 -org.neo4j.bolt:neo4j-bolt-connection-netty;10.0.1 -org.neo4j.bolt:neo4j-bolt-connection-pooled;10.0.1 -org.neo4j.bolt:neo4j-bolt-connection-query-api;10.0.1 -org.neo4j.bolt:neo4j-bolt-connection-routed;10.0.1 -org.neo4j.driver:neo4j-java-driver;6.0.1 -org.neo4j.driver:neo4j-java-driver-all;6.0.1 -org.neo4j.driver:neo4j-java-driver-bom;6.0.1 -org.neo4j.driver:neo4j-java-driver-observation-metrics;6.0.1 -org.neo4j.driver:neo4j-java-driver-observation-micrometer;6.0.1 -org.postgresql:postgresql;42.7.8 -org.postgresql:r2dbc-postgresql;1.1.1.RELEASE -org.projectlombok:lombok;1.18.42 -org.quartz-scheduler:quartz;2.5.1 -org.quartz-scheduler:quartz-jobs;2.5.1 -org.reactivestreams:reactive-streams;1.0.4 -org.seleniumhq.selenium:htmlunit3-driver;4.36.1 -org.seleniumhq.selenium:selenium-api;4.37.0 -org.seleniumhq.selenium:selenium-bom;4.37.0 -org.seleniumhq.selenium:selenium-chrome-driver;4.37.0 -org.seleniumhq.selenium:selenium-chromium-driver;4.37.0 -org.seleniumhq.selenium:selenium-devtools-v139;4.37.0 -org.seleniumhq.selenium:selenium-devtools-v140;4.37.0 -org.seleniumhq.selenium:selenium-devtools-v141;4.37.0 -org.seleniumhq.selenium:selenium-edge-driver;4.37.0 -org.seleniumhq.selenium:selenium-firefox-driver;4.37.0 -org.seleniumhq.selenium:selenium-grid;4.37.0 -org.seleniumhq.selenium:selenium-http;4.37.0 -org.seleniumhq.selenium:selenium-ie-driver;4.37.0 -org.seleniumhq.selenium:selenium-java;4.37.0 -org.seleniumhq.selenium:selenium-json;4.37.0 -org.seleniumhq.selenium:selenium-manager;4.37.0 -org.seleniumhq.selenium:selenium-remote-driver;4.37.0 -org.seleniumhq.selenium:selenium-safari-driver;4.37.0 -org.seleniumhq.selenium:selenium-session-map-jdbc;4.37.0 -org.seleniumhq.selenium:selenium-session-map-redis;4.37.0 -org.seleniumhq.selenium:selenium-support;4.37.0 -org.skyscreamer:jsonassert;1.5.3 -org.slf4j:jcl-over-slf4j;2.0.17 -org.slf4j:jul-to-slf4j;2.0.17 -org.slf4j:log4j-over-slf4j;2.0.17 -org.slf4j:slf4j-api;2.0.17 -org.slf4j:slf4j-ext;2.0.17 -org.slf4j:slf4j-jdk-platform-logging;2.0.17 -org.slf4j:slf4j-jdk14;2.0.17 -org.slf4j:slf4j-log4j12;2.0.17 -org.slf4j:slf4j-nop;2.0.17 -org.slf4j:slf4j-reload4j;2.0.17 -org.slf4j:slf4j-simple;2.0.17 -org.springframework.amqp:spring-amqp;4.0.0-RC1 -org.springframework.amqp:spring-amqp-bom;4.0.0-RC1 -org.springframework.amqp:spring-rabbit;4.0.0-RC1 -org.springframework.amqp:spring-rabbit-junit;4.0.0-RC1 -org.springframework.amqp:spring-rabbit-stream;4.0.0-RC1 -org.springframework.amqp:spring-rabbit-test;4.0.0-RC1 -org.springframework.amqp:spring-rabbitmq-client;4.0.0-RC1 -org.springframework.batch:spring-batch-bom;6.0.0-RC2 -org.springframework.boot:spring-boot;4.0.0-RC2 -org.springframework.boot:spring-boot-activemq;4.0.0-RC2 -org.springframework.boot:spring-boot-actuator;4.0.0-RC2 -org.springframework.boot:spring-boot-actuator-autoconfigure;4.0.0-RC2 -org.springframework.boot:spring-boot-amqp;4.0.0-RC2 -org.springframework.boot:spring-boot-artemis;4.0.0-RC2 -org.springframework.boot:spring-boot-autoconfigure;4.0.0-RC2 -org.springframework.boot:spring-boot-autoconfigure-classic;4.0.0-RC2 -org.springframework.boot:spring-boot-autoconfigure-classic-modules;4.0.0-RC2 -org.springframework.boot:spring-boot-autoconfigure-processor;4.0.0-RC2 -org.springframework.boot:spring-boot-batch;4.0.0-RC2 -org.springframework.boot:spring-boot-batch-jdbc;4.0.0-RC2 -org.springframework.boot:spring-boot-buildpack-platform;4.0.0-RC2 -org.springframework.boot:spring-boot-cache;4.0.0-RC2 -org.springframework.boot:spring-boot-cache-test;4.0.0-RC2 -org.springframework.boot:spring-boot-cassandra;4.0.0-RC2 -org.springframework.boot:spring-boot-cloudfoundry;4.0.0-RC2 -org.springframework.boot:spring-boot-configuration-metadata;4.0.0-RC2 -org.springframework.boot:spring-boot-configuration-processor;4.0.0-RC2 -org.springframework.boot:spring-boot-couchbase;4.0.0-RC2 -org.springframework.boot:spring-boot-data-cassandra;4.0.0-RC2 -org.springframework.boot:spring-boot-data-cassandra-test;4.0.0-RC2 -org.springframework.boot:spring-boot-data-commons;4.0.0-RC2 -org.springframework.boot:spring-boot-data-couchbase;4.0.0-RC2 -org.springframework.boot:spring-boot-data-couchbase-test;4.0.0-RC2 -org.springframework.boot:spring-boot-data-elasticsearch;4.0.0-RC2 -org.springframework.boot:spring-boot-data-elasticsearch-test;4.0.0-RC2 -org.springframework.boot:spring-boot-data-jdbc;4.0.0-RC2 -org.springframework.boot:spring-boot-data-jdbc-test;4.0.0-RC2 -org.springframework.boot:spring-boot-data-jpa;4.0.0-RC2 -org.springframework.boot:spring-boot-data-jpa-test;4.0.0-RC2 -org.springframework.boot:spring-boot-data-ldap;4.0.0-RC2 -org.springframework.boot:spring-boot-data-ldap-test;4.0.0-RC2 -org.springframework.boot:spring-boot-data-mongodb;4.0.0-RC2 -org.springframework.boot:spring-boot-data-mongodb-test;4.0.0-RC2 -org.springframework.boot:spring-boot-data-neo4j;4.0.0-RC2 -org.springframework.boot:spring-boot-data-neo4j-test;4.0.0-RC2 -org.springframework.boot:spring-boot-data-r2dbc;4.0.0-RC2 -org.springframework.boot:spring-boot-data-r2dbc-test;4.0.0-RC2 -org.springframework.boot:spring-boot-data-redis;4.0.0-RC2 -org.springframework.boot:spring-boot-data-redis-test;4.0.0-RC2 -org.springframework.boot:spring-boot-data-rest;4.0.0-RC2 -org.springframework.boot:spring-boot-dependencies;4.0.0-RC2 -org.springframework.boot:spring-boot-devtools;4.0.0-RC2 -org.springframework.boot:spring-boot-docker-compose;4.0.0-RC2 -org.springframework.boot:spring-boot-elasticsearch;4.0.0-RC2 -org.springframework.boot:spring-boot-flyway;4.0.0-RC2 -org.springframework.boot:spring-boot-freemarker;4.0.0-RC2 -org.springframework.boot:spring-boot-graphql;4.0.0-RC2 -org.springframework.boot:spring-boot-graphql-test;4.0.0-RC2 -org.springframework.boot:spring-boot-groovy-templates;4.0.0-RC2 -org.springframework.boot:spring-boot-gson;4.0.0-RC2 -org.springframework.boot:spring-boot-h2console;4.0.0-RC2 -org.springframework.boot:spring-boot-hateoas;4.0.0-RC2 -org.springframework.boot:spring-boot-hazelcast;4.0.0-RC2 -org.springframework.boot:spring-boot-health;4.0.0-RC2 -org.springframework.boot:spring-boot-hibernate;4.0.0-RC2 -org.springframework.boot:spring-boot-http-client;4.0.0-RC2 -org.springframework.boot:spring-boot-http-codec;4.0.0-RC2 -org.springframework.boot:spring-boot-http-converter;4.0.0-RC2 -org.springframework.boot:spring-boot-integration;4.0.0-RC2 -org.springframework.boot:spring-boot-jackson;4.0.0-RC2 -org.springframework.boot:spring-boot-jackson2;4.0.0-RC2 -org.springframework.boot:spring-boot-jarmode-tools;4.0.0-RC2 -org.springframework.boot:spring-boot-jdbc;4.0.0-RC2 -org.springframework.boot:spring-boot-jdbc-test;4.0.0-RC2 -org.springframework.boot:spring-boot-jersey;4.0.0-RC2 -org.springframework.boot:spring-boot-jetty;4.0.0-RC2 -org.springframework.boot:spring-boot-jetty-runtime;4.0.0-RC2 -org.springframework.boot:spring-boot-jms;4.0.0-RC2 -org.springframework.boot:spring-boot-jooq;4.0.0-RC2 -org.springframework.boot:spring-boot-jooq-test;4.0.0-RC2 -org.springframework.boot:spring-boot-jpa;4.0.0-RC2 -org.springframework.boot:spring-boot-jpa-test;4.0.0-RC2 -org.springframework.boot:spring-boot-jsonb;4.0.0-RC2 -org.springframework.boot:spring-boot-kafka;4.0.0-RC2 -org.springframework.boot:spring-boot-kotlin-serialization;4.0.0-RC2 -org.springframework.boot:spring-boot-ldap;4.0.0-RC2 -org.springframework.boot:spring-boot-liquibase;4.0.0-RC2 -org.springframework.boot:spring-boot-loader;4.0.0-RC2 -org.springframework.boot:spring-boot-mail;4.0.0-RC2 -org.springframework.boot:spring-boot-maven-plugin;4.0.0-RC2 -org.springframework.boot:spring-boot-micrometer-metrics;4.0.0-RC2 -org.springframework.boot:spring-boot-micrometer-metrics-test;4.0.0-RC2 -org.springframework.boot:spring-boot-micrometer-observation;4.0.0-RC2 -org.springframework.boot:spring-boot-micrometer-tracing;4.0.0-RC2 -org.springframework.boot:spring-boot-micrometer-tracing-brave;4.0.0-RC2 -org.springframework.boot:spring-boot-micrometer-tracing-opentelemetry;4.0.0-RC2 -org.springframework.boot:spring-boot-micrometer-tracing-test;4.0.0-RC2 -org.springframework.boot:spring-boot-mongodb;4.0.0-RC2 -org.springframework.boot:spring-boot-mustache;4.0.0-RC2 -org.springframework.boot:spring-boot-neo4j;4.0.0-RC2 -org.springframework.boot:spring-boot-netty;4.0.0-RC2 -org.springframework.boot:spring-boot-opentelemetry;4.0.0-RC2 -org.springframework.boot:spring-boot-persistence;4.0.0-RC2 -org.springframework.boot:spring-boot-properties-migrator;4.0.0-RC2 -org.springframework.boot:spring-boot-pulsar;4.0.0-RC2 -org.springframework.boot:spring-boot-quartz;4.0.0-RC2 -org.springframework.boot:spring-boot-r2dbc;4.0.0-RC2 -org.springframework.boot:spring-boot-reactor;4.0.0-RC2 -org.springframework.boot:spring-boot-reactor-netty;4.0.0-RC2 -org.springframework.boot:spring-boot-restclient;4.0.0-RC2 -org.springframework.boot:spring-boot-restclient-test;4.0.0-RC2 -org.springframework.boot:spring-boot-restdocs;4.0.0-RC2 -org.springframework.boot:spring-boot-resttestclient;4.0.0-RC2 -org.springframework.boot:spring-boot-rsocket;4.0.0-RC2 -org.springframework.boot:spring-boot-rsocket-test;4.0.0-RC2 -org.springframework.boot:spring-boot-security;4.0.0-RC2 -org.springframework.boot:spring-boot-security-oauth2-authorization-server;4.0.0-RC2 -org.springframework.boot:spring-boot-security-oauth2-client;4.0.0-RC2 -org.springframework.boot:spring-boot-security-oauth2-resource-server;4.0.0-RC2 -org.springframework.boot:spring-boot-security-saml2;4.0.0-RC2 -org.springframework.boot:spring-boot-security-test;4.0.0-RC2 -org.springframework.boot:spring-boot-sendgrid;4.0.0-RC2 -org.springframework.boot:spring-boot-servlet;4.0.0-RC2 -org.springframework.boot:spring-boot-session;4.0.0-RC2 -org.springframework.boot:spring-boot-session-data-redis;4.0.0-RC2 -org.springframework.boot:spring-boot-session-jdbc;4.0.0-RC2 -org.springframework.boot:spring-boot-sql;4.0.0-RC2 -org.springframework.boot:spring-boot-starter;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-activemq;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-activemq-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-actuator;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-actuator-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-amqp;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-amqp-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-artemis;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-artemis-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-aspectj;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-aspectj-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-batch;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-batch-jdbc;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-batch-jdbc-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-batch-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-cache;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-cache-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-cassandra;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-cassandra-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-classic;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-cloudfoundry;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-cloudfoundry-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-couchbase;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-couchbase-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-data-cassandra;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-data-cassandra-reactive;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-data-cassandra-reactive-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-data-cassandra-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-data-couchbase;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-data-couchbase-reactive;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-data-couchbase-reactive-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-data-couchbase-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-data-elasticsearch;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-data-elasticsearch-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-data-jdbc;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-data-jdbc-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-data-jpa;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-data-jpa-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-data-ldap;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-data-ldap-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-data-mongodb;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-data-mongodb-reactive;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-data-mongodb-reactive-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-data-mongodb-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-data-neo4j;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-data-neo4j-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-data-r2dbc;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-data-r2dbc-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-data-redis;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-data-redis-reactive;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-data-redis-reactive-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-data-redis-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-data-rest;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-data-rest-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-elasticsearch;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-elasticsearch-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-flyway;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-flyway-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-freemarker;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-freemarker-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-graphql;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-graphql-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-groovy-templates;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-groovy-templates-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-gson;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-gson-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-hateoas;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-hateoas-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-hazelcast;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-hazelcast-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-integration;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-integration-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-jackson;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-jackson-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-jdbc;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-jdbc-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-jersey;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-jersey-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-jetty;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-jms;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-jms-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-jooq;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-jooq-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-json;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-jsonb;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-jsonb-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-kafka;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-kafka-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-kotlin-serialization;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-kotlin-serialization-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-ldap;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-ldap-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-liquibase;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-liquibase-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-log4j2;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-logback;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-logging;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-mail;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-mail-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-mongodb;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-mongodb-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-mustache;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-mustache-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-neo4j;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-neo4j-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-oauth2-authorization-server;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-oauth2-client;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-oauth2-resource-server;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-opentelemetry;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-opentelemetry-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-parent;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-pulsar;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-pulsar-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-quartz;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-quartz-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-r2dbc;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-r2dbc-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-reactor-netty;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-restclient;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-restclient-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-rsocket;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-rsocket-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-security;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-security-oauth2-authorization-server;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-security-oauth2-authorization-server-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-security-oauth2-client;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-security-oauth2-client-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-security-oauth2-resource-server;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-security-oauth2-resource-server-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-security-saml2;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-security-saml2-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-security-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-sendgrid;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-sendgrid-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-session-data-redis;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-session-data-redis-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-session-jdbc;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-session-jdbc-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-test-classic;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-thymeleaf;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-thymeleaf-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-tomcat;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-validation;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-validation-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-web;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-web-services;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-webclient;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-webclient-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-webflux;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-webflux-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-webmvc;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-webmvc-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-webservices;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-webservices-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-websocket;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-websocket-test;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-zipkin;4.0.0-RC2 -org.springframework.boot:spring-boot-starter-zipkin-test;4.0.0-RC2 -org.springframework.boot:spring-boot-test;4.0.0-RC2 -org.springframework.boot:spring-boot-test-autoconfigure;4.0.0-RC2 -org.springframework.boot:spring-boot-test-classic-modules;4.0.0-RC2 -org.springframework.boot:spring-boot-testcontainers;4.0.0-RC2 -org.springframework.boot:spring-boot-thymeleaf;4.0.0-RC2 -org.springframework.boot:spring-boot-tomcat;4.0.0-RC2 -org.springframework.boot:spring-boot-tomcat-runtime;4.0.0-RC2 -org.springframework.boot:spring-boot-transaction;4.0.0-RC2 -org.springframework.boot:spring-boot-validation;4.0.0-RC2 -org.springframework.boot:spring-boot-web-server;4.0.0-RC2 -org.springframework.boot:spring-boot-webclient;4.0.0-RC2 -org.springframework.boot:spring-boot-webclient-test;4.0.0-RC2 -org.springframework.boot:spring-boot-webflux;4.0.0-RC2 -org.springframework.boot:spring-boot-webflux-test;4.0.0-RC2 -org.springframework.boot:spring-boot-webmvc;4.0.0-RC2 -org.springframework.boot:spring-boot-webmvc-test;4.0.0-RC2 -org.springframework.boot:spring-boot-webservices;4.0.0-RC2 -org.springframework.boot:spring-boot-webservices-test;4.0.0-RC2 -org.springframework.boot:spring-boot-websocket;4.0.0-RC2 -org.springframework.boot:spring-boot-webtestclient;4.0.0-RC2 -org.springframework.boot:spring-boot-zipkin;4.0.0-RC2 -org.springframework.cloud:spring-cloud-dependencies;2025.1.0-M4 -org.springframework.data:spring-data-bom;2025.1.0-RC2 -org.springframework.graphql:spring-graphql;2.0.0-RC2 -org.springframework.graphql:spring-graphql-test;2.0.0-RC2 -org.springframework.hateoas:spring-hateoas;3.0.0-RC2 -org.springframework.integration:spring-integration-amqp;7.0.0-RC2 -org.springframework.integration:spring-integration-bom;7.0.0-RC2 -org.springframework.integration:spring-integration-camel;7.0.0-RC2 -org.springframework.integration:spring-integration-cassandra;7.0.0-RC2 -org.springframework.integration:spring-integration-core;7.0.0-RC2 -org.springframework.integration:spring-integration-debezium;7.0.0-RC2 -org.springframework.integration:spring-integration-event;7.0.0-RC2 -org.springframework.integration:spring-integration-feed;7.0.0-RC2 -org.springframework.integration:spring-integration-file;7.0.0-RC2 -org.springframework.integration:spring-integration-ftp;7.0.0-RC2 -org.springframework.integration:spring-integration-graphql;7.0.0-RC2 -org.springframework.integration:spring-integration-groovy;7.0.0-RC2 -org.springframework.integration:spring-integration-hazelcast;7.0.0-RC2 -org.springframework.integration:spring-integration-http;7.0.0-RC2 -org.springframework.integration:spring-integration-ip;7.0.0-RC2 -org.springframework.integration:spring-integration-jdbc;7.0.0-RC2 -org.springframework.integration:spring-integration-jms;7.0.0-RC2 -org.springframework.integration:spring-integration-jmx;7.0.0-RC2 -org.springframework.integration:spring-integration-jpa;7.0.0-RC2 -org.springframework.integration:spring-integration-kafka;7.0.0-RC2 -org.springframework.integration:spring-integration-mail;7.0.0-RC2 -org.springframework.integration:spring-integration-mongodb;7.0.0-RC2 -org.springframework.integration:spring-integration-mqtt;7.0.0-RC2 -org.springframework.integration:spring-integration-r2dbc;7.0.0-RC2 -org.springframework.integration:spring-integration-redis;7.0.0-RC2 -org.springframework.integration:spring-integration-rsocket;7.0.0-RC2 -org.springframework.integration:spring-integration-scripting;7.0.0-RC2 -org.springframework.integration:spring-integration-sftp;7.0.0-RC2 -org.springframework.integration:spring-integration-smb;7.0.0-RC2 -org.springframework.integration:spring-integration-stomp;7.0.0-RC2 -org.springframework.integration:spring-integration-stream;7.0.0-RC2 -org.springframework.integration:spring-integration-syslog;7.0.0-RC2 -org.springframework.integration:spring-integration-test;7.0.0-RC2 -org.springframework.integration:spring-integration-test-support;7.0.0-RC2 -org.springframework.integration:spring-integration-webflux;7.0.0-RC2 -org.springframework.integration:spring-integration-websocket;7.0.0-RC2 -org.springframework.integration:spring-integration-ws;7.0.0-RC2 -org.springframework.integration:spring-integration-xml;7.0.0-RC2 -org.springframework.integration:spring-integration-xmpp;7.0.0-RC2 -org.springframework.integration:spring-integration-zeromq;7.0.0-RC2 -org.springframework.integration:spring-integration-zip;7.0.0-RC2 -org.springframework.integration:spring-integration-zookeeper;7.0.0-RC2 -org.springframework.kafka:spring-kafka;4.0.0-RC1 -org.springframework.kafka:spring-kafka-test;4.0.0-RC1 -org.springframework.ldap:spring-ldap-core;4.0.0-RC1 -org.springframework.ldap:spring-ldap-ldif-core;4.0.0-RC1 -org.springframework.ldap:spring-ldap-odm;4.0.0-RC1 -org.springframework.ldap:spring-ldap-test;4.0.0-RC1 -org.springframework.pulsar:spring-pulsar-bom;2.0.0-RC1 -org.springframework.restdocs:spring-restdocs-asciidoctor;4.0.0-RC1 -org.springframework.restdocs:spring-restdocs-bom;4.0.0-RC1 -org.springframework.restdocs:spring-restdocs-core;4.0.0-RC1 -org.springframework.restdocs:spring-restdocs-mockmvc;4.0.0-RC1 -org.springframework.restdocs:spring-restdocs-webtestclient;4.0.0-RC1 -org.springframework.security:spring-security-bom;7.0.0-RC3 -org.springframework.session:spring-session-bom;4.0.0-RC1 -org.springframework.ws:spring-ws-bom;5.0.0-RC1 -org.springframework.ws:spring-ws-core;5.0.0-RC1 -org.springframework.ws:spring-ws-security;5.0.0-RC1 -org.springframework.ws:spring-ws-support;5.0.0-RC1 -org.springframework.ws:spring-ws-test;5.0.0-RC1 -org.springframework.ws:spring-xml;5.0.0-RC1 -org.springframework:spring-aop;7.0.0-RC3 -org.springframework:spring-aspects;7.0.0-RC3 -org.springframework:spring-beans;7.0.0-RC3 -org.springframework:spring-context;7.0.0-RC3 -org.springframework:spring-context-indexer;7.0.0-RC3 -org.springframework:spring-context-support;7.0.0-RC3 -org.springframework:spring-core;7.0.0-RC3 -org.springframework:spring-core-test;7.0.0-RC3 -org.springframework:spring-expression;7.0.0-RC3 -org.springframework:spring-framework-bom;7.0.0-RC3 -org.springframework:spring-instrument;7.0.0-RC3 -org.springframework:spring-jdbc;7.0.0-RC3 -org.springframework:spring-jms;7.0.0-RC3 -org.springframework:spring-messaging;7.0.0-RC3 -org.springframework:spring-orm;7.0.0-RC3 -org.springframework:spring-oxm;7.0.0-RC3 -org.springframework:spring-r2dbc;7.0.0-RC3 -org.springframework:spring-test;7.0.0-RC3 -org.springframework:spring-tx;7.0.0-RC3 -org.springframework:spring-web;7.0.0-RC3 -org.springframework:spring-webflux;7.0.0-RC3 -org.springframework:spring-webmvc;7.0.0-RC3 -org.springframework:spring-websocket;7.0.0-RC3 -org.testcontainers:testcontainers;2.0.1 -org.testcontainers:testcontainers-activemq;2.0.1 -org.testcontainers:testcontainers-azure;2.0.1 -org.testcontainers:testcontainers-bom;2.0.1 -org.testcontainers:testcontainers-cassandra;2.0.1 -org.testcontainers:testcontainers-chromadb;2.0.1 -org.testcontainers:testcontainers-clickhouse;2.0.1 -org.testcontainers:testcontainers-cockroachdb;2.0.1 -org.testcontainers:testcontainers-consul;2.0.1 -org.testcontainers:testcontainers-couchbase;2.0.1 -org.testcontainers:testcontainers-cratedb;2.0.1 -org.testcontainers:testcontainers-database-commons;2.0.1 -org.testcontainers:testcontainers-databend;2.0.1 -org.testcontainers:testcontainers-db2;2.0.1 -org.testcontainers:testcontainers-elasticsearch;2.0.1 -org.testcontainers:testcontainers-gcloud;2.0.1 -org.testcontainers:testcontainers-grafana;2.0.1 -org.testcontainers:testcontainers-hivemq;2.0.1 -org.testcontainers:testcontainers-influxdb;2.0.1 -org.testcontainers:testcontainers-jdbc;2.0.1 -org.testcontainers:testcontainers-junit-jupiter;2.0.1 -org.testcontainers:testcontainers-k3s;2.0.1 -org.testcontainers:testcontainers-k6;2.0.1 -org.testcontainers:testcontainers-kafka;2.0.1 -org.testcontainers:testcontainers-ldap;2.0.1 -org.testcontainers:testcontainers-localstack;2.0.1 -org.testcontainers:testcontainers-mariadb;2.0.1 -org.testcontainers:testcontainers-milvus;2.0.1 -org.testcontainers:testcontainers-minio;2.0.1 -org.testcontainers:testcontainers-mockserver;2.0.1 -org.testcontainers:testcontainers-mongodb;2.0.1 -org.testcontainers:testcontainers-mssqlserver;2.0.1 -org.testcontainers:testcontainers-mysql;2.0.1 -org.testcontainers:testcontainers-neo4j;2.0.1 -org.testcontainers:testcontainers-nginx;2.0.1 -org.testcontainers:testcontainers-oceanbase;2.0.1 -org.testcontainers:testcontainers-ollama;2.0.1 -org.testcontainers:testcontainers-openfga;2.0.1 -org.testcontainers:testcontainers-oracle-free;2.0.1 -org.testcontainers:testcontainers-oracle-xe;2.0.1 -org.testcontainers:testcontainers-orientdb;2.0.1 -org.testcontainers:testcontainers-pinecone;2.0.1 -org.testcontainers:testcontainers-postgresql;2.0.1 -org.testcontainers:testcontainers-presto;2.0.1 -org.testcontainers:testcontainers-pulsar;2.0.1 -org.testcontainers:testcontainers-qdrant;2.0.1 -org.testcontainers:testcontainers-questdb;2.0.1 -org.testcontainers:testcontainers-r2dbc;2.0.1 -org.testcontainers:testcontainers-rabbitmq;2.0.1 -org.testcontainers:testcontainers-redpanda;2.0.1 -org.testcontainers:testcontainers-scylladb;2.0.1 -org.testcontainers:testcontainers-selenium;2.0.1 -org.testcontainers:testcontainers-solace;2.0.1 -org.testcontainers:testcontainers-solr;2.0.1 -org.testcontainers:testcontainers-spock;2.0.1 -org.testcontainers:testcontainers-tidb;2.0.1 -org.testcontainers:testcontainers-timeplus;2.0.1 -org.testcontainers:testcontainers-toxiproxy;2.0.1 -org.testcontainers:testcontainers-trino;2.0.1 -org.testcontainers:testcontainers-typesense;2.0.1 -org.testcontainers:testcontainers-vault;2.0.1 -org.testcontainers:testcontainers-weaviate;2.0.1 -org.testcontainers:testcontainers-yugabytedb;2.0.1 -org.thymeleaf.extras:thymeleaf-extras-springsecurity6;3.1.3.RELEASE -org.thymeleaf:thymeleaf;3.1.3.RELEASE -org.thymeleaf:thymeleaf-spring6;3.1.3.RELEASE -org.vibur:vibur-dbcp;26.0 -org.vibur:vibur-object-pool;26.0 -org.webjars:webjars-locator-core;0.59 -org.webjars:webjars-locator-lite;1.1.2 -org.xerial:sqlite-jdbc;3.50.3.0 -org.xmlunit:xmlunit-assertj;2.10.4 -org.xmlunit:xmlunit-assertj3;2.10.4 -org.xmlunit:xmlunit-core;2.10.4 -org.xmlunit:xmlunit-jakarta-jaxb-impl;2.10.4 -org.xmlunit:xmlunit-legacy;2.10.4 -org.xmlunit:xmlunit-matchers;2.10.4 -org.xmlunit:xmlunit-placeholders;2.10.4 -org.yaml:snakeyaml;2.5 -redis.clients:jedis;7.0.0 -tools.jackson.core:jackson-core;3.0.1 -tools.jackson.core:jackson-databind;3.0.1 -tools.jackson.dataformat:jackson-dataformat-avro;3.0.1 -tools.jackson.dataformat:jackson-dataformat-cbor;3.0.1 -tools.jackson.dataformat:jackson-dataformat-csv;3.0.1 -tools.jackson.dataformat:jackson-dataformat-ion;3.0.1 -tools.jackson.dataformat:jackson-dataformat-properties;3.0.1 -tools.jackson.dataformat:jackson-dataformat-protobuf;3.0.1 -tools.jackson.dataformat:jackson-dataformat-smile;3.0.1 -tools.jackson.dataformat:jackson-dataformat-toml;3.0.1 -tools.jackson.dataformat:jackson-dataformat-xml;3.0.1 -tools.jackson.dataformat:jackson-dataformat-yaml;3.0.1 -tools.jackson.datatype:jackson-datatype-eclipse-collections;3.0.1 -tools.jackson.datatype:jackson-datatype-guava;3.0.1 -tools.jackson.datatype:jackson-datatype-hppc;3.0.1 -tools.jackson.datatype:jackson-datatype-jakarta-jsonp;3.0.1 -tools.jackson.datatype:jackson-datatype-javax-money;3.0.1 -tools.jackson.datatype:jackson-datatype-jaxrs;3.0.1 -tools.jackson.datatype:jackson-datatype-joda;3.0.1 -tools.jackson.datatype:jackson-datatype-joda-money;3.0.1 -tools.jackson.datatype:jackson-datatype-json-org;3.0.1 -tools.jackson.datatype:jackson-datatype-jsr353;3.0.1 -tools.jackson.datatype:jackson-datatype-moneta;3.0.1 -tools.jackson.datatype:jackson-datatype-pcollections;3.0.1 -tools.jackson.jakarta.rs:jackson-jakarta-rs-base;3.0.1 -tools.jackson.jakarta.rs:jackson-jakarta-rs-cbor-provider;3.0.1 -tools.jackson.jakarta.rs:jackson-jakarta-rs-json-provider;3.0.1 -tools.jackson.jakarta.rs:jackson-jakarta-rs-smile-provider;3.0.1 -tools.jackson.jakarta.rs:jackson-jakarta-rs-xml-provider;3.0.1 -tools.jackson.jakarta.rs:jackson-jakarta-rs-yaml-provider;3.0.1 -tools.jackson.jaxrs:jackson-jaxrs-base;3.0.1 -tools.jackson.jaxrs:jackson-jaxrs-cbor-provider;3.0.1 -tools.jackson.jaxrs:jackson-jaxrs-json-provider;3.0.1 -tools.jackson.jaxrs:jackson-jaxrs-smile-provider;3.0.1 -tools.jackson.jaxrs:jackson-jaxrs-xml-provider;3.0.1 -tools.jackson.jaxrs:jackson-jaxrs-yaml-provider;3.0.1 -tools.jackson.jr:jackson-jr-all;3.0.1 -tools.jackson.jr:jackson-jr-annotation-support;3.0.1 -tools.jackson.jr:jackson-jr-extension-javatime;3.0.1 -tools.jackson.jr:jackson-jr-objects;3.0.1 -tools.jackson.jr:jackson-jr-retrofit2;3.0.1 -tools.jackson.jr:jackson-jr-stree;3.0.1 -tools.jackson.module:jackson-module-afterburner;3.0.1 -tools.jackson.module:jackson-module-android-record;3.0.1 -tools.jackson.module:jackson-module-blackbird;3.0.1 -tools.jackson.module:jackson-module-guice;3.0.1 -tools.jackson.module:jackson-module-guice7;3.0.1 -tools.jackson.module:jackson-module-jakarta-xmlbind-annotations;3.0.1 -tools.jackson.module:jackson-module-jaxb-annotations;3.0.1 -tools.jackson.module:jackson-module-kotlin;3.0.1 -tools.jackson.module:jackson-module-mrbean;3.0.1 -tools.jackson.module:jackson-module-no-ctor-deser;3.0.1 -tools.jackson.module:jackson-module-osgi;3.0.1 -tools.jackson.module:jackson-module-scala_2.12;3.0.1 -tools.jackson.module:jackson-module-scala_2.13;3.0.1 -tools.jackson.module:jackson-module-scala_3;3.0.1 -tools.jackson:jackson-bom;3.0.1 -wsdl4j:wsdl4j;1.6.3 -org.springframework.security:spring-security-config;7.0.0-RC3 -org.springframework.security:spring-security-core;7.0.0-RC3 -org.springframework.security:spring-security-oauth2-client;7.0.0-RC3 -org.springframework.security:spring-security-oauth2-core;7.0.0-RC3 -org.springframework.security:spring-security-oauth2-jose;7.0.0-RC3 -org.springframework.security:spring-security-oauth2-resource-server;7.0.0-RC3 -org.springframework.security:spring-security-web;7.0.0-RC3 -org.springframework.security:spring-security-test;7.0.0-RC3 diff --git a/sdk/spring/scripts/spring_boot_4.0.0_managed_external_dependencies.txt b/sdk/spring/scripts/spring_boot_4.0.0_managed_external_dependencies.txt new file mode 100644 index 000000000000..a1cfbf3baaa3 --- /dev/null +++ b/sdk/spring/scripts/spring_boot_4.0.0_managed_external_dependencies.txt @@ -0,0 +1,2176 @@ +ch.qos.logback:logback-classic;1.5.21 +ch.qos.logback:logback-core;1.5.21 +co.elastic.clients:elasticsearch-java;9.2.1 +co.elastic.clients:elasticsearch-rest5-client;9.2.1 +com.couchbase.client:java-client;3.9.2 +com.datastax.oss:native-protocol;1.5.2 +com.ecwid.consul:consul-api;1.4.5 +com.fasterxml.jackson.core:jackson-annotations;2.20 +com.fasterxml.jackson.core:jackson-core;2.20.1 +com.fasterxml.jackson.core:jackson-databind;2.20.1 +com.fasterxml.jackson.dataformat:jackson-dataformat-avro;2.20.1 +com.fasterxml.jackson.dataformat:jackson-dataformat-cbor;2.20.1 +com.fasterxml.jackson.dataformat:jackson-dataformat-csv;2.20.1 +com.fasterxml.jackson.dataformat:jackson-dataformat-ion;2.20.1 +com.fasterxml.jackson.dataformat:jackson-dataformat-properties;2.20.1 +com.fasterxml.jackson.dataformat:jackson-dataformat-protobuf;2.20.1 +com.fasterxml.jackson.dataformat:jackson-dataformat-smile;2.20.1 +com.fasterxml.jackson.dataformat:jackson-dataformat-toml;2.20.1 +com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.20.1 +com.fasterxml.jackson.dataformat:jackson-dataformat-yaml;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-eclipse-collections;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-guava;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-hibernate4;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-hibernate5;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-hibernate5-jakarta;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-hibernate6;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-hibernate7;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-hppc;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-jakarta-jsonp;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-javax-money;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-jaxrs;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-joda;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-joda-money;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-json-org;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-jsr353;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-moneta;2.20.1 +com.fasterxml.jackson.datatype:jackson-datatype-pcollections;2.20.1 +com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-base;2.20.1 +com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-cbor-provider;2.20.1 +com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-json-provider;2.20.1 +com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-smile-provider;2.20.1 +com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-xml-provider;2.20.1 +com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-yaml-provider;2.20.1 +com.fasterxml.jackson.jaxrs:jackson-jaxrs-base;2.20.1 +com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider;2.20.1 +com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider;2.20.1 +com.fasterxml.jackson.jaxrs:jackson-jaxrs-smile-provider;2.20.1 +com.fasterxml.jackson.jaxrs:jackson-jaxrs-xml-provider;2.20.1 +com.fasterxml.jackson.jaxrs:jackson-jaxrs-yaml-provider;2.20.1 +com.fasterxml.jackson.jr:jackson-jr-all;2.20.1 +com.fasterxml.jackson.jr:jackson-jr-annotation-support;2.20.1 +com.fasterxml.jackson.jr:jackson-jr-extension-javatime;2.20.1 +com.fasterxml.jackson.jr:jackson-jr-objects;2.20.1 +com.fasterxml.jackson.jr:jackson-jr-retrofit2;2.20.1 +com.fasterxml.jackson.jr:jackson-jr-stree;2.20.1 +com.fasterxml.jackson.module:jackson-module-afterburner;2.20.1 +com.fasterxml.jackson.module:jackson-module-android-record;2.20.1 +com.fasterxml.jackson.module:jackson-module-blackbird;2.20.1 +com.fasterxml.jackson.module:jackson-module-guice;2.20.1 +com.fasterxml.jackson.module:jackson-module-guice7;2.20.1 +com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations;2.20.1 +com.fasterxml.jackson.module:jackson-module-jaxb-annotations;2.20.1 +com.fasterxml.jackson.module:jackson-module-jsonSchema;2.20.1 +com.fasterxml.jackson.module:jackson-module-jsonSchema-jakarta;2.20.1 +com.fasterxml.jackson.module:jackson-module-kotlin;2.20.1 +com.fasterxml.jackson.module:jackson-module-mrbean;2.20.1 +com.fasterxml.jackson.module:jackson-module-no-ctor-deser;2.20.1 +com.fasterxml.jackson.module:jackson-module-osgi;2.20.1 +com.fasterxml.jackson.module:jackson-module-parameter-names;2.20.1 +com.fasterxml.jackson.module:jackson-module-paranamer;2.20.1 +com.fasterxml.jackson.module:jackson-module-scala_2.11;2.20.1 +com.fasterxml.jackson.module:jackson-module-scala_2.12;2.20.1 +com.fasterxml.jackson.module:jackson-module-scala_2.13;2.20.1 +com.fasterxml.jackson.module:jackson-module-scala_3;2.20.1 +com.fasterxml.jackson:jackson-bom;2.20.1 +com.fasterxml:classmate;1.7.1 +com.github.ben-manes.caffeine:caffeine;3.2.3 +com.github.ben-manes.caffeine:guava;3.2.3 +com.github.ben-manes.caffeine:jcache;3.2.3 +com.github.ben-manes.caffeine:simulator;3.2.3 +com.github.mxab.thymeleaf.extras:thymeleaf-extras-data-attribute;2.0.1 +com.google.code.gson:gson;2.13.2 +com.graphql-java:graphql-java;25.0 +com.h2database:h2;2.4.240 +com.hazelcast:hazelcast;5.5.0 +com.hazelcast:hazelcast-spring;5.5.0 +com.ibm.db2:jcc;12.1.3.0 +com.jayway.jsonpath:json-path;2.9.0 +com.jayway.jsonpath:json-path-assert;2.9.0 +com.microsoft.sqlserver:mssql-jdbc;13.2.1.jre11 +com.mysql:mysql-connector-j;9.5.0 +com.netflix.eureka:eureka-client;2.0.5 +com.netflix.eureka:eureka-client-jersey3;2.0.5 +com.netflix.eureka:eureka-core;2.0.5 +com.netflix.eureka:eureka-core-jersey3;2.0.5 +com.oracle.database.ha:ons;23.9.0.25.07 +com.oracle.database.ha:simplefan;23.9.0.25.07 +com.oracle.database.jdbc:ojdbc11;23.9.0.25.07 +com.oracle.database.jdbc:ojdbc11-production;23.9.0.25.07 +com.oracle.database.jdbc:ojdbc17;23.9.0.25.07 +com.oracle.database.jdbc:ojdbc17-production;23.9.0.25.07 +com.oracle.database.jdbc:ojdbc8;23.9.0.25.07 +com.oracle.database.jdbc:ojdbc8-production;23.9.0.25.07 +com.oracle.database.jdbc:rsi;23.9.0.25.07 +com.oracle.database.jdbc:ucp;23.9.0.25.07 +com.oracle.database.jdbc:ucp11;23.9.0.25.07 +com.oracle.database.jdbc:ucp17;23.9.0.25.07 +com.oracle.database.nls:orai18n;23.9.0.25.07 +com.oracle.database.r2dbc:oracle-r2dbc;1.3.0 +com.oracle.database.security:oraclepki;23.9.0.25.07 +com.oracle.database.xml:xdb;23.9.0.25.07 +com.oracle.database.xml:xmlparserv2;23.9.0.25.07 +com.querydsl:codegen-utils;5.1.0 +com.querydsl:querydsl-apt;5.1.0 +com.querydsl:querydsl-bom;5.1.0 +com.querydsl:querydsl-codegen;5.1.0 +com.querydsl:querydsl-collections;5.1.0 +com.querydsl:querydsl-core;5.1.0 +com.querydsl:querydsl-guava;5.1.0 +com.querydsl:querydsl-hibernate-search;5.1.0 +com.querydsl:querydsl-jdo;5.1.0 +com.querydsl:querydsl-jpa;5.1.0 +com.querydsl:querydsl-jpa-codegen;5.1.0 +com.querydsl:querydsl-kotlin;5.1.0 +com.querydsl:querydsl-kotlin-codegen;5.1.0 +com.querydsl:querydsl-lucene3;5.1.0 +com.querydsl:querydsl-lucene4;5.1.0 +com.querydsl:querydsl-lucene5;5.1.0 +com.querydsl:querydsl-mongodb;5.1.0 +com.querydsl:querydsl-scala;5.1.0 +com.querydsl:querydsl-spatial;5.1.0 +com.querydsl:querydsl-sql;5.1.0 +com.querydsl:querydsl-sql-codegen;5.1.0 +com.querydsl:querydsl-sql-spatial;5.1.0 +com.querydsl:querydsl-sql-spring;5.1.0 +com.rabbitmq:amqp-client;5.27.1 +com.rabbitmq:stream-client;0.23.0 +com.redis:testcontainers-redis;2.2.4 +com.samskivert:jmustache;1.16 +com.sendgrid:sendgrid-java;4.10.3 +com.squareup.okhttp3:logging-interceptor;4.12.0 +com.squareup.okhttp3:mockwebserver;4.12.0 +com.squareup.okhttp3:okcurl;4.12.0 +com.squareup.okhttp3:okhttp;4.12.0 +com.squareup.okhttp3:okhttp-bom;4.12.0 +com.squareup.okhttp3:okhttp-brotli;4.12.0 +com.squareup.okhttp3:okhttp-dnsoverhttps;4.12.0 +com.squareup.okhttp3:okhttp-sse;4.12.0 +com.squareup.okhttp3:okhttp-tls;4.12.0 +com.squareup.okhttp3:okhttp-urlconnection;4.12.0 +com.sun.xml.bind:jaxb-core;4.0.6 +com.sun.xml.bind:jaxb-impl;4.0.6 +com.sun.xml.bind:jaxb-jxc;4.0.6 +com.sun.xml.bind:jaxb-osgi;4.0.6 +com.sun.xml.bind:jaxb-xjc;4.0.6 +com.sun.xml.messaging.saaj:saaj-impl;3.0.4 +com.toomuchcoding.jsonassert:jsonassert;0.8.0 +com.toomuchcoding.jsonassert:jsonassert-shade;0.8.0 +com.unboundid:unboundid-ldapsdk;7.0.3 +com.zaxxer:HikariCP;7.0.2 +commons-codec:commons-codec;1.19.0 +commons-logging:commons-logging;1.3.5 +commons-pool:commons-pool;1.6 +io.asyncer:r2dbc-mysql;1.4.1 +io.fabric8.java-generator:io.fabric8.java-generator.gradle.plugin;7.4.0 +io.fabric8.kubernetes:kubernetes-karaf;7.4.0 +io.fabric8:certmanager-client;7.4.0 +io.fabric8:certmanager-model;7.4.0 +io.fabric8:chaosmesh-client;7.4.0 +io.fabric8:chaosmesh-model;7.4.0 +io.fabric8:crd-generator-api;7.4.0 +io.fabric8:crd-generator-api-v2;7.4.0 +io.fabric8:crd-generator-apt;7.4.0 +io.fabric8:crd-generator-cli;7.4.0 +io.fabric8:crd-generator-collector;7.4.0 +io.fabric8:crd-generator-maven-plugin;7.4.0 +io.fabric8:generator-annotations;7.4.0 +io.fabric8:istio-client;7.4.0 +io.fabric8:istio-model;7.4.0 +io.fabric8:java-generator-benchmark;7.4.0 +io.fabric8:java-generator-cli;7.4.0 +io.fabric8:java-generator-core;7.4.0 +io.fabric8:java-generator-maven-plugin;7.4.0 +io.fabric8:knative-client;7.4.0 +io.fabric8:knative-model;7.4.0 +io.fabric8:kube-api-test;7.4.0 +io.fabric8:kube-api-test-client-inject;7.4.0 +io.fabric8:kubernetes-client;7.4.0 +io.fabric8:kubernetes-client-api;7.4.0 +io.fabric8:kubernetes-client-bom;7.4.0 +io.fabric8:kubernetes-client-init-bc-fips;7.4.0 +io.fabric8:kubernetes-httpclient-jdk;7.4.0 +io.fabric8:kubernetes-httpclient-jetty;7.4.0 +io.fabric8:kubernetes-httpclient-okhttp;7.4.0 +io.fabric8:kubernetes-httpclient-vertx;7.4.0 +io.fabric8:kubernetes-junit-jupiter;7.4.0 +io.fabric8:kubernetes-junit-jupiter-autodetected;7.4.0 +io.fabric8:kubernetes-log4j;7.4.0 +io.fabric8:kubernetes-model-admissionregistration;7.4.0 +io.fabric8:kubernetes-model-apiextensions;7.4.0 +io.fabric8:kubernetes-model-apps;7.4.0 +io.fabric8:kubernetes-model-autoscaling;7.4.0 +io.fabric8:kubernetes-model-batch;7.4.0 +io.fabric8:kubernetes-model-certificates;7.4.0 +io.fabric8:kubernetes-model-common;7.4.0 +io.fabric8:kubernetes-model-coordination;7.4.0 +io.fabric8:kubernetes-model-core;7.4.0 +io.fabric8:kubernetes-model-discovery;7.4.0 +io.fabric8:kubernetes-model-events;7.4.0 +io.fabric8:kubernetes-model-extensions;7.4.0 +io.fabric8:kubernetes-model-flowcontrol;7.4.0 +io.fabric8:kubernetes-model-gatewayapi;7.4.0 +io.fabric8:kubernetes-model-kustomize;7.4.0 +io.fabric8:kubernetes-model-metrics;7.4.0 +io.fabric8:kubernetes-model-networking;7.4.0 +io.fabric8:kubernetes-model-node;7.4.0 +io.fabric8:kubernetes-model-policy;7.4.0 +io.fabric8:kubernetes-model-rbac;7.4.0 +io.fabric8:kubernetes-model-resource;7.4.0 +io.fabric8:kubernetes-model-scheduling;7.4.0 +io.fabric8:kubernetes-model-storageclass;7.4.0 +io.fabric8:kubernetes-model-validator;7.4.0 +io.fabric8:kubernetes-openshift-uberjar;7.4.0 +io.fabric8:kubernetes-server-mock;7.4.0 +io.fabric8:mockwebserver;7.4.0 +io.fabric8:open-cluster-management-client;7.4.0 +io.fabric8:open-cluster-management-model;7.4.0 +io.fabric8:openapi-model-generator-maven-plugin;7.4.0 +io.fabric8:openshift-client;7.4.0 +io.fabric8:openshift-client-api;7.4.0 +io.fabric8:openshift-model;7.4.0 +io.fabric8:openshift-model-autoscaling;7.4.0 +io.fabric8:openshift-model-config;7.4.0 +io.fabric8:openshift-model-console;7.4.0 +io.fabric8:openshift-model-hive;7.4.0 +io.fabric8:openshift-model-installer;7.4.0 +io.fabric8:openshift-model-machine;7.4.0 +io.fabric8:openshift-model-machineconfiguration;7.4.0 +io.fabric8:openshift-model-miscellaneous;7.4.0 +io.fabric8:openshift-model-monitoring;7.4.0 +io.fabric8:openshift-model-operator;7.4.0 +io.fabric8:openshift-model-operatorhub;7.4.0 +io.fabric8:openshift-model-storageversionmigrator;7.4.0 +io.fabric8:openshift-model-tuned;7.4.0 +io.fabric8:openshift-model-whereabouts;7.4.0 +io.fabric8:ovn-client;7.4.0 +io.fabric8:ovn-model;7.4.0 +io.fabric8:tekton-client;7.4.0 +io.fabric8:tekton-model;7.4.0 +io.fabric8:verticalpodautoscaler-client;7.4.0 +io.fabric8:verticalpodautoscaler-model;7.4.0 +io.fabric8:volcano-client;7.4.0 +io.fabric8:volcano-model;7.4.0 +io.fabric8:volumesnapshot-client;7.4.0 +io.fabric8:volumesnapshot-model;7.4.0 +io.fabric8:zjsonpatch;7.4.0 +io.github.git-commit-id:git-commit-id-maven-plugin;9.0.2 +io.github.openfeign:feign-annotation-error-decoder;13.6 +io.github.openfeign:feign-bom;13.6 +io.github.openfeign:feign-core;13.6 +io.github.openfeign:feign-dropwizard-metrics4;13.6 +io.github.openfeign:feign-dropwizard-metrics5;13.6 +io.github.openfeign:feign-fastjson2;13.6 +io.github.openfeign:feign-form;13.6 +io.github.openfeign:feign-form-spring;13.6 +io.github.openfeign:feign-googlehttpclient;13.6 +io.github.openfeign:feign-gson;13.6 +io.github.openfeign:feign-hc5;13.6 +io.github.openfeign:feign-httpclient;13.6 +io.github.openfeign:feign-hystrix;13.6 +io.github.openfeign:feign-jackson;13.6 +io.github.openfeign:feign-jackson-jaxb;13.6 +io.github.openfeign:feign-jackson-jr;13.6 +io.github.openfeign:feign-jakarta;13.6 +io.github.openfeign:feign-java11;13.6 +io.github.openfeign:feign-jaxb;13.6 +io.github.openfeign:feign-jaxb-jakarta;13.6 +io.github.openfeign:feign-jaxrs;13.6 +io.github.openfeign:feign-jaxrs2;13.6 +io.github.openfeign:feign-jaxrs3;13.6 +io.github.openfeign:feign-jaxrs4;13.6 +io.github.openfeign:feign-json;13.6 +io.github.openfeign:feign-kotlin;13.6 +io.github.openfeign:feign-micrometer;13.6 +io.github.openfeign:feign-mock;13.6 +io.github.openfeign:feign-moshi;13.6 +io.github.openfeign:feign-okhttp;13.6 +io.github.openfeign:feign-reactive-wrappers;13.6 +io.github.openfeign:feign-ribbon;13.6 +io.github.openfeign:feign-sax;13.6 +io.github.openfeign:feign-slf4j;13.6 +io.github.openfeign:feign-soap;13.6 +io.github.openfeign:feign-soap-jakarta;13.6 +io.github.openfeign:feign-spring;13.6 +io.github.openfeign:feign-vertx;13.6 +io.github.openfeign:feign-vertx4-test;13.6 +io.github.openfeign:feign-vertx5-test;13.6 +io.github.resilience4j:resilience4j-all;2.3.0 +io.github.resilience4j:resilience4j-annotations;2.3.0 +io.github.resilience4j:resilience4j-bom;2.3.0 +io.github.resilience4j:resilience4j-bulkhead;2.3.0 +io.github.resilience4j:resilience4j-cache;2.3.0 +io.github.resilience4j:resilience4j-circuitbreaker;2.3.0 +io.github.resilience4j:resilience4j-circularbuffer;2.3.0 +io.github.resilience4j:resilience4j-consumer;2.3.0 +io.github.resilience4j:resilience4j-core;2.3.0 +io.github.resilience4j:resilience4j-feign;2.3.0 +io.github.resilience4j:resilience4j-kotlin;2.3.0 +io.github.resilience4j:resilience4j-metrics;2.3.0 +io.github.resilience4j:resilience4j-micrometer;2.3.0 +io.github.resilience4j:resilience4j-ratelimiter;2.3.0 +io.github.resilience4j:resilience4j-reactor;2.3.0 +io.github.resilience4j:resilience4j-retry;2.3.0 +io.github.resilience4j:resilience4j-rxjava2;2.3.0 +io.github.resilience4j:resilience4j-rxjava3;2.3.0 +io.github.resilience4j:resilience4j-spring;2.3.0 +io.github.resilience4j:resilience4j-spring-boot2;2.3.0 +io.github.resilience4j:resilience4j-spring-boot3;2.3.0 +io.github.resilience4j:resilience4j-spring-cloud2;2.3.0 +io.github.resilience4j:resilience4j-spring6;2.3.0 +io.github.resilience4j:resilience4j-timelimiter;2.3.0 +io.github.resilience4j:resilience4j-vavr;2.3.0 +io.kubernetes:client-java;24.0.0 +io.kubernetes:client-java-extended;24.0.0 +io.kubernetes:client-java-spring-integration;24.0.0 +io.lettuce:lettuce-core;6.8.1.RELEASE +io.micrometer:context-propagation;1.2.0 +io.micrometer:docs;1.6.0 +io.micrometer:micrometer-bom;1.16.0 +io.micrometer:micrometer-commons;1.16.0 +io.micrometer:micrometer-core;1.16.0 +io.micrometer:micrometer-jakarta9;1.16.0 +io.micrometer:micrometer-java11;1.16.0 +io.micrometer:micrometer-java21;1.16.0 +io.micrometer:micrometer-jetty11;1.16.0 +io.micrometer:micrometer-jetty12;1.16.0 +io.micrometer:micrometer-observation;1.16.0 +io.micrometer:micrometer-observation-test;1.16.0 +io.micrometer:micrometer-registry-appoptics;1.16.0 +io.micrometer:micrometer-registry-atlas;1.16.0 +io.micrometer:micrometer-registry-azure-monitor;1.16.0 +io.micrometer:micrometer-registry-cloudwatch2;1.16.0 +io.micrometer:micrometer-registry-datadog;1.16.0 +io.micrometer:micrometer-registry-dynatrace;1.16.0 +io.micrometer:micrometer-registry-elastic;1.16.0 +io.micrometer:micrometer-registry-ganglia;1.16.0 +io.micrometer:micrometer-registry-graphite;1.16.0 +io.micrometer:micrometer-registry-health;1.16.0 +io.micrometer:micrometer-registry-humio;1.16.0 +io.micrometer:micrometer-registry-influx;1.16.0 +io.micrometer:micrometer-registry-jmx;1.16.0 +io.micrometer:micrometer-registry-kairos;1.16.0 +io.micrometer:micrometer-registry-new-relic;1.16.0 +io.micrometer:micrometer-registry-opentsdb;1.16.0 +io.micrometer:micrometer-registry-otlp;1.16.0 +io.micrometer:micrometer-registry-prometheus;1.16.0 +io.micrometer:micrometer-registry-prometheus-simpleclient;1.16.0 +io.micrometer:micrometer-registry-signalfx;1.16.0 +io.micrometer:micrometer-registry-stackdriver;1.16.0 +io.micrometer:micrometer-registry-statsd;1.16.0 +io.micrometer:micrometer-registry-wavefront;1.16.0 +io.micrometer:micrometer-test;1.16.0 +io.micrometer:micrometer-tracing;1.6.0 +io.micrometer:micrometer-tracing-bom;1.6.0 +io.micrometer:micrometer-tracing-bridge-brave;1.6.0 +io.micrometer:micrometer-tracing-bridge-otel;1.6.0 +io.micrometer:micrometer-tracing-integration-test;1.6.0 +io.micrometer:micrometer-tracing-reporter-wavefront;1.6.0 +io.micrometer:micrometer-tracing-test;1.6.0 +io.netty:netty-all;4.2.7.Final +io.netty:netty-bom;4.2.7.Final +io.netty:netty-buffer;4.2.7.Final +io.netty:netty-codec;4.2.7.Final +io.netty:netty-codec-base;4.2.7.Final +io.netty:netty-codec-classes-quic;4.2.7.Final +io.netty:netty-codec-compression;4.2.7.Final +io.netty:netty-codec-dns;4.2.7.Final +io.netty:netty-codec-haproxy;4.2.7.Final +io.netty:netty-codec-http;4.2.7.Final +io.netty:netty-codec-http2;4.2.7.Final +io.netty:netty-codec-http3;4.2.7.Final +io.netty:netty-codec-marshalling;4.2.7.Final +io.netty:netty-codec-memcache;4.2.7.Final +io.netty:netty-codec-mqtt;4.2.7.Final +io.netty:netty-codec-native-quic;4.2.7.Final +io.netty:netty-codec-protobuf;4.2.7.Final +io.netty:netty-codec-redis;4.2.7.Final +io.netty:netty-codec-smtp;4.2.7.Final +io.netty:netty-codec-socks;4.2.7.Final +io.netty:netty-codec-stomp;4.2.7.Final +io.netty:netty-codec-xml;4.2.7.Final +io.netty:netty-common;4.2.7.Final +io.netty:netty-dev-tools;4.2.7.Final +io.netty:netty-handler;4.2.7.Final +io.netty:netty-handler-proxy;4.2.7.Final +io.netty:netty-handler-ssl-ocsp;4.2.7.Final +io.netty:netty-pkitesting;4.2.7.Final +io.netty:netty-resolver;4.2.7.Final +io.netty:netty-resolver-dns;4.2.7.Final +io.netty:netty-resolver-dns-classes-macos;4.2.7.Final +io.netty:netty-resolver-dns-native-macos;4.2.7.Final +io.netty:netty-tcnative;2.0.74.Final +io.netty:netty-tcnative-boringssl-static;2.0.74.Final +io.netty:netty-tcnative-classes;2.0.74.Final +io.netty:netty-transport;4.2.7.Final +io.netty:netty-transport-classes-epoll;4.2.7.Final +io.netty:netty-transport-classes-io_uring;4.2.7.Final +io.netty:netty-transport-classes-kqueue;4.2.7.Final +io.netty:netty-transport-native-epoll;4.2.7.Final +io.netty:netty-transport-native-io_uring;4.2.7.Final +io.netty:netty-transport-native-kqueue;4.2.7.Final +io.netty:netty-transport-native-unix-common;4.2.7.Final +io.netty:netty-transport-rxtx;4.2.7.Final +io.netty:netty-transport-sctp;4.2.7.Final +io.netty:netty-transport-udt;4.2.7.Final +io.opentelemetry:opentelemetry-api;1.55.0 +io.opentelemetry:opentelemetry-bom;1.55.0 +io.opentelemetry:opentelemetry-common;1.55.0 +io.opentelemetry:opentelemetry-context;1.55.0 +io.opentelemetry:opentelemetry-exporter-common;1.55.0 +io.opentelemetry:opentelemetry-exporter-logging;1.55.0 +io.opentelemetry:opentelemetry-exporter-logging-otlp;1.55.0 +io.opentelemetry:opentelemetry-exporter-otlp;1.55.0 +io.opentelemetry:opentelemetry-exporter-otlp-common;1.55.0 +io.opentelemetry:opentelemetry-exporter-sender-grpc-managed-channel;1.55.0 +io.opentelemetry:opentelemetry-exporter-sender-jdk;1.55.0 +io.opentelemetry:opentelemetry-exporter-sender-okhttp;1.55.0 +io.opentelemetry:opentelemetry-exporter-zipkin;1.55.0 +io.opentelemetry:opentelemetry-extension-kotlin;1.55.0 +io.opentelemetry:opentelemetry-extension-trace-propagators;1.55.0 +io.opentelemetry:opentelemetry-opentracing-shim;1.55.0 +io.opentelemetry:opentelemetry-sdk;1.55.0 +io.opentelemetry:opentelemetry-sdk-common;1.55.0 +io.opentelemetry:opentelemetry-sdk-extension-autoconfigure;1.55.0 +io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi;1.55.0 +io.opentelemetry:opentelemetry-sdk-extension-jaeger-remote-sampler;1.55.0 +io.opentelemetry:opentelemetry-sdk-logs;1.55.0 +io.opentelemetry:opentelemetry-sdk-metrics;1.55.0 +io.opentelemetry:opentelemetry-sdk-testing;1.55.0 +io.opentelemetry:opentelemetry-sdk-trace;1.55.0 +io.projectreactor.addons:reactor-adapter;3.6.0 +io.projectreactor.addons:reactor-extra;3.6.0 +io.projectreactor.addons:reactor-pool;1.2.0 +io.projectreactor.addons:reactor-pool-micrometer;1.2.0 +io.projectreactor.kotlin:reactor-kotlin-extensions;1.3.0 +io.projectreactor.netty:reactor-netty;1.3.0 +io.projectreactor.netty:reactor-netty-core;1.3.0 +io.projectreactor.netty:reactor-netty-http;1.3.0 +io.projectreactor.netty:reactor-netty-http-brave;1.3.0 +io.projectreactor.netty:reactor-netty-quic;1.3.0 +io.projectreactor:reactor-bom;2025.0.0 +io.projectreactor:reactor-core;3.8.0 +io.projectreactor:reactor-core-micrometer;3.8.0 +io.projectreactor:reactor-test;3.8.0 +io.projectreactor:reactor-tools;3.8.0 +io.prometheus:prometheus-metrics-bom;1.4.3 +io.prometheus:prometheus-metrics-config;1.4.3 +io.prometheus:prometheus-metrics-core;1.4.3 +io.prometheus:prometheus-metrics-exporter-common;1.4.3 +io.prometheus:prometheus-metrics-exporter-httpserver;1.4.3 +io.prometheus:prometheus-metrics-exporter-opentelemetry;1.4.3 +io.prometheus:prometheus-metrics-exporter-opentelemetry-no-otel;1.4.3 +io.prometheus:prometheus-metrics-exporter-opentelemetry-otel-agent-resources;1.4.3 +io.prometheus:prometheus-metrics-exporter-pushgateway;1.4.3 +io.prometheus:prometheus-metrics-exporter-servlet-jakarta;1.4.3 +io.prometheus:prometheus-metrics-exporter-servlet-javax;1.4.3 +io.prometheus:prometheus-metrics-exposition-formats;1.4.3 +io.prometheus:prometheus-metrics-exposition-formats-no-protobuf;1.4.3 +io.prometheus:prometheus-metrics-exposition-textformats;1.4.3 +io.prometheus:prometheus-metrics-instrumentation-caffeine;1.4.3 +io.prometheus:prometheus-metrics-instrumentation-dropwizard;1.4.3 +io.prometheus:prometheus-metrics-instrumentation-dropwizard5;1.4.3 +io.prometheus:prometheus-metrics-instrumentation-guava;1.4.3 +io.prometheus:prometheus-metrics-instrumentation-jvm;1.4.3 +io.prometheus:prometheus-metrics-model;1.4.3 +io.prometheus:prometheus-metrics-simpleclient-bridge;1.4.3 +io.prometheus:prometheus-metrics-tracer;1.4.3 +io.prometheus:prometheus-metrics-tracer-common;1.4.3 +io.prometheus:prometheus-metrics-tracer-initializer;1.4.3 +io.prometheus:prometheus-metrics-tracer-otel;1.4.3 +io.prometheus:prometheus-metrics-tracer-otel-agent;1.4.3 +io.prometheus:simpleclient;0.16.0 +io.prometheus:simpleclient_bom;0.16.0 +io.prometheus:simpleclient_caffeine;0.16.0 +io.prometheus:simpleclient_common;0.16.0 +io.prometheus:simpleclient_dropwizard;0.16.0 +io.prometheus:simpleclient_graphite_bridge;0.16.0 +io.prometheus:simpleclient_guava;0.16.0 +io.prometheus:simpleclient_hibernate;0.16.0 +io.prometheus:simpleclient_hotspot;0.16.0 +io.prometheus:simpleclient_httpserver;0.16.0 +io.prometheus:simpleclient_jetty;0.16.0 +io.prometheus:simpleclient_jetty_jdk8;0.16.0 +io.prometheus:simpleclient_log4j;0.16.0 +io.prometheus:simpleclient_log4j2;0.16.0 +io.prometheus:simpleclient_logback;0.16.0 +io.prometheus:simpleclient_pushgateway;0.16.0 +io.prometheus:simpleclient_servlet;0.16.0 +io.prometheus:simpleclient_servlet_jakarta;0.16.0 +io.prometheus:simpleclient_spring_boot;0.16.0 +io.prometheus:simpleclient_spring_web;0.16.0 +io.prometheus:simpleclient_tracer_common;0.16.0 +io.prometheus:simpleclient_tracer_otel;0.16.0 +io.prometheus:simpleclient_tracer_otel_agent;0.16.0 +io.prometheus:simpleclient_vertx;0.16.0 +io.r2dbc:r2dbc-h2;1.1.0.RELEASE +io.r2dbc:r2dbc-mssql;1.0.3.RELEASE +io.r2dbc:r2dbc-pool;1.0.2.RELEASE +io.r2dbc:r2dbc-proxy;1.1.6.RELEASE +io.r2dbc:r2dbc-spi;1.0.0.RELEASE +io.reactivex.rxjava3:rxjava;3.1.12 +io.rsocket:rsocket-bom;1.1.5 +io.rsocket:rsocket-core;1.1.5 +io.rsocket:rsocket-load-balancer;1.1.5 +io.rsocket:rsocket-micrometer;1.1.5 +io.rsocket:rsocket-test;1.1.5 +io.rsocket:rsocket-transport-local;1.1.5 +io.rsocket:rsocket-transport-netty;1.1.5 +io.spring.gradle:dependency-management-plugin;1.1.7 +io.zipkin.brave:brave;6.3.0 +io.zipkin.brave:brave-bom;6.3.0 +io.zipkin.brave:brave-context-jfr;6.3.0 +io.zipkin.brave:brave-context-log4j12;6.3.0 +io.zipkin.brave:brave-context-log4j2;6.3.0 +io.zipkin.brave:brave-context-slf4j;6.3.0 +io.zipkin.brave:brave-instrumentation-dubbo;6.3.0 +io.zipkin.brave:brave-instrumentation-grpc;6.3.0 +io.zipkin.brave:brave-instrumentation-http;6.3.0 +io.zipkin.brave:brave-instrumentation-http-tests;6.3.0 +io.zipkin.brave:brave-instrumentation-http-tests-jakarta;6.3.0 +io.zipkin.brave:brave-instrumentation-httpasyncclient;6.3.0 +io.zipkin.brave:brave-instrumentation-httpclient;6.3.0 +io.zipkin.brave:brave-instrumentation-httpclient5;6.3.0 +io.zipkin.brave:brave-instrumentation-jakarta-jms;6.3.0 +io.zipkin.brave:brave-instrumentation-jaxrs2;6.3.0 +io.zipkin.brave:brave-instrumentation-jdbi3;6.3.0 +io.zipkin.brave:brave-instrumentation-jersey-server;6.3.0 +io.zipkin.brave:brave-instrumentation-jersey-server-jakarta;6.3.0 +io.zipkin.brave:brave-instrumentation-jms;6.3.0 +io.zipkin.brave:brave-instrumentation-jms-jakarta;6.3.0 +io.zipkin.brave:brave-instrumentation-kafka-clients;6.3.0 +io.zipkin.brave:brave-instrumentation-kafka-streams;6.3.0 +io.zipkin.brave:brave-instrumentation-messaging;6.3.0 +io.zipkin.brave:brave-instrumentation-mongodb;6.3.0 +io.zipkin.brave:brave-instrumentation-mysql;6.3.0 +io.zipkin.brave:brave-instrumentation-mysql6;6.3.0 +io.zipkin.brave:brave-instrumentation-mysql8;6.3.0 +io.zipkin.brave:brave-instrumentation-netty-codec-http;6.3.0 +io.zipkin.brave:brave-instrumentation-okhttp3;6.3.0 +io.zipkin.brave:brave-instrumentation-rocketmq-client;6.3.0 +io.zipkin.brave:brave-instrumentation-rpc;6.3.0 +io.zipkin.brave:brave-instrumentation-servlet;6.3.0 +io.zipkin.brave:brave-instrumentation-servlet-jakarta;6.3.0 +io.zipkin.brave:brave-instrumentation-spring-rabbit;6.3.0 +io.zipkin.brave:brave-instrumentation-spring-web;6.3.0 +io.zipkin.brave:brave-instrumentation-spring-webmvc;6.3.0 +io.zipkin.brave:brave-instrumentation-vertx-web;6.3.0 +io.zipkin.brave:brave-spring-beans;6.3.0 +io.zipkin.brave:brave-tests;6.3.0 +io.zipkin.reporter2:zipkin-reporter;3.5.1 +io.zipkin.reporter2:zipkin-reporter-bom;3.5.1 +io.zipkin.reporter2:zipkin-reporter-brave;3.5.1 +io.zipkin.reporter2:zipkin-reporter-metrics-micrometer;3.5.1 +io.zipkin.reporter2:zipkin-reporter-spring-beans;3.5.1 +io.zipkin.reporter2:zipkin-sender-activemq-client;3.5.1 +io.zipkin.reporter2:zipkin-sender-amqp-client;3.5.1 +io.zipkin.reporter2:zipkin-sender-kafka;3.5.1 +io.zipkin.reporter2:zipkin-sender-libthrift;3.5.1 +io.zipkin.reporter2:zipkin-sender-okhttp3;3.5.1 +io.zipkin.reporter2:zipkin-sender-pulsar-client;3.5.1 +io.zipkin.reporter2:zipkin-sender-urlconnection;3.5.1 +jakarta.activation:jakarta.activation-api;2.1.4 +jakarta.annotation:jakarta.annotation-api;3.0.0 +jakarta.inject:jakarta.inject-api;2.0.1 +jakarta.jms:jakarta.jms-api;3.1.0 +jakarta.json.bind:jakarta.json.bind-api;3.0.1 +jakarta.json:jakarta.json-api;2.1.3 +jakarta.mail:jakarta.mail-api;2.1.5 +jakarta.management.j2ee:jakarta.management.j2ee-api;1.1.4 +jakarta.persistence:jakarta.persistence-api;3.2.0 +jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api;3.0.2 +jakarta.servlet:jakarta.servlet-api;6.1.0 +jakarta.transaction:jakarta.transaction-api;2.0.1 +jakarta.validation:jakarta.validation-api;3.1.1 +jakarta.websocket:jakarta.websocket-api;2.2.0 +jakarta.websocket:jakarta.websocket-client-api;2.2.0 +jakarta.ws.rs:jakarta.ws.rs-api;4.0.0 +jakarta.xml.bind:jakarta.xml.bind-api;4.0.4 +jakarta.xml.soap:jakarta.xml.soap-api;3.0.2 +jakarta.xml.ws:jakarta.xml.ws-api;4.0.2 +javax.cache:cache-api;1.1.1 +javax.money:money-api;1.1 +jaxen:jaxen;2.0.0 +junit:junit;4.13.2 +net.bytebuddy:byte-buddy;1.17.8 +net.bytebuddy:byte-buddy-agent;1.17.8 +net.minidev:json-smart;2.6.0 +net.sourceforge.jtds:jtds;1.3.1 +net.sourceforge.nekohtml:nekohtml;1.9.22 +nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect;3.4.0 +org.apache.activemq:activemq-all;6.1.8 +org.apache.activemq:activemq-amqp;6.1.8 +org.apache.activemq:activemq-blueprint;6.1.8 +org.apache.activemq:activemq-bom;6.1.8 +org.apache.activemq:activemq-broker;6.1.8 +org.apache.activemq:activemq-client;6.1.8 +org.apache.activemq:activemq-console;6.1.8 +org.apache.activemq:activemq-http;6.1.8 +org.apache.activemq:activemq-jaas;6.1.8 +org.apache.activemq:activemq-jdbc-store;6.1.8 +org.apache.activemq:activemq-jms-pool;6.1.8 +org.apache.activemq:activemq-kahadb-store;6.1.8 +org.apache.activemq:activemq-karaf;6.1.8 +org.apache.activemq:activemq-log4j-appender;6.1.8 +org.apache.activemq:activemq-mqtt;6.1.8 +org.apache.activemq:activemq-openwire-generator;6.1.8 +org.apache.activemq:activemq-openwire-legacy;6.1.8 +org.apache.activemq:activemq-osgi;6.1.8 +org.apache.activemq:activemq-pool;6.1.8 +org.apache.activemq:activemq-ra;6.1.8 +org.apache.activemq:activemq-rar;6.1.8 +org.apache.activemq:activemq-run;6.1.8 +org.apache.activemq:activemq-runtime-config;6.1.8 +org.apache.activemq:activemq-shiro;6.1.8 +org.apache.activemq:activemq-spring;6.1.8 +org.apache.activemq:activemq-stomp;6.1.8 +org.apache.activemq:activemq-web;6.1.8 +org.apache.activemq:activemq-web-console;6.1.8 +org.apache.activemq:activemq-web-demo;6.1.8 +org.apache.activemq:artemis-amqp-protocol;2.43.0 +org.apache.activemq:artemis-bom;2.43.0 +org.apache.activemq:artemis-boot;2.43.0 +org.apache.activemq:artemis-cdi-client;2.43.0 +org.apache.activemq:artemis-cli;2.43.0 +org.apache.activemq:artemis-commons;2.43.0 +org.apache.activemq:artemis-console;2.43.0 +org.apache.activemq:artemis-core-client;2.43.0 +org.apache.activemq:artemis-core-client-all;2.43.0 +org.apache.activemq:artemis-core-client-osgi;2.43.0 +org.apache.activemq:artemis-dto;2.43.0 +org.apache.activemq:artemis-features;2.43.0 +org.apache.activemq:artemis-hornetq-protocol;2.43.0 +org.apache.activemq:artemis-hqclient-protocol;2.43.0 +org.apache.activemq:artemis-jakarta-cdi-client;2.43.0 +org.apache.activemq:artemis-jakarta-client;2.43.0 +org.apache.activemq:artemis-jakarta-client-all;2.43.0 +org.apache.activemq:artemis-jakarta-openwire-protocol;2.43.0 +org.apache.activemq:artemis-jakarta-ra;2.43.0 +org.apache.activemq:artemis-jakarta-server;2.43.0 +org.apache.activemq:artemis-jakarta-service-extensions;2.43.0 +org.apache.activemq:artemis-jdbc-store;2.43.0 +org.apache.activemq:artemis-jms-client;2.43.0 +org.apache.activemq:artemis-jms-client-all;2.43.0 +org.apache.activemq:artemis-jms-client-osgi;2.43.0 +org.apache.activemq:artemis-jms-server;2.43.0 +org.apache.activemq:artemis-journal;2.43.0 +org.apache.activemq:artemis-lockmanager-api;2.43.0 +org.apache.activemq:artemis-lockmanager-ri;2.43.0 +org.apache.activemq:artemis-mqtt-protocol;2.43.0 +org.apache.activemq:artemis-openwire-protocol;2.43.0 +org.apache.activemq:artemis-ra;2.43.0 +org.apache.activemq:artemis-selector;2.43.0 +org.apache.activemq:artemis-server;2.43.0 +org.apache.activemq:artemis-server-osgi;2.43.0 +org.apache.activemq:artemis-service-extensions;2.43.0 +org.apache.activemq:artemis-stomp-protocol;2.43.0 +org.apache.activemq:artemis-web;2.43.0 +org.apache.activemq:artemis-website;2.43.0 +org.apache.cassandra:java-driver-bom;4.19.2 +org.apache.cassandra:java-driver-core;4.19.2 +org.apache.cassandra:java-driver-core-shaded;4.19.2 +org.apache.cassandra:java-driver-guava-shaded;4.19.2 +org.apache.cassandra:java-driver-mapper-processor;4.19.2 +org.apache.cassandra:java-driver-mapper-runtime;4.19.2 +org.apache.cassandra:java-driver-metrics-micrometer;4.19.2 +org.apache.cassandra:java-driver-metrics-microprofile;4.19.2 +org.apache.cassandra:java-driver-query-builder;4.19.2 +org.apache.cassandra:java-driver-test-infra;4.19.2 +org.apache.commons:commons-dbcp2;2.13.0 +org.apache.commons:commons-lang3;3.19.0 +org.apache.commons:commons-pool2;2.12.1 +org.apache.curator:curator-framework;5.9.0 +org.apache.curator:curator-recipes;5.9.0 +org.apache.curator:curator-test;5.9.0 +org.apache.curator:curator-x-discovery;5.9.0 +org.apache.derby:derby;10.16.1.1 +org.apache.derby:derbyclient;10.16.1.1 +org.apache.derby:derbynet;10.16.1.1 +org.apache.derby:derbyoptionaltools;10.16.1.1 +org.apache.derby:derbyshared;10.16.1.1 +org.apache.derby:derbytools;10.16.1.1 +org.apache.groovy:groovy;5.0.2 +org.apache.groovy:groovy-ant;5.0.2 +org.apache.groovy:groovy-astbuilder;5.0.2 +org.apache.groovy:groovy-bom;5.0.2 +org.apache.groovy:groovy-cli-commons;5.0.2 +org.apache.groovy:groovy-cli-picocli;5.0.2 +org.apache.groovy:groovy-console;5.0.2 +org.apache.groovy:groovy-contracts;5.0.2 +org.apache.groovy:groovy-datetime;5.0.2 +org.apache.groovy:groovy-dateutil;5.0.2 +org.apache.groovy:groovy-docgenerator;5.0.2 +org.apache.groovy:groovy-ginq;5.0.2 +org.apache.groovy:groovy-groovydoc;5.0.2 +org.apache.groovy:groovy-groovysh;5.0.2 +org.apache.groovy:groovy-jmx;5.0.2 +org.apache.groovy:groovy-json;5.0.2 +org.apache.groovy:groovy-jsr223;5.0.2 +org.apache.groovy:groovy-macro;5.0.2 +org.apache.groovy:groovy-macro-library;5.0.2 +org.apache.groovy:groovy-nio;5.0.2 +org.apache.groovy:groovy-servlet;5.0.2 +org.apache.groovy:groovy-sql;5.0.2 +org.apache.groovy:groovy-swing;5.0.2 +org.apache.groovy:groovy-templates;5.0.2 +org.apache.groovy:groovy-test;5.0.2 +org.apache.groovy:groovy-test-junit5;5.0.2 +org.apache.groovy:groovy-testng;5.0.2 +org.apache.groovy:groovy-toml;5.0.2 +org.apache.groovy:groovy-typecheckers;5.0.2 +org.apache.groovy:groovy-xml;5.0.2 +org.apache.groovy:groovy-yaml;5.0.2 +org.apache.httpcomponents.client5:httpclient5;5.5.1 +org.apache.httpcomponents.client5:httpclient5-cache;5.5.1 +org.apache.httpcomponents.client5:httpclient5-fluent;5.5.1 +org.apache.httpcomponents.core5:httpcore5;5.3.6 +org.apache.httpcomponents.core5:httpcore5-h2;5.3.6 +org.apache.httpcomponents.core5:httpcore5-reactive;5.3.6 +org.apache.httpcomponents:httpasyncclient;4.1.5 +org.apache.httpcomponents:httpcore;4.4.16 +org.apache.httpcomponents:httpcore-nio;4.4.16 +org.apache.kafka:connect;4.1.1 +org.apache.kafka:connect-api;4.1.1 +org.apache.kafka:connect-basic-auth-extension;4.1.1 +org.apache.kafka:connect-file;4.1.1 +org.apache.kafka:connect-json;4.1.1 +org.apache.kafka:connect-mirror;4.1.1 +org.apache.kafka:connect-mirror-client;4.1.1 +org.apache.kafka:connect-runtime;4.1.1 +org.apache.kafka:connect-transforms;4.1.1 +org.apache.kafka:generator;4.1.1 +org.apache.kafka:kafka-clients;4.1.1 +org.apache.kafka:kafka-metadata;4.1.1 +org.apache.kafka:kafka-raft;4.1.1 +org.apache.kafka:kafka-server;4.1.1 +org.apache.kafka:kafka-server-common;4.1.1 +org.apache.kafka:kafka-shell;4.1.1 +org.apache.kafka:kafka-storage;4.1.1 +org.apache.kafka:kafka-storage-api;4.1.1 +org.apache.kafka:kafka-streams;4.1.1 +org.apache.kafka:kafka-streams-scala_2.13;4.1.1 +org.apache.kafka:kafka-streams-test-utils;4.1.1 +org.apache.kafka:kafka-tools;4.1.1 +org.apache.kafka:kafka_2.13;4.1.1 +org.apache.kafka:trogdor;4.1.1 +org.apache.logging.log4j:log4j-1.2-api;2.25.2 +org.apache.logging.log4j:log4j-api;2.25.2 +org.apache.logging.log4j:log4j-api-test;2.25.2 +org.apache.logging.log4j:log4j-appserver;2.25.2 +org.apache.logging.log4j:log4j-bom;2.25.2 +org.apache.logging.log4j:log4j-cassandra;2.25.2 +org.apache.logging.log4j:log4j-core;2.25.2 +org.apache.logging.log4j:log4j-core-test;2.25.2 +org.apache.logging.log4j:log4j-couchdb;2.25.2 +org.apache.logging.log4j:log4j-docker;2.25.2 +org.apache.logging.log4j:log4j-flume-ng;2.23.1 +org.apache.logging.log4j:log4j-iostreams;2.25.2 +org.apache.logging.log4j:log4j-jakarta-jms;2.25.2 +org.apache.logging.log4j:log4j-jakarta-smtp;2.25.2 +org.apache.logging.log4j:log4j-jakarta-web;2.25.2 +org.apache.logging.log4j:log4j-jcl;2.25.2 +org.apache.logging.log4j:log4j-jpa;2.25.2 +org.apache.logging.log4j:log4j-jpl;2.25.2 +org.apache.logging.log4j:log4j-jul;2.25.2 +org.apache.logging.log4j:log4j-layout-template-json;2.25.2 +org.apache.logging.log4j:log4j-mongodb;2.25.2 +org.apache.logging.log4j:log4j-mongodb4;2.25.2 +org.apache.logging.log4j:log4j-slf4j-impl;2.25.2 +org.apache.logging.log4j:log4j-slf4j2-impl;2.25.2 +org.apache.logging.log4j:log4j-spring-boot;2.25.2 +org.apache.logging.log4j:log4j-spring-cloud-config-client;2.25.2 +org.apache.logging.log4j:log4j-taglib;2.25.2 +org.apache.logging.log4j:log4j-to-jul;2.25.2 +org.apache.logging.log4j:log4j-to-slf4j;2.25.2 +org.apache.logging.log4j:log4j-web;2.25.2 +org.apache.maven.plugins:maven-antrun-plugin;3.2.0 +org.apache.maven.plugins:maven-assembly-plugin;3.7.1 +org.apache.maven.plugins:maven-clean-plugin;3.5.0 +org.apache.maven.plugins:maven-compiler-plugin;3.14.1 +org.apache.maven.plugins:maven-dependency-plugin;3.9.0 +org.apache.maven.plugins:maven-deploy-plugin;3.1.4 +org.apache.maven.plugins:maven-enforcer-plugin;3.6.2 +org.apache.maven.plugins:maven-failsafe-plugin;3.5.4 +org.apache.maven.plugins:maven-help-plugin;3.5.1 +org.apache.maven.plugins:maven-install-plugin;3.1.4 +org.apache.maven.plugins:maven-invoker-plugin;3.9.1 +org.apache.maven.plugins:maven-jar-plugin;3.4.2 +org.apache.maven.plugins:maven-javadoc-plugin;3.12.0 +org.apache.maven.plugins:maven-release-plugin;3.2.0 +org.apache.maven.plugins:maven-resources-plugin;3.3.1 +org.apache.maven.plugins:maven-shade-plugin;3.6.1 +org.apache.maven.plugins:maven-source-plugin;3.3.1 +org.apache.maven.plugins:maven-surefire-plugin;3.5.4 +org.apache.maven.plugins:maven-war-plugin;3.4.0 +org.apache.pulsar:bouncy-castle-bc;4.1.1 +org.apache.pulsar:bouncy-castle-bcfips;4.1.1 +org.apache.pulsar:bouncy-castle-parent;4.1.1 +org.apache.pulsar:buildtools;4.1.1 +org.apache.pulsar:distribution;4.1.1 +org.apache.pulsar:docker-images;4.1.1 +org.apache.pulsar:jclouds-shaded;4.1.1 +org.apache.pulsar:managed-ledger;4.1.1 +org.apache.pulsar:pulsar;4.1.1 +org.apache.pulsar:pulsar-all-docker-image;4.1.1 +org.apache.pulsar:pulsar-bom;4.1.1 +org.apache.pulsar:pulsar-broker;4.1.1 +org.apache.pulsar:pulsar-broker-auth-athenz;4.1.1 +org.apache.pulsar:pulsar-broker-auth-oidc;4.1.1 +org.apache.pulsar:pulsar-broker-auth-sasl;4.1.1 +org.apache.pulsar:pulsar-broker-common;4.1.1 +org.apache.pulsar:pulsar-cli-utils;4.1.1 +org.apache.pulsar:pulsar-client;4.1.1 +org.apache.pulsar:pulsar-client-admin;4.1.1 +org.apache.pulsar:pulsar-client-admin-api;4.1.1 +org.apache.pulsar:pulsar-client-admin-original;4.1.1 +org.apache.pulsar:pulsar-client-all;4.1.1 +org.apache.pulsar:pulsar-client-api;4.1.1 +org.apache.pulsar:pulsar-client-auth-athenz;4.1.1 +org.apache.pulsar:pulsar-client-auth-sasl;4.1.1 +org.apache.pulsar:pulsar-client-messagecrypto-bc;4.1.1 +org.apache.pulsar:pulsar-client-original;4.1.1 +org.apache.pulsar:pulsar-client-tools;4.1.1 +org.apache.pulsar:pulsar-client-tools-api;4.1.1 +org.apache.pulsar:pulsar-common;4.1.1 +org.apache.pulsar:pulsar-config-validation;4.1.1 +org.apache.pulsar:pulsar-docker-image;4.1.1 +org.apache.pulsar:pulsar-docs-tools;4.1.1 +org.apache.pulsar:pulsar-functions;4.1.1 +org.apache.pulsar:pulsar-functions-api;4.1.1 +org.apache.pulsar:pulsar-functions-api-examples;4.1.1 +org.apache.pulsar:pulsar-functions-api-examples-builtin;4.1.1 +org.apache.pulsar:pulsar-functions-instance;4.1.1 +org.apache.pulsar:pulsar-functions-local-runner;4.1.1 +org.apache.pulsar:pulsar-functions-local-runner-original;4.1.1 +org.apache.pulsar:pulsar-functions-proto;4.1.1 +org.apache.pulsar:pulsar-functions-runtime;4.1.1 +org.apache.pulsar:pulsar-functions-runtime-all;4.1.1 +org.apache.pulsar:pulsar-functions-secrets;4.1.1 +org.apache.pulsar:pulsar-functions-utils;4.1.1 +org.apache.pulsar:pulsar-functions-worker;4.1.1 +org.apache.pulsar:pulsar-io;4.1.1 +org.apache.pulsar:pulsar-io-aerospike;4.1.1 +org.apache.pulsar:pulsar-io-alluxio;4.1.1 +org.apache.pulsar:pulsar-io-aws;4.1.1 +org.apache.pulsar:pulsar-io-batch-data-generator;4.1.1 +org.apache.pulsar:pulsar-io-batch-discovery-triggerers;4.1.1 +org.apache.pulsar:pulsar-io-canal;4.1.1 +org.apache.pulsar:pulsar-io-cassandra;4.1.1 +org.apache.pulsar:pulsar-io-common;4.1.1 +org.apache.pulsar:pulsar-io-core;4.1.1 +org.apache.pulsar:pulsar-io-data-generator;4.1.1 +org.apache.pulsar:pulsar-io-debezium;4.1.1 +org.apache.pulsar:pulsar-io-debezium-core;4.1.1 +org.apache.pulsar:pulsar-io-debezium-mongodb;4.1.1 +org.apache.pulsar:pulsar-io-debezium-mssql;4.1.1 +org.apache.pulsar:pulsar-io-debezium-mysql;4.1.1 +org.apache.pulsar:pulsar-io-debezium-oracle;4.1.1 +org.apache.pulsar:pulsar-io-debezium-postgres;4.1.1 +org.apache.pulsar:pulsar-io-distribution;4.1.1 +org.apache.pulsar:pulsar-io-docs;4.1.1 +org.apache.pulsar:pulsar-io-dynamodb;4.1.1 +org.apache.pulsar:pulsar-io-elastic-search;4.1.1 +org.apache.pulsar:pulsar-io-file;4.1.1 +org.apache.pulsar:pulsar-io-flume;4.1.1 +org.apache.pulsar:pulsar-io-hbase;4.1.1 +org.apache.pulsar:pulsar-io-hdfs3;4.1.1 +org.apache.pulsar:pulsar-io-http;4.1.1 +org.apache.pulsar:pulsar-io-influxdb;4.1.1 +org.apache.pulsar:pulsar-io-jdbc;4.1.1 +org.apache.pulsar:pulsar-io-jdbc-clickhouse;4.1.1 +org.apache.pulsar:pulsar-io-jdbc-core;4.1.1 +org.apache.pulsar:pulsar-io-jdbc-mariadb;4.1.1 +org.apache.pulsar:pulsar-io-jdbc-openmldb;4.1.1 +org.apache.pulsar:pulsar-io-jdbc-postgres;4.1.1 +org.apache.pulsar:pulsar-io-jdbc-sqlite;4.1.1 +org.apache.pulsar:pulsar-io-kafka;4.1.1 +org.apache.pulsar:pulsar-io-kafka-connect-adaptor;4.1.1 +org.apache.pulsar:pulsar-io-kafka-connect-adaptor-nar;4.1.1 +org.apache.pulsar:pulsar-io-kinesis;4.1.1 +org.apache.pulsar:pulsar-io-mongo;4.1.1 +org.apache.pulsar:pulsar-io-netty;4.1.1 +org.apache.pulsar:pulsar-io-nsq;4.1.1 +org.apache.pulsar:pulsar-io-rabbitmq;4.1.1 +org.apache.pulsar:pulsar-io-redis;4.1.1 +org.apache.pulsar:pulsar-io-solr;4.1.1 +org.apache.pulsar:pulsar-io-twitter;4.1.1 +org.apache.pulsar:pulsar-metadata;4.1.1 +org.apache.pulsar:pulsar-offloader-distribution;4.1.1 +org.apache.pulsar:pulsar-package-bookkeeper-storage;4.1.1 +org.apache.pulsar:pulsar-package-core;4.1.1 +org.apache.pulsar:pulsar-package-filesystem-storage;4.1.1 +org.apache.pulsar:pulsar-package-management;4.1.1 +org.apache.pulsar:pulsar-proxy;4.1.1 +org.apache.pulsar:pulsar-server-distribution;4.1.1 +org.apache.pulsar:pulsar-shell-distribution;4.1.1 +org.apache.pulsar:pulsar-testclient;4.1.1 +org.apache.pulsar:pulsar-transaction-common;4.1.1 +org.apache.pulsar:pulsar-transaction-coordinator;4.1.1 +org.apache.pulsar:pulsar-transaction-parent;4.1.1 +org.apache.pulsar:pulsar-websocket;4.1.1 +org.apache.pulsar:structured-event-log;4.1.1 +org.apache.pulsar:testmocks;4.1.1 +org.apache.pulsar:tiered-storage-file-system;4.1.1 +org.apache.pulsar:tiered-storage-jcloud;4.1.1 +org.apache.pulsar:tiered-storage-parent;4.1.1 +org.apache.tomcat.embed:tomcat-embed-core;11.0.14 +org.apache.tomcat.embed:tomcat-embed-el;11.0.14 +org.apache.tomcat.embed:tomcat-embed-jasper;11.0.14 +org.apache.tomcat.embed:tomcat-embed-websocket;11.0.14 +org.apache.tomcat:tomcat-annotations-api;11.0.14 +org.apache.tomcat:tomcat-jdbc;11.0.14 +org.apache.tomcat:tomcat-jsp-api;11.0.14 +org.aspectj:aspectjrt;1.9.25 +org.aspectj:aspectjtools;1.9.25 +org.aspectj:aspectjweaver;1.9.25 +org.assertj:assertj-bom;3.27.6 +org.assertj:assertj-core;3.27.6 +org.assertj:assertj-guava;3.27.6 +org.awaitility:awaitility;4.3.0 +org.awaitility:awaitility-groovy;4.3.0 +org.awaitility:awaitility-kotlin;4.3.0 +org.awaitility:awaitility-scala;4.3.0 +org.cache2k:cache2k-api;2.6.1.Final +org.cache2k:cache2k-config;2.6.1.Final +org.cache2k:cache2k-core;2.6.1.Final +org.cache2k:cache2k-jcache;2.6.1.Final +org.cache2k:cache2k-micrometer;2.6.1.Final +org.cache2k:cache2k-spring;2.6.1.Final +org.codehaus.janino:commons-compiler;3.1.12 +org.codehaus.janino:commons-compiler-jdk;3.1.12 +org.codehaus.janino:janino;3.1.12 +org.codehaus.mojo:build-helper-maven-plugin;3.6.1 +org.codehaus.mojo:versions-maven-plugin;2.19.1 +org.codehaus.mojo:xml-maven-plugin;1.2.0 +org.crac:crac;1.5.0 +org.cyclonedx:cyclonedx-maven-plugin;2.9.1 +org.eclipse.angus:angus-core;2.0.5 +org.eclipse.angus:angus-mail;2.0.5 +org.eclipse.angus:dsn;2.0.5 +org.eclipse.angus:gimap;2.0.5 +org.eclipse.angus:imap;2.0.5 +org.eclipse.angus:jakarta.mail;2.0.5 +org.eclipse.angus:logging-mailhandler;2.0.5 +org.eclipse.angus:pop3;2.0.5 +org.eclipse.angus:smtp;2.0.5 +org.eclipse.jetty.compression:jetty-compression-brotli;12.1.4 +org.eclipse.jetty.compression:jetty-compression-common;12.1.4 +org.eclipse.jetty.compression:jetty-compression-gzip;12.1.4 +org.eclipse.jetty.compression:jetty-compression-server;12.1.4 +org.eclipse.jetty.compression:jetty-compression-zstandard;12.1.4 +org.eclipse.jetty.demos:jetty-core-demo-handler;12.1.4 +org.eclipse.jetty.ee11.osgi:jetty-ee11-osgi-alpn;12.1.4 +org.eclipse.jetty.ee11.osgi:jetty-ee11-osgi-boot;12.1.4 +org.eclipse.jetty.ee11.osgi:jetty-ee11-osgi-boot-jsp;12.1.4 +org.eclipse.jetty.ee11.websocket:jetty-ee11-websocket-jakarta-client;12.1.4 +org.eclipse.jetty.ee11.websocket:jetty-ee11-websocket-jakarta-client-webapp;12.1.4 +org.eclipse.jetty.ee11.websocket:jetty-ee11-websocket-jakarta-common;12.1.4 +org.eclipse.jetty.ee11.websocket:jetty-ee11-websocket-jakarta-server;12.1.4 +org.eclipse.jetty.ee11.websocket:jetty-ee11-websocket-jetty-client-webapp;12.1.4 +org.eclipse.jetty.ee11.websocket:jetty-ee11-websocket-jetty-server;12.1.4 +org.eclipse.jetty.ee11.websocket:jetty-ee11-websocket-servlet;12.1.4 +org.eclipse.jetty.ee11:jetty-ee11-annotations;12.1.4 +org.eclipse.jetty.ee11:jetty-ee11-apache-jsp;12.1.4 +org.eclipse.jetty.ee11:jetty-ee11-bom;12.1.4 +org.eclipse.jetty.ee11:jetty-ee11-cdi;12.1.4 +org.eclipse.jetty.ee11:jetty-ee11-fcgi-proxy;12.1.4 +org.eclipse.jetty.ee11:jetty-ee11-glassfish-jstl;12.1.4 +org.eclipse.jetty.ee11:jetty-ee11-jaspi;12.1.4 +org.eclipse.jetty.ee11:jetty-ee11-jndi;12.1.4 +org.eclipse.jetty.ee11:jetty-ee11-jspc-maven-plugin;12.1.4 +org.eclipse.jetty.ee11:jetty-ee11-maven-plugin;12.1.4 +org.eclipse.jetty.ee11:jetty-ee11-plus;12.1.4 +org.eclipse.jetty.ee11:jetty-ee11-proxy;12.1.4 +org.eclipse.jetty.ee11:jetty-ee11-quickstart;12.1.4 +org.eclipse.jetty.ee11:jetty-ee11-servlet;12.1.4 +org.eclipse.jetty.ee11:jetty-ee11-servlets;12.1.4 +org.eclipse.jetty.ee11:jetty-ee11-webapp;12.1.4 +org.eclipse.jetty.ee:jetty-ee-webapp;12.1.4 +org.eclipse.jetty.fcgi:jetty-fcgi-client;12.1.4 +org.eclipse.jetty.fcgi:jetty-fcgi-proxy;12.1.4 +org.eclipse.jetty.fcgi:jetty-fcgi-server;12.1.4 +org.eclipse.jetty.http2:jetty-http2-client;12.1.4 +org.eclipse.jetty.http2:jetty-http2-client-transport;12.1.4 +org.eclipse.jetty.http2:jetty-http2-common;12.1.4 +org.eclipse.jetty.http2:jetty-http2-hpack;12.1.4 +org.eclipse.jetty.http2:jetty-http2-server;12.1.4 +org.eclipse.jetty.http3:jetty-http3-client;12.1.4 +org.eclipse.jetty.http3:jetty-http3-client-transport;12.1.4 +org.eclipse.jetty.http3:jetty-http3-common;12.1.4 +org.eclipse.jetty.http3:jetty-http3-qpack;12.1.4 +org.eclipse.jetty.http3:jetty-http3-server;12.1.4 +org.eclipse.jetty.quic:jetty-quic-common;12.1.4 +org.eclipse.jetty.quic:jetty-quic-quiche-client;12.1.4 +org.eclipse.jetty.quic:jetty-quic-quiche-common;12.1.4 +org.eclipse.jetty.quic:jetty-quic-quiche-foreign;12.1.4 +org.eclipse.jetty.quic:jetty-quic-quiche-jna;12.1.4 +org.eclipse.jetty.quic:jetty-quic-server;12.1.4 +org.eclipse.jetty.websocket:jetty-websocket-core-client;12.1.4 +org.eclipse.jetty.websocket:jetty-websocket-core-common;12.1.4 +org.eclipse.jetty.websocket:jetty-websocket-core-server;12.1.4 +org.eclipse.jetty.websocket:jetty-websocket-jetty-api;12.1.4 +org.eclipse.jetty.websocket:jetty-websocket-jetty-client;12.1.4 +org.eclipse.jetty.websocket:jetty-websocket-jetty-common;12.1.4 +org.eclipse.jetty.websocket:jetty-websocket-jetty-server;12.1.4 +org.eclipse.jetty:jetty-alpn-client;12.1.4 +org.eclipse.jetty:jetty-alpn-conscrypt-client;12.1.4 +org.eclipse.jetty:jetty-alpn-conscrypt-server;12.1.4 +org.eclipse.jetty:jetty-alpn-java-client;12.1.4 +org.eclipse.jetty:jetty-alpn-java-server;12.1.4 +org.eclipse.jetty:jetty-alpn-server;12.1.4 +org.eclipse.jetty:jetty-bom;12.1.4 +org.eclipse.jetty:jetty-client;12.1.4 +org.eclipse.jetty:jetty-coreapp;12.1.4 +org.eclipse.jetty:jetty-deploy;12.1.4 +org.eclipse.jetty:jetty-ethereum;12.1.4 +org.eclipse.jetty:jetty-http;12.1.4 +org.eclipse.jetty:jetty-http-spi;12.1.4 +org.eclipse.jetty:jetty-http-tools;12.1.4 +org.eclipse.jetty:jetty-io;12.1.4 +org.eclipse.jetty:jetty-jmx;12.1.4 +org.eclipse.jetty:jetty-jndi;12.1.4 +org.eclipse.jetty:jetty-keystore;12.1.4 +org.eclipse.jetty:jetty-openid;12.1.4 +org.eclipse.jetty:jetty-osgi;12.1.4 +org.eclipse.jetty:jetty-plus;12.1.4 +org.eclipse.jetty:jetty-proxy;12.1.4 +org.eclipse.jetty:jetty-reactive-httpclient;4.1.4 +org.eclipse.jetty:jetty-rewrite;12.1.4 +org.eclipse.jetty:jetty-security;12.1.4 +org.eclipse.jetty:jetty-server;12.1.4 +org.eclipse.jetty:jetty-session;12.1.4 +org.eclipse.jetty:jetty-slf4j-impl;12.1.4 +org.eclipse.jetty:jetty-start;12.1.4 +org.eclipse.jetty:jetty-staticapp;12.1.4 +org.eclipse.jetty:jetty-unixdomain-server;12.1.4 +org.eclipse.jetty:jetty-util;12.1.4 +org.eclipse.jetty:jetty-util-ajax;12.1.4 +org.eclipse.jetty:jetty-xml;12.1.4 +org.eclipse.jgit:org.eclipse.jgit;7.4.0.202509020913-r +org.eclipse.jgit:org.eclipse.jgit.http.apache;7.4.0.202509020913-r +org.eclipse.jgit:org.eclipse.jgit.junit.http;7.4.0.202509020913-r +org.eclipse.jgit:org.eclipse.jgit.ssh.apache;7.4.0.202509020913-r +org.eclipse:yasson;3.0.4 +org.ehcache:ehcache;3.11.1 +org.ehcache:ehcache-clustered;3.11.1 +org.ehcache:ehcache-transactions;3.11.1 +org.firebirdsql.jdbc:jaybird;6.0.3 +org.flywaydb:flyway-commandline;11.14.1 +org.flywaydb:flyway-core;11.14.1 +org.flywaydb:flyway-database-cassandra;11.14.1 +org.flywaydb:flyway-database-db2;11.14.1 +org.flywaydb:flyway-database-derby;11.14.1 +org.flywaydb:flyway-database-hsqldb;11.14.1 +org.flywaydb:flyway-database-informix;11.14.1 +org.flywaydb:flyway-database-mongodb;11.14.1 +org.flywaydb:flyway-database-oracle;11.14.1 +org.flywaydb:flyway-database-postgresql;11.14.1 +org.flywaydb:flyway-database-redshift;11.14.1 +org.flywaydb:flyway-database-saphana;11.14.1 +org.flywaydb:flyway-database-snowflake;11.14.1 +org.flywaydb:flyway-database-sybasease;11.14.1 +org.flywaydb:flyway-firebird;11.14.1 +org.flywaydb:flyway-gcp-bigquery;11.14.1 +org.flywaydb:flyway-gcp-spanner;11.14.1 +org.flywaydb:flyway-maven-plugin;11.14.1 +org.flywaydb:flyway-mysql;11.14.1 +org.flywaydb:flyway-singlestore;11.14.1 +org.flywaydb:flyway-sqlserver;11.14.1 +org.freemarker:freemarker;2.3.34 +org.glassfish.jaxb:codemodel;4.0.6 +org.glassfish.jaxb:jaxb-core;4.0.6 +org.glassfish.jaxb:jaxb-jxc;4.0.6 +org.glassfish.jaxb:jaxb-runtime;4.0.6 +org.glassfish.jaxb:jaxb-xjc;4.0.6 +org.glassfish.jaxb:txw2;4.0.6 +org.glassfish.jaxb:xsom;4.0.6 +org.glassfish.jersey.connectors:jersey-apache5-connector;4.0.0 +org.glassfish.jersey.connectors:jersey-grizzly-connector;4.0.0 +org.glassfish.jersey.connectors:jersey-helidon-connector;4.0.0 +org.glassfish.jersey.connectors:jersey-jdk-connector;4.0.0 +org.glassfish.jersey.connectors:jersey-jetty-connector;4.0.0 +org.glassfish.jersey.connectors:jersey-jetty-http2-connector;4.0.0 +org.glassfish.jersey.connectors:jersey-jnh-connector;4.0.0 +org.glassfish.jersey.connectors:jersey-netty-connector;4.0.0 +org.glassfish.jersey.containers.glassfish:jersey-gf-ejb;4.0.0 +org.glassfish.jersey.containers:jersey-container-grizzly2-http;4.0.0 +org.glassfish.jersey.containers:jersey-container-grizzly2-servlet;4.0.0 +org.glassfish.jersey.containers:jersey-container-helidon-http;4.0.0 +org.glassfish.jersey.containers:jersey-container-jdk-http;4.0.0 +org.glassfish.jersey.containers:jersey-container-jetty-http;4.0.0 +org.glassfish.jersey.containers:jersey-container-jetty-http2;4.0.0 +org.glassfish.jersey.containers:jersey-container-jetty-servlet;4.0.0 +org.glassfish.jersey.containers:jersey-container-netty-http;4.0.0 +org.glassfish.jersey.containers:jersey-container-servlet;4.0.0 +org.glassfish.jersey.core:jersey-client;4.0.0 +org.glassfish.jersey.core:jersey-common;4.0.0 +org.glassfish.jersey.core:jersey-server;4.0.0 +org.glassfish.jersey.ext.cdi:jersey-cdi-rs-inject;4.0.0 +org.glassfish.jersey.ext.cdi:jersey-cdi1x;4.0.0 +org.glassfish.jersey.ext.cdi:jersey-cdi1x-ban-custom-hk2-binding;4.0.0 +org.glassfish.jersey.ext.cdi:jersey-cdi1x-servlet;4.0.0 +org.glassfish.jersey.ext.cdi:jersey-cdi1x-transaction;4.0.0 +org.glassfish.jersey.ext.cdi:jersey-cdi1x-validation;4.0.0 +org.glassfish.jersey.ext.cdi:jersey-weld2-se;4.0.0 +org.glassfish.jersey.ext.microprofile:jersey-mp-config;4.0.0 +org.glassfish.jersey.ext.microprofile:jersey-mp-rest-client;4.0.0 +org.glassfish.jersey.ext.rx:jersey-rx-client-guava;4.0.0 +org.glassfish.jersey.ext.rx:jersey-rx-client-rxjava;4.0.0 +org.glassfish.jersey.ext.rx:jersey-rx-client-rxjava2;4.0.0 +org.glassfish.jersey.ext:jersey-bean-validation;4.0.0 +org.glassfish.jersey.ext:jersey-constants;4.0.0 +org.glassfish.jersey.ext:jersey-declarative-linking;4.0.0 +org.glassfish.jersey.ext:jersey-entity-filtering;4.0.0 +org.glassfish.jersey.ext:jersey-metainf-services;4.0.0 +org.glassfish.jersey.ext:jersey-micrometer;4.0.0 +org.glassfish.jersey.ext:jersey-mvc;4.0.0 +org.glassfish.jersey.ext:jersey-mvc-bean-validation;4.0.0 +org.glassfish.jersey.ext:jersey-mvc-freemarker;4.0.0 +org.glassfish.jersey.ext:jersey-mvc-jsp;4.0.0 +org.glassfish.jersey.ext:jersey-mvc-mustache;4.0.0 +org.glassfish.jersey.ext:jersey-proxy-client;4.0.0 +org.glassfish.jersey.ext:jersey-spring6;4.0.0 +org.glassfish.jersey.ext:jersey-wadl-doclet;4.0.0 +org.glassfish.jersey.inject:jersey-cdi2-se;4.0.0 +org.glassfish.jersey.inject:jersey-hk2;4.0.0 +org.glassfish.jersey.media:jersey-media-jaxb;4.0.0 +org.glassfish.jersey.media:jersey-media-json-binding;4.0.0 +org.glassfish.jersey.media:jersey-media-json-gson;4.0.0 +org.glassfish.jersey.media:jersey-media-json-jackson;4.0.0 +org.glassfish.jersey.media:jersey-media-json-jettison;4.0.0 +org.glassfish.jersey.media:jersey-media-json-processing;4.0.0 +org.glassfish.jersey.media:jersey-media-kryo;4.0.0 +org.glassfish.jersey.media:jersey-media-moxy;4.0.0 +org.glassfish.jersey.media:jersey-media-multipart;4.0.0 +org.glassfish.jersey.media:jersey-media-sse;4.0.0 +org.glassfish.jersey.security:oauth1-client;4.0.0 +org.glassfish.jersey.security:oauth1-server;4.0.0 +org.glassfish.jersey.security:oauth1-signature;4.0.0 +org.glassfish.jersey.security:oauth2-client;4.0.0 +org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-bundle;4.0.0 +org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-external;4.0.0 +org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2;4.0.0 +org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-helidon;4.0.0 +org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-inmemory;4.0.0 +org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jdk-http;4.0.0 +org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jetty;4.0.0 +org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jetty-http2;4.0.0 +org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-netty;4.0.0 +org.glassfish.jersey.test-framework:jersey-test-framework-core;4.0.0 +org.glassfish.jersey.test-framework:jersey-test-framework-util;4.0.0 +org.glassfish.jersey:jersey-bom;4.0.0 +org.glassfish.web:jakarta.servlet.jsp.jstl;3.0.1 +org.graalvm.buildtools:native-maven-plugin;0.11.3 +org.hamcrest:hamcrest;3.0 +org.hamcrest:hamcrest-core;3.0 +org.hamcrest:hamcrest-library;3.0 +org.hibernate.orm:hibernate-agroal;7.1.8.Final +org.hibernate.orm:hibernate-ant;7.1.8.Final +org.hibernate.orm:hibernate-c3p0;7.1.8.Final +org.hibernate.orm:hibernate-community-dialects;7.1.8.Final +org.hibernate.orm:hibernate-core;7.1.8.Final +org.hibernate.orm:hibernate-envers;7.1.8.Final +org.hibernate.orm:hibernate-graalvm;7.1.8.Final +org.hibernate.orm:hibernate-hikaricp;7.1.8.Final +org.hibernate.orm:hibernate-jcache;7.1.8.Final +org.hibernate.orm:hibernate-micrometer;7.1.8.Final +org.hibernate.orm:hibernate-processor;7.1.8.Final +org.hibernate.orm:hibernate-scan-jandex;7.1.8.Final +org.hibernate.orm:hibernate-spatial;7.1.8.Final +org.hibernate.orm:hibernate-testing;7.1.8.Final +org.hibernate.orm:hibernate-vector;7.1.8.Final +org.hibernate.validator:hibernate-validator;9.0.1.Final +org.hibernate.validator:hibernate-validator-annotation-processor;9.0.1.Final +org.hsqldb:hsqldb;2.7.3 +org.htmlunit:htmlunit;4.17.0 +org.infinispan.protostream:protostream;5.0.13.Final +org.infinispan.protostream:protostream-processor;5.0.13.Final +org.infinispan.protostream:protostream-types;5.0.13.Final +org.infinispan:infinispan-anchored-keys;15.2.6.Final +org.infinispan:infinispan-api;15.2.6.Final +org.infinispan:infinispan-bom;15.2.6.Final +org.infinispan:infinispan-cachestore-jdbc;15.2.6.Final +org.infinispan:infinispan-cachestore-jdbc-common;15.2.6.Final +org.infinispan:infinispan-cachestore-remote;15.2.6.Final +org.infinispan:infinispan-cachestore-rocksdb;15.2.6.Final +org.infinispan:infinispan-cachestore-sql;15.2.6.Final +org.infinispan:infinispan-cdi-common;15.2.6.Final +org.infinispan:infinispan-cdi-embedded;15.2.6.Final +org.infinispan:infinispan-cdi-remote;15.2.6.Final +org.infinispan:infinispan-checkstyle;15.2.6.Final +org.infinispan:infinispan-cli-client;15.2.6.Final +org.infinispan:infinispan-client-hotrod;15.2.6.Final +org.infinispan:infinispan-client-hotrod-legacy;15.2.6.Final +org.infinispan:infinispan-client-rest;15.2.6.Final +org.infinispan:infinispan-clustered-counter;15.2.6.Final +org.infinispan:infinispan-clustered-lock;15.2.6.Final +org.infinispan:infinispan-commons;15.2.6.Final +org.infinispan:infinispan-commons-graalvm;15.2.6.Final +org.infinispan:infinispan-commons-spi;15.2.6.Final +org.infinispan:infinispan-commons-test;15.2.6.Final +org.infinispan:infinispan-component-annotations;15.2.6.Final +org.infinispan:infinispan-component-processor;15.2.6.Final +org.infinispan:infinispan-console;15.2.1.Final +org.infinispan:infinispan-core;15.2.6.Final +org.infinispan:infinispan-core-graalvm;15.2.6.Final +org.infinispan:infinispan-counter-api;15.2.6.Final +org.infinispan:infinispan-hibernate-cache-commons;15.2.6.Final +org.infinispan:infinispan-hibernate-cache-spi;15.2.6.Final +org.infinispan:infinispan-hibernate-cache-v62;15.2.6.Final +org.infinispan:infinispan-jboss-marshalling;15.2.6.Final +org.infinispan:infinispan-jcache;15.2.6.Final +org.infinispan:infinispan-jcache-commons;15.2.6.Final +org.infinispan:infinispan-jcache-remote;15.2.6.Final +org.infinispan:infinispan-key-value-store-client;15.2.6.Final +org.infinispan:infinispan-logging-annotations;15.2.6.Final +org.infinispan:infinispan-logging-processor;15.2.6.Final +org.infinispan:infinispan-multimap;15.2.6.Final +org.infinispan:infinispan-objectfilter;15.2.6.Final +org.infinispan:infinispan-query;15.2.6.Final +org.infinispan:infinispan-query-core;15.2.6.Final +org.infinispan:infinispan-query-dsl;15.2.6.Final +org.infinispan:infinispan-remote-query-client;15.2.6.Final +org.infinispan:infinispan-remote-query-server;15.2.6.Final +org.infinispan:infinispan-scripting;15.2.6.Final +org.infinispan:infinispan-server-core;15.2.6.Final +org.infinispan:infinispan-server-hotrod;15.2.6.Final +org.infinispan:infinispan-server-memcached;15.2.6.Final +org.infinispan:infinispan-server-resp;15.2.6.Final +org.infinispan:infinispan-server-rest;15.2.6.Final +org.infinispan:infinispan-server-router;15.2.6.Final +org.infinispan:infinispan-server-runtime;15.2.6.Final +org.infinispan:infinispan-server-testdriver-core;15.2.6.Final +org.infinispan:infinispan-server-testdriver-junit4;15.2.6.Final +org.infinispan:infinispan-server-testdriver-junit5;15.2.6.Final +org.infinispan:infinispan-spring-boot3-starter-embedded;15.2.6.Final +org.infinispan:infinispan-spring-boot3-starter-remote;15.2.6.Final +org.infinispan:infinispan-spring6-common;15.2.6.Final +org.infinispan:infinispan-spring6-embedded;15.2.6.Final +org.infinispan:infinispan-spring6-remote;15.2.6.Final +org.infinispan:infinispan-tasks;15.2.6.Final +org.infinispan:infinispan-tasks-api;15.2.6.Final +org.infinispan:infinispan-tools;15.2.6.Final +org.influxdb:influxdb-java;2.25 +org.jboss.logging:jboss-logging;3.6.1.Final +org.jdom:jdom2;2.0.6.1 +org.jetbrains.kotlin:kotlin-bom;2.2.21 +org.jetbrains.kotlin:kotlin-compiler;2.2.21 +org.jetbrains.kotlin:kotlin-compiler-embeddable;2.2.21 +org.jetbrains.kotlin:kotlin-daemon-client;2.2.21 +org.jetbrains.kotlin:kotlin-main-kts;2.2.21 +org.jetbrains.kotlin:kotlin-maven-plugin;2.2.21 +org.jetbrains.kotlin:kotlin-osgi-bundle;2.2.21 +org.jetbrains.kotlin:kotlin-reflect;2.2.21 +org.jetbrains.kotlin:kotlin-script-runtime;2.2.21 +org.jetbrains.kotlin:kotlin-scripting-common;2.2.21 +org.jetbrains.kotlin:kotlin-scripting-ide-services;2.2.21 +org.jetbrains.kotlin:kotlin-scripting-jvm;2.2.21 +org.jetbrains.kotlin:kotlin-scripting-jvm-host;2.2.21 +org.jetbrains.kotlin:kotlin-stdlib;2.2.21 +org.jetbrains.kotlin:kotlin-stdlib-common;2.2.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk7;2.2.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk8;2.2.21 +org.jetbrains.kotlin:kotlin-stdlib-js;2.2.21 +org.jetbrains.kotlin:kotlin-test;2.2.21 +org.jetbrains.kotlin:kotlin-test-annotations-common;2.2.21 +org.jetbrains.kotlin:kotlin-test-common;2.2.21 +org.jetbrains.kotlin:kotlin-test-js;2.2.21 +org.jetbrains.kotlin:kotlin-test-junit;2.2.21 +org.jetbrains.kotlin:kotlin-test-junit5;2.2.21 +org.jetbrains.kotlin:kotlin-test-testng;2.2.21 +org.jetbrains.kotlinx:kotlinx-coroutines-android;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-bom;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-core;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-debug;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-guava;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-javafx;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-jdk8;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-jdk9;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-play-services;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-reactive;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-reactor;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-rx2;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-rx3;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-slf4j;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-swing;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-test;1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-test-jvm;1.10.2 +org.jetbrains.kotlinx:kotlinx-serialization-bom;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-cbor;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-cbor-jvm;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-core;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-core-jvm;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-hocon;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-json;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-json-io;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-json-io-jvm;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-json-jvm;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-json-okio;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-json-okio-jvm;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-properties;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-properties-jvm;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-protobuf;1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-protobuf-jvm;1.9.0 +org.jooq:jooq;3.19.28 +org.jooq:jooq-bom;3.19.28 +org.jooq:jooq-checker;3.19.28 +org.jooq:jooq-codegen;3.19.28 +org.jooq:jooq-codegen-gradle;3.19.28 +org.jooq:jooq-codegen-maven;3.19.28 +org.jooq:jooq-jackson-extensions;3.19.28 +org.jooq:jooq-kotlin;3.19.28 +org.jooq:jooq-kotlin-coroutines;3.19.28 +org.jooq:jooq-meta;3.19.28 +org.jooq:jooq-meta-extensions;3.19.28 +org.jooq:jooq-meta-extensions-hibernate;3.19.28 +org.jooq:jooq-meta-extensions-liquibase;3.19.28 +org.jooq:jooq-meta-kotlin;3.19.28 +org.jooq:jooq-migrations;3.19.28 +org.jooq:jooq-migrations-maven;3.19.28 +org.jooq:jooq-postgres-extensions;3.19.28 +org.jooq:jooq-scala_2.13;3.19.28 +org.jooq:jooq-xtend;3.19.28 +org.jspecify:jspecify;1.0.0 +org.junit.jupiter:junit-jupiter;6.0.1 +org.junit.jupiter:junit-jupiter-api;6.0.1 +org.junit.jupiter:junit-jupiter-engine;6.0.1 +org.junit.jupiter:junit-jupiter-migrationsupport;6.0.1 +org.junit.jupiter:junit-jupiter-params;6.0.1 +org.junit.platform:junit-platform-commons;6.0.1 +org.junit.platform:junit-platform-console;6.0.1 +org.junit.platform:junit-platform-engine;6.0.1 +org.junit.platform:junit-platform-launcher;6.0.1 +org.junit.platform:junit-platform-reporting;6.0.1 +org.junit.platform:junit-platform-suite;6.0.1 +org.junit.platform:junit-platform-suite-api;6.0.1 +org.junit.platform:junit-platform-suite-engine;6.0.1 +org.junit.platform:junit-platform-testkit;6.0.1 +org.junit.vintage:junit-vintage-engine;6.0.1 +org.junit:junit-bom;6.0.1 +org.liquibase:liquibase-cdi;5.0.1 +org.liquibase:liquibase-core;5.0.1 +org.liquibase:liquibase-maven-plugin;5.0.1 +org.mariadb.jdbc:mariadb-java-client;3.5.6 +org.mariadb:r2dbc-mariadb;1.3.0 +org.messaginghub:pooled-jms;3.1.7 +org.mockito:mockito-android;5.20.0 +org.mockito:mockito-bom;5.20.0 +org.mockito:mockito-core;5.20.0 +org.mockito:mockito-errorprone;5.20.0 +org.mockito:mockito-junit-jupiter;5.20.0 +org.mockito:mockito-proxy;5.20.0 +org.mockito:mockito-subclass;5.20.0 +org.mongodb.scala:mongo-scala-bson_2.11;5.6.1 +org.mongodb.scala:mongo-scala-bson_2.12;5.6.1 +org.mongodb.scala:mongo-scala-bson_2.13;5.6.1 +org.mongodb.scala:mongo-scala-driver_2.11;5.6.1 +org.mongodb.scala:mongo-scala-driver_2.12;5.6.1 +org.mongodb.scala:mongo-scala-driver_2.13;5.6.1 +org.mongodb:bson;5.6.1 +org.mongodb:bson-kotlin;5.6.1 +org.mongodb:bson-kotlinx;5.6.1 +org.mongodb:bson-record-codec;5.6.1 +org.mongodb:mongodb-crypt;5.6.1 +org.mongodb:mongodb-driver-bom;5.6.1 +org.mongodb:mongodb-driver-core;5.6.1 +org.mongodb:mongodb-driver-kotlin-coroutine;5.6.1 +org.mongodb:mongodb-driver-kotlin-extensions;5.6.1 +org.mongodb:mongodb-driver-kotlin-sync;5.6.1 +org.mongodb:mongodb-driver-reactivestreams;5.6.1 +org.mongodb:mongodb-driver-sync;5.6.1 +org.neo4j.bolt:neo4j-bolt-connection;10.1.0 +org.neo4j.bolt:neo4j-bolt-connection-bom;10.1.0 +org.neo4j.bolt:neo4j-bolt-connection-netty;10.1.0 +org.neo4j.bolt:neo4j-bolt-connection-pooled;10.1.0 +org.neo4j.bolt:neo4j-bolt-connection-query-api;10.1.0 +org.neo4j.bolt:neo4j-bolt-connection-routed;10.1.0 +org.neo4j.driver:neo4j-java-driver;6.0.2 +org.neo4j.driver:neo4j-java-driver-all;6.0.2 +org.neo4j.driver:neo4j-java-driver-bom;6.0.2 +org.neo4j.driver:neo4j-java-driver-observation-metrics;6.0.2 +org.neo4j.driver:neo4j-java-driver-observation-micrometer;6.0.2 +org.postgresql:postgresql;42.7.8 +org.postgresql:r2dbc-postgresql;1.1.1.RELEASE +org.projectlombok:lombok;1.18.42 +org.quartz-scheduler:quartz;2.5.1 +org.quartz-scheduler:quartz-jobs;2.5.1 +org.reactivestreams:reactive-streams;1.0.4 +org.seleniumhq.selenium:htmlunit3-driver;4.36.1 +org.seleniumhq.selenium:selenium-api;4.37.0 +org.seleniumhq.selenium:selenium-bom;4.37.0 +org.seleniumhq.selenium:selenium-chrome-driver;4.37.0 +org.seleniumhq.selenium:selenium-chromium-driver;4.37.0 +org.seleniumhq.selenium:selenium-devtools-v139;4.37.0 +org.seleniumhq.selenium:selenium-devtools-v140;4.37.0 +org.seleniumhq.selenium:selenium-devtools-v141;4.37.0 +org.seleniumhq.selenium:selenium-edge-driver;4.37.0 +org.seleniumhq.selenium:selenium-firefox-driver;4.37.0 +org.seleniumhq.selenium:selenium-grid;4.37.0 +org.seleniumhq.selenium:selenium-http;4.37.0 +org.seleniumhq.selenium:selenium-ie-driver;4.37.0 +org.seleniumhq.selenium:selenium-java;4.37.0 +org.seleniumhq.selenium:selenium-json;4.37.0 +org.seleniumhq.selenium:selenium-manager;4.37.0 +org.seleniumhq.selenium:selenium-remote-driver;4.37.0 +org.seleniumhq.selenium:selenium-safari-driver;4.37.0 +org.seleniumhq.selenium:selenium-session-map-jdbc;4.37.0 +org.seleniumhq.selenium:selenium-session-map-redis;4.37.0 +org.seleniumhq.selenium:selenium-support;4.37.0 +org.skyscreamer:jsonassert;1.5.3 +org.slf4j:jcl-over-slf4j;2.0.17 +org.slf4j:jul-to-slf4j;2.0.17 +org.slf4j:log4j-over-slf4j;2.0.17 +org.slf4j:slf4j-api;2.0.17 +org.slf4j:slf4j-ext;2.0.17 +org.slf4j:slf4j-jdk-platform-logging;2.0.17 +org.slf4j:slf4j-jdk14;2.0.17 +org.slf4j:slf4j-log4j12;2.0.17 +org.slf4j:slf4j-nop;2.0.17 +org.slf4j:slf4j-reload4j;2.0.17 +org.slf4j:slf4j-simple;2.0.17 +org.springframework.amqp:spring-amqp;4.0.0 +org.springframework.amqp:spring-amqp-bom;4.0.0 +org.springframework.amqp:spring-rabbit;4.0.0 +org.springframework.amqp:spring-rabbit-junit;4.0.0 +org.springframework.amqp:spring-rabbit-stream;4.0.0 +org.springframework.amqp:spring-rabbit-test;4.0.0 +org.springframework.amqp:spring-rabbitmq-client;4.0.0 +org.springframework.batch:spring-batch-bom;6.0.0 +org.springframework.batch:spring-batch-core;6.0.0 +org.springframework.batch:spring-batch-infrastructure;6.0.0 +org.springframework.batch:spring-batch-integration;6.0.0 +org.springframework.batch:spring-batch-test;6.0.0 +org.springframework.boot:spring-boot;4.0.0 +org.springframework.boot:spring-boot-activemq;4.0.0 +org.springframework.boot:spring-boot-actuator;4.0.0 +org.springframework.boot:spring-boot-actuator-autoconfigure;4.0.0 +org.springframework.boot:spring-boot-amqp;4.0.0 +org.springframework.boot:spring-boot-artemis;4.0.0 +org.springframework.boot:spring-boot-autoconfigure;4.0.0 +org.springframework.boot:spring-boot-autoconfigure-classic;4.0.0 +org.springframework.boot:spring-boot-autoconfigure-classic-modules;4.0.0 +org.springframework.boot:spring-boot-autoconfigure-processor;4.0.0 +org.springframework.boot:spring-boot-batch;4.0.0 +org.springframework.boot:spring-boot-batch-jdbc;4.0.0 +org.springframework.boot:spring-boot-buildpack-platform;4.0.0 +org.springframework.boot:spring-boot-cache;4.0.0 +org.springframework.boot:spring-boot-cache-test;4.0.0 +org.springframework.boot:spring-boot-cassandra;4.0.0 +org.springframework.boot:spring-boot-cloudfoundry;4.0.0 +org.springframework.boot:spring-boot-configuration-metadata;4.0.0 +org.springframework.boot:spring-boot-configuration-processor;4.0.0 +org.springframework.boot:spring-boot-couchbase;4.0.0 +org.springframework.boot:spring-boot-data-cassandra;4.0.0 +org.springframework.boot:spring-boot-data-cassandra-test;4.0.0 +org.springframework.boot:spring-boot-data-commons;4.0.0 +org.springframework.boot:spring-boot-data-couchbase;4.0.0 +org.springframework.boot:spring-boot-data-couchbase-test;4.0.0 +org.springframework.boot:spring-boot-data-elasticsearch;4.0.0 +org.springframework.boot:spring-boot-data-elasticsearch-test;4.0.0 +org.springframework.boot:spring-boot-data-jdbc;4.0.0 +org.springframework.boot:spring-boot-data-jdbc-test;4.0.0 +org.springframework.boot:spring-boot-data-jpa;4.0.0 +org.springframework.boot:spring-boot-data-jpa-test;4.0.0 +org.springframework.boot:spring-boot-data-ldap;4.0.0 +org.springframework.boot:spring-boot-data-ldap-test;4.0.0 +org.springframework.boot:spring-boot-data-mongodb;4.0.0 +org.springframework.boot:spring-boot-data-mongodb-test;4.0.0 +org.springframework.boot:spring-boot-data-neo4j;4.0.0 +org.springframework.boot:spring-boot-data-neo4j-test;4.0.0 +org.springframework.boot:spring-boot-data-r2dbc;4.0.0 +org.springframework.boot:spring-boot-data-r2dbc-test;4.0.0 +org.springframework.boot:spring-boot-data-redis;4.0.0 +org.springframework.boot:spring-boot-data-redis-test;4.0.0 +org.springframework.boot:spring-boot-data-rest;4.0.0 +org.springframework.boot:spring-boot-dependencies;4.0.0 +org.springframework.boot:spring-boot-devtools;4.0.0 +org.springframework.boot:spring-boot-docker-compose;4.0.0 +org.springframework.boot:spring-boot-elasticsearch;4.0.0 +org.springframework.boot:spring-boot-flyway;4.0.0 +org.springframework.boot:spring-boot-freemarker;4.0.0 +org.springframework.boot:spring-boot-graphql;4.0.0 +org.springframework.boot:spring-boot-graphql-test;4.0.0 +org.springframework.boot:spring-boot-groovy-templates;4.0.0 +org.springframework.boot:spring-boot-gson;4.0.0 +org.springframework.boot:spring-boot-h2console;4.0.0 +org.springframework.boot:spring-boot-hateoas;4.0.0 +org.springframework.boot:spring-boot-hazelcast;4.0.0 +org.springframework.boot:spring-boot-health;4.0.0 +org.springframework.boot:spring-boot-hibernate;4.0.0 +org.springframework.boot:spring-boot-http-client;4.0.0 +org.springframework.boot:spring-boot-http-codec;4.0.0 +org.springframework.boot:spring-boot-http-converter;4.0.0 +org.springframework.boot:spring-boot-integration;4.0.0 +org.springframework.boot:spring-boot-jackson;4.0.0 +org.springframework.boot:spring-boot-jackson2;4.0.0 +org.springframework.boot:spring-boot-jarmode-tools;4.0.0 +org.springframework.boot:spring-boot-jdbc;4.0.0 +org.springframework.boot:spring-boot-jdbc-test;4.0.0 +org.springframework.boot:spring-boot-jersey;4.0.0 +org.springframework.boot:spring-boot-jetty;4.0.0 +org.springframework.boot:spring-boot-jms;4.0.0 +org.springframework.boot:spring-boot-jooq;4.0.0 +org.springframework.boot:spring-boot-jooq-test;4.0.0 +org.springframework.boot:spring-boot-jpa;4.0.0 +org.springframework.boot:spring-boot-jpa-test;4.0.0 +org.springframework.boot:spring-boot-jsonb;4.0.0 +org.springframework.boot:spring-boot-kafka;4.0.0 +org.springframework.boot:spring-boot-kotlinx-serialization-json;4.0.0 +org.springframework.boot:spring-boot-ldap;4.0.0 +org.springframework.boot:spring-boot-liquibase;4.0.0 +org.springframework.boot:spring-boot-loader;4.0.0 +org.springframework.boot:spring-boot-mail;4.0.0 +org.springframework.boot:spring-boot-maven-plugin;4.0.0 +org.springframework.boot:spring-boot-micrometer-metrics;4.0.0 +org.springframework.boot:spring-boot-micrometer-metrics-test;4.0.0 +org.springframework.boot:spring-boot-micrometer-observation;4.0.0 +org.springframework.boot:spring-boot-micrometer-tracing;4.0.0 +org.springframework.boot:spring-boot-micrometer-tracing-brave;4.0.0 +org.springframework.boot:spring-boot-micrometer-tracing-opentelemetry;4.0.0 +org.springframework.boot:spring-boot-micrometer-tracing-test;4.0.0 +org.springframework.boot:spring-boot-mongodb;4.0.0 +org.springframework.boot:spring-boot-mustache;4.0.0 +org.springframework.boot:spring-boot-neo4j;4.0.0 +org.springframework.boot:spring-boot-netty;4.0.0 +org.springframework.boot:spring-boot-opentelemetry;4.0.0 +org.springframework.boot:spring-boot-persistence;4.0.0 +org.springframework.boot:spring-boot-properties-migrator;4.0.0 +org.springframework.boot:spring-boot-pulsar;4.0.0 +org.springframework.boot:spring-boot-quartz;4.0.0 +org.springframework.boot:spring-boot-r2dbc;4.0.0 +org.springframework.boot:spring-boot-reactor;4.0.0 +org.springframework.boot:spring-boot-reactor-netty;4.0.0 +org.springframework.boot:spring-boot-restclient;4.0.0 +org.springframework.boot:spring-boot-restclient-test;4.0.0 +org.springframework.boot:spring-boot-restdocs;4.0.0 +org.springframework.boot:spring-boot-resttestclient;4.0.0 +org.springframework.boot:spring-boot-rsocket;4.0.0 +org.springframework.boot:spring-boot-rsocket-test;4.0.0 +org.springframework.boot:spring-boot-security;4.0.0 +org.springframework.boot:spring-boot-security-oauth2-authorization-server;4.0.0 +org.springframework.boot:spring-boot-security-oauth2-client;4.0.0 +org.springframework.boot:spring-boot-security-oauth2-resource-server;4.0.0 +org.springframework.boot:spring-boot-security-saml2;4.0.0 +org.springframework.boot:spring-boot-security-test;4.0.0 +org.springframework.boot:spring-boot-sendgrid;4.0.0 +org.springframework.boot:spring-boot-servlet;4.0.0 +org.springframework.boot:spring-boot-session;4.0.0 +org.springframework.boot:spring-boot-session-data-redis;4.0.0 +org.springframework.boot:spring-boot-session-jdbc;4.0.0 +org.springframework.boot:spring-boot-sql;4.0.0 +org.springframework.boot:spring-boot-starter;4.0.0 +org.springframework.boot:spring-boot-starter-activemq;4.0.0 +org.springframework.boot:spring-boot-starter-activemq-test;4.0.0 +org.springframework.boot:spring-boot-starter-actuator;4.0.0 +org.springframework.boot:spring-boot-starter-actuator-test;4.0.0 +org.springframework.boot:spring-boot-starter-amqp;4.0.0 +org.springframework.boot:spring-boot-starter-amqp-test;4.0.0 +org.springframework.boot:spring-boot-starter-artemis;4.0.0 +org.springframework.boot:spring-boot-starter-artemis-test;4.0.0 +org.springframework.boot:spring-boot-starter-aspectj;4.0.0 +org.springframework.boot:spring-boot-starter-aspectj-test;4.0.0 +org.springframework.boot:spring-boot-starter-batch;4.0.0 +org.springframework.boot:spring-boot-starter-batch-jdbc;4.0.0 +org.springframework.boot:spring-boot-starter-batch-jdbc-test;4.0.0 +org.springframework.boot:spring-boot-starter-batch-test;4.0.0 +org.springframework.boot:spring-boot-starter-cache;4.0.0 +org.springframework.boot:spring-boot-starter-cache-test;4.0.0 +org.springframework.boot:spring-boot-starter-cassandra;4.0.0 +org.springframework.boot:spring-boot-starter-cassandra-test;4.0.0 +org.springframework.boot:spring-boot-starter-classic;4.0.0 +org.springframework.boot:spring-boot-starter-cloudfoundry;4.0.0 +org.springframework.boot:spring-boot-starter-cloudfoundry-test;4.0.0 +org.springframework.boot:spring-boot-starter-couchbase;4.0.0 +org.springframework.boot:spring-boot-starter-couchbase-test;4.0.0 +org.springframework.boot:spring-boot-starter-data-cassandra;4.0.0 +org.springframework.boot:spring-boot-starter-data-cassandra-reactive;4.0.0 +org.springframework.boot:spring-boot-starter-data-cassandra-reactive-test;4.0.0 +org.springframework.boot:spring-boot-starter-data-cassandra-test;4.0.0 +org.springframework.boot:spring-boot-starter-data-couchbase;4.0.0 +org.springframework.boot:spring-boot-starter-data-couchbase-reactive;4.0.0 +org.springframework.boot:spring-boot-starter-data-couchbase-reactive-test;4.0.0 +org.springframework.boot:spring-boot-starter-data-couchbase-test;4.0.0 +org.springframework.boot:spring-boot-starter-data-elasticsearch;4.0.0 +org.springframework.boot:spring-boot-starter-data-elasticsearch-test;4.0.0 +org.springframework.boot:spring-boot-starter-data-jdbc;4.0.0 +org.springframework.boot:spring-boot-starter-data-jdbc-test;4.0.0 +org.springframework.boot:spring-boot-starter-data-jpa;4.0.0 +org.springframework.boot:spring-boot-starter-data-jpa-test;4.0.0 +org.springframework.boot:spring-boot-starter-data-ldap;4.0.0 +org.springframework.boot:spring-boot-starter-data-ldap-test;4.0.0 +org.springframework.boot:spring-boot-starter-data-mongodb;4.0.0 +org.springframework.boot:spring-boot-starter-data-mongodb-reactive;4.0.0 +org.springframework.boot:spring-boot-starter-data-mongodb-reactive-test;4.0.0 +org.springframework.boot:spring-boot-starter-data-mongodb-test;4.0.0 +org.springframework.boot:spring-boot-starter-data-neo4j;4.0.0 +org.springframework.boot:spring-boot-starter-data-neo4j-test;4.0.0 +org.springframework.boot:spring-boot-starter-data-r2dbc;4.0.0 +org.springframework.boot:spring-boot-starter-data-r2dbc-test;4.0.0 +org.springframework.boot:spring-boot-starter-data-redis;4.0.0 +org.springframework.boot:spring-boot-starter-data-redis-reactive;4.0.0 +org.springframework.boot:spring-boot-starter-data-redis-reactive-test;4.0.0 +org.springframework.boot:spring-boot-starter-data-redis-test;4.0.0 +org.springframework.boot:spring-boot-starter-data-rest;4.0.0 +org.springframework.boot:spring-boot-starter-data-rest-test;4.0.0 +org.springframework.boot:spring-boot-starter-elasticsearch;4.0.0 +org.springframework.boot:spring-boot-starter-elasticsearch-test;4.0.0 +org.springframework.boot:spring-boot-starter-flyway;4.0.0 +org.springframework.boot:spring-boot-starter-flyway-test;4.0.0 +org.springframework.boot:spring-boot-starter-freemarker;4.0.0 +org.springframework.boot:spring-boot-starter-freemarker-test;4.0.0 +org.springframework.boot:spring-boot-starter-graphql;4.0.0 +org.springframework.boot:spring-boot-starter-graphql-test;4.0.0 +org.springframework.boot:spring-boot-starter-groovy-templates;4.0.0 +org.springframework.boot:spring-boot-starter-groovy-templates-test;4.0.0 +org.springframework.boot:spring-boot-starter-gson;4.0.0 +org.springframework.boot:spring-boot-starter-gson-test;4.0.0 +org.springframework.boot:spring-boot-starter-hateoas;4.0.0 +org.springframework.boot:spring-boot-starter-hateoas-test;4.0.0 +org.springframework.boot:spring-boot-starter-hazelcast;4.0.0 +org.springframework.boot:spring-boot-starter-hazelcast-test;4.0.0 +org.springframework.boot:spring-boot-starter-integration;4.0.0 +org.springframework.boot:spring-boot-starter-integration-test;4.0.0 +org.springframework.boot:spring-boot-starter-jackson;4.0.0 +org.springframework.boot:spring-boot-starter-jackson-test;4.0.0 +org.springframework.boot:spring-boot-starter-jdbc;4.0.0 +org.springframework.boot:spring-boot-starter-jdbc-test;4.0.0 +org.springframework.boot:spring-boot-starter-jersey;4.0.0 +org.springframework.boot:spring-boot-starter-jersey-test;4.0.0 +org.springframework.boot:spring-boot-starter-jetty;4.0.0 +org.springframework.boot:spring-boot-starter-jetty-runtime;4.0.0 +org.springframework.boot:spring-boot-starter-jms;4.0.0 +org.springframework.boot:spring-boot-starter-jms-test;4.0.0 +org.springframework.boot:spring-boot-starter-jooq;4.0.0 +org.springframework.boot:spring-boot-starter-jooq-test;4.0.0 +org.springframework.boot:spring-boot-starter-json;4.0.0 +org.springframework.boot:spring-boot-starter-jsonb;4.0.0 +org.springframework.boot:spring-boot-starter-jsonb-test;4.0.0 +org.springframework.boot:spring-boot-starter-kafka;4.0.0 +org.springframework.boot:spring-boot-starter-kafka-test;4.0.0 +org.springframework.boot:spring-boot-starter-kotlin-serialization;4.0.0 +org.springframework.boot:spring-boot-starter-kotlin-serialization-test;4.0.0 +org.springframework.boot:spring-boot-starter-ldap;4.0.0 +org.springframework.boot:spring-boot-starter-ldap-test;4.0.0 +org.springframework.boot:spring-boot-starter-liquibase;4.0.0 +org.springframework.boot:spring-boot-starter-liquibase-test;4.0.0 +org.springframework.boot:spring-boot-starter-log4j2;4.0.0 +org.springframework.boot:spring-boot-starter-logback;4.0.0 +org.springframework.boot:spring-boot-starter-logging;4.0.0 +org.springframework.boot:spring-boot-starter-mail;4.0.0 +org.springframework.boot:spring-boot-starter-mail-test;4.0.0 +org.springframework.boot:spring-boot-starter-micrometer-metrics;4.0.0 +org.springframework.boot:spring-boot-starter-micrometer-metrics-test;4.0.0 +org.springframework.boot:spring-boot-starter-mongodb;4.0.0 +org.springframework.boot:spring-boot-starter-mongodb-test;4.0.0 +org.springframework.boot:spring-boot-starter-mustache;4.0.0 +org.springframework.boot:spring-boot-starter-mustache-test;4.0.0 +org.springframework.boot:spring-boot-starter-neo4j;4.0.0 +org.springframework.boot:spring-boot-starter-neo4j-test;4.0.0 +org.springframework.boot:spring-boot-starter-oauth2-authorization-server;4.0.0 +org.springframework.boot:spring-boot-starter-oauth2-client;4.0.0 +org.springframework.boot:spring-boot-starter-oauth2-resource-server;4.0.0 +org.springframework.boot:spring-boot-starter-opentelemetry;4.0.0 +org.springframework.boot:spring-boot-starter-opentelemetry-test;4.0.0 +org.springframework.boot:spring-boot-starter-parent;4.0.0 +org.springframework.boot:spring-boot-starter-pulsar;4.0.0 +org.springframework.boot:spring-boot-starter-pulsar-test;4.0.0 +org.springframework.boot:spring-boot-starter-quartz;4.0.0 +org.springframework.boot:spring-boot-starter-quartz-test;4.0.0 +org.springframework.boot:spring-boot-starter-r2dbc;4.0.0 +org.springframework.boot:spring-boot-starter-r2dbc-test;4.0.0 +org.springframework.boot:spring-boot-starter-reactor-netty;4.0.0 +org.springframework.boot:spring-boot-starter-restclient;4.0.0 +org.springframework.boot:spring-boot-starter-restclient-test;4.0.0 +org.springframework.boot:spring-boot-starter-rsocket;4.0.0 +org.springframework.boot:spring-boot-starter-rsocket-test;4.0.0 +org.springframework.boot:spring-boot-starter-security;4.0.0 +org.springframework.boot:spring-boot-starter-security-oauth2-authorization-server;4.0.0 +org.springframework.boot:spring-boot-starter-security-oauth2-authorization-server-test;4.0.0 +org.springframework.boot:spring-boot-starter-security-oauth2-client;4.0.0 +org.springframework.boot:spring-boot-starter-security-oauth2-client-test;4.0.0 +org.springframework.boot:spring-boot-starter-security-oauth2-resource-server;4.0.0 +org.springframework.boot:spring-boot-starter-security-oauth2-resource-server-test;4.0.0 +org.springframework.boot:spring-boot-starter-security-saml2;4.0.0 +org.springframework.boot:spring-boot-starter-security-saml2-test;4.0.0 +org.springframework.boot:spring-boot-starter-security-test;4.0.0 +org.springframework.boot:spring-boot-starter-sendgrid;4.0.0 +org.springframework.boot:spring-boot-starter-sendgrid-test;4.0.0 +org.springframework.boot:spring-boot-starter-session-data-redis;4.0.0 +org.springframework.boot:spring-boot-starter-session-data-redis-test;4.0.0 +org.springframework.boot:spring-boot-starter-session-jdbc;4.0.0 +org.springframework.boot:spring-boot-starter-session-jdbc-test;4.0.0 +org.springframework.boot:spring-boot-starter-test;4.0.0 +org.springframework.boot:spring-boot-starter-test-classic;4.0.0 +org.springframework.boot:spring-boot-starter-thymeleaf;4.0.0 +org.springframework.boot:spring-boot-starter-thymeleaf-test;4.0.0 +org.springframework.boot:spring-boot-starter-tomcat;4.0.0 +org.springframework.boot:spring-boot-starter-tomcat-runtime;4.0.0 +org.springframework.boot:spring-boot-starter-validation;4.0.0 +org.springframework.boot:spring-boot-starter-validation-test;4.0.0 +org.springframework.boot:spring-boot-starter-web;4.0.0 +org.springframework.boot:spring-boot-starter-web-services;4.0.0 +org.springframework.boot:spring-boot-starter-webclient;4.0.0 +org.springframework.boot:spring-boot-starter-webclient-test;4.0.0 +org.springframework.boot:spring-boot-starter-webflux;4.0.0 +org.springframework.boot:spring-boot-starter-webflux-test;4.0.0 +org.springframework.boot:spring-boot-starter-webmvc;4.0.0 +org.springframework.boot:spring-boot-starter-webmvc-test;4.0.0 +org.springframework.boot:spring-boot-starter-webservices;4.0.0 +org.springframework.boot:spring-boot-starter-webservices-test;4.0.0 +org.springframework.boot:spring-boot-starter-websocket;4.0.0 +org.springframework.boot:spring-boot-starter-websocket-test;4.0.0 +org.springframework.boot:spring-boot-starter-zipkin;4.0.0 +org.springframework.boot:spring-boot-starter-zipkin-test;4.0.0 +org.springframework.boot:spring-boot-test;4.0.0 +org.springframework.boot:spring-boot-test-autoconfigure;4.0.0 +org.springframework.boot:spring-boot-test-classic-modules;4.0.0 +org.springframework.boot:spring-boot-testcontainers;4.0.0 +org.springframework.boot:spring-boot-thymeleaf;4.0.0 +org.springframework.boot:spring-boot-tomcat;4.0.0 +org.springframework.boot:spring-boot-transaction;4.0.0 +org.springframework.boot:spring-boot-validation;4.0.0 +org.springframework.boot:spring-boot-web-server;4.0.0 +org.springframework.boot:spring-boot-webclient;4.0.0 +org.springframework.boot:spring-boot-webclient-test;4.0.0 +org.springframework.boot:spring-boot-webflux;4.0.0 +org.springframework.boot:spring-boot-webflux-test;4.0.0 +org.springframework.boot:spring-boot-webmvc;4.0.0 +org.springframework.boot:spring-boot-webmvc-test;4.0.0 +org.springframework.boot:spring-boot-webservices;4.0.0 +org.springframework.boot:spring-boot-webservices-test;4.0.0 +org.springframework.boot:spring-boot-websocket;4.0.0 +org.springframework.boot:spring-boot-webtestclient;4.0.0 +org.springframework.boot:spring-boot-zipkin;4.0.0 +org.springframework.cloud:spring-cloud-bus;5.0.0 +org.springframework.cloud:spring-cloud-bus-dependencies;5.0.0 +org.springframework.cloud:spring-cloud-circuitbreaker-dependencies;5.0.0 +org.springframework.cloud:spring-cloud-circuitbreaker-framework-retry;5.0.0 +org.springframework.cloud:spring-cloud-circuitbreaker-resilience4j;5.0.0 +org.springframework.cloud:spring-cloud-circuitbreaker-spring-retry;5.0.0 +org.springframework.cloud:spring-cloud-commons;5.0.0 +org.springframework.cloud:spring-cloud-commons-dependencies;5.0.0 +org.springframework.cloud:spring-cloud-config-client;5.0.0 +org.springframework.cloud:spring-cloud-config-dependencies;5.0.0 +org.springframework.cloud:spring-cloud-config-monitor;5.0.0 +org.springframework.cloud:spring-cloud-config-server;5.0.0 +org.springframework.cloud:spring-cloud-consul-binder;5.0.0 +org.springframework.cloud:spring-cloud-consul-config;5.0.0 +org.springframework.cloud:spring-cloud-consul-core;5.0.0 +org.springframework.cloud:spring-cloud-consul-dependencies;5.0.0 +org.springframework.cloud:spring-cloud-consul-discovery;5.0.0 +org.springframework.cloud:spring-cloud-context;5.0.0 +org.springframework.cloud:spring-cloud-contract-converters;5.0.0 +org.springframework.cloud:spring-cloud-contract-dependencies;5.0.0 +org.springframework.cloud:spring-cloud-contract-gradle-plugin;5.0.0 +org.springframework.cloud:spring-cloud-contract-maven-plugin;5.0.0 +org.springframework.cloud:spring-cloud-contract-spec;5.0.0 +org.springframework.cloud:spring-cloud-contract-spec-groovy;5.0.0 +org.springframework.cloud:spring-cloud-contract-spec-java;5.0.0 +org.springframework.cloud:spring-cloud-contract-spec-kotlin;5.0.0 +org.springframework.cloud:spring-cloud-contract-stub-runner;5.0.0 +org.springframework.cloud:spring-cloud-contract-stub-runner-boot;5.0.0 +org.springframework.cloud:spring-cloud-contract-verifier;5.0.0 +org.springframework.cloud:spring-cloud-contract-wiremock;5.0.0 +org.springframework.cloud:spring-cloud-dependencies;2025.1.0 +org.springframework.cloud:spring-cloud-function-adapter-aws;5.0.0 +org.springframework.cloud:spring-cloud-function-adapter-azure;5.0.0 +org.springframework.cloud:spring-cloud-function-adapter-azure-web;5.0.0 +org.springframework.cloud:spring-cloud-function-adapter-gcp;5.0.0 +org.springframework.cloud:spring-cloud-function-context;5.0.0 +org.springframework.cloud:spring-cloud-function-core;5.0.0 +org.springframework.cloud:spring-cloud-function-dependencies;5.0.0 +org.springframework.cloud:spring-cloud-function-deployer;5.0.0 +org.springframework.cloud:spring-cloud-function-grpc;5.0.0 +org.springframework.cloud:spring-cloud-function-grpc-cloudevent-ext;5.0.0 +org.springframework.cloud:spring-cloud-function-integration;5.0.0 +org.springframework.cloud:spring-cloud-function-kotlin;5.0.0 +org.springframework.cloud:spring-cloud-function-rsocket;5.0.0 +org.springframework.cloud:spring-cloud-function-serverless-web;5.0.0 +org.springframework.cloud:spring-cloud-function-web;5.0.0 +org.springframework.cloud:spring-cloud-gateway-dependencies;5.0.0 +org.springframework.cloud:spring-cloud-gateway-proxyexchange-webflux;5.0.0 +org.springframework.cloud:spring-cloud-gateway-proxyexchange-webmvc;5.0.0 +org.springframework.cloud:spring-cloud-gateway-server-webflux;5.0.0 +org.springframework.cloud:spring-cloud-gateway-server-webmvc;5.0.0 +org.springframework.cloud:spring-cloud-kubernetes-client-autoconfig;5.0.0 +org.springframework.cloud:spring-cloud-kubernetes-client-config;5.0.0 +org.springframework.cloud:spring-cloud-kubernetes-client-discovery;5.0.0 +org.springframework.cloud:spring-cloud-kubernetes-client-loadbalancer;5.0.0 +org.springframework.cloud:spring-cloud-kubernetes-commons;5.0.0 +org.springframework.cloud:spring-cloud-kubernetes-dependencies;5.0.0 +org.springframework.cloud:spring-cloud-kubernetes-discovery;5.0.0 +org.springframework.cloud:spring-cloud-kubernetes-fabric8-autoconfig;5.0.0 +org.springframework.cloud:spring-cloud-kubernetes-fabric8-config;5.0.0 +org.springframework.cloud:spring-cloud-kubernetes-fabric8-discovery;5.0.0 +org.springframework.cloud:spring-cloud-kubernetes-fabric8-istio;5.0.0 +org.springframework.cloud:spring-cloud-kubernetes-fabric8-leader;5.0.0 +org.springframework.cloud:spring-cloud-kubernetes-fabric8-loadbalancer;5.0.0 +org.springframework.cloud:spring-cloud-kubernetes-test-support;5.0.0 +org.springframework.cloud:spring-cloud-loadbalancer;5.0.0 +org.springframework.cloud:spring-cloud-netflix-dependencies;5.0.0 +org.springframework.cloud:spring-cloud-netflix-eureka-client;5.0.0 +org.springframework.cloud:spring-cloud-netflix-eureka-server;5.0.0 +org.springframework.cloud:spring-cloud-openfeign-core;5.0.0 +org.springframework.cloud:spring-cloud-openfeign-dependencies;5.0.0 +org.springframework.cloud:spring-cloud-starter;5.0.0 +org.springframework.cloud:spring-cloud-starter-bootstrap;5.0.0 +org.springframework.cloud:spring-cloud-starter-bus-amqp;5.0.0 +org.springframework.cloud:spring-cloud-starter-bus-kafka;5.0.0 +org.springframework.cloud:spring-cloud-starter-bus-stream;5.0.0 +org.springframework.cloud:spring-cloud-starter-circuitbreaker-framework-retry;5.0.0 +org.springframework.cloud:spring-cloud-starter-circuitbreaker-reactor-resilience4j;5.0.0 +org.springframework.cloud:spring-cloud-starter-circuitbreaker-resilience4j;5.0.0 +org.springframework.cloud:spring-cloud-starter-circuitbreaker-spring-retry;5.0.0 +org.springframework.cloud:spring-cloud-starter-config;5.0.0 +org.springframework.cloud:spring-cloud-starter-consul;5.0.0 +org.springframework.cloud:spring-cloud-starter-consul-all;5.0.0 +org.springframework.cloud:spring-cloud-starter-consul-bus;5.0.0 +org.springframework.cloud:spring-cloud-starter-consul-config;5.0.0 +org.springframework.cloud:spring-cloud-starter-consul-discovery;5.0.0 +org.springframework.cloud:spring-cloud-starter-contract-stub-runner;5.0.0 +org.springframework.cloud:spring-cloud-starter-contract-stub-runner-jetty;5.0.0 +org.springframework.cloud:spring-cloud-starter-contract-verifier;5.0.0 +org.springframework.cloud:spring-cloud-starter-function-web;5.0.0 +org.springframework.cloud:spring-cloud-starter-function-webflux;5.0.0 +org.springframework.cloud:spring-cloud-starter-gateway-server-webflux;5.0.0 +org.springframework.cloud:spring-cloud-starter-gateway-server-webmvc;5.0.0 +org.springframework.cloud:spring-cloud-starter-kubernetes-client;5.0.0 +org.springframework.cloud:spring-cloud-starter-kubernetes-client-all;5.0.0 +org.springframework.cloud:spring-cloud-starter-kubernetes-client-config;5.0.0 +org.springframework.cloud:spring-cloud-starter-kubernetes-client-loadbalancer;5.0.0 +org.springframework.cloud:spring-cloud-starter-kubernetes-discoveryclient;5.0.0 +org.springframework.cloud:spring-cloud-starter-kubernetes-fabric8;5.0.0 +org.springframework.cloud:spring-cloud-starter-kubernetes-fabric8-all;5.0.0 +org.springframework.cloud:spring-cloud-starter-kubernetes-fabric8-config;5.0.0 +org.springframework.cloud:spring-cloud-starter-kubernetes-fabric8-loadbalancer;5.0.0 +org.springframework.cloud:spring-cloud-starter-loadbalancer;5.0.0 +org.springframework.cloud:spring-cloud-starter-netflix-eureka-client;5.0.0 +org.springframework.cloud:spring-cloud-starter-netflix-eureka-server;5.0.0 +org.springframework.cloud:spring-cloud-starter-openfeign;5.0.0 +org.springframework.cloud:spring-cloud-starter-stream-kafka;5.0.0 +org.springframework.cloud:spring-cloud-starter-stream-rabbit;5.0.0 +org.springframework.cloud:spring-cloud-starter-task;5.0.0 +org.springframework.cloud:spring-cloud-starter-vault-config;5.0.0 +org.springframework.cloud:spring-cloud-starter-zookeeper;5.0.0 +org.springframework.cloud:spring-cloud-starter-zookeeper-all;5.0.0 +org.springframework.cloud:spring-cloud-starter-zookeeper-config;5.0.0 +org.springframework.cloud:spring-cloud-starter-zookeeper-discovery;5.0.0 +org.springframework.cloud:spring-cloud-stream;5.0.0 +org.springframework.cloud:spring-cloud-stream-binder-kafka;5.0.0 +org.springframework.cloud:spring-cloud-stream-binder-kafka-core;5.0.0 +org.springframework.cloud:spring-cloud-stream-binder-kafka-reactive;5.0.0 +org.springframework.cloud:spring-cloud-stream-binder-kafka-streams;5.0.0 +org.springframework.cloud:spring-cloud-stream-binder-pulsar;5.0.0 +org.springframework.cloud:spring-cloud-stream-binder-rabbit;5.0.0 +org.springframework.cloud:spring-cloud-stream-binder-rabbit-core;5.0.0 +org.springframework.cloud:spring-cloud-stream-binder-rabbit-test-support;5.0.0 +org.springframework.cloud:spring-cloud-stream-dependencies;5.0.0 +org.springframework.cloud:spring-cloud-stream-schema-registry-client;5.0.0 +org.springframework.cloud:spring-cloud-stream-schema-registry-core;5.0.0 +org.springframework.cloud:spring-cloud-stream-schema-registry-server;5.0.0 +org.springframework.cloud:spring-cloud-stream-test-binder;5.0.0 +org.springframework.cloud:spring-cloud-stream-test-support;5.0.0 +org.springframework.cloud:spring-cloud-task-batch;5.0.0 +org.springframework.cloud:spring-cloud-task-core;5.0.0 +org.springframework.cloud:spring-cloud-task-dependencies;5.0.0 +org.springframework.cloud:spring-cloud-task-stream;5.0.0 +org.springframework.cloud:spring-cloud-test-support;5.0.0 +org.springframework.cloud:spring-cloud-vault-config;5.0.0 +org.springframework.cloud:spring-cloud-vault-config-aws;5.0.0 +org.springframework.cloud:spring-cloud-vault-config-consul;5.0.0 +org.springframework.cloud:spring-cloud-vault-config-databases;5.0.0 +org.springframework.cloud:spring-cloud-vault-config-rabbitmq;5.0.0 +org.springframework.cloud:spring-cloud-vault-dependencies;5.0.0 +org.springframework.cloud:spring-cloud-zookeeper-config;5.0.0 +org.springframework.cloud:spring-cloud-zookeeper-core;5.0.0 +org.springframework.cloud:spring-cloud-zookeeper-dependencies;5.0.0 +org.springframework.cloud:spring-cloud-zookeeper-discovery;5.0.0 +org.springframework.credhub:spring-credhub-core;3.5.0 +org.springframework.data:spring-data-bom;2025.1.0 +org.springframework.data:spring-data-cassandra;5.0.0 +org.springframework.data:spring-data-commons;4.0.0 +org.springframework.data:spring-data-couchbase;6.0.0 +org.springframework.data:spring-data-elasticsearch;6.0.0 +org.springframework.data:spring-data-envers;4.0.0 +org.springframework.data:spring-data-jdbc;4.0.0 +org.springframework.data:spring-data-jpa;4.0.0 +org.springframework.data:spring-data-keyvalue;4.0.0 +org.springframework.data:spring-data-ldap;4.0.0 +org.springframework.data:spring-data-mongodb;5.0.0 +org.springframework.data:spring-data-neo4j;8.0.0 +org.springframework.data:spring-data-r2dbc;4.0.0 +org.springframework.data:spring-data-redis;4.0.0 +org.springframework.data:spring-data-relational;4.0.0 +org.springframework.data:spring-data-rest-core;5.0.0 +org.springframework.data:spring-data-rest-hal-explorer;5.0.0 +org.springframework.data:spring-data-rest-webmvc;5.0.0 +org.springframework.graphql:spring-graphql;2.0.0 +org.springframework.graphql:spring-graphql-test;2.0.0 +org.springframework.hateoas:spring-hateoas;3.0.0 +org.springframework.integration:spring-integration-amqp;7.0.0 +org.springframework.integration:spring-integration-bom;7.0.0 +org.springframework.integration:spring-integration-camel;7.0.0 +org.springframework.integration:spring-integration-cassandra;7.0.0 +org.springframework.integration:spring-integration-core;7.0.0 +org.springframework.integration:spring-integration-debezium;7.0.0 +org.springframework.integration:spring-integration-event;7.0.0 +org.springframework.integration:spring-integration-feed;7.0.0 +org.springframework.integration:spring-integration-file;7.0.0 +org.springframework.integration:spring-integration-ftp;7.0.0 +org.springframework.integration:spring-integration-graphql;7.0.0 +org.springframework.integration:spring-integration-groovy;7.0.0 +org.springframework.integration:spring-integration-hazelcast;7.0.0 +org.springframework.integration:spring-integration-http;7.0.0 +org.springframework.integration:spring-integration-ip;7.0.0 +org.springframework.integration:spring-integration-jdbc;7.0.0 +org.springframework.integration:spring-integration-jms;7.0.0 +org.springframework.integration:spring-integration-jmx;7.0.0 +org.springframework.integration:spring-integration-jpa;7.0.0 +org.springframework.integration:spring-integration-kafka;7.0.0 +org.springframework.integration:spring-integration-mail;7.0.0 +org.springframework.integration:spring-integration-mongodb;7.0.0 +org.springframework.integration:spring-integration-mqtt;7.0.0 +org.springframework.integration:spring-integration-r2dbc;7.0.0 +org.springframework.integration:spring-integration-redis;7.0.0 +org.springframework.integration:spring-integration-rsocket;7.0.0 +org.springframework.integration:spring-integration-scripting;7.0.0 +org.springframework.integration:spring-integration-sftp;7.0.0 +org.springframework.integration:spring-integration-smb;7.0.0 +org.springframework.integration:spring-integration-stomp;7.0.0 +org.springframework.integration:spring-integration-stream;7.0.0 +org.springframework.integration:spring-integration-syslog;7.0.0 +org.springframework.integration:spring-integration-test;7.0.0 +org.springframework.integration:spring-integration-test-support;7.0.0 +org.springframework.integration:spring-integration-webflux;7.0.0 +org.springframework.integration:spring-integration-websocket;7.0.0 +org.springframework.integration:spring-integration-ws;7.0.0 +org.springframework.integration:spring-integration-xml;7.0.0 +org.springframework.integration:spring-integration-xmpp;7.0.0 +org.springframework.integration:spring-integration-zeromq;7.0.0 +org.springframework.integration:spring-integration-zip;7.0.0 +org.springframework.integration:spring-integration-zookeeper;7.0.0 +org.springframework.kafka:spring-kafka;4.0.0 +org.springframework.kafka:spring-kafka-test;4.0.0 +org.springframework.ldap:spring-ldap-core;4.0.0 +org.springframework.ldap:spring-ldap-ldif-core;4.0.0 +org.springframework.ldap:spring-ldap-odm;4.0.0 +org.springframework.ldap:spring-ldap-test;4.0.0 +org.springframework.pulsar:spring-pulsar;2.0.0 +org.springframework.pulsar:spring-pulsar-bom;2.0.0 +org.springframework.pulsar:spring-pulsar-cache-provider;2.0.0 +org.springframework.pulsar:spring-pulsar-cache-provider-caffeine;2.0.0 +org.springframework.pulsar:spring-pulsar-test;2.0.0 +org.springframework.restdocs:spring-restdocs-asciidoctor;4.0.0 +org.springframework.restdocs:spring-restdocs-bom;4.0.0 +org.springframework.restdocs:spring-restdocs-core;4.0.0 +org.springframework.restdocs:spring-restdocs-mockmvc;4.0.0 +org.springframework.restdocs:spring-restdocs-webtestclient;4.0.0 +org.springframework.retry:spring-retry;2.0.12 +org.springframework.security:spring-security-access;7.0.0 +org.springframework.security:spring-security-acl;7.0.0 +org.springframework.security:spring-security-aspects;7.0.0 +org.springframework.security:spring-security-bom;7.0.0 +org.springframework.security:spring-security-cas;7.0.0 +org.springframework.security:spring-security-config;7.0.0 +org.springframework.security:spring-security-core;7.0.0 +org.springframework.security:spring-security-crypto;7.0.0 +org.springframework.security:spring-security-data;7.0.0 +org.springframework.security:spring-security-kerberos-client;7.0.0 +org.springframework.security:spring-security-kerberos-core;7.0.0 +org.springframework.security:spring-security-kerberos-test;7.0.0 +org.springframework.security:spring-security-kerberos-web;7.0.0 +org.springframework.security:spring-security-ldap;7.0.0 +org.springframework.security:spring-security-messaging;7.0.0 +org.springframework.security:spring-security-oauth2-authorization-server;7.0.0 +org.springframework.security:spring-security-oauth2-client;7.0.0 +org.springframework.security:spring-security-oauth2-core;7.0.0 +org.springframework.security:spring-security-oauth2-jose;7.0.0 +org.springframework.security:spring-security-oauth2-resource-server;7.0.0 +org.springframework.security:spring-security-rsocket;7.0.0 +org.springframework.security:spring-security-saml2-service-provider;7.0.0 +org.springframework.security:spring-security-taglibs;7.0.0 +org.springframework.security:spring-security-test;7.0.0 +org.springframework.security:spring-security-web;7.0.0 +org.springframework.security:spring-security-webauthn;7.0.0 +org.springframework.session:spring-session-bom;4.0.0 +org.springframework.session:spring-session-core;4.0.0 +org.springframework.session:spring-session-data-redis;4.0.0 +org.springframework.session:spring-session-jdbc;4.0.0 +org.springframework.vault:spring-vault-core;4.0.0 +org.springframework.ws:spring-ws-bom;5.0.0 +org.springframework.ws:spring-ws-core;5.0.0 +org.springframework.ws:spring-ws-security;5.0.0 +org.springframework.ws:spring-ws-support;5.0.0 +org.springframework.ws:spring-ws-test;5.0.0 +org.springframework.ws:spring-xml;5.0.0 +org.springframework:spring-aop;7.0.1 +org.springframework:spring-aspects;7.0.1 +org.springframework:spring-beans;7.0.1 +org.springframework:spring-context;7.0.1 +org.springframework:spring-context-indexer;7.0.1 +org.springframework:spring-context-support;7.0.1 +org.springframework:spring-core;7.0.1 +org.springframework:spring-core-test;7.0.1 +org.springframework:spring-expression;7.0.1 +org.springframework:spring-framework-bom;7.0.1 +org.springframework:spring-instrument;7.0.1 +org.springframework:spring-jdbc;7.0.1 +org.springframework:spring-jms;7.0.1 +org.springframework:spring-messaging;7.0.1 +org.springframework:spring-orm;7.0.1 +org.springframework:spring-oxm;7.0.1 +org.springframework:spring-r2dbc;7.0.1 +org.springframework:spring-test;7.0.1 +org.springframework:spring-tx;7.0.1 +org.springframework:spring-web;7.0.1 +org.springframework:spring-webflux;7.0.1 +org.springframework:spring-webmvc;7.0.1 +org.springframework:spring-websocket;7.0.1 +org.testcontainers:testcontainers;2.0.2 +org.testcontainers:testcontainers-activemq;2.0.2 +org.testcontainers:testcontainers-azure;2.0.2 +org.testcontainers:testcontainers-bom;2.0.2 +org.testcontainers:testcontainers-cassandra;2.0.2 +org.testcontainers:testcontainers-chromadb;2.0.2 +org.testcontainers:testcontainers-clickhouse;2.0.2 +org.testcontainers:testcontainers-cockroachdb;2.0.2 +org.testcontainers:testcontainers-consul;2.0.2 +org.testcontainers:testcontainers-couchbase;2.0.2 +org.testcontainers:testcontainers-cratedb;2.0.2 +org.testcontainers:testcontainers-database-commons;2.0.2 +org.testcontainers:testcontainers-databend;2.0.2 +org.testcontainers:testcontainers-db2;2.0.2 +org.testcontainers:testcontainers-elasticsearch;2.0.2 +org.testcontainers:testcontainers-gcloud;2.0.2 +org.testcontainers:testcontainers-grafana;2.0.2 +org.testcontainers:testcontainers-hivemq;2.0.2 +org.testcontainers:testcontainers-influxdb;2.0.2 +org.testcontainers:testcontainers-jdbc;2.0.2 +org.testcontainers:testcontainers-junit-jupiter;2.0.2 +org.testcontainers:testcontainers-k3s;2.0.2 +org.testcontainers:testcontainers-k6;2.0.2 +org.testcontainers:testcontainers-kafka;2.0.2 +org.testcontainers:testcontainers-ldap;2.0.2 +org.testcontainers:testcontainers-localstack;2.0.2 +org.testcontainers:testcontainers-mariadb;2.0.2 +org.testcontainers:testcontainers-milvus;2.0.2 +org.testcontainers:testcontainers-minio;2.0.2 +org.testcontainers:testcontainers-mockserver;2.0.2 +org.testcontainers:testcontainers-mongodb;2.0.2 +org.testcontainers:testcontainers-mssqlserver;2.0.2 +org.testcontainers:testcontainers-mysql;2.0.2 +org.testcontainers:testcontainers-neo4j;2.0.2 +org.testcontainers:testcontainers-nginx;2.0.2 +org.testcontainers:testcontainers-oceanbase;2.0.2 +org.testcontainers:testcontainers-ollama;2.0.2 +org.testcontainers:testcontainers-openfga;2.0.2 +org.testcontainers:testcontainers-oracle-free;2.0.2 +org.testcontainers:testcontainers-oracle-xe;2.0.2 +org.testcontainers:testcontainers-orientdb;2.0.2 +org.testcontainers:testcontainers-pinecone;2.0.2 +org.testcontainers:testcontainers-postgresql;2.0.2 +org.testcontainers:testcontainers-presto;2.0.2 +org.testcontainers:testcontainers-pulsar;2.0.2 +org.testcontainers:testcontainers-qdrant;2.0.2 +org.testcontainers:testcontainers-questdb;2.0.2 +org.testcontainers:testcontainers-r2dbc;2.0.2 +org.testcontainers:testcontainers-rabbitmq;2.0.2 +org.testcontainers:testcontainers-redpanda;2.0.2 +org.testcontainers:testcontainers-scylladb;2.0.2 +org.testcontainers:testcontainers-selenium;2.0.2 +org.testcontainers:testcontainers-solace;2.0.2 +org.testcontainers:testcontainers-solr;2.0.2 +org.testcontainers:testcontainers-spock;2.0.2 +org.testcontainers:testcontainers-tidb;2.0.2 +org.testcontainers:testcontainers-timeplus;2.0.2 +org.testcontainers:testcontainers-toxiproxy;2.0.2 +org.testcontainers:testcontainers-trino;2.0.2 +org.testcontainers:testcontainers-typesense;2.0.2 +org.testcontainers:testcontainers-vault;2.0.2 +org.testcontainers:testcontainers-weaviate;2.0.2 +org.testcontainers:testcontainers-yugabytedb;2.0.2 +org.thymeleaf.extras:thymeleaf-extras-springsecurity6;3.1.3.RELEASE +org.thymeleaf:thymeleaf;3.1.3.RELEASE +org.thymeleaf:thymeleaf-spring6;3.1.3.RELEASE +org.tmatesoft.svnkit:svnkit;1.10.11 +org.vibur:vibur-dbcp;26.0 +org.vibur:vibur-object-pool;26.0 +org.webjars:webjars-locator-core;0.59 +org.webjars:webjars-locator-lite;1.1.2 +org.wiremock:wiremock-standalone;3.13.2 +org.xerial:sqlite-jdbc;3.50.3.0 +org.xmlunit:xmlunit-assertj;2.10.4 +org.xmlunit:xmlunit-assertj3;2.10.4 +org.xmlunit:xmlunit-core;2.10.4 +org.xmlunit:xmlunit-jakarta-jaxb-impl;2.10.4 +org.xmlunit:xmlunit-legacy;2.10.4 +org.xmlunit:xmlunit-matchers;2.10.4 +org.xmlunit:xmlunit-placeholders;2.10.4 +org.yaml:snakeyaml;2.5 +redis.clients:jedis;7.0.0 +tools.jackson.core:jackson-core;3.0.2 +tools.jackson.core:jackson-databind;3.0.2 +tools.jackson.dataformat:jackson-dataformat-avro;3.0.2 +tools.jackson.dataformat:jackson-dataformat-cbor;3.0.2 +tools.jackson.dataformat:jackson-dataformat-csv;3.0.2 +tools.jackson.dataformat:jackson-dataformat-ion;3.0.2 +tools.jackson.dataformat:jackson-dataformat-properties;3.0.2 +tools.jackson.dataformat:jackson-dataformat-protobuf;3.0.2 +tools.jackson.dataformat:jackson-dataformat-smile;3.0.2 +tools.jackson.dataformat:jackson-dataformat-toml;3.0.2 +tools.jackson.dataformat:jackson-dataformat-xml;3.0.2 +tools.jackson.dataformat:jackson-dataformat-yaml;3.0.2 +tools.jackson.datatype:jackson-datatype-eclipse-collections;3.0.2 +tools.jackson.datatype:jackson-datatype-guava;3.0.2 +tools.jackson.datatype:jackson-datatype-hibernate4;3.0.2 +tools.jackson.datatype:jackson-datatype-hibernate5;3.0.2 +tools.jackson.datatype:jackson-datatype-hibernate5-jakarta;3.0.2 +tools.jackson.datatype:jackson-datatype-hibernate6;3.0.2 +tools.jackson.datatype:jackson-datatype-hibernate7;3.0.2 +tools.jackson.datatype:jackson-datatype-hppc;3.0.2 +tools.jackson.datatype:jackson-datatype-jakarta-jsonp;3.0.2 +tools.jackson.datatype:jackson-datatype-javax-money;3.0.2 +tools.jackson.datatype:jackson-datatype-jaxrs;3.0.2 +tools.jackson.datatype:jackson-datatype-joda;3.0.2 +tools.jackson.datatype:jackson-datatype-joda-money;3.0.2 +tools.jackson.datatype:jackson-datatype-json-org;3.0.2 +tools.jackson.datatype:jackson-datatype-jsr353;3.0.2 +tools.jackson.datatype:jackson-datatype-moneta;3.0.2 +tools.jackson.datatype:jackson-datatype-pcollections;3.0.2 +tools.jackson.jakarta.rs:jackson-jakarta-rs-base;3.0.2 +tools.jackson.jakarta.rs:jackson-jakarta-rs-cbor-provider;3.0.2 +tools.jackson.jakarta.rs:jackson-jakarta-rs-json-provider;3.0.2 +tools.jackson.jakarta.rs:jackson-jakarta-rs-smile-provider;3.0.2 +tools.jackson.jakarta.rs:jackson-jakarta-rs-xml-provider;3.0.2 +tools.jackson.jakarta.rs:jackson-jakarta-rs-yaml-provider;3.0.2 +tools.jackson.jaxrs:jackson-jaxrs-base;3.0.2 +tools.jackson.jaxrs:jackson-jaxrs-cbor-provider;3.0.2 +tools.jackson.jaxrs:jackson-jaxrs-json-provider;3.0.2 +tools.jackson.jaxrs:jackson-jaxrs-smile-provider;3.0.2 +tools.jackson.jaxrs:jackson-jaxrs-xml-provider;3.0.2 +tools.jackson.jaxrs:jackson-jaxrs-yaml-provider;3.0.2 +tools.jackson.jr:jackson-jr-all;3.0.2 +tools.jackson.jr:jackson-jr-annotation-support;3.0.2 +tools.jackson.jr:jackson-jr-extension-javatime;3.0.2 +tools.jackson.jr:jackson-jr-objects;3.0.2 +tools.jackson.jr:jackson-jr-retrofit2;3.0.2 +tools.jackson.jr:jackson-jr-stree;3.0.2 +tools.jackson.module:jackson-module-afterburner;3.0.2 +tools.jackson.module:jackson-module-android-record;3.0.2 +tools.jackson.module:jackson-module-blackbird;3.0.2 +tools.jackson.module:jackson-module-guice;3.0.2 +tools.jackson.module:jackson-module-guice7;3.0.2 +tools.jackson.module:jackson-module-jakarta-xmlbind-annotations;3.0.2 +tools.jackson.module:jackson-module-jaxb-annotations;3.0.2 +tools.jackson.module:jackson-module-kotlin;3.0.2 +tools.jackson.module:jackson-module-mrbean;3.0.2 +tools.jackson.module:jackson-module-no-ctor-deser;3.0.2 +tools.jackson.module:jackson-module-osgi;3.0.2 +tools.jackson.module:jackson-module-scala_2.12;3.0.2 +tools.jackson.module:jackson-module-scala_2.13;3.0.2 +tools.jackson.module:jackson-module-scala_3;3.0.2 +tools.jackson:jackson-bom;3.0.2 +wsdl4j:wsdl4j;1.6.3 diff --git a/sdk/spring/scripts/sync_external_dependencies.py b/sdk/spring/scripts/sync_external_dependencies.py index 34e6594899b2..8b67bafaf9ab 100644 --- a/sdk/spring/scripts/sync_external_dependencies.py +++ b/sdk/spring/scripts/sync_external_dependencies.py @@ -11,6 +11,8 @@ # Or `python .\sdk\spring\scripts\sync_external_dependencies.py --spring-boot-dependencies-version 2.7.18`. # 3.2 Sync Spring Boot 3.x, run command: `python .\sdk\spring\scripts\sync_external_dependencies.py -b 3.3.1 -sbmvn 3`. # Or `python .\sdk\spring\scripts\sync_external_dependencies.py --spring-boot-dependencies-version 3.3.1 --spring-boot-major-version-number 3`. +# 3.3 Sync Spring Boot 4.x, run command: `python .\sdk\spring\scripts\sync_external_dependencies.py -b 4.0.0 -sbmvn 4`. +# Or `python .\sdk\spring\scripts\sync_external_dependencies.py --spring-boot-dependencies-version 4.0.0 --spring-boot-major-version-number 4`. # 4. Then `eng/versioning/external_dependencies.txt` will be updated. # # Please refer to ./README.md to get more information about this script. @@ -23,7 +25,7 @@ from version_util import version_greater_than from log import log -from _constants import SPRING_BOOT_MAJOR_2_VERSION_NAME, SPRING_BOOT_MAJOR_3_VERSION_NAME, get_spring_boot_version_tag_prefix +from _constants import SPRING_BOOT_MAJOR_2_VERSION_NAME, SPRING_BOOT_MAJOR_3_VERSION_NAME, SPRING_BOOT_MAJOR_4_VERSION_NAME, get_spring_boot_version_tag_prefix EXTERNAL_DEPENDENCIES_FILE = 'eng/versioning/external_dependencies.txt' SKIP_IDS = [ @@ -50,7 +52,7 @@ def get_args(): '-sbmvn', '--spring-boot-major-version-number', type=str, - choices=[SPRING_BOOT_MAJOR_2_VERSION_NAME, SPRING_BOOT_MAJOR_3_VERSION_NAME], + choices=[SPRING_BOOT_MAJOR_2_VERSION_NAME, SPRING_BOOT_MAJOR_3_VERSION_NAME, SPRING_BOOT_MAJOR_4_VERSION_NAME], required=False, default=SPRING_BOOT_MAJOR_2_VERSION_NAME, help='Update the dependencies of Spring Boot major version. The default is ' + SPRING_BOOT_MAJOR_2_VERSION_NAME + '.' diff --git a/sdk/spring/scripts/version_util.py b/sdk/spring/scripts/version_util.py index 63583986b32a..a9886a817edb 100644 --- a/sdk/spring/scripts/version_util.py +++ b/sdk/spring/scripts/version_util.py @@ -11,20 +11,8 @@ def version_greater_than(source_version, target_version): source_version = format_version(source_version, SPECIAL_VERSION_LIST) target_version = format_version(target_version, SPECIAL_VERSION_LIST) - try: - sv = parse(source_version) - except: - # Handle invalid version formats (e.g., year-based versions with milestones like 2025.1.0-M4) - sv = None - try: - tv = parse(target_version) - except: - # Handle invalid version formats - tv = None - - # If both versions can't be parsed, use special comparison - if sv is None or tv is None: - return special_version_greater_than(source_version, target_version) + sv = parse(source_version) + tv = parse(target_version) if sv == tv: return True diff --git a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/pom.xml b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/pom.xml index 1f54bcb9040a..6a2b1c67e965 100644 --- a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/pom.xml +++ b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/pom.xml @@ -41,19 +41,19 @@ org.springframework.boot spring-boot-actuator-autoconfigure - 4.0.0-RC2 + 4.0.0 compile org.springframework.boot spring-boot-health - 4.0.0-RC2 + 4.0.0 true com.fasterxml.jackson.core jackson-databind - 2.20.1 + 2.20.1 com.azure.spring @@ -134,7 +134,7 @@ org.springframework.boot spring-boot-starter-test - 4.0.0-RC2 + 4.0.0 test @@ -142,7 +142,7 @@ org.mockito mockito-core - 5.20.0 + 5.20.0 test @@ -150,13 +150,13 @@ net.bytebuddy byte-buddy - 1.17.8 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.8 + 1.17.8 test @@ -166,7 +166,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.1 + 3.14.1 @@ -200,15 +200,15 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.6.2 + 3.6.2 - com.fasterxml.jackson.core:jackson-databind:[2.20.1] - org.springframework.boot:spring-boot-actuator:[4.0.0-RC2] - org.springframework.boot:spring-boot-actuator-autoconfigure:[4.0.0-RC2] - org.springframework.boot:spring-boot-health:[4.0.0-RC2] + com.fasterxml.jackson.core:jackson-databind:[2.20.1] + org.springframework.boot:spring-boot-actuator:[4.0.0] + org.springframework.boot:spring-boot-actuator-autoconfigure:[4.0.0] + org.springframework.boot:spring-boot-health:[4.0.0] @@ -217,7 +217,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -262,7 +262,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.2.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-actuator/pom.xml b/sdk/spring/spring-cloud-azure-actuator/pom.xml index bc6d1e55d8a0..8552dbd5e1ef 100644 --- a/sdk/spring/spring-cloud-azure-actuator/pom.xml +++ b/sdk/spring/spring-cloud-azure-actuator/pom.xml @@ -45,13 +45,13 @@ org.springframework.boot spring-boot-actuator - 4.0.0-RC2 + 4.0.0 compile org.springframework.boot spring-boot-health - 4.0.0-RC2 + 4.0.0 true @@ -122,7 +122,7 @@ org.springframework.boot spring-boot-starter-test - 4.0.0-RC2 + 4.0.0 test @@ -130,7 +130,7 @@ org.mockito mockito-core - 5.20.0 + 5.20.0 test @@ -138,13 +138,13 @@ net.bytebuddy byte-buddy - 1.17.8 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.8 + 1.17.8 test @@ -154,7 +154,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.1 + 3.14.1 @@ -185,13 +185,13 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.6.2 + 3.6.2 - org.springframework.boot:spring-boot-actuator:[4.0.0-RC2] - org.springframework.boot:spring-boot-health:[4.0.0-RC2] + org.springframework.boot:spring-boot-actuator:[4.0.0] + org.springframework.boot:spring-boot-health:[4.0.0] @@ -200,7 +200,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -245,7 +245,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.2.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-appconfiguration-config-web/pom.xml b/sdk/spring/spring-cloud-azure-appconfiguration-config-web/pom.xml index 0bd524eb10f0..1b4c6a4e951d 100644 --- a/sdk/spring/spring-cloud-azure-appconfiguration-config-web/pom.xml +++ b/sdk/spring/spring-cloud-azure-appconfiguration-config-web/pom.xml @@ -26,24 +26,24 @@ org.springframework.boot spring-boot-starter-webmvc - 4.0.0-RC2 + 4.0.0 org.springframework.boot spring-boot-starter-actuator - 4.0.0-RC2 + 4.0.0 true org.springframework.cloud spring-cloud-bus - 4.3.0 + 5.0.0 true org.springframework.boot spring-boot-starter-test - 4.0.0-RC2 + 4.0.0 test @@ -51,7 +51,7 @@ org.mockito mockito-core - 5.20.0 + 5.20.0 test @@ -59,13 +59,13 @@ net.bytebuddy byte-buddy - 1.17.8 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.8 + 1.17.8 test @@ -74,7 +74,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.1 + 3.14.1 -Xlint:deprecation @@ -113,14 +113,14 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.6.2 + 3.6.2 - org.springframework.boot:spring-boot-starter-actuator:[4.0.0-RC2] - org.springframework.boot:spring-boot-starter-webmvc:[4.0.0-RC2] - org.springframework.cloud:spring-cloud-bus:[4.3.0] + org.springframework.boot:spring-boot-starter-actuator:[4.0.0] + org.springframework.boot:spring-boot-starter-webmvc:[4.0.0] + org.springframework.cloud:spring-cloud-bus:[5.0.0] @@ -129,7 +129,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -177,7 +177,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.12.0 + 3.12.0 attach-javadocs @@ -193,7 +193,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.2.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-appconfiguration-config/pom.xml b/sdk/spring/spring-cloud-azure-appconfiguration-config/pom.xml index d3e6aa095ae0..59e3f2d435a7 100644 --- a/sdk/spring/spring-cloud-azure-appconfiguration-config/pom.xml +++ b/sdk/spring/spring-cloud-azure-appconfiguration-config/pom.xml @@ -21,29 +21,29 @@ org.springframework.boot spring-boot-autoconfigure - 4.0.0-RC2 + 4.0.0 org.springframework.boot spring-boot-configuration-processor - 4.0.0-RC2 + 4.0.0 true org.springframework.cloud spring-cloud-context - 4.3.0 + 5.0.0 org.springframework.boot spring-boot-actuator - 4.0.0-RC2 + 4.0.0 compile jakarta.annotation jakarta.annotation-api - 3.0.0 + 3.0.0 @@ -80,7 +80,7 @@ org.springframework.boot spring-boot-starter-test - 4.0.0-RC2 + 4.0.0 test @@ -88,7 +88,7 @@ org.mockito mockito-core - 5.20.0 + 5.20.0 test @@ -96,13 +96,13 @@ net.bytebuddy byte-buddy - 1.17.8 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.8 + 1.17.8 test + 3.0.2 provided @@ -121,7 +121,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.1 + 3.14.1 -Xlint:deprecation @@ -172,18 +172,18 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.6.2 + 3.6.2 - com.fasterxml.jackson.core:jackson-annotations:[2.20] - com.fasterxml.jackson.core:jackson-databind:[2.20.1] - org.springframework.boot:spring-boot-actuator:[4.0.0-RC2] - org.springframework.boot:spring-boot-autoconfigure:[4.0.0-RC2] - org.springframework.cloud:spring-cloud-context:[4.3.0] - jakarta.annotation:jakarta.annotation-api:[3.0.0] - org.springframework.boot:spring-boot-configuration-processor:[4.0.0-RC2] + com.fasterxml.jackson.core:jackson-annotations:[2.20] + com.fasterxml.jackson.core:jackson-databind:[2.20.1] + org.springframework.boot:spring-boot-actuator:[4.0.0] + org.springframework.boot:spring-boot-autoconfigure:[4.0.0] + org.springframework.cloud:spring-cloud-context:[5.0.0] + jakarta.annotation:jakarta.annotation-api:[3.0.0] + org.springframework.boot:spring-boot-configuration-processor:[4.0.0] @@ -192,7 +192,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml index c34a3d802bc4..10cfd099581a 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml +++ b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml @@ -86,13 +86,13 @@ org.springframework.boot spring-boot-kafka - 4.0.0-RC2 + 4.0.0 true org.springframework.cloud spring-cloud-starter-stream-kafka - 5.0.0-RC1 + 5.0.0 true @@ -100,19 +100,19 @@ io.lettuce lettuce-core - 6.8.1.RELEASE + 6.8.1.RELEASE true org.springframework.boot spring-boot-data-redis - 4.0.0-RC2 + 4.0.0 true org.springframework spring-tx - 7.0.0-RC3 + 7.0.1 true @@ -128,13 +128,13 @@ org.springframework.boot spring-boot-jms - 4.0.0-RC2 + 4.0.0 true org.messaginghub pooled-jms - 3.1.7 + 3.1.7 true @@ -158,7 +158,7 @@ org.springframework.boot spring-boot-jdbc - 4.0.0-RC2 + 4.0.0 true @@ -166,7 +166,7 @@ org.springframework.boot spring-boot-restclient - 4.0.0-RC2 + 4.0.0 true @@ -174,7 +174,7 @@ org.springframework.boot spring-boot-security - 4.0.0-RC2 + 4.0.0 true @@ -182,13 +182,13 @@ org.springframework.boot spring-boot-jackson - 4.0.0-RC2 + 4.0.0 true com.fasterxml.jackson.datatype jackson-datatype-jsr310 - 2.20.1 + 2.20.1 true @@ -338,25 +338,25 @@ org.springframework.boot spring-boot-autoconfigure - 4.0.0-RC2 + 4.0.0 org.springframework spring-context-support - 7.0.0-RC3 + 7.0.1 true org.springframework.boot spring-boot-actuator-autoconfigure - 4.0.0-RC2 + 4.0.0 true org.springframework.boot spring-boot-configuration-processor - 4.0.0-RC2 + 4.0.0 true @@ -364,25 +364,25 @@ org.springframework.security spring-security-oauth2-client - 7.0.0-RC3 + 7.0.0 true org.springframework.security spring-security-oauth2-resource-server - 7.0.0-RC3 + 7.0.0 true org.springframework.security spring-security-oauth2-jose - 7.0.0-RC3 + 7.0.0 true org.springframework.security spring-security-config - 7.0.0-RC3 + 7.0.0 true @@ -392,26 +392,26 @@ com.google.code.findbugs jsr305 - 3.0.2 + 3.0.2 provided jakarta.servlet jakarta.servlet-api - 6.1.0 + 6.1.0 true org.hibernate.validator hibernate-validator - 9.0.1.Final + 9.0.1.Final true jakarta.validation jakarta.validation-api - 3.1.1 + 3.1.1 @@ -425,31 +425,31 @@ org.springframework.boot spring-boot-security-oauth2-client - 4.0.0-RC2 + 4.0.0 test org.springframework.boot spring-boot-http-converter - 4.0.0-RC2 + 4.0.0 test org.springframework.boot spring-boot-starter-test - 4.0.0-RC2 + 4.0.0 test org.springframework spring-core-test - 7.0.0-RC3 + 7.0.1 test org.springframework.boot spring-boot-configuration-metadata - 4.0.0-RC2 + 4.0.0 test @@ -457,7 +457,7 @@ org.mockito mockito-core - 5.20.0 + 5.20.0 test @@ -465,27 +465,27 @@ net.bytebuddy byte-buddy - 1.17.8 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.8 + 1.17.8 test com.mysql mysql-connector-j - 9.4.0 + 9.5.0 test org.postgresql postgresql - 42.7.8 + 42.7.8 test @@ -496,7 +496,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.1 + 3.14.1 @@ -542,38 +542,38 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.6.2 + 3.6.2 com.azure:azure-servicebus-jms:[2.0.0] - com.mysql:mysql-connector-j:[9.4.0] - com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.20.1] - io.lettuce:lettuce-core:[6.8.1.RELEASE] - jakarta.servlet:jakarta.servlet-api:[6.1.0] - jakarta.validation:jakarta.validation-api:[3.1.1] - org.hibernate.validator:hibernate-validator:[9.0.1.Final] - org.messaginghub:pooled-jms:[3.1.7] - org.postgresql:postgresql:[42.7.8] - org.springframework.boot:spring-boot-actuator-autoconfigure:[4.0.0-RC2] - org.springframework.boot:spring-boot-autoconfigure:[4.0.0-RC2] - org.springframework.boot:spring-boot-configuration-processor:[4.0.0-RC2] - org.springframework.boot:spring-boot-data-redis:[4.0.0-RC2] - org.springframework.boot:spring-boot-http-converter:[4.0.0-RC2] - org.springframework.boot:spring-boot-kafka:[4.0.0-RC2] - org.springframework.boot:spring-boot-jackson:[4.0.0-RC2] - org.springframework.boot:spring-boot-jdbc:[4.0.0-RC2] - org.springframework.boot:spring-boot-jms:[4.0.0-RC2] - org.springframework.boot:spring-boot-restclient:[4.0.0-RC2] - org.springframework.boot:spring-boot-security:[4.0.0-RC2] - org.springframework.cloud:spring-cloud-starter-stream-kafka:[5.0.0-RC1] - org.springframework.security:spring-security-config:[7.0.0-RC3] - org.springframework.security:spring-security-oauth2-client:[7.0.0-RC3] - org.springframework.security:spring-security-oauth2-jose:[7.0.0-RC3] - org.springframework.security:spring-security-oauth2-resource-server:[7.0.0-RC3] - org.springframework:spring-context-support:[7.0.0-RC3] - org.springframework:spring-tx:[7.0.0-RC3] + com.mysql:mysql-connector-j:[9.5.0] + com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.20.1] + io.lettuce:lettuce-core:[6.8.1.RELEASE] + jakarta.servlet:jakarta.servlet-api:[6.1.0] + jakarta.validation:jakarta.validation-api:[3.1.1] + org.hibernate.validator:hibernate-validator:[9.0.1.Final] + org.messaginghub:pooled-jms:[3.1.7] + org.postgresql:postgresql:[42.7.8] + org.springframework.boot:spring-boot-actuator-autoconfigure:[4.0.0] + org.springframework.boot:spring-boot-autoconfigure:[4.0.0] + org.springframework.boot:spring-boot-configuration-processor:[4.0.0] + org.springframework.boot:spring-boot-data-redis:[4.0.0] + org.springframework.boot:spring-boot-http-converter:[4.0.0] + org.springframework.boot:spring-boot-kafka:[4.0.0] + org.springframework.boot:spring-boot-jackson:[4.0.0] + org.springframework.boot:spring-boot-jdbc:[4.0.0] + org.springframework.boot:spring-boot-jms:[4.0.0] + org.springframework.boot:spring-boot-restclient:[4.0.0] + org.springframework.boot:spring-boot-security:[4.0.0] + org.springframework.cloud:spring-cloud-starter-stream-kafka:[5.0.0] + org.springframework.security:spring-security-config:[7.0.0] + org.springframework.security:spring-security-oauth2-client:[7.0.0] + org.springframework.security:spring-security-oauth2-jose:[7.0.0] + org.springframework.security:spring-security-oauth2-resource-server:[7.0.0] + org.springframework:spring-context-support:[7.0.1] + org.springframework:spring-tx:[7.0.1] @@ -582,7 +582,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 diff --git a/sdk/spring/spring-cloud-azure-core/pom.xml b/sdk/spring/spring-cloud-azure-core/pom.xml index 7ef2433b0771..b3236db5a4c9 100644 --- a/sdk/spring/spring-cloud-azure-core/pom.xml +++ b/sdk/spring/spring-cloud-azure-core/pom.xml @@ -40,7 +40,7 @@ org.springframework spring-context - 7.0.0-RC3 + 7.0.1 com.azure @@ -98,7 +98,7 @@ org.mockito mockito-core - 5.20.0 + 5.20.0 test @@ -106,25 +106,25 @@ net.bytebuddy byte-buddy - 1.17.8 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.8 + 1.17.8 test org.junit.jupiter junit-jupiter - 6.0.1 + 6.0.1 test org.springframework spring-test - 7.0.0-RC3 + 7.0.1 test @@ -135,7 +135,7 @@ com.google.code.findbugs jsr305 - 3.0.2 + 3.0.2 provided @@ -145,7 +145,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.1 + 3.14.1 @@ -176,12 +176,12 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.6.2 + 3.6.2 - org.springframework:spring-context:[7.0.0-RC3] + org.springframework:spring-context:[7.0.1] @@ -190,7 +190,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 diff --git a/sdk/spring/spring-cloud-azure-docker-compose/pom.xml b/sdk/spring/spring-cloud-azure-docker-compose/pom.xml index eae1aee6c469..b514c2dfa6e6 100644 --- a/sdk/spring/spring-cloud-azure-docker-compose/pom.xml +++ b/sdk/spring/spring-cloud-azure-docker-compose/pom.xml @@ -81,7 +81,7 @@ org.springframework.boot spring-boot-docker-compose - 4.0.0-RC2 + 4.0.0 + 3.0.2 provided org.springframework.boot spring-boot-test - 4.0.0-RC2 + 4.0.0 test org.springframework spring-test - 7.0.0-RC3 + 7.0.1 test org.junit.jupiter junit-jupiter - 6.0.1 + 6.0.1 test org.assertj assertj-core - 3.27.6 + 3.27.6 test @@ -124,7 +124,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.1 + 3.14.1 @@ -155,12 +155,12 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.6.2 + 3.6.2 - org.springframework.boot:spring-boot-docker-compose:[4.0.0-RC2] + org.springframework.boot:spring-boot-docker-compose:[4.0.0] @@ -169,7 +169,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -214,7 +214,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.2.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-feature-management-web/pom.xml b/sdk/spring/spring-cloud-azure-feature-management-web/pom.xml index 2647f98dd721..bd874ef095c7 100644 --- a/sdk/spring/spring-cloud-azure-feature-management-web/pom.xml +++ b/sdk/spring/spring-cloud-azure-feature-management-web/pom.xml @@ -29,12 +29,12 @@ org.springframework spring-web - 7.0.0-RC3 + 7.0.1 org.springframework spring-webmvc - 7.0.0-RC3 + 7.0.1 com.azure.spring @@ -44,26 +44,26 @@ jakarta.servlet jakarta.servlet-api - 6.1.0 + 6.1.0 provided org.springframework.boot spring-boot-starter-test - 4.0.0-RC2 + 4.0.0 test net.bytebuddy byte-buddy - 1.17.8 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.8 + 1.17.8 test @@ -72,7 +72,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -88,7 +88,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.1 + 3.14.1 @@ -122,15 +122,15 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.6.2 + 3.6.2 com.azure.spring:spring-cloud-azure-feature-management:[6.1.0-beta.1] - jakarta.servlet:jakarta.servlet-api:[6.1.0] - org.springframework:spring-web:[7.0.0-RC3] - org.springframework:spring-webmvc:[7.0.0-RC3] + jakarta.servlet:jakarta.servlet-api:[6.1.0] + org.springframework:spring-web:[7.0.1] + org.springframework:spring-webmvc:[7.0.1] diff --git a/sdk/spring/spring-cloud-azure-feature-management/pom.xml b/sdk/spring/spring-cloud-azure-feature-management/pom.xml index c3e670a71976..f962ad02c398 100644 --- a/sdk/spring/spring-cloud-azure-feature-management/pom.xml +++ b/sdk/spring/spring-cloud-azure-feature-management/pom.xml @@ -29,12 +29,12 @@ org.springframework spring-context - 7.0.0-RC3 + 7.0.1 org.springframework.boot spring-boot-starter - 4.0.0-RC2 + 4.0.0 ch.qos.logback @@ -45,35 +45,35 @@ org.springframework.boot spring-boot-configuration-processor - 4.0.0-RC2 + 4.0.0 true com.fasterxml.jackson.core jackson-annotations - 2.20 + 2.20 com.fasterxml.jackson.core jackson-databind - 2.20.1 + 2.20.1 io.projectreactor.netty reactor-netty - 1.3.0-RC1 + 1.3.0 org.springframework.boot spring-boot-starter-test - 4.0.0-RC2 + 4.0.0 test org.mockito mockito-core - 5.20.0 + 5.20.0 test @@ -81,19 +81,19 @@ net.bytebuddy byte-buddy - 1.17.8 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.8 + 1.17.8 test ch.qos.logback logback-classic - 1.5.20 + 1.5.21 test @@ -102,7 +102,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -118,7 +118,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.1 + 3.14.1 @@ -161,17 +161,17 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.6.2 + 3.6.2 - com.fasterxml.jackson.core:jackson-annotations:[2.20] - com.fasterxml.jackson.core:jackson-databind:[2.20.1] - io.projectreactor.netty:reactor-netty:[1.3.0-RC1] - org.springframework.boot:spring-boot-configuration-processor:[4.0.0-RC2] - org.springframework.boot:spring-boot-starter:[4.0.0-RC2] - org.springframework:spring-context:[7.0.0-RC3] + com.fasterxml.jackson.core:jackson-annotations:[2.20] + com.fasterxml.jackson.core:jackson-databind:[2.20.1] + io.projectreactor.netty:reactor-netty:[1.3.0] + org.springframework.boot:spring-boot-configuration-processor:[4.0.0] + org.springframework.boot:spring-boot-starter:[4.0.0] + org.springframework:spring-context:[7.0.1] diff --git a/sdk/spring/spring-cloud-azure-integration-test-appconfiguration-config/pom.xml b/sdk/spring/spring-cloud-azure-integration-test-appconfiguration-config/pom.xml index aec66b0f6c01..2c4095570cbe 100644 --- a/sdk/spring/spring-cloud-azure-integration-test-appconfiguration-config/pom.xml +++ b/sdk/spring/spring-cloud-azure-integration-test-appconfiguration-config/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 4.0.0-RC2 + 4.0.0 com.azure.spring @@ -30,7 +30,7 @@ org.springframework.boot spring-boot-starter-test - 4.0.0-RC2 + 4.0.0 test @@ -39,7 +39,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.5.4 + 3.5.4 default diff --git a/sdk/spring/spring-cloud-azure-integration-tests/pom.xml b/sdk/spring/spring-cloud-azure-integration-tests/pom.xml index c0ab0483a786..ed5a3dc9c7e2 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 - 4.0.0-RC2 + 4.0.0 @@ -107,7 +107,7 @@ org.springframework.cloud spring-cloud-starter-stream-kafka - 5.0.0-RC1 + 5.0.0 org.springframework.boot @@ -142,7 +142,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.5.4 + 3.5.4 default diff --git a/sdk/spring/spring-cloud-azure-resourcemanager/pom.xml b/sdk/spring/spring-cloud-azure-resourcemanager/pom.xml index 9a791d3c427c..5e0e646c913a 100644 --- a/sdk/spring/spring-cloud-azure-resourcemanager/pom.xml +++ b/sdk/spring/spring-cloud-azure-resourcemanager/pom.xml @@ -53,7 +53,7 @@ org.mockito mockito-core - 5.20.0 + 5.20.0 test @@ -61,25 +61,25 @@ net.bytebuddy byte-buddy - 1.17.8 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.8 + 1.17.8 test org.junit.jupiter junit-jupiter - 6.0.1 + 6.0.1 test org.springframework spring-test - 7.0.0-RC3 + 7.0.1 test @@ -90,7 +90,7 @@ com.google.code.findbugs jsr305 - 3.0.2 + 3.0.2 provided @@ -100,7 +100,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.1 + 3.14.1 @@ -131,7 +131,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -176,7 +176,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.2.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-service/pom.xml b/sdk/spring/spring-cloud-azure-service/pom.xml index 7ca858176b3b..486dedff8cc5 100644 --- a/sdk/spring/spring-cloud-azure-service/pom.xml +++ b/sdk/spring/spring-cloud-azure-service/pom.xml @@ -116,7 +116,7 @@ org.apache.kafka kafka-clients - 4.1.0 + 4.1.1 true @@ -131,7 +131,7 @@ org.mockito mockito-core - 5.20.0 + 5.20.0 test @@ -139,25 +139,25 @@ net.bytebuddy byte-buddy - 1.17.8 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.8 + 1.17.8 test org.junit.jupiter junit-jupiter - 6.0.1 + 6.0.1 test org.springframework spring-test - 7.0.0-RC3 + 7.0.1 test @@ -168,7 +168,7 @@ com.google.code.findbugs jsr305 - 3.0.2 + 3.0.2 provided @@ -178,7 +178,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.1 + 3.14.1 @@ -209,13 +209,13 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.6.2 + 3.6.2 - org.apache.kafka:kafka-clients:[4.1.0] - org.postgresql:postgresql:[42.7.8] + org.apache.kafka:kafka-clients:[4.1.1] + org.postgresql:postgresql:[42.7.8] com.nimbusds:nimbus-jose-jwt:[9.37.3] @@ -225,7 +225,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 diff --git a/sdk/spring/spring-cloud-azure-starter-active-directory-b2c/pom.xml b/sdk/spring/spring-cloud-azure-starter-active-directory-b2c/pom.xml index 176e7e0c84ab..963233cade39 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 @@ -95,22 +95,22 @@ org.springframework.security spring-security-config - 7.0.0-RC3 + 7.0.0 org.springframework.security spring-security-oauth2-client - 7.0.0-RC3 + 7.0.0 org.springframework.security spring-security-oauth2-jose - 7.0.0-RC3 + 7.0.0 org.springframework.security spring-security-oauth2-resource-server - 7.0.0-RC3 + 7.0.0 @@ -119,7 +119,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -127,7 +127,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -135,7 +135,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -151,7 +151,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -199,7 +199,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.2.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-active-directory/pom.xml b/sdk/spring/spring-cloud-azure-starter-active-directory/pom.xml index 31fc942e4e0c..7a9ebb483ba0 100644 --- a/sdk/spring/spring-cloud-azure-starter-active-directory/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-active-directory/pom.xml @@ -94,17 +94,17 @@ org.springframework.security spring-security-web - 7.0.0-RC3 + 7.0.0 org.springframework.security spring-security-config - 7.0.0-RC3 + 7.0.0 com.nimbusds nimbus-jose-jwt - 9.37.3 + 9.37.3 @@ -113,7 +113,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -121,7 +121,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -129,7 +129,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -145,7 +145,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -193,7 +193,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.2.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-actuator/pom.xml b/sdk/spring/spring-cloud-azure-starter-actuator/pom.xml index 828c133517a8..769c7b02b944 100644 --- a/sdk/spring/spring-cloud-azure-starter-actuator/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-actuator/pom.xml @@ -99,7 +99,7 @@ org.springframework.boot spring-boot-starter-actuator - 4.0.0-RC2 + 4.0.0 @@ -108,7 +108,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -116,7 +116,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -124,7 +124,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -140,7 +140,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -188,7 +188,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.2.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-appconfiguration-config/pom.xml b/sdk/spring/spring-cloud-azure-starter-appconfiguration-config/pom.xml index a2f2eca6dc8a..975c6017f6b1 100644 --- a/sdk/spring/spring-cloud-azure-starter-appconfiguration-config/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-appconfiguration-config/pom.xml @@ -102,7 +102,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -110,7 +110,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -118,7 +118,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -134,7 +134,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -185,7 +185,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.2.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-appconfiguration/pom.xml b/sdk/spring/spring-cloud-azure-starter-appconfiguration/pom.xml index 5b7e91306713..771ad5683c21 100644 --- a/sdk/spring/spring-cloud-azure-starter-appconfiguration/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-appconfiguration/pom.xml @@ -103,7 +103,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -111,7 +111,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -119,7 +119,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -135,7 +135,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -183,7 +183,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.2.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-cosmos/pom.xml b/sdk/spring/spring-cloud-azure-starter-cosmos/pom.xml index c0000d2c500c..5ab6fbbb88f2 100644 --- a/sdk/spring/spring-cloud-azure-starter-cosmos/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-cosmos/pom.xml @@ -103,7 +103,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -111,7 +111,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -119,7 +119,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -135,7 +135,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -183,7 +183,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.2.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-data-cosmos/pom.xml b/sdk/spring/spring-cloud-azure-starter-data-cosmos/pom.xml index 4fc0ec3633cb..d151888501e5 100644 --- a/sdk/spring/spring-cloud-azure-starter-data-cosmos/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-data-cosmos/pom.xml @@ -103,7 +103,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -111,7 +111,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -119,7 +119,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -135,7 +135,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -183,7 +183,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.2.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-data-redis-lettuce/pom.xml b/sdk/spring/spring-cloud-azure-starter-data-redis-lettuce/pom.xml index 9f4b6dd42bdb..c5e31d62f20c 100644 --- a/sdk/spring/spring-cloud-azure-starter-data-redis-lettuce/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-data-redis-lettuce/pom.xml @@ -95,13 +95,13 @@ org.springframework.data spring-data-redis - 3.5.3 + 4.0.0 io.lettuce lettuce-core - 6.8.1.RELEASE + 6.8.1.RELEASE true @@ -118,7 +118,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -126,7 +126,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -134,7 +134,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -150,7 +150,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -198,7 +198,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.2.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-eventgrid/pom.xml b/sdk/spring/spring-cloud-azure-starter-eventgrid/pom.xml index 88606ed94052..1b3d1af35c1e 100644 --- a/sdk/spring/spring-cloud-azure-starter-eventgrid/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-eventgrid/pom.xml @@ -105,7 +105,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -113,7 +113,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -121,7 +121,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -137,7 +137,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -185,7 +185,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.2.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-eventhubs/pom.xml b/sdk/spring/spring-cloud-azure-starter-eventhubs/pom.xml index ba8d2d0e7229..b14f0101e3b4 100644 --- a/sdk/spring/spring-cloud-azure-starter-eventhubs/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-eventhubs/pom.xml @@ -111,7 +111,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -119,7 +119,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -127,7 +127,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -143,7 +143,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -191,7 +191,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.2.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-integration-eventhubs/pom.xml b/sdk/spring/spring-cloud-azure-starter-integration-eventhubs/pom.xml index de34805f7a1e..a4b1bad5035d 100644 --- a/sdk/spring/spring-cloud-azure-starter-integration-eventhubs/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-integration-eventhubs/pom.xml @@ -95,7 +95,7 @@ org.springframework.boot spring-boot-starter-integration - 4.0.0-RC2 + 4.0.0 com.azure.spring @@ -109,7 +109,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -117,7 +117,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -125,7 +125,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -141,7 +141,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -189,7 +189,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.2.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-integration-servicebus/pom.xml b/sdk/spring/spring-cloud-azure-starter-integration-servicebus/pom.xml index ea4eba599fd9..e49c9f6c7994 100644 --- a/sdk/spring/spring-cloud-azure-starter-integration-servicebus/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-integration-servicebus/pom.xml @@ -95,7 +95,7 @@ org.springframework.boot spring-boot-starter-integration - 4.0.0-RC2 + 4.0.0 com.azure.spring @@ -109,7 +109,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -117,7 +117,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -125,7 +125,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -141,7 +141,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -189,7 +189,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.2.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-integration-storage-queue/pom.xml b/sdk/spring/spring-cloud-azure-starter-integration-storage-queue/pom.xml index 7e8c9e42328a..b6e11599c5df 100644 --- a/sdk/spring/spring-cloud-azure-starter-integration-storage-queue/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-integration-storage-queue/pom.xml @@ -98,7 +98,7 @@ org.springframework.boot spring-boot-starter-integration - 4.0.0-RC2 + 4.0.0 com.azure.spring @@ -112,7 +112,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -120,7 +120,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -128,7 +128,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -144,7 +144,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -192,7 +192,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.2.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-jdbc-mysql/pom.xml b/sdk/spring/spring-cloud-azure-starter-jdbc-mysql/pom.xml index 3547883db3e2..368ea925b3f0 100644 --- a/sdk/spring/spring-cloud-azure-starter-jdbc-mysql/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-jdbc-mysql/pom.xml @@ -101,7 +101,7 @@ com.mysql mysql-connector-j - 9.4.0 + 9.5.0 @@ -110,7 +110,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -118,7 +118,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -126,7 +126,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -142,7 +142,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -190,7 +190,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.2.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-jdbc-postgresql/pom.xml b/sdk/spring/spring-cloud-azure-starter-jdbc-postgresql/pom.xml index fd7e24f31097..d567ba95bb13 100644 --- a/sdk/spring/spring-cloud-azure-starter-jdbc-postgresql/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-jdbc-postgresql/pom.xml @@ -101,7 +101,7 @@ org.postgresql postgresql - 42.7.8 + 42.7.8 @@ -110,7 +110,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -118,7 +118,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -126,7 +126,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -142,7 +142,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -190,7 +190,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.2.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-keyvault-certificates/pom.xml b/sdk/spring/spring-cloud-azure-starter-keyvault-certificates/pom.xml index 4f0fe5b21b93..d64fcf6b0694 100644 --- a/sdk/spring/spring-cloud-azure-starter-keyvault-certificates/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-keyvault-certificates/pom.xml @@ -103,7 +103,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -111,7 +111,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -119,7 +119,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -135,7 +135,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -183,7 +183,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.2.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-keyvault-jca/pom.xml b/sdk/spring/spring-cloud-azure-starter-keyvault-jca/pom.xml index 80773b472706..463d4a2edfc2 100644 --- a/sdk/spring/spring-cloud-azure-starter-keyvault-jca/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-keyvault-jca/pom.xml @@ -103,7 +103,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -111,7 +111,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -119,7 +119,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -135,7 +135,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -183,7 +183,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.2.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-keyvault-secrets/pom.xml b/sdk/spring/spring-cloud-azure-starter-keyvault-secrets/pom.xml index cf7fd6ad6fb9..a44bbda6e4bf 100644 --- a/sdk/spring/spring-cloud-azure-starter-keyvault-secrets/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-keyvault-secrets/pom.xml @@ -103,7 +103,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -111,7 +111,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -119,7 +119,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -135,7 +135,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -183,7 +183,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.2.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-keyvault/pom.xml b/sdk/spring/spring-cloud-azure-starter-keyvault/pom.xml index 68f2915232ec..ade9361a79b0 100644 --- a/sdk/spring/spring-cloud-azure-starter-keyvault/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-keyvault/pom.xml @@ -108,7 +108,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -116,7 +116,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -124,7 +124,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -140,7 +140,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -188,7 +188,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.2.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-monitor-test/pom.xml b/sdk/spring/spring-cloud-azure-starter-monitor-test/pom.xml index 0ea0ee440840..f40b9a1004c5 100644 --- a/sdk/spring/spring-cloud-azure-starter-monitor-test/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-monitor-test/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 4.0.0-RC2 + 4.0.0 @@ -48,23 +48,23 @@ org.springframework.boot spring-boot-starter-webmvc - 4.0.0-RC2 + 4.0.0 org.springframework.boot spring-boot-starter-data-jdbc - 4.0.0-RC2 + 4.0.0 org.springframework.boot spring-boot-starter-test - 4.0.0-RC2 + 4.0.0 test org.springframework.boot spring-boot-resttestclient - 4.0.0-RC2 + 4.0.0 test diff --git a/sdk/spring/spring-cloud-azure-starter-monitor/pom.xml b/sdk/spring/spring-cloud-azure-starter-monitor/pom.xml index 0a385980184f..3c70f7b99a25 100644 --- a/sdk/spring/spring-cloud-azure-starter-monitor/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-monitor/pom.xml @@ -87,7 +87,7 @@ org.springframework.boot spring-boot-starter - 4.0.0-RC2 + 4.0.0 provided @@ -160,13 +160,13 @@ org.slf4j slf4j-simple - 2.0.17 + 2.0.17 test org.springframework.boot spring-boot-starter-test - 4.0.0-RC2 + 4.0.0 test @@ -178,7 +178,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.1 + 3.14.1 @@ -222,7 +222,7 @@ io.opentelemetry:opentelemetry-sdk-metrics:[1.49.0] io.opentelemetry:opentelemetry-sdk-logs:[1.49.0] io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:[1.49.0] - org.springframework.boot:spring-boot-starter:[4.0.0-RC2] + org.springframework.boot:spring-boot-starter:[4.0.0] diff --git a/sdk/spring/spring-cloud-azure-starter-servicebus-jms/pom.xml b/sdk/spring/spring-cloud-azure-starter-servicebus-jms/pom.xml index 4301713ba787..5a0aa7f8d90f 100644 --- a/sdk/spring/spring-cloud-azure-starter-servicebus-jms/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-servicebus-jms/pom.xml @@ -96,12 +96,12 @@ org.springframework spring-jms - 7.0.0-RC3 + 7.0.1 org.messaginghub pooled-jms - 3.1.7 + 3.1.7 com.azure @@ -136,37 +136,37 @@ currently released version and a lower version is resolved. --> io.netty netty-buffer - 4.2.7.Final + 4.2.7.Final io.netty netty-common - 4.2.7.Final + 4.2.7.Final io.netty netty-handler - 4.2.7.Final + 4.2.7.Final io.netty netty-transport - 4.2.7.Final + 4.2.7.Final io.netty netty-transport-native-epoll - 4.2.7.Final + 4.2.7.Final io.netty netty-transport-native-kqueue - 4.2.7.Final + 4.2.7.Final io.netty netty-codec-http - 4.2.7.Final + 4.2.7.Final com.azure @@ -180,7 +180,7 @@ currently released version and a lower version is resolved. --> com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -188,7 +188,7 @@ currently released version and a lower version is resolved. --> com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -196,7 +196,7 @@ currently released version and a lower version is resolved. --> org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -212,7 +212,7 @@ currently released version and a lower version is resolved. --> org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -260,7 +260,7 @@ currently released version and a lower version is resolved. --> org.apache.maven.plugins maven-antrun-plugin - 3.2.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-servicebus/pom.xml b/sdk/spring/spring-cloud-azure-starter-servicebus/pom.xml index d28744b094b5..23cad108c58d 100644 --- a/sdk/spring/spring-cloud-azure-starter-servicebus/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-servicebus/pom.xml @@ -104,7 +104,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -112,7 +112,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -120,7 +120,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -136,7 +136,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -184,7 +184,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.2.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-storage-blob/pom.xml b/sdk/spring/spring-cloud-azure-starter-storage-blob/pom.xml index 2e1f2a760cea..d976c14ff75e 100644 --- a/sdk/spring/spring-cloud-azure-starter-storage-blob/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-storage-blob/pom.xml @@ -104,7 +104,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -112,7 +112,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -120,7 +120,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -136,7 +136,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -184,7 +184,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.2.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-storage-file-share/pom.xml b/sdk/spring/spring-cloud-azure-starter-storage-file-share/pom.xml index 1520ec1065ee..9188f2c589e4 100644 --- a/sdk/spring/spring-cloud-azure-starter-storage-file-share/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-storage-file-share/pom.xml @@ -104,7 +104,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -112,7 +112,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -120,7 +120,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -136,7 +136,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -184,7 +184,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.2.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-storage-queue/pom.xml b/sdk/spring/spring-cloud-azure-starter-storage-queue/pom.xml index 6662f8aa3c85..9a3263708280 100644 --- a/sdk/spring/spring-cloud-azure-starter-storage-queue/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-storage-queue/pom.xml @@ -107,7 +107,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -115,7 +115,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -123,7 +123,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -139,7 +139,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -187,7 +187,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.2.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-storage/pom.xml b/sdk/spring/spring-cloud-azure-starter-storage/pom.xml index e691d6405a21..809feecc49c5 100644 --- a/sdk/spring/spring-cloud-azure-starter-storage/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-storage/pom.xml @@ -110,7 +110,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -118,7 +118,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -126,7 +126,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -142,7 +142,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -190,7 +190,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.2.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-stream-eventhubs/pom.xml b/sdk/spring/spring-cloud-azure-starter-stream-eventhubs/pom.xml index 2efee45c7ff5..cb107d5d1705 100644 --- a/sdk/spring/spring-cloud-azure-starter-stream-eventhubs/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-stream-eventhubs/pom.xml @@ -99,7 +99,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -107,7 +107,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -115,7 +115,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -131,7 +131,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -179,7 +179,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.2.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter-stream-servicebus/pom.xml b/sdk/spring/spring-cloud-azure-starter-stream-servicebus/pom.xml index 20e56584f39a..04fdf7bfa21c 100644 --- a/sdk/spring/spring-cloud-azure-starter-stream-servicebus/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-stream-servicebus/pom.xml @@ -99,7 +99,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -107,7 +107,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -115,7 +115,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -131,7 +131,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -179,7 +179,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.2.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-starter/pom.xml b/sdk/spring/spring-cloud-azure-starter/pom.xml index 6eb7d159daae..398b4c1dcf05 100644 --- a/sdk/spring/spring-cloud-azure-starter/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter/pom.xml @@ -89,7 +89,7 @@ org.springframework.boot spring-boot-starter - 4.0.0-RC2 + 4.0.0 com.azure.spring @@ -103,7 +103,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.2.0 true @@ -111,7 +111,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.30.0 true @@ -119,7 +119,7 @@ org.revapi revapi-maven-plugin - 0.14.6 + 0.14.6 true @@ -135,7 +135,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -192,7 +192,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.2.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-cloud-azure-stream-binder-eventhubs-core/pom.xml b/sdk/spring/spring-cloud-azure-stream-binder-eventhubs-core/pom.xml index 4ab14ba21534..2e09532d69d7 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 @@ -47,7 +47,7 @@ spring-integration-core - 4.3.0 + 5.0.0 @@ -59,14 +59,14 @@ org.springframework.boot spring-boot-configuration-processor - 4.0.0-RC2 + 4.0.0 true org.mockito mockito-core - 5.20.0 + 5.20.0 test @@ -74,25 +74,25 @@ net.bytebuddy byte-buddy - 1.17.8 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.8 + 1.17.8 test org.junit.jupiter junit-jupiter - 6.0.1 + 6.0.1 test org.springframework spring-test - 7.0.0-RC3 + 7.0.1 test @@ -102,19 +102,19 @@ com.google.code.findbugs jsr305 - 3.0.2 + 3.0.2 provided org.springframework.boot spring-boot-test - 4.0.0-RC2 + 4.0.0 test org.assertj assertj-core - 3.27.6 + 3.27.6 test @@ -123,7 +123,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.1 + 3.14.1 @@ -166,13 +166,13 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.6.2 + 3.6.2 - org.springframework.boot:spring-boot-configuration-processor:[4.0.0-RC2] - org.springframework.cloud:spring-cloud-stream:[4.3.0] + org.springframework.boot:spring-boot-configuration-processor:[4.0.0] + org.springframework.cloud:spring-cloud-stream:[5.0.0] @@ -181,7 +181,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 diff --git a/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/pom.xml b/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/pom.xml index 6f1086970efe..41842d93e71c 100644 --- a/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/pom.xml +++ b/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/pom.xml @@ -57,7 +57,7 @@ org.springframework.boot spring-boot-starter-actuator - 4.0.0-RC2 + 4.0.0 true @@ -70,7 +70,7 @@ org.springframework.cloud spring-cloud-stream-test-binder - 4.3.0 + 5.0.0 test @@ -82,7 +82,7 @@ org.springframework.boot spring-boot-starter-test - 4.0.0-RC2 + 4.0.0 test @@ -90,13 +90,13 @@ net.bytebuddy byte-buddy - 1.17.8 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.8 + 1.17.8 test + 3.0.2 provided @@ -113,7 +113,7 @@ org.mockito mockito-core - 5.20.0 + 5.20.0 test @@ -123,7 +123,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.1 + 3.14.1 @@ -157,12 +157,12 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.6.2 + 3.6.2 - org.springframework.boot:spring-boot-starter-actuator:[4.0.0-RC2] + org.springframework.boot:spring-boot-starter-actuator:[4.0.0] @@ -171,7 +171,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 diff --git a/sdk/spring/spring-cloud-azure-stream-binder-servicebus-core/pom.xml b/sdk/spring/spring-cloud-azure-stream-binder-servicebus-core/pom.xml index 59d45b84a014..d9f657d34acf 100644 --- a/sdk/spring/spring-cloud-azure-stream-binder-servicebus-core/pom.xml +++ b/sdk/spring/spring-cloud-azure-stream-binder-servicebus-core/pom.xml @@ -41,7 +41,7 @@ org.springframework.cloud spring-cloud-stream - 4.3.0 + 5.0.0 @@ -57,14 +57,14 @@ org.springframework.boot spring-boot-configuration-processor - 4.0.0-RC2 + 4.0.0 true org.mockito mockito-core - 5.20.0 + 5.20.0 test @@ -72,25 +72,25 @@ net.bytebuddy byte-buddy - 1.17.8 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.8 + 1.17.8 test org.junit.jupiter junit-jupiter - 6.0.1 + 6.0.1 test org.springframework spring-test - 7.0.0-RC3 + 7.0.1 test @@ -100,19 +100,19 @@ com.google.code.findbugs jsr305 - 3.0.2 + 3.0.2 provided org.springframework.boot spring-boot-test - 4.0.0-RC2 + 4.0.0 test org.assertj assertj-core - 3.27.6 + 3.27.6 test @@ -122,7 +122,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.1 + 3.14.1 @@ -165,13 +165,13 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.6.2 + 3.6.2 - org.springframework.boot:spring-boot-configuration-processor:[4.0.0-RC2] - org.springframework.cloud:spring-cloud-stream:[4.3.0] + org.springframework.boot:spring-boot-configuration-processor:[4.0.0] + org.springframework.cloud:spring-cloud-stream:[5.0.0] @@ -180,7 +180,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 diff --git a/sdk/spring/spring-cloud-azure-stream-binder-servicebus/pom.xml b/sdk/spring/spring-cloud-azure-stream-binder-servicebus/pom.xml index 62719981c469..0c5cb0905ba7 100644 --- a/sdk/spring/spring-cloud-azure-stream-binder-servicebus/pom.xml +++ b/sdk/spring/spring-cloud-azure-stream-binder-servicebus/pom.xml @@ -56,7 +56,7 @@ org.springframework.boot spring-boot-starter-actuator - 4.0.0-RC2 + 4.0.0 true + 3.0.2 provided org.springframework.cloud spring-cloud-stream-test-binder - 4.3.0 + 5.0.0 test @@ -84,7 +84,7 @@ org.springframework.boot spring-boot-starter-test - 4.0.0-RC2 + 4.0.0 test @@ -92,7 +92,7 @@ org.mockito mockito-core - 5.20.0 + 5.20.0 test @@ -100,13 +100,13 @@ net.bytebuddy byte-buddy - 1.17.8 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.8 + 1.17.8 test @@ -116,7 +116,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.1 + 3.14.1 @@ -150,12 +150,12 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.6.2 + 3.6.2 - org.springframework.boot:spring-boot-starter-actuator:[4.0.0-RC2] + org.springframework.boot:spring-boot-starter-actuator:[4.0.0] @@ -164,7 +164,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 diff --git a/sdk/spring/spring-cloud-azure-testcontainers/pom.xml b/sdk/spring/spring-cloud-azure-testcontainers/pom.xml index 7b320ee3eab3..3bd93fa39c83 100644 --- a/sdk/spring/spring-cloud-azure-testcontainers/pom.xml +++ b/sdk/spring/spring-cloud-azure-testcontainers/pom.xml @@ -82,12 +82,12 @@ org.springframework.boot spring-boot-testcontainers - 4.0.0-RC2 + 4.0.0 org.testcontainers azure - 1.21.3 + 1.21.3 true + 3.0.2 provided org.springframework spring-test - 7.0.0-RC3 + 7.0.1 test org.junit.jupiter junit-jupiter - 6.0.1 + 6.0.1 test org.assertj assertj-core - 3.27.6 + 3.27.6 test org.testcontainers junit-jupiter - 1.21.3 + 1.21.3 test @@ -131,7 +131,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.1 + 3.14.1 @@ -162,13 +162,13 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.6.2 + 3.6.2 - org.springframework.boot:spring-boot-testcontainers:[4.0.0-RC2] - org.testcontainers:azure:[1.21.3] + org.springframework.boot:spring-boot-testcontainers:[4.0.0] + org.testcontainers:azure:[1.21.3] @@ -177,7 +177,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 @@ -222,7 +222,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.2.0 + 3.2.0 copy-readme-to-javadocTemp-and-sourceTemp diff --git a/sdk/spring/spring-integration-azure-core/pom.xml b/sdk/spring/spring-integration-azure-core/pom.xml index 4deec95bd658..d7b953e34cc8 100644 --- a/sdk/spring/spring-integration-azure-core/pom.xml +++ b/sdk/spring/spring-integration-azure-core/pom.xml @@ -48,7 +48,7 @@ org.springframework.integration spring-integration-core - 7.0.0-RC2 + 7.0.0 + 3.0.2 provided org.mockito mockito-core - 5.20.0 + 5.20.0 test @@ -71,31 +71,31 @@ net.bytebuddy byte-buddy - 1.17.8 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.8 + 1.17.8 test org.springframework spring-test - 7.0.0-RC3 + 7.0.1 test org.junit.jupiter junit-jupiter - 6.0.1 + 6.0.1 test org.assertj assertj-core - 3.27.6 + 3.27.6 test @@ -105,7 +105,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.1 + 3.14.1 @@ -136,12 +136,12 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.6.2 + 3.6.2 - org.springframework.integration:spring-integration-core:[7.0.0-RC2] + org.springframework.integration:spring-integration-core:[7.0.0] @@ -150,7 +150,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 diff --git a/sdk/spring/spring-integration-azure-eventhubs/pom.xml b/sdk/spring/spring-integration-azure-eventhubs/pom.xml index e3723b641388..ea72e6442e8a 100644 --- a/sdk/spring/spring-integration-azure-eventhubs/pom.xml +++ b/sdk/spring/spring-integration-azure-eventhubs/pom.xml @@ -61,13 +61,13 @@ com.google.code.findbugs jsr305 - 3.0.2 + 3.0.2 provided org.mockito mockito-core - 5.20.0 + 5.20.0 test @@ -75,31 +75,31 @@ net.bytebuddy byte-buddy - 1.17.8 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.8 + 1.17.8 test org.springframework spring-test - 7.0.0-RC3 + 7.0.1 test org.assertj assertj-core - 3.27.6 + 3.27.6 test org.junit.jupiter junit-jupiter - 6.0.1 + 6.0.1 test @@ -109,7 +109,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.1 + 3.14.1 @@ -140,7 +140,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 diff --git a/sdk/spring/spring-integration-azure-servicebus/pom.xml b/sdk/spring/spring-integration-azure-servicebus/pom.xml index 36e822f69987..c292f38dd432 100644 --- a/sdk/spring/spring-integration-azure-servicebus/pom.xml +++ b/sdk/spring/spring-integration-azure-servicebus/pom.xml @@ -54,7 +54,7 @@ com.google.code.findbugs jsr305 - 3.0.2 + 3.0.2 provided @@ -66,7 +66,7 @@ org.mockito mockito-core - 5.20.0 + 5.20.0 test @@ -74,31 +74,31 @@ net.bytebuddy byte-buddy - 1.17.8 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.8 + 1.17.8 test org.junit.jupiter junit-jupiter - 6.0.1 + 6.0.1 test org.springframework spring-test - 7.0.0-RC3 + 7.0.1 test org.assertj assertj-core - 3.27.6 + 3.27.6 test @@ -108,7 +108,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.1 + 3.14.1 @@ -139,7 +139,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 diff --git a/sdk/spring/spring-integration-azure-storage-queue/pom.xml b/sdk/spring/spring-integration-azure-storage-queue/pom.xml index ce7a67c5b4cb..a567ce9692bf 100644 --- a/sdk/spring/spring-integration-azure-storage-queue/pom.xml +++ b/sdk/spring/spring-integration-azure-storage-queue/pom.xml @@ -56,14 +56,14 @@ com.google.code.findbugs jsr305 - 3.0.2 + 3.0.2 provided org.mockito mockito-core - 5.20.0 + 5.20.0 test @@ -71,19 +71,19 @@ net.bytebuddy byte-buddy - 1.17.8 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.8 + 1.17.8 test org.junit.jupiter junit-jupiter - 6.0.1 + 6.0.1 test @@ -93,7 +93,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.1 + 3.14.1 @@ -124,7 +124,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 diff --git a/sdk/spring/spring-messaging-azure-eventhubs/pom.xml b/sdk/spring/spring-messaging-azure-eventhubs/pom.xml index 276ec4a2a744..dea3b8f2aa06 100644 --- a/sdk/spring/spring-messaging-azure-eventhubs/pom.xml +++ b/sdk/spring/spring-messaging-azure-eventhubs/pom.xml @@ -59,19 +59,19 @@ org.springframework spring-tx - 7.0.0-RC3 + 7.0.1 true org.springframework.retry spring-retry - 2.0.12 + 2.0.12 true org.springframework.data spring-data-commons - 3.5.3 + 4.0.0 org.slf4j @@ -83,27 +83,27 @@ io.micrometer micrometer-core - 1.15.3 + 1.16.0 true com.google.code.findbugs jsr305 - 3.0.2 + 3.0.2 provided org.springframework spring-test - 7.0.0-RC3 + 7.0.1 test org.mockito mockito-core - 5.20.0 + 5.20.0 test @@ -111,25 +111,25 @@ net.bytebuddy byte-buddy - 1.17.8 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.8 + 1.17.8 test org.junit.jupiter junit-jupiter - 6.0.1 + 6.0.1 test io.projectreactor reactor-test - 3.8.0-RC1 + 3.8.0 test @@ -138,7 +138,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.1 + 3.14.1 @@ -169,15 +169,15 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.6.2 + 3.6.2 - io.micrometer:micrometer-core:[1.15.3] - org.springframework:spring-tx:[7.0.0-RC3] - org.springframework.retry:spring-retry:[2.0.12] - org.springframework.data:spring-data-commons:[3.5.3] + io.micrometer:micrometer-core:[1.16.0] + org.springframework:spring-tx:[7.0.1] + org.springframework.retry:spring-retry:[2.0.12] + org.springframework.data:spring-data-commons:[4.0.0] @@ -186,7 +186,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 diff --git a/sdk/spring/spring-messaging-azure-servicebus/pom.xml b/sdk/spring/spring-messaging-azure-servicebus/pom.xml index bad93272f541..5a8f53418b9a 100644 --- a/sdk/spring/spring-messaging-azure-servicebus/pom.xml +++ b/sdk/spring/spring-messaging-azure-servicebus/pom.xml @@ -52,19 +52,19 @@ org.springframework spring-tx - 7.0.0-RC3 + 7.0.1 true org.springframework.retry spring-retry - 2.0.12 + 2.0.12 true org.springframework.data spring-data-commons - 3.5.3 + 4.0.0 org.slf4j @@ -76,13 +76,13 @@ io.micrometer micrometer-core - 1.15.3 + 1.16.0 true org.mockito mockito-core - 5.20.0 + 5.20.0 test @@ -90,25 +90,25 @@ net.bytebuddy byte-buddy - 1.17.8 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.8 + 1.17.8 test org.junit.jupiter junit-jupiter - 6.0.1 + 6.0.1 test com.google.code.findbugs jsr305 - 3.0.2 + 3.0.2 provided @@ -123,7 +123,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.1 + 3.14.1 @@ -154,15 +154,15 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.6.2 + 3.6.2 - io.micrometer:micrometer-core:[1.15.3] - org.springframework:spring-tx:[7.0.0-RC3] - org.springframework.retry:spring-retry:[2.0.12] - org.springframework.data:spring-data-commons:[3.5.3] + io.micrometer:micrometer-core:[1.16.0] + org.springframework:spring-tx:[7.0.1] + org.springframework.retry:spring-retry:[2.0.12] + org.springframework.data:spring-data-commons:[4.0.0] @@ -171,7 +171,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 diff --git a/sdk/spring/spring-messaging-azure-storage-queue/pom.xml b/sdk/spring/spring-messaging-azure-storage-queue/pom.xml index e19d826595f9..5feaaf02fd9a 100644 --- a/sdk/spring/spring-messaging-azure-storage-queue/pom.xml +++ b/sdk/spring/spring-messaging-azure-storage-queue/pom.xml @@ -52,7 +52,7 @@ org.mockito mockito-core - 5.20.0 + 5.20.0 test @@ -60,31 +60,31 @@ net.bytebuddy byte-buddy - 1.17.8 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.8 + 1.17.8 test org.junit.jupiter junit-jupiter - 6.0.1 + 6.0.1 test org.springframework.boot spring-boot-starter-test - 4.0.0-RC2 + 4.0.0 test com.google.code.findbugs jsr305 - 3.0.2 + 3.0.2 provided @@ -100,7 +100,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.1 + 3.14.1 @@ -131,7 +131,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 diff --git a/sdk/spring/spring-messaging-azure/pom.xml b/sdk/spring/spring-messaging-azure/pom.xml index 1f55d805bd41..6c74d444589b 100644 --- a/sdk/spring/spring-messaging-azure/pom.xml +++ b/sdk/spring/spring-messaging-azure/pom.xml @@ -46,24 +46,24 @@ org.springframework spring-messaging - 7.0.0-RC3 + 7.0.1 org.springframework spring-tx - 7.0.0-RC3 + 7.0.1 true org.springframework.retry spring-retry - 2.0.12 + 2.0.12 true org.springframework.data spring-data-commons - 3.5.3 + 4.0.0 org.slf4j @@ -75,7 +75,7 @@ io.micrometer micrometer-core - 1.15.3 + 1.16.0 true + 3.0.2 provided @@ -92,14 +92,14 @@ org.springframework.boot spring-boot-starter-test - 4.0.0-RC2 + 4.0.0 test org.mockito mockito-core - 5.20.0 + 5.20.0 test @@ -107,13 +107,13 @@ net.bytebuddy byte-buddy - 1.17.8 + 1.17.8 test net.bytebuddy byte-buddy-agent - 1.17.8 + 1.17.8 test @@ -123,7 +123,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.1 + 3.14.1 @@ -154,16 +154,16 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.6.2 + 3.6.2 - io.micrometer:micrometer-core:[1.15.3] - org.springframework.data:spring-data-commons:[3.5.3] - org.springframework:spring-messaging:[7.0.0-RC3] - org.springframework:spring-tx:[7.0.0-RC3] - org.springframework.retry:spring-retry:[2.0.12] + io.micrometer:micrometer-core:[1.16.0] + org.springframework.data:spring-data-commons:[4.0.0] + org.springframework:spring-messaging:[7.0.1] + org.springframework:spring-tx:[7.0.1] + org.springframework.retry:spring-retry:[2.0.12] @@ -172,7 +172,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.2 + 3.4.2 From f7756757ce06b7cfddaf327c7d3ceaf7db12ae4f Mon Sep 17 00:00:00 2001 From: muyao Date: Fri, 28 Nov 2025 15:01:51 +0800 Subject: [PATCH 44/76] replace org.springframework.data.util.TypeInformation with org.springframework.data.core.TypeInformation --- .../data/cosmos/core/mapping/BasicCosmosPersistentEntity.java | 2 +- .../spring/data/cosmos/core/mapping/CosmosMappingContext.java | 2 +- .../spring/data/cosmos/repository/query/CosmosParameter.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/BasicCosmosPersistentEntity.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/BasicCosmosPersistentEntity.java index 7655f85d1b96..1ba5ad75d8ec 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/BasicCosmosPersistentEntity.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/BasicCosmosPersistentEntity.java @@ -9,7 +9,7 @@ import org.springframework.context.expression.BeanFactoryAccessor; import org.springframework.context.expression.BeanFactoryResolver; import org.springframework.data.mapping.model.BasicPersistentEntity; -import org.springframework.data.util.TypeInformation; +import org.springframework.data.core.TypeInformation; import org.springframework.expression.spel.support.StandardEvaluationContext; /** diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/CosmosMappingContext.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/CosmosMappingContext.java index 37ff147eaff1..4370def19cf5 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/CosmosMappingContext.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/mapping/CosmosMappingContext.java @@ -7,7 +7,7 @@ import org.springframework.data.mapping.context.AbstractMappingContext; import org.springframework.data.mapping.model.Property; import org.springframework.data.mapping.model.SimpleTypeHolder; -import org.springframework.data.util.TypeInformation; +import org.springframework.data.core.TypeInformation; /** * Class to build mapping metadata and thus create instances of {@link BasicCosmosPersistentEntity} and diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosParameter.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosParameter.java index 5bbc3ca93ed5..52fbc0f05794 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosParameter.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosParameter.java @@ -4,7 +4,7 @@ import org.springframework.core.MethodParameter; import org.springframework.data.repository.query.Parameter; -import org.springframework.data.util.TypeInformation; +import org.springframework.data.core.TypeInformation; /** * A single cosmos parameter of a query method. From ec36cf04609f664ca6ede2fcfcffc09e78c72169 Mon Sep 17 00:00:00 2001 From: muyao Date: Fri, 28 Nov 2025 15:02:44 +0800 Subject: [PATCH 45/76] replace with ParametersSource.of() --- .../spring/data/cosmos/repository/query/CosmosParameters.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosParameters.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosParameters.java index a489c30d77b2..015ebe6dc2f0 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosParameters.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/query/CosmosParameters.java @@ -3,6 +3,7 @@ package com.azure.spring.data.cosmos.repository.query; import org.springframework.data.repository.query.Parameters; +import org.springframework.data.repository.query.ParametersSource; import java.lang.reflect.Method; import java.util.List; @@ -17,9 +18,8 @@ public class CosmosParameters extends Parameters parameters) { From 31fc7b134b03eb7e0ef9c593d9113649704064c2 Mon Sep 17 00:00:00 2001 From: muyao Date: Fri, 28 Nov 2025 15:18:21 +0800 Subject: [PATCH 46/76] replace QueryMethodEvaluationContextProvider with ValueExpressionDelegate --- .../repository/support/CosmosRepositoryFactory.java | 10 ++++------ .../support/ReactiveCosmosRepositoryFactory.java | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/CosmosRepositoryFactory.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/CosmosRepositoryFactory.java index 214fe3bff377..547a3bb232e4 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/CosmosRepositoryFactory.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/CosmosRepositoryFactory.java @@ -14,6 +14,7 @@ import org.springframework.data.repository.core.support.RepositoryFactorySupport; import org.springframework.data.repository.query.QueryLookupStrategy; import org.springframework.data.repository.query.RepositoryQuery; +import org.springframework.data.repository.query.ValueExpressionDelegate; import org.springframework.util.Assert; import java.io.Serializable; @@ -53,18 +54,15 @@ public EntityInformation getEntityInformation(Class domainType } @Override - @SuppressWarnings({"deprecation", "removal"}) protected Optional getQueryLookupStrategy(QueryLookupStrategy.Key key, - org.springframework.data.repository.query.QueryMethodEvaluationContextProvider evaluationContextProvider) { - return Optional.of(new CosmosDbQueryLookupStrategy(cosmosOperations, evaluationContextProvider)); + ValueExpressionDelegate valueExpressionDelegate) { + return Optional.of(new CosmosDbQueryLookupStrategy(cosmosOperations, valueExpressionDelegate)); } - @SuppressWarnings({"deprecation", "removal"}) private static class CosmosDbQueryLookupStrategy implements QueryLookupStrategy { private final CosmosOperations dbOperations; - CosmosDbQueryLookupStrategy(CosmosOperations operations, - org.springframework.data.repository.query.QueryMethodEvaluationContextProvider provider) { + CosmosDbQueryLookupStrategy(CosmosOperations operations, ValueExpressionDelegate delegate) { this.dbOperations = operations; } diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/ReactiveCosmosRepositoryFactory.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/ReactiveCosmosRepositoryFactory.java index fea259c60194..0a0626209e55 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/ReactiveCosmosRepositoryFactory.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/ReactiveCosmosRepositoryFactory.java @@ -13,6 +13,7 @@ import org.springframework.data.repository.core.support.ReactiveRepositoryFactorySupport; import org.springframework.data.repository.query.QueryLookupStrategy; import org.springframework.data.repository.query.RepositoryQuery; +import org.springframework.data.repository.query.ValueExpressionDelegate; import org.springframework.util.Assert; import java.io.Serializable; @@ -53,19 +54,16 @@ protected Class getRepositoryBaseClass(RepositoryMetadata metadata) { } @Override - @SuppressWarnings({"deprecation", "removal"}) protected Optional getQueryLookupStrategy(QueryLookupStrategy.Key key, - org.springframework.data.repository.query.QueryMethodEvaluationContextProvider evaluationContextProvider) { + ValueExpressionDelegate valueExpressionDelegate) { return Optional.of(new ReactiveCosmosQueryLookupStrategy(cosmosOperations, - evaluationContextProvider)); + valueExpressionDelegate)); } - @SuppressWarnings({"deprecation", "removal"}) private static class ReactiveCosmosQueryLookupStrategy implements QueryLookupStrategy { private final ReactiveCosmosOperations cosmosOperations; - ReactiveCosmosQueryLookupStrategy(ReactiveCosmosOperations operations, - org.springframework.data.repository.query.QueryMethodEvaluationContextProvider provider) { + ReactiveCosmosQueryLookupStrategy(ReactiveCosmosOperations operations, ValueExpressionDelegate delegate) { this.cosmosOperations = operations; } From 20376f189411a1318dbed277227b963a8372ac1d Mon Sep 17 00:00:00 2001 From: muyao Date: Fri, 28 Nov 2025 15:48:44 +0800 Subject: [PATCH 47/76] replace ClassTypeInformation.from with TypeInformation.of --- .../core/mapping/BasicCosmosPersistentEntityUnitTest.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/BasicCosmosPersistentEntityUnitTest.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/BasicCosmosPersistentEntityUnitTest.java index 59d3e5c6a7f6..7ae7ed2c90f9 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/BasicCosmosPersistentEntityUnitTest.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/BasicCosmosPersistentEntityUnitTest.java @@ -5,25 +5,23 @@ import com.azure.spring.data.cosmos.domain.Person; import org.junit.Test; -import org.springframework.data.util.ClassTypeInformation; +import org.springframework.data.core.TypeInformation; import static org.assertj.core.api.Assertions.assertThat; public class BasicCosmosPersistentEntityUnitTest { - @SuppressWarnings({"deprecation", "removal"}) @Test public void testGetCollection() { final BasicCosmosPersistentEntity entity = new BasicCosmosPersistentEntity( - ClassTypeInformation.from(Person.class)); + TypeInformation.of(Person.class)); assertThat(entity.getContainer()).isEqualTo(""); } - @SuppressWarnings({"deprecation", "removal"}) @Test public void testGetLanguage() { final BasicCosmosPersistentEntity entity = new BasicCosmosPersistentEntity( - ClassTypeInformation.from(Person.class)); + TypeInformation.of(Person.class)); assertThat(entity.getLanguage()).isEqualTo(""); } From 0366061537dd7163a10b7d282b5a8d7571edc4c1 Mon Sep 17 00:00:00 2001 From: muyao Date: Fri, 28 Nov 2025 15:49:24 +0800 Subject: [PATCH 48/76] suppress warning --- .../data/cosmos/repository/support/CosmosRepositoryFactory.java | 1 + .../repository/support/ReactiveCosmosRepositoryFactory.java | 1 + 2 files changed, 2 insertions(+) diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/CosmosRepositoryFactory.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/CosmosRepositoryFactory.java index 547a3bb232e4..66b4193fecab 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/CosmosRepositoryFactory.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/CosmosRepositoryFactory.java @@ -49,6 +49,7 @@ protected Object getTargetRepository(RepositoryInformation information) { } @Override + @SuppressWarnings("deprecation") public EntityInformation getEntityInformation(Class domainType) { return new CosmosEntityInformation<>(domainType); } diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/ReactiveCosmosRepositoryFactory.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/ReactiveCosmosRepositoryFactory.java index 0a0626209e55..7cacb7d39c4a 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/ReactiveCosmosRepositoryFactory.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/repository/support/ReactiveCosmosRepositoryFactory.java @@ -37,6 +37,7 @@ public ReactiveCosmosRepositoryFactory(ReactiveCosmosOperations cosmosOperations } @Override + @SuppressWarnings("deprecation") public EntityInformation getEntityInformation(Class domainType) { return new CosmosEntityInformation<>(domainType); } From a39db5a96387dd946e4ba07702c442fe87ca1126 Mon Sep 17 00:00:00 2001 From: muyao Date: Fri, 28 Nov 2025 16:11:19 +0800 Subject: [PATCH 49/76] update comments --- sdk/spring/azure-spring-data-cosmos/pom.xml | 1 + sdk/spring/pom.xml | 23 ----------- ...BearerGrantRequestParametersConverter.java | 19 +++------ .../core/handler/DefaultMessageHandler.java | 40 +++++++++---------- 4 files changed, 25 insertions(+), 58 deletions(-) diff --git a/sdk/spring/azure-spring-data-cosmos/pom.xml b/sdk/spring/azure-spring-data-cosmos/pom.xml index 04a751e7852c..f85d1775f3ef 100644 --- a/sdk/spring/azure-spring-data-cosmos/pom.xml +++ b/sdk/spring/azure-spring-data-cosmos/pom.xml @@ -101,6 +101,7 @@ org.springframework.boot spring-boot-persistence 4.0.0 + test com.azure diff --git a/sdk/spring/pom.xml b/sdk/spring/pom.xml index 59df68d9ae92..005b5bc5c160 100644 --- a/sdk/spring/pom.xml +++ b/sdk/spring/pom.xml @@ -8,29 +8,6 @@ pom 1.0.0 - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - false - - - - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - false - - - - default diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadJwtBearerGrantRequestParametersConverter.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadJwtBearerGrantRequestParametersConverter.java index 3b366b550c18..4550d3ef017a 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadJwtBearerGrantRequestParametersConverter.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadJwtBearerGrantRequestParametersConverter.java @@ -4,6 +4,7 @@ package com.azure.spring.cloud.autoconfigure.implementation.aad.security; import org.springframework.core.convert.converter.Converter; +import org.springframework.security.oauth2.client.endpoint.DefaultOAuth2TokenRequestParametersConverter; import org.springframework.security.oauth2.client.endpoint.JwtBearerGrantRequest; import org.springframework.security.oauth2.client.registration.ClientRegistration; import org.springframework.security.oauth2.core.ClientAuthenticationMethod; @@ -16,26 +17,18 @@ /** * This is a special JWT Bearer flow implementation for Microsoft identify platform. * - * @since 4.3.0 + * @since 7.0.0 * @see OAuth 2.0 On-Behalf-Of */ public class AadJwtBearerGrantRequestParametersConverter implements Converter> { + private final DefaultOAuth2TokenRequestParametersConverter delegate = + new DefaultOAuth2TokenRequestParametersConverter<>(); + @Override public MultiValueMap convert(JwtBearerGrantRequest jwtBearerGrantRequest) { - ClientRegistration clientRegistration = jwtBearerGrantRequest.getClientRegistration(); - MultiValueMap parameters = new LinkedMultiValueMap<>(); - parameters.add(OAuth2ParameterNames.GRANT_TYPE, jwtBearerGrantRequest.getGrantType().getValue()); - parameters.add(OAuth2ParameterNames.ASSERTION, jwtBearerGrantRequest.getJwt().getTokenValue()); - if (!CollectionUtils.isEmpty(clientRegistration.getScopes())) { - parameters.add(OAuth2ParameterNames.SCOPE, - StringUtils.collectionToDelimitedString(clientRegistration.getScopes(), " ")); - } - if (ClientAuthenticationMethod.CLIENT_SECRET_POST.equals(clientRegistration.getClientAuthenticationMethod())) { - parameters.add(OAuth2ParameterNames.CLIENT_ID, clientRegistration.getClientId()); - parameters.add(OAuth2ParameterNames.CLIENT_SECRET, clientRegistration.getClientSecret()); - } + MultiValueMap parameters = delegate.convert(jwtBearerGrantRequest); parameters.add("requested_token_use", "on_behalf_of"); return parameters; } diff --git a/sdk/spring/spring-integration-azure-core/src/main/java/com/azure/spring/integration/core/handler/DefaultMessageHandler.java b/sdk/spring/spring-integration-azure-core/src/main/java/com/azure/spring/integration/core/handler/DefaultMessageHandler.java index cd772b49a577..bbe3dad3a05e 100644 --- a/sdk/spring/spring-integration-azure-core/src/main/java/com/azure/spring/integration/core/handler/DefaultMessageHandler.java +++ b/sdk/spring/spring-integration-azure-core/src/main/java/com/azure/spring/integration/core/handler/DefaultMessageHandler.java @@ -31,7 +31,6 @@ import java.util.HashMap; import java.util.Map; import java.util.Optional; -import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeoutException; import java.util.function.BiConsumer; @@ -110,29 +109,26 @@ protected void handleMessageInternal(Message message) { } private void handleSendResponseAsync(Mono mono, Message message) { - CompletableFuture future = mono.toFuture(); - future.whenComplete((t, ex) -> { - if (ex != null) { - if (LOGGER.isWarnEnabled()) { - LOGGER.warn("{} sent failed in async mode due to {}", message, ex.getMessage()); - } - if (this.sendCallback != null) { - this.sendCallback.accept(null, ex); - } + mono.doOnError(ex -> { + if (LOGGER.isWarnEnabled()) { + LOGGER.warn("{} sent failed in async mode due to {}", message, ex.getMessage()); + } + if (this.sendCallback != null) { + this.sendCallback.accept(null, ex); + } - if (getSendFailureChannel() != null) { - this.messagingTemplate.send(getSendFailureChannel(), getErrorMessageStrategy() - .buildErrorMessage(new AzureSendFailureException(message, ex), null)); - } - } else { - if (LOGGER.isDebugEnabled()) { - LOGGER.debug("{} sent successfully in async mode", message); - } - if (this.sendCallback != null) { - this.sendCallback.accept(null, null); - } + if (getSendFailureChannel() != null) { + this.messagingTemplate.send(getSendFailureChannel(), getErrorMessageStrategy() + .buildErrorMessage(new AzureSendFailureException(message, ex), null)); + } + }).doOnSuccess(t -> { + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("{} sent successfully in async mode", message); + } + if (this.sendCallback != null) { + this.sendCallback.accept(null, null); } - }); + }).subscribe(); } private void waitingSendResponse(Mono mono, Message message) { From 4fc27863cc689c4bf52458cab64bd1aa248c1cf1 Mon Sep 17 00:00:00 2001 From: muyao Date: Mon, 1 Dec 2025 09:09:20 +0800 Subject: [PATCH 50/76] fix --- eng/lintingconfigs/revapi/track2/revapi.json | 26 +++++++++++++++++++- eng/versioning/external_dependencies.txt | 6 ----- eng/versioning/find_unused_dependencies.py | 6 ++--- 3 files changed, 28 insertions(+), 10 deletions(-) diff --git a/eng/lintingconfigs/revapi/track2/revapi.json b/eng/lintingconfigs/revapi/track2/revapi.json index ef3c51ce850f..b9001bbad8f4 100644 --- a/eng/lintingconfigs/revapi/track2/revapi.json +++ b/eng/lintingconfigs/revapi/track2/revapi.json @@ -340,11 +340,35 @@ "old" : "interface com.azure.spring.cloud.autoconfigure.jms.ServiceBusJmsConnectionFactoryCustomizer", "justification" : "Remove deprecated method" }, + { + "code" : "java.method.parameterTypeChanged", + "old" : "parameter void com.azure.spring.data.cosmos.core.mapping.BasicCosmosPersistentEntity::(===org.springframework.data.util.TypeInformation===)", + "new" : "parameter void com.azure.spring.data.cosmos.core.mapping.BasicCosmosPersistentEntity::(===org.springframework.data.core.TypeInformation===)", + "justification" : "Replace deprecated parameterType" + }, + { + "code" : "java.method.parameterTypeChanged", + "old" : "parameter com.azure.spring.data.cosmos.core.mapping.BasicCosmosPersistentEntity com.azure.spring.data.cosmos.core.mapping.CosmosMappingContext::createPersistentEntity(===org.springframework.data.util.TypeInformation===)", + "new" : "parameter com.azure.spring.data.cosmos.core.mapping.BasicCosmosPersistentEntity com.azure.spring.data.cosmos.core.mapping.CosmosMappingContext::createPersistentEntity(===org.springframework.data.core.TypeInformation===)", + "justification" : "Replace deprecated parameterType" + }, + { + "code" : "java.method.parameterTypeChanged", + "old" : "parameter java.util.Optional com.azure.spring.data.cosmos.repository.support.CosmosRepositoryFactory::getQueryLookupStrategy(org.springframework.data.repository.query.QueryLookupStrategy.Key, ===org.springframework.data.repository.query.QueryMethodEvaluationContextProvider===)", + "new" : "parameter java.util.Optional com.azure.spring.data.cosmos.repository.support.CosmosRepositoryFactory::getQueryLookupStrategy(org.springframework.data.repository.query.QueryLookupStrategy.Key, ===org.springframework.data.repository.query.ValueExpressionDelegate===)", + "justification" : "Replace deprecated parameterType" + }, + { + "code" : "java.method.parameterTypeChanged", + "old" : "parameter java.util.Optional com.azure.spring.data.cosmos.repository.support.ReactiveCosmosRepositoryFactory::getQueryLookupStrategy(org.springframework.data.repository.query.QueryLookupStrategy.Key, ===org.springframework.data.repository.query.QueryMethodEvaluationContextProvider===)", + "new" : "parameter java.util.Optional com.azure.spring.data.cosmos.repository.support.ReactiveCosmosRepositoryFactory::getQueryLookupStrategy(org.springframework.data.repository.query.QueryLookupStrategy.Key, ===org.springframework.data.repository.query.ValueExpressionDelegate===)", + "justification" : "Replace deprecated parameterType" + }, { "code" : "java.method.parameterTypeChanged", "old" : "parameter void com.azure.spring.integration.core.handler.DefaultMessageHandler::setSendCallback(===org.springframework.util.concurrent.ListenableFutureCallback===)", "new" : "parameter void com.azure.spring.integration.core.handler.DefaultMessageHandler::setSendCallback(===java.util.function.BiConsumer===)", - "name" : "Replace deprecated parameterType" + "justification" : "Replace deprecated parameterType" }, { "code": "java.method.numberOfParametersChanged", diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index 9731a410f72c..26d812ad0f47 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -314,12 +314,9 @@ storage_com.microsoft.azure:azure-storage;8.6.6 # sdk\spring\pom.xml modules springboot4_com.diffplug.spotless:spotless-maven-plugin;2.30.0 springboot4_com.fasterxml.jackson.core:jackson-annotations;2.20 -springboot4_com.fasterxml.jackson.core:jackson-core;2.20.1 springboot4_com.fasterxml.jackson.core:jackson-databind;2.20.1 -springboot4_com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.20.1 springboot4_com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.20.1 springboot4_com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.20.1 -springboot4_com.fasterxml.jackson.module:jackson-module-afterburner;2.20.1 springboot4_com.fasterxml.jackson.module:jackson-module-parameter-names;2.20.1 springboot4_com.github.spotbugs:spotbugs-maven-plugin;4.8.2.0 springboot4_com.google.code.findbugs:jsr305;3.0.2 @@ -386,7 +383,6 @@ springboot4_org.springframework.boot:spring-boot-starter-integration;4.0.0 springboot4_org.springframework.boot:spring-boot-starter-parent;4.0.0 springboot4_org.springframework.boot:spring-boot-starter-test;4.0.0 springboot4_org.springframework.boot:spring-boot-starter-webmvc;4.0.0 -springboot4_org.springframework.boot:spring-boot-starter-web;4.0.0 springboot4_org.springframework.boot:spring-boot-starter;4.0.0 springboot4_org.springframework.boot:spring-boot-test;4.0.0 springboot4_org.springframework.boot:spring-boot-testcontainers;4.0.0 @@ -398,7 +394,6 @@ springboot4_org.springframework.cloud:spring-cloud-stream;5.0.0 springboot4_org.springframework.data:spring-data-commons;4.0.0 springboot4_org.springframework.data:spring-data-redis;4.0.0 springboot4_org.springframework.integration:spring-integration-core;7.0.0 -springboot4_org.springframework.kafka:spring-kafka;4.0.0 springboot4_org.springframework.retry:spring-retry;2.0.12 springboot4_org.springframework.security:spring-security-config;7.0.0 springboot4_org.springframework.security:spring-security-oauth2-client;7.0.0 @@ -411,7 +406,6 @@ springboot4_org.springframework:spring-context;7.0.1 springboot4_org.springframework:spring-core-test;7.0.1 springboot4_org.springframework:spring-core;7.0.1 springboot4_org.springframework:spring-expression;7.0.1 -springboot4_org.springframework:spring-jdbc;7.0.1 springboot4_org.springframework:spring-jms;7.0.1 springboot4_org.springframework:spring-messaging;7.0.1 springboot4_org.springframework:spring-test;7.0.1 diff --git a/eng/versioning/find_unused_dependencies.py b/eng/versioning/find_unused_dependencies.py index e5dae738b3c8..bf08c4d18610 100644 --- a/eng/versioning/find_unused_dependencies.py +++ b/eng/versioning/find_unused_dependencies.py @@ -9,8 +9,8 @@ from utils import load_version_map_from_file from utils import version_update_marker -IGNORED_DEPENDENCIES = {'springboot3_org.springframework.boot:spring-boot-dependencies', - 'springboot3_org.springframework.cloud:spring-cloud-dependencies'} +IGNORED_DEPENDENCIES = {'springboot4_org.springframework.boot:spring-boot-dependencies', + 'springboot4_org.springframework.cloud:spring-cloud-dependencies'} def fixup_version_map(version_file, version_map): # uses the util function to load the version map from the file, then adds a bool to each entry to track if it is visisted @@ -64,4 +64,4 @@ def main(): exit(1) if __name__ == "__main__": - main() \ No newline at end of file + main() From 659b6984b1dae2f70815cc46f5b9e928977782e3 Mon Sep 17 00:00:00 2001 From: muyao Date: Mon, 1 Dec 2025 09:35:37 +0800 Subject: [PATCH 51/76] fix --- .vscode/cspell.json | 1 + 1 file changed, 1 insertion(+) diff --git a/.vscode/cspell.json b/.vscode/cspell.json index 0278b8f108e0..dabb512db6a6 100644 --- a/.vscode/cspell.json +++ b/.vscode/cspell.json @@ -1197,6 +1197,7 @@ "vibur", "wadl", "weaviate", + "webauthn", "webmvc", "xerial", "xmlparserv", From 08a1b3cabab09ceb4b0d53b3bd123f31f377aeee Mon Sep 17 00:00:00 2001 From: muyao Date: Mon, 1 Dec 2025 12:58:08 +0800 Subject: [PATCH 52/76] fix --- .../AadJwtBearerGrantRequestParametersConverter.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadJwtBearerGrantRequestParametersConverter.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadJwtBearerGrantRequestParametersConverter.java index 4550d3ef017a..234e2c8f2a02 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadJwtBearerGrantRequestParametersConverter.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/aad/security/AadJwtBearerGrantRequestParametersConverter.java @@ -6,13 +6,7 @@ import org.springframework.core.convert.converter.Converter; import org.springframework.security.oauth2.client.endpoint.DefaultOAuth2TokenRequestParametersConverter; import org.springframework.security.oauth2.client.endpoint.JwtBearerGrantRequest; -import org.springframework.security.oauth2.client.registration.ClientRegistration; -import org.springframework.security.oauth2.core.ClientAuthenticationMethod; -import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames; -import org.springframework.util.CollectionUtils; -import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; -import org.springframework.util.StringUtils; /** * This is a special JWT Bearer flow implementation for Microsoft identify platform. From 50e12ae6f86b78b3a29f9cd97f859b4b6db27627 Mon Sep 17 00:00:00 2001 From: Copilot <198982749+copilot@users.noreply.github.com> Date: Tue, 2 Dec 2025 09:29:15 +0800 Subject: [PATCH 53/76] Migrate azure-spring-data-cosmos tests from JUnit 4 to JUnit 5 (#47346) - Removed JUnit 4 and junit-vintage-engine dependencies from pom.xml - Updated imports from org.junit to org.junit.jupiter.api - Replaced @Before/@After with @BeforeEach/@AfterEach - Replaced @BeforeClass/@AfterClass with @BeforeAll/@AfterAll - Replaced @RunWith with @ExtendWith for Mockito and Spring - Replaced Assert with Assertions - Removed TestRule interface from AbstractIntegrationTestCollectionManager - Fixed static imports for AssertJ and JUnit Jupiter - Migrate @Test(expected=...) to assertThrows (cherry picked from commit 7ced3305474aa16dd2e39c8a23fb821032b5e538) --- sdk/spring/azure-spring-data-cosmos/pom.xml | 18 -- ...tractIntegrationTestCollectionManager.java | 18 +- .../spring/data/cosmos/ContainerLockIT.java | 22 +- .../data/cosmos/CosmosFactoryTestIT.java | 9 +- .../common/ExpressionResolverUnitTest.java | 6 +- .../data/cosmos/common/MemoizerUnitTest.java | 8 +- .../data/cosmos/common/PageTestUtils.java | 2 +- .../cosmos/common/PropertyLoaderUnitTest.java | 10 +- .../config/AbstractCosmosConfigurationIT.java | 35 ++- .../cosmos/core/CosmosFactoryUnitTest.java | 8 +- .../data/cosmos/core/CosmosTemplateIT.java | 38 ++-- .../core/CosmosTemplateIllegalTest.java | 12 +- .../core/CosmosTemplatePartitionIT.java | 22 +- .../cosmos/core/CosmosTemplateUnitTest.java | 22 +- .../MultiTenantContainerCosmosFactoryIT.java | 28 ++- .../core/MultiTenantDBCosmosFactoryIT.java | 28 ++- .../cosmos/core/ReactiveCosmosTemplateIT.java | 202 +++++++++--------- .../ReactiveCosmosTemplatePartitionIT.java | 74 ++++--- ...veMultiTenantContainerCosmosFactoryIT.java | 28 ++- .../ReactiveMultiTenantDBCosmosFactoryIT.java | 24 +-- .../ZonedDateTimeDeserializerTest.java | 2 +- .../MappingCosmosConverterUnitTest.java | 12 +- .../generator/AbstractQueryGeneratorTest.java | 25 +-- .../generator/NativeQueryGeneratorTest.java | 10 +- .../BasicCosmosPersistentEntityUnitTest.java | 10 +- .../mapping/CosmosMappingContextUnitTest.java | 2 +- .../event/ApplicationContextEventErrorIT.java | 23 +- ...pplicationContextEventErrorReactiveIT.java | 28 ++- .../event/ApplicationContextEventIT.java | 22 +- .../ApplicationContextEventReactiveIT.java | 22 +- .../event/CosmosEventListenerUnitTests.java | 2 +- .../core/query/CosmosQueryUnitTest.java | 12 +- .../cosmos/core/query/CriteriaUnitTest.java | 65 +++--- .../exception/CosmosExceptionUtilsTest.java | 4 +- .../repository/CosmosAnnotationUnitTest.java | 6 +- .../repository/EntityImplRepositoryIT.java | 16 +- .../repository/MultiCosmosTemplateIT.java | 22 +- .../ReactiveUUIDIdDomainRepositoryIT.java | 23 +- .../SimpleCosmosRepositoryIllegalTest.java | 46 ++-- .../SimpleCosmosRepositoryUnitTest.java | 32 ++- ...ositoryConfigurationExtensionUnitTest.java | 2 +- ...ositoryConfigurationExtensionUnitTest.java | 2 +- .../integration/AddressRepositoryIT.java | 38 ++-- .../AddressRepositoryNoMetricsIT.java | 16 +- .../integration/AnnotatedQueryIT.java | 16 +- .../repository/integration/AuditableIT.java | 20 +- .../integration/BasicItemRepositoryIT.java | 25 ++- .../integration/BigTypeRepositoryIT.java | 18 +- .../integration/CompositeIndexIT.java | 20 +- .../integration/ContactRepositoryIT.java | 70 +++--- .../integration/CosmosAnnotationIT.java | 20 +- .../repository/integration/CountIT.java | 42 ++-- .../integration/CustomerRepositoryIT.java | 28 +-- .../cosmos/repository/integration/EtagIT.java | 57 +++-- .../HierarchicalPartitionKeyRepositoryIT.java | 24 +-- .../integration/IndexPolicyUpdateIT.java | 16 +- .../IntegerIdDomainRepositoryIT.java | 94 ++++---- .../integration/LongIdDomainRepositoryIT.java | 104 ++++----- .../integration/MemoRepositoryIT.java | 79 ++++--- .../NestedPartitionKeyRepositoryIT.java | 20 +- .../PageableAddressRepositoryIT.java | 16 +- .../integration/PageableMemoRepositoryIT.java | 16 +- .../PageablePersonRepositoryIT.java | 16 +- .../repository/integration/PersistableIT.java | 34 ++- .../integration/PersonCrossPartitionIT.java | 20 +- .../integration/ProjectRepositoryIT.java | 78 +++---- .../integration/ProjectRepositorySortIT.java | 78 +++---- .../integration/QuestionRepositoryIT.java | 33 ++- .../integration/ReactiveAuditableIT.java | 16 +- .../ReactiveCourseRepositoryIT.java | 27 ++- .../ReactiveCourseRepositoryNoMetricsIT.java | 16 +- .../integration/ReactiveEtagIT.java | 59 +++-- ...eHierarchicalPartitionKeyRepositoryIT.java | 26 ++- .../ReactiveIndexPolicyUpdateIT.java | 16 +- ...dDomainPartitionPartitionRepositoryIT.java | 23 +- ...eactiveNestedPartitionKeyRepositoryIT.java | 20 +- .../integration/ReactiveRoleRepositoryIT.java | 16 +- .../ReactiveTeacherRepositoryIT.java | 16 +- .../integration/SpELCosmosAnnotationIT.java | 20 +- .../integration/SquareRepositoryIT.java | 16 +- .../integration/StudentRepositoryIT.java | 28 ++- .../integration/TeacherRepositoryIT.java | 28 ++- .../integration/UUIDIdDomainRepositoryIT.java | 77 +++---- .../integration/UniqueKeyPolicyIT.java | 20 +- .../query/AbstractCosmosQueryUnitTest.java | 8 +- .../AbstractReactiveCosmosQueryUnitTest.java | 8 +- .../CosmosEntityInformationUnitTest.java | 2 +- .../CosmosRepositoryFactoryBeanUnitTest.java | 8 +- .../CosmosRepositoryFactoryUnitTest.java | 10 +- .../StringBasedCosmosQueryUnitTest.java | 8 +- ...tringBasedReactiveCosmosQueryUnitTest.java | 8 +- 91 files changed, 1182 insertions(+), 1294 deletions(-) diff --git a/sdk/spring/azure-spring-data-cosmos/pom.xml b/sdk/spring/azure-spring-data-cosmos/pom.xml index f85d1775f3ef..156af3b37992 100644 --- a/sdk/spring/azure-spring-data-cosmos/pom.xml +++ b/sdk/spring/azure-spring-data-cosmos/pom.xml @@ -160,12 +160,6 @@ 1.17.8 test - - junit - junit - 4.13.2 - test - org.springframework.boot spring-boot-starter-test @@ -208,18 +202,6 @@ slf4j-api 2.0.17 - - org.junit.vintage - junit-vintage-engine - 6.0.1 - test - - - org.hamcrest - hamcrest-core - - - diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/AbstractIntegrationTestCollectionManager.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/AbstractIntegrationTestCollectionManager.java index b856a0f85888..d5edd2a06f1a 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/AbstractIntegrationTestCollectionManager.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/AbstractIntegrationTestCollectionManager.java @@ -6,9 +6,6 @@ import com.azure.spring.data.cosmos.core.CosmosTemplate; import com.azure.spring.data.cosmos.core.ReactiveCosmosTemplate; import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; -import org.junit.rules.TestRule; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -19,7 +16,7 @@ import java.util.concurrent.ConcurrentMap; @SuppressWarnings({"rawtypes", "unchecked"}) -public abstract class AbstractIntegrationTestCollectionManager implements TestRule { +public abstract class AbstractIntegrationTestCollectionManager { private static final Logger LOGGER = LoggerFactory.getLogger(AbstractIntegrationTestCollectionManager.class); private static final Duration LEASE_DURATION = Duration.ofSeconds(5 * 60); @@ -115,19 +112,6 @@ private void releaseLocks() { } } - @Override - public Statement apply(Statement base, Description description) { - return new Statement() { - public void evaluate() throws Throwable { - try { - base.evaluate(); - } finally { - releaseLocks(); - } - } - }; - } - private static class ContainerRefs { CosmosEntityInformation cosmosEntityInformation; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/ContainerLockIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/ContainerLockIT.java index de89e28d7cc5..2b817a1aba7e 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/ContainerLockIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/ContainerLockIT.java @@ -6,21 +6,21 @@ import com.azure.spring.data.cosmos.domain.Address; import com.azure.spring.data.cosmos.repository.TestRepositoryConfig; import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.time.Duration; import java.time.OffsetDateTime; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) @SuppressWarnings({"rawtypes", "unchecked", "deprecation"}) public class ContainerLockIT { @@ -36,7 +36,7 @@ public class ContainerLockIT { private ContainerLock lock; private ContainerLock otherLock; - @Before + @BeforeEach public void setup() { staticTemplate = template; CosmosEntityInformation entityInfo = new CosmosEntityInformation(Address.class); @@ -46,7 +46,7 @@ public void setup() { otherLock = new ContainerLock(reactiveTemplate, entityInfo.getContainerName(), SHORT_LEASE_DURATION); } - @After + @AfterEach public void cleanup() { releaseLockIgnoreException(lock); releaseLockIgnoreException(otherLock); @@ -81,7 +81,7 @@ public void acquireShouldThrowExceptionIfWaitForIsLessThanLeaseDuration() { try { otherLock.acquire(SHORT_LEASE_DURATION.minusSeconds(1)); - Assert.fail(); + Assertions.fail(); } catch (ContainerLock.LockAcquisitionFailedException ex) { } } diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/CosmosFactoryTestIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/CosmosFactoryTestIT.java index 32700ec603a4..108d70296bd5 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/CosmosFactoryTestIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/CosmosFactoryTestIT.java @@ -5,18 +5,17 @@ import com.azure.cosmos.CosmosAsyncClient; import com.azure.cosmos.CosmosClientBuilder; import com.azure.spring.data.cosmos.repository.TestRepositoryConfig; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Value; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.lang.reflect.Field; import static org.assertj.core.api.Assertions.assertThat; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class CosmosFactoryTestIT { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/common/ExpressionResolverUnitTest.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/common/ExpressionResolverUnitTest.java index 40bf96bfa513..4f4cec394d2d 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/common/ExpressionResolverUnitTest.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/common/ExpressionResolverUnitTest.java @@ -2,15 +2,15 @@ // Licensed under the MIT License. package com.azure.spring.data.cosmos.common; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class ExpressionResolverUnitTest { private static final String LITERAL_EXPRESSION = "literal expression"; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/common/MemoizerUnitTest.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/common/MemoizerUnitTest.java index 88c79e428d33..178113c302b0 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/common/MemoizerUnitTest.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/common/MemoizerUnitTest.java @@ -2,8 +2,8 @@ // Licensed under the MIT License. package com.azure.spring.data.cosmos.common; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.Map; @@ -11,7 +11,7 @@ import java.util.function.Function; import java.util.stream.IntStream; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class MemoizerUnitTest { @@ -20,7 +20,7 @@ public class MemoizerUnitTest { private static final Function MEMOIZED_FUNCTION = Memoizer.memoize(MemoizerUnitTest::incrCount); - @Before + @BeforeEach public void setUp() { COUNT_MAP.put(KEY, new AtomicInteger(0)); } diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/common/PageTestUtils.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/common/PageTestUtils.java index 36ce7dc5bff2..e51797db2ba0 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/common/PageTestUtils.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/common/PageTestUtils.java @@ -11,7 +11,7 @@ import org.springframework.data.domain.Pageable; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class PageTestUtils { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/common/PropertyLoaderUnitTest.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/common/PropertyLoaderUnitTest.java index ccbe5eddb73f..11e1a089307f 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/common/PropertyLoaderUnitTest.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/common/PropertyLoaderUnitTest.java @@ -2,8 +2,8 @@ // Licensed under the MIT License. package com.azure.spring.data.cosmos.common; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class PropertyLoaderUnitTest { @@ -11,8 +11,8 @@ public class PropertyLoaderUnitTest { public void testGetProjectVersion() { final String version = PropertyLoader.getProjectVersion(); - Assert.assertNotNull(version); - Assert.assertNotEquals(version, ""); - Assert.assertNotEquals(version, "@project.version@"); + Assertions.assertNotNull(version); + Assertions.assertNotEquals(version, ""); + Assertions.assertNotEquals(version, "@project.version@"); } } diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/config/AbstractCosmosConfigurationIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/config/AbstractCosmosConfigurationIT.java index c3371d44f68f..24f29aeffbf7 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/config/AbstractCosmosConfigurationIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/config/AbstractCosmosConfigurationIT.java @@ -11,10 +11,7 @@ import com.azure.spring.data.cosmos.common.ExpressionResolver; import com.azure.spring.data.cosmos.common.TestConstants; import com.fasterxml.jackson.databind.ObjectMapper; -import org.assertj.core.api.Assertions; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.AnnotationConfigApplicationContext; @@ -26,13 +23,13 @@ import java.lang.reflect.Field; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; public class AbstractCosmosConfigurationIT { - @SuppressWarnings("deprecation") - @Rule - public ExpectedException exception = ExpectedException.none(); + @Test public void containsExpressionResolver() { @@ -47,15 +44,17 @@ public void containsCosmosFactory() { final AbstractApplicationContext context = new AnnotationConfigApplicationContext( TestCosmosConfiguration.class); - Assertions.assertThat(context.getBean(CosmosFactory.class)).isNotNull(); + assertThat(context.getBean(CosmosFactory.class)).isNotNull(); } - @Test(expected = NoSuchBeanDefinitionException.class) + @Test public void defaultObjectMapperBeanNotExists() { - final AbstractApplicationContext context = new AnnotationConfigApplicationContext( - TestCosmosConfiguration.class); + assertThrows(NoSuchBeanDefinitionException.class, () -> { + final AbstractApplicationContext context = new AnnotationConfigApplicationContext( + TestCosmosConfiguration.class); - context.getBean(ObjectMapper.class); + context.getBean(ObjectMapper.class); + }); } @Test @@ -63,8 +62,8 @@ public void objectMapperIsConfigurable() { final AbstractApplicationContext context = new AnnotationConfigApplicationContext( ObjectMapperConfiguration.class); - Assertions.assertThat(context.getBean(ObjectMapper.class)).isNotNull(); - Assertions.assertThat(context.getBean(Constants.OBJECT_MAPPER_BEAN_NAME)).isNotNull(); + assertThat(context.getBean(ObjectMapper.class)).isNotNull(); + assertThat(context.getBean(Constants.OBJECT_MAPPER_BEAN_NAME)).isNotNull(); } @Test @@ -73,16 +72,16 @@ public void testCosmosClientBuilderConfigurable() throws IllegalAccessException, RequestOptionsConfiguration.class); final CosmosFactory factory = context.getBean(CosmosFactory.class); - Assertions.assertThat(factory).isNotNull(); + assertThat(factory).isNotNull(); final CosmosAsyncClient cosmosAsyncClient = factory.getCosmosAsyncClient(); - Assertions.assertThat(cosmosAsyncClient).isNotNull(); + assertThat(cosmosAsyncClient).isNotNull(); Field desiredConsistencyLevel = cosmosAsyncClient.getClass().getDeclaredField("desiredConsistencyLevel"); desiredConsistencyLevel.setAccessible(true); ConsistencyLevel consistencyLevel = (ConsistencyLevel) desiredConsistencyLevel.get(cosmosAsyncClient); - Assertions.assertThat(consistencyLevel).isEqualTo(ConsistencyLevel.CONSISTENT_PREFIX); + assertThat(consistencyLevel).isEqualTo(ConsistencyLevel.CONSISTENT_PREFIX); } @Configuration diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosFactoryUnitTest.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosFactoryUnitTest.java index cca2296ee87d..940c3caeec01 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosFactoryUnitTest.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosFactoryUnitTest.java @@ -7,16 +7,16 @@ import com.azure.spring.data.cosmos.Constants; import com.azure.spring.data.cosmos.CosmosFactory; import com.azure.spring.data.cosmos.common.PropertyLoader; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import static org.assertj.core.api.Assertions.assertThat; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class CosmosFactoryUnitTest { @Test diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIT.java index 1eecb3455ec4..9daa3a398ba4 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIT.java @@ -46,13 +46,12 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import org.assertj.core.util.Lists; -import org.junit.Assert; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.persistence.autoconfigure.EntityScanner; +import org.springframework.boot.autoconfigure.domain.EntityScanner; import org.springframework.context.ApplicationContext; import org.springframework.data.annotation.Persistent; import org.springframework.data.auditing.IsNewAwareAuditingHandler; @@ -62,7 +61,6 @@ import org.springframework.data.domain.Sort; import org.springframework.data.repository.query.parser.Part; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.util.ReflectionTestUtils; import java.lang.reflect.InvocationTargetException; @@ -102,13 +100,9 @@ import static com.azure.spring.data.cosmos.common.TestConstants.TRANSIENT_PROPERTY; import static com.azure.spring.data.cosmos.common.TestConstants.UPDATED_FIRST_NAME; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.*; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class CosmosTemplateIT { private static final Person TEST_PERSON = new Person(ID_1, FIRST_NAME, LAST_NAME, HOBBIES, @@ -161,7 +155,7 @@ public class CosmosTemplateIT { private static final CosmosPatchItemRequestOptions options = new CosmosPatchItemRequestOptions(); - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); private static CosmosAsyncClient client; @@ -193,7 +187,7 @@ public class CosmosTemplateIT { public CosmosTemplateIT() throws JsonProcessingException { } - @Before + @BeforeEach public void setUp() throws ClassNotFoundException { if (cosmosTemplate == null) { client = CosmosFactory.createCosmosAsyncClient(cosmosClientBuilder); @@ -244,7 +238,7 @@ public void testInsertDocShouldNotPersistTransientFields() { final Person personWithTransientField = TEST_PERSON_4; assertThat(personWithTransientField.getTransientProperty()).isNotNull(); final Person insertedPerson = cosmosTemplate.insert(Person.class.getSimpleName(), personWithTransientField, new PartitionKey(personInfo.getPartitionKeyFieldValue(TEST_PERSON_4))); - Assert.assertEquals(TRANSIENT_PROPERTY, insertedPerson.getTransientProperty()); + assertEquals(TRANSIENT_PROPERTY, insertedPerson.getTransientProperty()); final Person retrievedPerson = cosmosTemplate.findById(Person.class.getSimpleName(), insertedPerson.getId(), Person.class); assertThat(retrievedPerson.getTransientProperty()).isNull(); } @@ -259,7 +253,7 @@ public void testInsertAllAndFindAllWithTransientField() { Iterable insertAllResponse = cosmosTemplate.insertAll(personInfo, entitiesToSave); //check that the transient field is retained in the response for (Person person : insertAllResponse) { - Assert.assertEquals(TRANSIENT_PROPERTY, person.getTransientProperty()); + assertEquals(TRANSIENT_PROPERTY, person.getTransientProperty()); } Iterable findByIdsResponse = cosmosTemplate.findByIds(Arrays.asList(TEST_PERSON_4.getId()), Person.class, containerName); @@ -270,10 +264,12 @@ public void testInsertAllAndFindAllWithTransientField() { } - @Test(expected = CosmosBadRequestException.class) + @Test public void testInsertShouldFailIfColumnNotAnnotatedWithAutoGenerate() { - final Person person = new Person(null, FIRST_NAME, LAST_NAME, HOBBIES, ADDRESSES, AGE, PASSPORT_IDS_BY_COUNTRY); - cosmosTemplate.insert(Person.class.getSimpleName(), person, new PartitionKey(person.getLastName())); + assertThrows(CosmosBadRequestException.class, () -> { + final Person person = new Person(null, FIRST_NAME, LAST_NAME, HOBBIES, ADDRESSES, AGE, PASSPORT_IDS_BY_COUNTRY); + cosmosTemplate.insert(Person.class.getSimpleName(), person, new PartitionKey(person.getLastName())); + }); } @Test @@ -482,7 +478,7 @@ public void testUpsertNewDocumentIgnoresTransientFields() { final Person person = cosmosTemplate.upsertAndReturnEntity(Person.class.getSimpleName(), newPerson); - Assert.assertEquals(TRANSIENT_PROPERTY, person.getTransientProperty()); + assertEquals(TRANSIENT_PROPERTY, person.getTransientProperty()); assertThat(responseDiagnosticsTestUtils.getCosmosDiagnostics()).isNotNull(); assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNull(); diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIllegalTest.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIllegalTest.java index e18960ae2da6..bae7b195bee9 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIllegalTest.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIllegalTest.java @@ -8,12 +8,12 @@ import com.azure.spring.data.cosmos.core.query.CriteriaType; import com.azure.spring.data.cosmos.domain.Person; import org.apache.commons.lang3.StringUtils; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Answers; +import org.mockito.junit.jupiter.MockitoExtension; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; import org.springframework.data.repository.query.parser.Part; import org.springframework.util.Assert; @@ -21,7 +21,7 @@ import java.lang.reflect.Method; import java.util.Arrays; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class CosmosTemplateIllegalTest { private static final String NULL_STR = null; private static final String DUMMY_COLL = "dummy"; @@ -35,7 +35,7 @@ public class CosmosTemplateIllegalTest { private CosmosTemplate cosmosTemplate; private Class cosmosTemplateClass; - @Before + @BeforeEach public void setUp() { cosmosTemplateClass = cosmosTemplate.getClass(); } diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplatePartitionIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplatePartitionIT.java index eb4816e5fd4c..62beed86c8d1 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplatePartitionIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplatePartitionIT.java @@ -3,6 +3,9 @@ package com.azure.spring.data.cosmos.core; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; + import com.azure.cosmos.CosmosAsyncClient; import com.azure.cosmos.CosmosClientBuilder; import com.azure.cosmos.models.PartitionKey; @@ -22,12 +25,11 @@ import com.azure.spring.data.cosmos.domain.PartitionPerson; import com.azure.spring.data.cosmos.repository.TestRepositoryConfig; import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; + +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.persistence.autoconfigure.EntityScanner; +import org.springframework.boot.autoconfigure.domain.EntityScanner; import org.springframework.context.ApplicationContext; import org.springframework.data.annotation.Persistent; import org.springframework.data.domain.Page; @@ -35,7 +37,6 @@ import org.springframework.data.domain.Sort; import org.springframework.data.repository.query.parser.Part; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.util.Collections; import java.util.List; @@ -57,12 +58,11 @@ import static com.azure.spring.data.cosmos.common.TestConstants.UPDATED_FIRST_NAME; import static com.azure.spring.data.cosmos.common.TestConstants.ZIP_CODE; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.springframework.data.domain.Sort.Direction.ASC; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class CosmosTemplatePartitionIT { private static final PartitionPerson TEST_PERSON = new PartitionPerson(ID_1, FIRST_NAME, ZIP_CODE, @@ -74,7 +74,7 @@ public class CosmosTemplatePartitionIT { private static final PartitionPerson TEST_PERSON_3 = new PartitionPerson(ID_3, FIRST_NAME, NEW_ZIP_CODE, HOBBIES, ADDRESSES); - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); private static CosmosFactory cosmosFactory; @@ -91,7 +91,7 @@ public class CosmosTemplatePartitionIT { @Autowired private ResponseDiagnosticsTestUtils responseDiagnosticsTestUtils; - @Before + @BeforeEach public void setUp() throws ClassNotFoundException { if (cosmosTemplate == null) { // Query plan caching is enabled by default diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateUnitTest.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateUnitTest.java index 54f515a8a62c..c9aaaa74e4a9 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateUnitTest.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateUnitTest.java @@ -7,18 +7,22 @@ import com.azure.cosmos.CosmosClientBuilder; import com.azure.spring.data.cosmos.CosmosFactory; import com.azure.spring.data.cosmos.common.TestConstants; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; -@RunWith(MockitoJUnitRunner.class) +import static org.junit.jupiter.api.Assertions.assertThrows; + +@ExtendWith(MockitoExtension.class) public class CosmosTemplateUnitTest { - @Test(expected = IllegalArgumentException.class) + @Test public void rejectNullDbFactory() { - CosmosAsyncClient client = CosmosFactory.createCosmosAsyncClient(new CosmosClientBuilder() - .endpoint("") - .key("")); - new CosmosFactory(client, TestConstants.DB_NAME); + assertThrows(IllegalArgumentException.class, () -> { + CosmosAsyncClient client = CosmosFactory.createCosmosAsyncClient(new CosmosClientBuilder() + .endpoint("") + .key("")); + new CosmosFactory(client, TestConstants.DB_NAME); + }); } } diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantContainerCosmosFactoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantContainerCosmosFactoryIT.java index d2b50d9e9a36..f087dd4888d0 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantContainerCosmosFactoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantContainerCosmosFactoryIT.java @@ -16,17 +16,16 @@ import com.azure.spring.data.cosmos.domain.Person; import com.azure.spring.data.cosmos.repository.MultiTenantTestRepositoryConfig; import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; -import org.junit.Assert; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.persistence.autoconfigure.EntityScanner; +import org.springframework.boot.autoconfigure.domain.EntityScanner; import org.springframework.context.ApplicationContext; import org.springframework.data.annotation.Persistent; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.util.ArrayList; import java.util.List; @@ -40,10 +39,9 @@ import static com.azure.spring.data.cosmos.common.TestConstants.LAST_NAME; import static com.azure.spring.data.cosmos.common.TestConstants.PASSPORT_IDS_BY_COUNTRY; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = MultiTenantTestRepositoryConfig.class) public class MultiTenantContainerCosmosFactoryIT { @@ -55,7 +53,7 @@ public class MultiTenantContainerCosmosFactoryIT { private final Person TEST_PERSON_1 = new Person(ID_1, FIRST_NAME, LAST_NAME, HOBBIES, ADDRESSES, AGE, PASSPORT_IDS_BY_COUNTRY); private final Person TEST_PERSON_2 = new Person(ID_2, FIRST_NAME, LAST_NAME, HOBBIES, ADDRESSES, AGE, PASSPORT_IDS_BY_COUNTRY); - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); @Autowired @@ -70,7 +68,7 @@ public class MultiTenantContainerCosmosFactoryIT { private CosmosAsyncClient client; private CosmosEntityInformation personInfo; - @Before + @BeforeEach public void setUp() throws ClassNotFoundException { /// Setup client = CosmosFactory.createCosmosAsyncClient(cosmosClientBuilder); @@ -80,7 +78,7 @@ public void setUp() throws ClassNotFoundException { try { mappingContext.setInitialEntitySet(new EntityScanner(this.applicationContext).scan(Persistent.class)); } catch (Exception e) { - Assert.fail(); + Assertions.fail(); } final MappingCosmosConverter cosmosConverter = new MappingCosmosConverter(mappingContext, null); @@ -110,7 +108,7 @@ public void testGetContainerFunctionality() { Iterable iterableDB2 = cosmosTemplate.findAll(personInfo.getContainerName(), Person.class); List resultDB2 = new ArrayList<>(); iterableDB2.forEach(resultDB2::add); - Assert.assertEquals(expectedResultsContainer2, resultDB2); + assertEquals(expectedResultsContainer2, resultDB2); // Check that testContainer1 has the correct contents cosmosFactory.manuallySetContainerName = testContainer1; @@ -119,7 +117,7 @@ public void testGetContainerFunctionality() { Iterable iterableDB1 = cosmosTemplate.findAll(personInfo.getContainerName(), Person.class); List resultDB1 = new ArrayList<>(); iterableDB1.forEach(resultDB1::add); - Assert.assertEquals(expectedResultsContainer1, resultDB1); + assertEquals(expectedResultsContainer1, resultDB1); //Cleanup deleteDatabaseIfExists(testDB1); diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantDBCosmosFactoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantDBCosmosFactoryIT.java index c3194aabca05..0de37438ecea 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantDBCosmosFactoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantDBCosmosFactoryIT.java @@ -16,17 +16,16 @@ import com.azure.spring.data.cosmos.domain.Person; import com.azure.spring.data.cosmos.repository.MultiTenantTestRepositoryConfig; import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; -import org.junit.Assert; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.persistence.autoconfigure.EntityScanner; +import org.springframework.boot.autoconfigure.domain.EntityScanner; import org.springframework.context.ApplicationContext; import org.springframework.data.annotation.Persistent; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.util.ArrayList; import java.util.List; @@ -40,10 +39,9 @@ import static com.azure.spring.data.cosmos.common.TestConstants.LAST_NAME; import static com.azure.spring.data.cosmos.common.TestConstants.PASSPORT_IDS_BY_COUNTRY; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = MultiTenantTestRepositoryConfig.class) public class MultiTenantDBCosmosFactoryIT { @@ -53,7 +51,7 @@ public class MultiTenantDBCosmosFactoryIT { private final Person TEST_PERSON_1 = new Person(ID_1, FIRST_NAME, LAST_NAME, HOBBIES, ADDRESSES, AGE, PASSPORT_IDS_BY_COUNTRY); private final Person TEST_PERSON_2 = new Person(ID_2, FIRST_NAME, LAST_NAME, HOBBIES, ADDRESSES, AGE, PASSPORT_IDS_BY_COUNTRY); - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); @Autowired @@ -68,7 +66,7 @@ public class MultiTenantDBCosmosFactoryIT { private CosmosAsyncClient client; private CosmosEntityInformation personInfo; - @Before + @BeforeEach public void setUp() throws ClassNotFoundException { /// Setup client = CosmosFactory.createCosmosAsyncClient(cosmosClientBuilder); @@ -78,7 +76,7 @@ public void setUp() throws ClassNotFoundException { try { mappingContext.setInitialEntitySet(new EntityScanner(this.applicationContext).scan(Persistent.class)); } catch (Exception e) { - Assert.fail(); + Assertions.fail(); } final MappingCosmosConverter cosmosConverter = new MappingCosmosConverter(mappingContext, null); @@ -107,7 +105,7 @@ public void testGetDatabaseFunctionality() { Iterable iterableDB2 = cosmosTemplate.findAll(personInfo.getContainerName(), Person.class); List resultDB2 = new ArrayList<>(); iterableDB2.forEach(resultDB2::add); - Assert.assertEquals(expectedResultsDB2, resultDB2); + assertEquals(expectedResultsDB2, resultDB2); // Check that DB1 has the correct contents cosmosFactory.manuallySetDatabaseName = testDB1; @@ -116,7 +114,7 @@ public void testGetDatabaseFunctionality() { Iterable iterableDB1 = cosmosTemplate.findAll(personInfo.getContainerName(), Person.class); List resultDB1 = new ArrayList<>(); iterableDB1.forEach(resultDB1::add); - Assert.assertEquals(expectedResultsDB1, resultDB1); + assertEquals(expectedResultsDB1, resultDB1); //Cleanup deleteDatabaseIfExists(testDB1); diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplateIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplateIT.java index 7b7af5273812..407187e1c35e 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplateIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplateIT.java @@ -45,23 +45,20 @@ import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import org.assertj.core.api.Assertions; import org.assertj.core.util.Lists; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.persistence.autoconfigure.EntityScanner; +import org.springframework.boot.autoconfigure.domain.EntityScanner; import org.springframework.context.ApplicationContext; import org.springframework.data.annotation.Persistent; import org.springframework.data.auditing.IsNewAwareAuditingHandler; import org.springframework.data.repository.query.parser.Part; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.util.ReflectionTestUtils; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -95,12 +92,11 @@ import static com.azure.spring.data.cosmos.common.TestConstants.PATCH_HOBBY1; import static com.azure.spring.data.cosmos.common.TestConstants.TRANSIENT_PROPERTY; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.fail; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class ReactiveCosmosTemplateIT { private static final Person TEST_PERSON = new Person(TestConstants.ID_1, TestConstants.FIRST_NAME, @@ -154,7 +150,7 @@ public class ReactiveCosmosTemplateIT { private static final CosmosPatchItemRequestOptions options = new CosmosPatchItemRequestOptions(); - @ClassRule + public static final ReactiveIntegrationTestCollectionManager collectionManager = new ReactiveIntegrationTestCollectionManager(); @Value("${cosmos.secondaryKey}") @@ -192,7 +188,7 @@ public class ReactiveCosmosTemplateIT { @Autowired private StubDateTimeProvider stubDateTimeProvider; - @Before + @BeforeEach public void setUp() throws ClassNotFoundException { if (cosmosTemplate == null) { azureKeyCredential = new AzureKeyCredential(cosmosDbKey); @@ -224,7 +220,7 @@ private ReactiveCosmosTemplate createReactiveCosmosTemplate(CosmosConfig config, return new ReactiveCosmosTemplate(cosmosFactory, config, cosmosConverter, inah); } - @After + @AfterEach public void cleanup() { // Reset master key azureKeyCredential.update(cosmosDbKey); @@ -247,7 +243,7 @@ public void testInsertDocShouldNotPersistTransientFields() { final Person personWithTransientField = TEST_PERSON_5; assertThat(personWithTransientField.getTransientProperty()).isNotNull(); final Mono insertedPerson = cosmosTemplate.insert(Person.class.getSimpleName(), personWithTransientField, new PartitionKey(personInfo.getPartitionKeyFieldValue(TEST_PERSON_5))); - Assert.assertEquals(TRANSIENT_PROPERTY, insertedPerson.block().getTransientProperty()); + assertEquals(TRANSIENT_PROPERTY, insertedPerson.block().getTransientProperty()); final Mono retrievedPerson = cosmosTemplate.findById(Person.class.getSimpleName(), personWithTransientField.getId(), Person.class); assertThat(retrievedPerson.block().getTransientProperty()).isNull(); } @@ -284,7 +280,7 @@ public void testFindByIdPointRead() { BASIC_ITEM.getId(), BasicItem.class); StepVerifier.create(findById) - .consumeNextWith(actual -> Assert.assertEquals(actual, BASIC_ITEM)) + .consumeNextWith(actual -> assertEquals(actual, BASIC_ITEM)) .verifyComplete(); assertThat(responseDiagnosticsTestUtils.getCosmosDiagnostics()).isNotNull(); assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNull(); @@ -297,11 +293,11 @@ public void testFindByID() { TEST_PERSON.getId(), Person.class); StepVerifier.create(findById) - .consumeNextWith(actual -> Assert.assertEquals(actual, TEST_PERSON)) + .consumeNextWith(actual -> assertEquals(actual, TEST_PERSON)) .verifyComplete(); assertThat(responseDiagnosticsTestUtils.getCosmosDiagnostics()).isNotNull(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull(); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0); } @Test @@ -311,13 +307,13 @@ public void testFindByIDBySecondaryKey() { TEST_PERSON.getId(), Person.class); StepVerifier.create(findById).consumeNextWith(actual -> { - Assert.assertEquals(actual.getFirstName(), TEST_PERSON.getFirstName()); - Assert.assertEquals(actual.getLastName(), TEST_PERSON.getLastName()); + assertEquals(actual.getFirstName(), TEST_PERSON.getFirstName()); + assertEquals(actual.getLastName(), TEST_PERSON.getLastName()); }).verifyComplete(); assertThat(responseDiagnosticsTestUtils.getCosmosDiagnostics()).isNotNull(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull(); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0); } @Test @@ -327,20 +323,20 @@ public void testFindAll() { StepVerifier.create(flux).expectNextCount(1).verifyComplete(); assertThat(responseDiagnosticsTestUtils.getCosmosDiagnostics()).isNotNull(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull(); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0); } @Test public void testFindByIdWithContainerName() { StepVerifier.create(cosmosTemplate.findById(Person.class.getSimpleName(), TEST_PERSON.getId(), Person.class)) - .consumeNextWith(actual -> Assert.assertEquals(actual, TEST_PERSON)) + .consumeNextWith(actual -> assertEquals(actual, TEST_PERSON)) .verifyComplete(); assertThat(responseDiagnosticsTestUtils.getCosmosDiagnostics()).isNotNull(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull(); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0); } @Test @@ -350,29 +346,29 @@ public void testSaveSetsAuditData() { stubDateTimeProvider.setNow(now); StepVerifier.create(cosmosTemplate.insert(TEST_AUDITABLE_ENTITY_1)) .consumeNextWith(actual -> { - Assert.assertEquals(actual.getId(), UUID_1); + assertEquals(actual.getId(), UUID_1); }).verifyComplete(); StepVerifier.create(cosmosTemplate.insert(TEST_AUDITABLE_ENTITY_2)) .consumeNextWith(actual -> { - Assert.assertEquals(actual.getId(), UUID_2); + assertEquals(actual.getId(), UUID_2); }).verifyComplete(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNull(); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNull(); assertThat(responseDiagnosticsTestUtils.getCosmosDiagnostics()).isNotNull(); final Flux flux = cosmosTemplate.findAll(auditableEntityInfo.getContainerName(), AuditableEntity.class); StepVerifier.create(flux).consumeNextWith(actual -> { - Assert.assertEquals(actual.getId(), UUID_1); - Assert.assertEquals(actual.getCreatedBy(), "test-auditor"); - Assert.assertEquals(actual.getLastModifiedBy(), "test-auditor"); - Assert.assertEquals(actual.getCreatedDate(), now); - Assert.assertEquals(actual.getLastModifiedByDate(), now); + assertEquals(actual.getId(), UUID_1); + assertEquals(actual.getCreatedBy(), "test-auditor"); + assertEquals(actual.getLastModifiedBy(), "test-auditor"); + assertEquals(actual.getCreatedDate(), now); + assertEquals(actual.getLastModifiedByDate(), now); }).consumeNextWith(actual -> { - Assert.assertEquals(actual.getId(), UUID_2); - Assert.assertEquals(actual.getCreatedBy(), "test-auditor"); - Assert.assertEquals(actual.getLastModifiedBy(), "test-auditor"); - Assert.assertEquals(actual.getCreatedDate(), now); - Assert.assertEquals(actual.getLastModifiedByDate(), now); + assertEquals(actual.getId(), UUID_2); + assertEquals(actual.getCreatedBy(), "test-auditor"); + assertEquals(actual.getLastModifiedBy(), "test-auditor"); + assertEquals(actual.getCreatedDate(), now); + assertEquals(actual.getLastModifiedByDate(), now); }).verifyComplete(); } @@ -384,22 +380,22 @@ public void testSaveAllSetsAuditData() { StepVerifier.create(cosmosTemplate.insertAll(auditableEntityInfo, Lists.newArrayList(TEST_AUDITABLE_ENTITY_1, TEST_AUDITABLE_ENTITY_2))).expectNextCount(2).verifyComplete(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNull(); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNull(); assertThat(responseDiagnosticsTestUtils.getCosmosDiagnostics()).isNotNull(); final Flux flux = cosmosTemplate.findAll(auditableEntityInfo.getContainerName(), AuditableEntity.class); StepVerifier.create(flux).consumeNextWith(actual -> { - Assert.assertEquals(actual.getId(), UUID_1); - Assert.assertEquals(actual.getCreatedBy(), "test-auditor-2"); - Assert.assertEquals(actual.getLastModifiedBy(), "test-auditor-2"); - Assert.assertEquals(actual.getCreatedDate(), now); - Assert.assertEquals(actual.getLastModifiedByDate(), now); + assertEquals(actual.getId(), UUID_1); + assertEquals(actual.getCreatedBy(), "test-auditor-2"); + assertEquals(actual.getLastModifiedBy(), "test-auditor-2"); + assertEquals(actual.getCreatedDate(), now); + assertEquals(actual.getLastModifiedByDate(), now); }).consumeNextWith(actual -> { - Assert.assertEquals(actual.getId(), UUID_2); - Assert.assertEquals(actual.getCreatedBy(), "test-auditor-2"); - Assert.assertEquals(actual.getLastModifiedBy(), "test-auditor-2"); - Assert.assertEquals(actual.getCreatedDate(), now); - Assert.assertEquals(actual.getLastModifiedByDate(), now); + assertEquals(actual.getId(), UUID_2); + assertEquals(actual.getCreatedBy(), "test-auditor-2"); + assertEquals(actual.getLastModifiedBy(), "test-auditor-2"); + assertEquals(actual.getCreatedDate(), now); + assertEquals(actual.getLastModifiedByDate(), now); }).verifyComplete(); } @@ -411,7 +407,7 @@ public void testSaveAllFailureAuditData() { StepVerifier.create(cosmosTemplate.insertAll(auditableEntityInfo, Lists.newArrayList(TEST_AUDITABLE_ENTITY_1, TEST_AUDITABLE_ENTITY_2, TEST_AUDITABLE_ENTITY_3))).expectNextCount(3).verifyComplete(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNull(); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNull(); assertThat(responseDiagnosticsTestUtils.getCosmosDiagnostics()).isNotNull(); final List result = cosmosTemplate.findAll(auditableEntityInfo.getContainerName(), AuditableEntity.class).collectList().block(); @@ -422,28 +418,28 @@ public void testSaveAllFailureAuditData() { stubDateTimeProvider.setNow(now2); StepVerifier.create(cosmosTemplate.insertAll(auditableEntityInfo, result)) - .consumeNextWith(actual -> Assert.assertEquals(actual.getId(), UUID_1)) - .consumeNextWith(actual -> Assert.assertEquals(actual.getId(), UUID_3)).verifyComplete(); + .consumeNextWith(actual -> assertEquals(actual.getId(), UUID_1)) + .consumeNextWith(actual -> assertEquals(actual.getId(), UUID_3)).verifyComplete(); final Flux flux = cosmosTemplate.findAll(auditableEntityInfo.getContainerName(), AuditableEntity.class); StepVerifier.create(flux).consumeNextWith(actual -> { - Assert.assertEquals(actual.getId(), UUID_1); - Assert.assertEquals(actual.getCreatedBy(), "test-auditor-2"); - Assert.assertEquals(actual.getLastModifiedBy(), "test-auditor-3"); - Assert.assertEquals(actual.getCreatedDate(), now); - Assert.assertEquals(actual.getLastModifiedByDate(), now2); + assertEquals(actual.getId(), UUID_1); + assertEquals(actual.getCreatedBy(), "test-auditor-2"); + assertEquals(actual.getLastModifiedBy(), "test-auditor-3"); + assertEquals(actual.getCreatedDate(), now); + assertEquals(actual.getLastModifiedByDate(), now2); }).consumeNextWith(actual -> { - Assert.assertEquals(actual.getId(), UUID_2); - Assert.assertEquals(actual.getCreatedBy(), "test-auditor-2"); - Assert.assertEquals(actual.getLastModifiedBy(), "test-auditor-2"); - Assert.assertEquals(actual.getCreatedDate(), now); - Assert.assertEquals(actual.getLastModifiedByDate(), now); + assertEquals(actual.getId(), UUID_2); + assertEquals(actual.getCreatedBy(), "test-auditor-2"); + assertEquals(actual.getLastModifiedBy(), "test-auditor-2"); + assertEquals(actual.getCreatedDate(), now); + assertEquals(actual.getLastModifiedByDate(), now); }).consumeNextWith(actual -> { - Assert.assertEquals(actual.getId(), UUID_3); - Assert.assertEquals(actual.getCreatedBy(), "test-auditor-2"); - Assert.assertEquals(actual.getLastModifiedBy(), "test-auditor-3"); - Assert.assertEquals(actual.getCreatedDate(), now); - Assert.assertEquals(actual.getLastModifiedByDate(), now2); + assertEquals(actual.getId(), UUID_3); + assertEquals(actual.getCreatedBy(), "test-auditor-2"); + assertEquals(actual.getLastModifiedBy(), "test-auditor-3"); + assertEquals(actual.getCreatedDate(), now); + assertEquals(actual.getLastModifiedByDate(), now2); }).verifyComplete(); } @@ -454,7 +450,7 @@ public void testInsert() { .expectNext(TEST_PERSON_3).verifyComplete(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNull(); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNull(); assertThat(responseDiagnosticsTestUtils.getCosmosDiagnostics()).isNotNull(); } @@ -466,7 +462,7 @@ public void testInsertBySecondaryKey() { .expectNext(TEST_PERSON_3).verifyComplete(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNull(); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNull(); assertThat(responseDiagnosticsTestUtils.getCosmosDiagnostics()).isNotNull(); } @@ -477,7 +473,7 @@ public void testInsertWithContainerName() { .expectNext(TEST_PERSON_2).verifyComplete(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNull(); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNull(); assertThat(responseDiagnosticsTestUtils.getCosmosDiagnostics()).isNotNull(); } @@ -510,7 +506,7 @@ public void testUpsert() { p.setHobbies(hobbies); final Mono upsert = cosmosTemplate.upsert(p); StepVerifier.create(upsert).expectNextCount(1).verifyComplete(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNull(); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNull(); assertThat(responseDiagnosticsTestUtils.getCosmosDiagnostics()).isNotNull(); } @@ -526,7 +522,7 @@ public void testUpsertNewDocumentIgnoresTransientFields() { final Mono person = cosmosTemplate.upsert(Person.class.getSimpleName(), newPerson); - Assert.assertEquals(TRANSIENT_PROPERTY, person.block().getTransientProperty()); + assertEquals(TRANSIENT_PROPERTY, person.block().getTransientProperty()); assertThat(responseDiagnosticsTestUtils.getCosmosDiagnostics()).isNotNull(); assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNull(); @@ -606,7 +602,7 @@ public void testUpsertBySecondaryKey() { StepVerifier.create(upsert).expectNextCount(1).verifyComplete(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNull(); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNull(); assertThat(responseDiagnosticsTestUtils.getCosmosDiagnostics()).isNotNull(); } @@ -620,7 +616,7 @@ public void testUpsertWithContainerName() { StepVerifier.create(upsert).expectNextCount(1).verifyComplete(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNull(); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNull(); assertThat(responseDiagnosticsTestUtils.getCosmosDiagnostics()).isNotNull(); } @@ -630,15 +626,15 @@ public void testDeleteById() { new PartitionKey(personInfo.getPartitionKeyFieldValue(TEST_PERSON_4))).block(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNull(); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNull(); assertThat(responseDiagnosticsTestUtils.getCosmosDiagnostics()).isNotNull(); Flux flux = cosmosTemplate.findAll(Person.class.getSimpleName(), Person.class); StepVerifier.create(flux).expectNextCount(2).verifyComplete(); assertThat(responseDiagnosticsTestUtils.getCosmosDiagnostics()).isNotNull(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull(); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0); final Mono voidMono = cosmosTemplate.deleteById(Person.class.getSimpleName(), @@ -647,15 +643,15 @@ public void testDeleteById() { StepVerifier.create(voidMono).verifyComplete(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNull(); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNull(); assertThat(responseDiagnosticsTestUtils.getCosmosDiagnostics()).isNotNull(); flux = cosmosTemplate.findAll(Person.class.getSimpleName(), Person.class); StepVerifier.create(flux).expectNextCount(1).verifyComplete(); assertThat(responseDiagnosticsTestUtils.getCosmosDiagnostics()).isNotNull(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull(); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0); } @@ -665,30 +661,30 @@ public void testDeleteByEntity() { new PartitionKey(personInfo.getPartitionKeyFieldValue(TEST_PERSON_4))).block(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNull(); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNull(); assertThat(responseDiagnosticsTestUtils.getCosmosDiagnostics()).isNotNull(); Flux flux = cosmosTemplate.findAll(Person.class.getSimpleName(), Person.class); StepVerifier.create(flux).expectNextCount(2).verifyComplete(); assertThat(responseDiagnosticsTestUtils.getCosmosDiagnostics()).isNotNull(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull(); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0); final Mono voidMono = cosmosTemplate.deleteEntity(Person.class.getSimpleName(), insertedPerson); StepVerifier.create(voidMono).verifyComplete(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNull(); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNull(); assertThat(responseDiagnosticsTestUtils.getCosmosDiagnostics()).isNotNull(); flux = cosmosTemplate.findAll(Person.class.getSimpleName(), Person.class); StepVerifier.create(flux).expectNextCount(1).verifyComplete(); assertThat(responseDiagnosticsTestUtils.getCosmosDiagnostics()).isNotNull(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull(); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0); } @@ -697,7 +693,7 @@ public void testDeleteByQuery() { cosmosTemplate.insert(TEST_PERSON_4, new PartitionKey(personInfo.getPartitionKeyFieldValue(TEST_PERSON_4))).block(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNull(); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNull(); assertThat(responseDiagnosticsTestUtils.getCosmosDiagnostics()).isNotNull(); final Criteria criteria = Criteria.getInstance(CriteriaType.IS_EQUAL, "id", @@ -708,8 +704,8 @@ public void testDeleteByQuery() { StepVerifier.create(deleteFlux).expectNextCount(1).verifyComplete(); assertThat(responseDiagnosticsTestUtils.getCosmosDiagnostics()).isNotNull(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull(); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0); Mono itemMono = cosmosTemplate.findById(TEST_PERSON_4.getId(), Person.class); StepVerifier.create(itemMono).expectNextCount(0).verifyComplete(); @@ -748,8 +744,8 @@ public void testFind() { StepVerifier.create(personFluxIgnoreCase).expectNextCount(1).verifyComplete(); assertThat(responseDiagnosticsTestUtils.getCosmosDiagnostics()).isNotNull(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull(); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0); } @Test @@ -768,8 +764,8 @@ public void testExists() { StepVerifier.create(existsIgnoreCase).expectNext(true).verifyComplete(); assertThat(responseDiagnosticsTestUtils.getCosmosDiagnostics()).isNotNull(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull(); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0); } @Test @@ -788,8 +784,8 @@ public void testNotExists() { StepVerifier.create(existsIgnoreCase).expectNext(false).verifyComplete(); assertThat(responseDiagnosticsTestUtils.getCosmosDiagnostics()).isNotNull(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull(); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0); } @Test @@ -798,8 +794,8 @@ public void testCount() { StepVerifier.create(count).expectNext((long) 1).verifyComplete(); assertThat(responseDiagnosticsTestUtils.getCosmosDiagnostics()).isNotNull(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull(); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0); } @Test diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplatePartitionIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplatePartitionIT.java index a0c94f82100a..ffbfe5068841 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplatePartitionIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplatePartitionIT.java @@ -2,6 +2,9 @@ // Licensed under the MIT License. package com.azure.spring.data.cosmos.core; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; + import com.azure.cosmos.CosmosAsyncClient; import com.azure.cosmos.CosmosClientBuilder; import com.azure.cosmos.models.PartitionKey; @@ -18,19 +21,15 @@ import com.azure.spring.data.cosmos.domain.PartitionPerson; import com.azure.spring.data.cosmos.repository.TestRepositoryConfig; import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; -import org.assertj.core.api.Assertions; -import org.junit.Assert; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; + +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.persistence.autoconfigure.EntityScanner; +import org.springframework.boot.autoconfigure.domain.EntityScanner; import org.springframework.context.ApplicationContext; import org.springframework.data.annotation.Persistent; import org.springframework.data.repository.query.parser.Part; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; @@ -42,8 +41,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class ReactiveCosmosTemplatePartitionIT { private static final PartitionPerson TEST_PERSON = new PartitionPerson(TestConstants.ID_1, @@ -54,7 +52,7 @@ public class ReactiveCosmosTemplatePartitionIT { TestConstants.NEW_FIRST_NAME, TestConstants.NEW_ZIP_CODE, TestConstants.HOBBIES, TestConstants.ADDRESSES); - @ClassRule + public static final ReactiveIntegrationTestCollectionManager collectionManager = new ReactiveIntegrationTestCollectionManager(); private static CosmosFactory cosmosFactory; @@ -71,7 +69,7 @@ public class ReactiveCosmosTemplatePartitionIT { @Autowired private ResponseDiagnosticsTestUtils responseDiagnosticsTestUtils; - @Before + @BeforeEach public void setUp() throws ClassNotFoundException { if (cosmosTemplate == null) { // Query plan caching is enabled by default @@ -102,13 +100,13 @@ public void testFindWithPartition() { PartitionPerson.class, PartitionPerson.class.getSimpleName()); StepVerifier.create(partitionPersonFlux).consumeNextWith(actual -> { - Assert.assertEquals(actual.getFirstName(), TEST_PERSON.getFirstName()); - Assert.assertEquals(actual.getZipCode(), TEST_PERSON.getZipCode()); + assertEquals(actual.getFirstName(), TEST_PERSON.getFirstName()); + assertEquals(actual.getZipCode(), TEST_PERSON.getZipCode()); }).verifyComplete(); assertThat(responseDiagnosticsTestUtils.getCosmosDiagnostics()).isNotNull(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull(); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0); } // TODO: Find a way to test the query plan cache contents without using implementation package @@ -122,8 +120,8 @@ public void testFindWithPartitionWithQueryPlanCachingEnabled() { PartitionPerson.class, PartitionPerson.class.getSimpleName()); StepVerifier.create(partitionPersonFlux).consumeNextWith(actual -> { - Assert.assertEquals(actual.getFirstName(), TEST_PERSON.getFirstName()); - Assert.assertEquals(actual.getZipCode(), TEST_PERSON.getZipCode()); + assertEquals(actual.getFirstName(), TEST_PERSON.getFirstName()); + assertEquals(actual.getZipCode(), TEST_PERSON.getZipCode()); }).verifyComplete(); // CosmosAsyncClient cosmosAsyncClient = cosmosFactory.getCosmosAsyncClient(); @@ -143,8 +141,8 @@ public void testFindWithPartitionWithQueryPlanCachingEnabled() { PartitionPerson.class, PartitionPerson.class.getSimpleName()); StepVerifier.create(partitionPersonFlux).consumeNextWith(actual -> { - Assert.assertEquals(actual.getFirstName(), TEST_PERSON_2.getFirstName()); - Assert.assertEquals(actual.getZipCode(), TEST_PERSON_2.getZipCode()); + assertEquals(actual.getFirstName(), TEST_PERSON_2.getFirstName()); + assertEquals(actual.getZipCode(), TEST_PERSON_2.getZipCode()); }).verifyComplete(); // Map postQueryCallCache = asyncDocumentClient.getQueryPlanCache(); @@ -161,13 +159,13 @@ public void testFindIgnoreCaseWithPartition() { PartitionPerson.class, PartitionPerson.class.getSimpleName()); StepVerifier.create(partitionPersonFlux).consumeNextWith(actual -> { - Assert.assertEquals(actual.getFirstName(), TEST_PERSON.getFirstName()); - Assert.assertEquals(actual.getZipCode(), TEST_PERSON.getZipCode()); + assertEquals(actual.getFirstName(), TEST_PERSON.getFirstName()); + assertEquals(actual.getZipCode(), TEST_PERSON.getZipCode()); }).verifyComplete(); assertThat(responseDiagnosticsTestUtils.getCosmosDiagnostics()).isNotNull(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull(); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0); } @@ -177,8 +175,8 @@ public void testFindByIdWithPartition() { PartitionPerson.class, new PartitionKey(personInfo.getPartitionKeyFieldValue(TEST_PERSON))); StepVerifier.create(partitionPersonMono).consumeNextWith(actual -> { - Assert.assertEquals(actual.getFirstName(), TEST_PERSON.getFirstName()); - Assert.assertEquals(actual.getZipCode(), TEST_PERSON.getZipCode()); + assertEquals(actual.getFirstName(), TEST_PERSON.getFirstName()); + assertEquals(actual.getZipCode(), TEST_PERSON.getZipCode()); }).verifyComplete(); assertThat(responseDiagnosticsTestUtils.getCosmosDiagnostics()).isNotNull(); @@ -221,8 +219,8 @@ public void testUpdateWithPartition() { assertEquals(person, updated); assertThat(responseDiagnosticsTestUtils.getCosmosDiagnostics()).isNotNull(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull(); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0); } @Test @@ -237,8 +235,8 @@ public void testDeleteByIdPartition() { .verifyComplete(); assertThat(responseDiagnosticsTestUtils.getCosmosDiagnostics()).isNotNull(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull(); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0); } @Test @@ -251,8 +249,8 @@ public void testDeleteAll() { .verifyComplete(); assertThat(responseDiagnosticsTestUtils.getCosmosDiagnostics()).isNotNull(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull(); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0); } @Test @@ -264,8 +262,8 @@ public void testCountForPartitionedCollection() { .expectNext((long) 2).verifyComplete(); assertThat(responseDiagnosticsTestUtils.getCosmosDiagnostics()).isNotNull(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull(); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0); } @Test @@ -278,8 +276,8 @@ public void testCountForPartitionedCollectionByQuery() { .expectNext((long) 1).verifyComplete(); assertThat(responseDiagnosticsTestUtils.getCosmosDiagnostics()).isNotNull(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull(); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0); } @Test @@ -292,8 +290,8 @@ public void testCountIgnoreCaseForPartitionedCollectionByQuery() { .expectNext((long) 1).verifyComplete(); assertThat(responseDiagnosticsTestUtils.getCosmosDiagnostics()).isNotNull(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull(); - Assertions.assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNotNull(); + assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0); } } diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantContainerCosmosFactoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantContainerCosmosFactoryIT.java index 3bcaca81a3fc..77eef43b221b 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantContainerCosmosFactoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantContainerCosmosFactoryIT.java @@ -16,17 +16,16 @@ import com.azure.spring.data.cosmos.domain.Person; import com.azure.spring.data.cosmos.repository.MultiTenantTestRepositoryConfig; import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; -import org.junit.Assert; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.persistence.autoconfigure.EntityScanner; +import org.springframework.boot.autoconfigure.domain.EntityScanner; import org.springframework.context.ApplicationContext; import org.springframework.data.annotation.Persistent; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import reactor.core.publisher.Flux; import reactor.test.StepVerifier; @@ -42,10 +41,9 @@ import static com.azure.spring.data.cosmos.common.TestConstants.LAST_NAME; import static com.azure.spring.data.cosmos.common.TestConstants.PASSPORT_IDS_BY_COUNTRY; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = MultiTenantTestRepositoryConfig.class) public class ReactiveMultiTenantContainerCosmosFactoryIT { @@ -57,7 +55,7 @@ public class ReactiveMultiTenantContainerCosmosFactoryIT { private final Person TEST_PERSON_1 = new Person(ID_1, FIRST_NAME, LAST_NAME, HOBBIES, ADDRESSES, AGE, PASSPORT_IDS_BY_COUNTRY); private final Person TEST_PERSON_2 = new Person(ID_2, FIRST_NAME, LAST_NAME, HOBBIES, ADDRESSES, AGE, PASSPORT_IDS_BY_COUNTRY); - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); @Autowired @@ -72,7 +70,7 @@ public class ReactiveMultiTenantContainerCosmosFactoryIT { private CosmosAsyncClient client; private CosmosEntityInformation personInfo; - @Before + @BeforeEach public void setUp() throws ClassNotFoundException { /// Setup client = CosmosFactory.createCosmosAsyncClient(cosmosClientBuilder); @@ -82,7 +80,7 @@ public void setUp() throws ClassNotFoundException { try { mappingContext.setInitialEntitySet(new EntityScanner(this.applicationContext).scan(Persistent.class)); } catch (Exception e) { - Assert.fail(); + Assertions.fail(); } final MappingCosmosConverter cosmosConverter = new MappingCosmosConverter(mappingContext, null); @@ -113,7 +111,7 @@ public void testGetContainerFunctionality() { StepVerifier.create(fluxDB2).expectNextCount(1).verifyComplete(); List resultDB2 = new ArrayList<>(); fluxDB2.toIterable().forEach(resultDB2::add); - Assert.assertEquals(expectedResultsContainer2, resultDB2); + assertEquals(expectedResultsContainer2, resultDB2); // Check that testContainer1 has the correct contents cosmosFactory.manuallySetContainerName = testContainer1; @@ -123,7 +121,7 @@ public void testGetContainerFunctionality() { StepVerifier.create(fluxDB1).expectNextCount(1).verifyComplete(); List resultDB1 = new ArrayList<>(); fluxDB1.toIterable().forEach(resultDB1::add); - Assert.assertEquals(expectedResultsContainer1, resultDB1); + assertEquals(expectedResultsContainer1, resultDB1); //Cleanup deleteDatabaseIfExists(testDB1); diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantDBCosmosFactoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantDBCosmosFactoryIT.java index 32619f94c101..56bc2acd0499 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantDBCosmosFactoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantDBCosmosFactoryIT.java @@ -16,17 +16,16 @@ import com.azure.spring.data.cosmos.domain.Person; import com.azure.spring.data.cosmos.repository.MultiTenantTestRepositoryConfig; import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; -import org.junit.Assert; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.persistence.autoconfigure.EntityScanner; +import org.springframework.boot.autoconfigure.domain.EntityScanner; import org.springframework.context.ApplicationContext; import org.springframework.data.annotation.Persistent; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import reactor.core.publisher.Flux; import reactor.test.StepVerifier; @@ -42,10 +41,9 @@ import static com.azure.spring.data.cosmos.common.TestConstants.LAST_NAME; import static com.azure.spring.data.cosmos.common.TestConstants.PASSPORT_IDS_BY_COUNTRY; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = MultiTenantTestRepositoryConfig.class) public class ReactiveMultiTenantDBCosmosFactoryIT { @@ -55,7 +53,7 @@ public class ReactiveMultiTenantDBCosmosFactoryIT { private final Person TEST_PERSON_1 = new Person(ID_1, FIRST_NAME, LAST_NAME, HOBBIES, ADDRESSES, AGE, PASSPORT_IDS_BY_COUNTRY); private final Person TEST_PERSON_2 = new Person(ID_2, FIRST_NAME, LAST_NAME, HOBBIES, ADDRESSES, AGE, PASSPORT_IDS_BY_COUNTRY); - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); @Autowired @@ -70,7 +68,7 @@ public class ReactiveMultiTenantDBCosmosFactoryIT { private CosmosAsyncClient client; private CosmosEntityInformation personInfo; - @Before + @BeforeEach public void setUp() throws ClassNotFoundException { /// Setup client = CosmosFactory.createCosmosAsyncClient(cosmosClientBuilder); @@ -80,7 +78,7 @@ public void setUp() throws ClassNotFoundException { try { mappingContext.setInitialEntitySet(new EntityScanner(this.applicationContext).scan(Persistent.class)); } catch (Exception e) { - Assert.fail(); + Assertions.fail(); } final MappingCosmosConverter cosmosConverter = new MappingCosmosConverter(mappingContext, null); diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/convert/ZonedDateTimeDeserializerTest.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/convert/ZonedDateTimeDeserializerTest.java index 88b593f2fe95..57059cfc962f 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/convert/ZonedDateTimeDeserializerTest.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/convert/ZonedDateTimeDeserializerTest.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. package com.azure.spring.data.cosmos.core.convert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.time.ZoneId; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/converter/MappingCosmosConverterUnitTest.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/converter/MappingCosmosConverterUnitTest.java index 0a11e4a78741..f86817f8f79a 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/converter/MappingCosmosConverterUnitTest.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/converter/MappingCosmosConverterUnitTest.java @@ -15,11 +15,11 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.context.ApplicationContext; import java.text.ParseException; @@ -29,7 +29,7 @@ import static org.assertj.core.api.Assertions.assertThat; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class MappingCosmosConverterUnitTest { private static final SimpleDateFormat DATE = new SimpleDateFormat(TestConstants.DATE_FORMAT); private static final SimpleDateFormat TIMEZONE_DATE = new SimpleDateFormat(TestConstants.DATE_TIMEZONE_FORMAT); @@ -39,7 +39,7 @@ public class MappingCosmosConverterUnitTest { @Mock ApplicationContext applicationContext; - @Before + @BeforeEach public void setUp() { final CosmosMappingContext mappingContext = new CosmosMappingContext(); final ObjectMapper objectMapper = new ObjectMapper(); diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/generator/AbstractQueryGeneratorTest.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/generator/AbstractQueryGeneratorTest.java index 55c21c65ce11..9c6d48004646 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/generator/AbstractQueryGeneratorTest.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/generator/AbstractQueryGeneratorTest.java @@ -10,9 +10,9 @@ import com.azure.spring.data.cosmos.core.query.CriteriaType; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.springframework.data.domain.Sort; import org.springframework.data.repository.query.parser.Part; @@ -22,13 +22,14 @@ import java.util.stream.Collectors; import static org.springframework.data.domain.Sort.Direction.ASC; +import static org.junit.jupiter.api.Assertions.*; public class AbstractQueryGeneratorTest { @Mock private EmptyQueryGenerator queryGenerator; - @Before + @BeforeEach public void setUp() { this.queryGenerator = new EmptyQueryGenerator(); } @@ -45,7 +46,7 @@ public void binaryOperatorPriorityPreserved() { final CosmosQuery query = new CosmosQuery(and); SqlQuerySpec querySpec = queryGenerator.generateCosmos(query); List parameterNames = querySpec.getParameters().stream().map(SqlParameter::getName).collect(Collectors.toList()); - Assert.assertNotNull(querySpec.getQueryText()); + Assertions.assertNotNull(querySpec.getQueryText()); MatcherAssert.assertThat(querySpec.getQueryText(), Matchers.stringContainsInOrder( parameterNames.get(0), CriteriaType.AND.getSqlKeyword(), "(", parameterNames.get(1), CriteriaType.OR.getSqlKeyword(), parameterNames.get(2), ")")); @@ -60,7 +61,7 @@ public void generateBinaryQueryWithStartsWithDoesNotUseUpper() { SqlQuerySpec result = queryGenerator.generateCosmos(query); - Assert.assertEquals(result.getQueryText(), " WHERE STARTSWITH(r.firstName, @firstName0, true) "); + assertEquals(result.getQueryText(), " WHERE STARTSWITH(r.firstName, @firstName0, true) "); } @Test @@ -72,7 +73,7 @@ public void generateBinaryQueryWithSort() { SqlQuerySpec result = queryGenerator.generateCosmos(query); - Assert.assertEquals(result.getQueryText(), " WHERE ARRAY_CONTAINS(UPPER(r.lastName), UPPER(@lastName0)) ORDER BY r.id ASC"); + assertEquals(result.getQueryText(), " WHERE ARRAY_CONTAINS(UPPER(r.lastName), UPPER(@lastName0)) ORDER BY r.id ASC"); } @Test @@ -84,7 +85,7 @@ public void generateBinaryQueryWithArrayContainsUsesUpper() { SqlQuerySpec result = queryGenerator.generateCosmos(query); - Assert.assertEquals(result.getQueryText(), " WHERE ARRAY_CONTAINS(UPPER(r.lastName), UPPER(@lastName0)) "); + assertEquals(result.getQueryText(), " WHERE ARRAY_CONTAINS(UPPER(r.lastName), UPPER(@lastName0)) "); } @Test @@ -98,9 +99,9 @@ public void generateBinaryQueryWithStringEquals() { SqlQuerySpec result = queryGenerator.generateCosmos(query); if (ignoreCaseType == Part.IgnoreCaseType.NEVER) { - Assert.assertEquals(result.getQueryText(), " WHERE STRINGEQUALS(r.firstName, @firstName0) "); + assertEquals(result.getQueryText(), " WHERE STRINGEQUALS(r.firstName, @firstName0) "); } else { - Assert.assertEquals(result.getQueryText(), " WHERE STRINGEQUALS(r.firstName, @firstName0, true) "); + assertEquals(result.getQueryText(), " WHERE STRINGEQUALS(r.firstName, @firstName0, true) "); } } } @@ -114,7 +115,7 @@ public void generateBinaryQueryWithIsEqualIntUsesUpper() { SqlQuerySpec result = queryGenerator.generateCosmos(query); - Assert.assertEquals(result.getQueryText(), " WHERE UPPER(r.zipcode) = UPPER(@zipcode0) "); + assertEquals(result.getQueryText(), " WHERE UPPER(r.zipcode) = UPPER(@zipcode0) "); } @Test @@ -126,7 +127,7 @@ public void generateBinaryQueryWithIsEqualStringDoesNotUseUpper() { SqlQuerySpec result = queryGenerator.generateCosmos(query); - Assert.assertEquals(result.getQueryText(), " WHERE STRINGEQUALS(r.firstName, @firstName0, true) "); + assertEquals(result.getQueryText(), " WHERE STRINGEQUALS(r.firstName, @firstName0, true) "); } private static class EmptyQueryGenerator extends AbstractQueryGenerator implements QuerySpecGenerator { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/generator/NativeQueryGeneratorTest.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/generator/NativeQueryGeneratorTest.java index a21f4aeb60fc..e6c165623020 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/generator/NativeQueryGeneratorTest.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/generator/NativeQueryGeneratorTest.java @@ -6,9 +6,8 @@ import com.azure.cosmos.models.SqlParameter; import com.azure.cosmos.models.SqlQuerySpec; import com.azure.spring.data.cosmos.core.query.CosmosQuery; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.springframework.data.domain.Sort; @@ -16,13 +15,14 @@ import java.util.List; import static org.springframework.data.domain.Sort.Direction.ASC; +import static org.junit.jupiter.api.Assertions.*; public class NativeQueryGeneratorTest { @Mock private EmptyQueryGenerator queryGenerator; - @Before + @BeforeEach public void setUp() { this.queryGenerator = new EmptyQueryGenerator(); } @@ -35,7 +35,7 @@ public void generateSortedQueryTest() { SqlQuerySpec querySpec = new SqlQuerySpec("select * from a where a.firstName = @firstName", sqlParameters); final SqlQuerySpec sortedQuerySpec = NativeQueryGenerator.getInstance().generateSortedQuery(querySpec, Sort.by(ASC, "id")); - Assert.assertEquals(sortedQuerySpec.getQueryText(), "select * from a where a.firstName = @firstName ORDER BY a.id ASC"); + assertEquals(sortedQuerySpec.getQueryText(), "select * from a where a.firstName = @firstName ORDER BY a.id ASC"); } private static class EmptyQueryGenerator extends NativeQueryGenerator implements QuerySpecGenerator { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/BasicCosmosPersistentEntityUnitTest.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/BasicCosmosPersistentEntityUnitTest.java index 7ae7ed2c90f9..345457579818 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/BasicCosmosPersistentEntityUnitTest.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/BasicCosmosPersistentEntityUnitTest.java @@ -4,24 +4,26 @@ package com.azure.spring.data.cosmos.core.mapping; import com.azure.spring.data.cosmos.domain.Person; -import org.junit.Test; -import org.springframework.data.core.TypeInformation; +import org.junit.jupiter.api.Test; +import org.springframework.data.util.ClassTypeInformation; import static org.assertj.core.api.Assertions.assertThat; public class BasicCosmosPersistentEntityUnitTest { + @SuppressWarnings({"deprecation", "removal"}) @Test public void testGetCollection() { final BasicCosmosPersistentEntity entity = new BasicCosmosPersistentEntity( - TypeInformation.of(Person.class)); + ClassTypeInformation.from(Person.class)); assertThat(entity.getContainer()).isEqualTo(""); } + @SuppressWarnings({"deprecation", "removal"}) @Test public void testGetLanguage() { final BasicCosmosPersistentEntity entity = new BasicCosmosPersistentEntity( - TypeInformation.of(Person.class)); + ClassTypeInformation.from(Person.class)); assertThat(entity.getLanguage()).isEqualTo(""); } diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/CosmosMappingContextUnitTest.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/CosmosMappingContextUnitTest.java index 2ed4fbbdc906..506f5034267f 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/CosmosMappingContextUnitTest.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/CosmosMappingContextUnitTest.java @@ -3,7 +3,7 @@ package com.azure.spring.data.cosmos.core.mapping; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.springframework.context.ApplicationContext; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/event/ApplicationContextEventErrorIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/event/ApplicationContextEventErrorIT.java index e2e6ef889a99..200d92e55202 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/event/ApplicationContextEventErrorIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/event/ApplicationContextEventErrorIT.java @@ -10,22 +10,21 @@ import com.azure.spring.data.cosmos.repository.TestRepositoryConfig; import com.azure.spring.data.cosmos.repository.repository.AddressRepository; import org.assertj.core.util.Lists; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import static com.azure.spring.data.cosmos.domain.Address.TEST_ADDRESS1_PARTITION1; +import static org.junit.jupiter.api.Assertions.assertThrows; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = {TestRepositoryConfig.class, ErrorEventListenerConfig.class}) public class ApplicationContextEventErrorIT { - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); @Autowired @@ -33,14 +32,16 @@ public class ApplicationContextEventErrorIT { @Autowired private CosmosTemplate template; - @Before + @BeforeEach public void setUp() { collectionManager.ensureContainersCreatedAndEmpty(template, Address.class); repository.saveAll(Lists.newArrayList(TEST_ADDRESS1_PARTITION1)); } - @Test(expected = CosmosAccessException.class) + @Test public void shouldThrowExceptionIfEventListenerThrowsException() { - repository.findById(TEST_ADDRESS1_PARTITION1.getPostalCode(), new PartitionKey(TEST_ADDRESS1_PARTITION1.getCity())); + assertThrows(CosmosAccessException.class, () -> + repository.findById(TEST_ADDRESS1_PARTITION1.getPostalCode(), + new PartitionKey(TEST_ADDRESS1_PARTITION1.getCity()))); } } diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/event/ApplicationContextEventErrorReactiveIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/event/ApplicationContextEventErrorReactiveIT.java index 95fc0f2d2af6..5db9dea65ea7 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/event/ApplicationContextEventErrorReactiveIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/event/ApplicationContextEventErrorReactiveIT.java @@ -10,22 +10,20 @@ import com.azure.spring.data.cosmos.repository.TestRepositoryConfig; import com.azure.spring.data.cosmos.repository.repository.ReactiveAddressRepository; import org.assertj.core.util.Lists; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import static com.azure.spring.data.cosmos.domain.Address.TEST_ADDRESS1_PARTITION1; +import static org.junit.jupiter.api.Assertions.assertThrows; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = {TestRepositoryConfig.class, ErrorEventListenerConfig.class}) public class ApplicationContextEventErrorReactiveIT { - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); @Autowired @@ -33,14 +31,12 @@ public class ApplicationContextEventErrorReactiveIT { @Autowired private CosmosTemplate template; - @Before - public void setUp() { - collectionManager.ensureContainersCreatedAndEmpty(template, Address.class); - repository.saveAll(Lists.newArrayList(TEST_ADDRESS1_PARTITION1)).collectList().block(); - } - - @Test(expected = CosmosAccessException.class) + @Test public void shouldThrowExceptionIfEventListenerThrowsException() { - repository.findById(TEST_ADDRESS1_PARTITION1.getPostalCode(), new PartitionKey(TEST_ADDRESS1_PARTITION1.getCity())).block(); + assertThrows(CosmosAccessException.class, () -> { + collectionManager.ensureContainersCreatedAndEmpty(template, Address.class); + repository.saveAll(Lists.newArrayList(TEST_ADDRESS1_PARTITION1)).collectList().block(); + repository.findById(TEST_ADDRESS1_PARTITION1.getPostalCode(), new PartitionKey(TEST_ADDRESS1_PARTITION1.getCity())).block(); + }); } } diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/event/ApplicationContextEventIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/event/ApplicationContextEventIT.java index 173de249f221..f63cd324cd57 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/event/ApplicationContextEventIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/event/ApplicationContextEventIT.java @@ -11,15 +11,12 @@ import com.azure.spring.data.cosmos.repository.TestRepositoryConfig; import com.azure.spring.data.cosmos.repository.repository.AddressRepository; import org.assertj.core.util.Lists; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.util.ArrayList; import java.util.List; @@ -30,12 +27,11 @@ import static com.azure.spring.data.cosmos.domain.Address.TEST_ADDRESS4_PARTITION3; import static org.assertj.core.api.Assertions.assertThat; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class ApplicationContextEventIT { - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); @Autowired @@ -45,11 +41,9 @@ public class ApplicationContextEventIT { @Autowired private SimpleCosmosMappingEventListener simpleCosmosMappingEventListener; - @SuppressWarnings("deprecation") - @Rule - public ExpectedException expectedException = ExpectedException.none(); - @Before + + @BeforeEach public void setUp() { collectionManager.ensureContainersCreatedAndEmpty(template, Address.class); repository.saveAll(Lists.newArrayList(TEST_ADDRESS1_PARTITION1, TEST_ADDRESS1_PARTITION2, diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/event/ApplicationContextEventReactiveIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/event/ApplicationContextEventReactiveIT.java index 8a3e88ac1395..4ce9f3e4a148 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/event/ApplicationContextEventReactiveIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/event/ApplicationContextEventReactiveIT.java @@ -10,15 +10,12 @@ import com.azure.spring.data.cosmos.repository.TestRepositoryConfig; import com.azure.spring.data.cosmos.repository.repository.ReactiveAddressRepository; import org.assertj.core.util.Lists; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.util.ArrayList; import java.util.List; @@ -29,12 +26,11 @@ import static com.azure.spring.data.cosmos.domain.Address.TEST_ADDRESS4_PARTITION3; import static org.assertj.core.api.Assertions.assertThat; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class ApplicationContextEventReactiveIT { - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); @Autowired @@ -44,11 +40,9 @@ public class ApplicationContextEventReactiveIT { @Autowired private SimpleCosmosMappingEventListener simpleCosmosMappingEventListener; - @SuppressWarnings("deprecation") - @Rule - public ExpectedException expectedException = ExpectedException.none(); - @Before + + @BeforeEach public void setUp() { collectionManager.ensureContainersCreatedAndEmpty(template, Address.class); repository.saveAll(Lists.newArrayList(TEST_ADDRESS1_PARTITION1, TEST_ADDRESS1_PARTITION2, diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/event/CosmosEventListenerUnitTests.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/event/CosmosEventListenerUnitTests.java index e604fdddd8a9..50339dc8194b 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/event/CosmosEventListenerUnitTests.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/event/CosmosEventListenerUnitTests.java @@ -7,7 +7,7 @@ import com.azure.spring.data.cosmos.domain.Student; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.NullNode; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/query/CosmosQueryUnitTest.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/query/CosmosQueryUnitTest.java index 39e0e584129a..6a163bc57a7d 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/query/CosmosQueryUnitTest.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/query/CosmosQueryUnitTest.java @@ -2,8 +2,7 @@ // Licensed under the MIT License. package com.azure.spring.data.cosmos.core.query; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.repository.query.parser.Part; @@ -12,6 +11,7 @@ import static com.azure.spring.data.cosmos.common.TestConstants.CRITERIA_KEY; import static com.azure.spring.data.cosmos.common.TestConstants.CRITERIA_OBJECT; +import static org.junit.jupiter.api.Assertions.*; public class CosmosQueryUnitTest { @@ -22,9 +22,9 @@ public void testDocumentQueryCreate() { final CosmosQuery query = new CosmosQuery(criteria); - Assert.assertEquals(criteria, query.getCriteria()); - Assert.assertEquals(Sort.unsorted(), query.getSort()); - Assert.assertEquals(Pageable.unpaged(), query.getPageable()); - Assert.assertEquals(Part.IgnoreCaseType.NEVER, criteria.getIgnoreCase()); + assertEquals(criteria, query.getCriteria()); + assertEquals(Sort.unsorted(), query.getSort()); + assertEquals(Pageable.unpaged(), query.getPageable()); + assertEquals(Part.IgnoreCaseType.NEVER, criteria.getIgnoreCase()); } } diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/query/CriteriaUnitTest.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/query/CriteriaUnitTest.java index 3ac5bdd4e561..70eac9006d0b 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/query/CriteriaUnitTest.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/query/CriteriaUnitTest.java @@ -4,8 +4,8 @@ import com.azure.spring.data.cosmos.core.generator.FindQuerySpecGenerator; import com.azure.spring.data.cosmos.exception.IllegalQueryException; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.springframework.data.repository.query.parser.Part; import java.util.Arrays; @@ -14,6 +14,7 @@ import static com.azure.spring.data.cosmos.common.TestConstants.CRITERIA_KEY; import static com.azure.spring.data.cosmos.common.TestConstants.CRITERIA_OBJECT; +import static org.junit.jupiter.api.Assertions.*; public class CriteriaUnitTest { @@ -23,12 +24,12 @@ public void testUnaryCriteria() { final Criteria criteria = Criteria.getInstance(CriteriaType.IS_EQUAL, CRITERIA_KEY, values, Part.IgnoreCaseType.NEVER); - Assert.assertTrue(criteria.getSubCriteria().isEmpty()); - Assert.assertEquals(values, criteria.getSubjectValues()); - Assert.assertEquals(CriteriaType.IS_EQUAL, criteria.getType()); - Assert.assertEquals(CRITERIA_KEY, criteria.getSubject()); - Assert.assertTrue(CriteriaType.isBinary(criteria.getType())); - Assert.assertEquals(Part.IgnoreCaseType.NEVER, criteria.getIgnoreCase()); + Assertions.assertTrue(criteria.getSubCriteria().isEmpty()); + assertEquals(values, criteria.getSubjectValues()); + assertEquals(CriteriaType.IS_EQUAL, criteria.getType()); + assertEquals(CRITERIA_KEY, criteria.getSubject()); + Assertions.assertTrue(CriteriaType.isBinary(criteria.getType())); + assertEquals(Part.IgnoreCaseType.NEVER, criteria.getIgnoreCase()); } @Test @@ -40,37 +41,41 @@ public void testBinaryCriteria() { CRITERIA_OBJECT, values, Part.IgnoreCaseType.NEVER); final Criteria criteria = Criteria.getInstance(CriteriaType.AND, leftCriteria, rightCriteria); - Assert.assertNotNull(criteria.getSubCriteria()); - Assert.assertNull(criteria.getSubjectValues()); - Assert.assertNull(criteria.getSubject()); - Assert.assertEquals(criteria.getType(), CriteriaType.AND); - Assert.assertTrue(CriteriaType.isClosed(criteria.getType())); + Assertions.assertNotNull(criteria.getSubCriteria()); + Assertions.assertNull(criteria.getSubjectValues()); + Assertions.assertNull(criteria.getSubject()); + assertEquals(criteria.getType(), CriteriaType.AND); + Assertions.assertTrue(CriteriaType.isClosed(criteria.getType())); - Assert.assertEquals(2, criteria.getSubCriteria().size()); - Assert.assertEquals(leftCriteria, criteria.getSubCriteria().get(0)); - Assert.assertEquals(rightCriteria, criteria.getSubCriteria().get(1)); + assertEquals(2, criteria.getSubCriteria().size()); + assertEquals(leftCriteria, criteria.getSubCriteria().get(0)); + assertEquals(rightCriteria, criteria.getSubCriteria().get(1)); - Assert.assertEquals(Part.IgnoreCaseType.NEVER, criteria.getSubCriteria().get(0).getIgnoreCase()); - Assert.assertEquals(Part.IgnoreCaseType.NEVER, criteria.getSubCriteria().get(1).getIgnoreCase()); + assertEquals(Part.IgnoreCaseType.NEVER, criteria.getSubCriteria().get(0).getIgnoreCase()); + assertEquals(Part.IgnoreCaseType.NEVER, criteria.getSubCriteria().get(1).getIgnoreCase()); } - @Test(expected = IllegalQueryException.class) + @Test public void testInvalidInKeywordParameter() { - final List values = Collections.singletonList(CRITERIA_OBJECT); - final Criteria criteria = Criteria.getInstance(CriteriaType.IN, - CRITERIA_KEY, values, Part.IgnoreCaseType.NEVER); - final CosmosQuery query = new CosmosQuery(criteria); + assertThrows(IllegalQueryException.class, () -> { + final List values = Collections.singletonList(CRITERIA_OBJECT); + final Criteria criteria = Criteria.getInstance(CriteriaType.IN, + CRITERIA_KEY, values, Part.IgnoreCaseType.NEVER); + final CosmosQuery query = new CosmosQuery(criteria); - new FindQuerySpecGenerator().generateCosmos(query); + new FindQuerySpecGenerator().generateCosmos(query); + }); } - @Test(expected = IllegalQueryException.class) + @Test public void testInvalidInKeywordType() { - final List values = Collections.singletonList(new IllegalQueryException("")); - final Criteria criteria = Criteria.getInstance(CriteriaType.IN, - CRITERIA_KEY, values, Part.IgnoreCaseType.NEVER); - final CosmosQuery query = new CosmosQuery(criteria); + assertThrows(IllegalQueryException.class, () -> { + final List values = Collections.singletonList(new IllegalQueryException("")); + final Criteria criteria = Criteria.getInstance(CriteriaType.IN, + CRITERIA_KEY, values, Part.IgnoreCaseType.NEVER); + final CosmosQuery query = new CosmosQuery(criteria); - new FindQuerySpecGenerator().generateCosmos(query); + new FindQuerySpecGenerator().generateCosmos(query); + }); } } diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/exception/CosmosExceptionUtilsTest.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/exception/CosmosExceptionUtilsTest.java index 0ff893eeea00..917f93b74faf 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/exception/CosmosExceptionUtilsTest.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/exception/CosmosExceptionUtilsTest.java @@ -5,11 +5,11 @@ import com.azure.cosmos.BridgeInternal; import com.azure.cosmos.CosmosException; import com.azure.spring.data.cosmos.core.ResponseDiagnosticsProcessor; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; -import static org.junit.Assert.assertThrows; +import static org.junit.jupiter.api.Assertions.assertThrows; public class CosmosExceptionUtilsTest { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/CosmosAnnotationUnitTest.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/CosmosAnnotationUnitTest.java index 73f2c734de4c..4a40d9a968a7 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/CosmosAnnotationUnitTest.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/CosmosAnnotationUnitTest.java @@ -11,8 +11,8 @@ import com.azure.spring.data.cosmos.domain.Role; import com.azure.spring.data.cosmos.domain.TimeToLiveSample; import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.util.Assert; @@ -20,7 +20,7 @@ public class CosmosAnnotationUnitTest { private CosmosEntityInformation personInfo; private CosmosEntityInformation roleInfo; - @Before + @BeforeEach public void setUp() { personInfo = new CosmosEntityInformation<>(NoDBAnnotationPerson.class); roleInfo = new CosmosEntityInformation<>(Role.class); diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/EntityImplRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/EntityImplRepositoryIT.java index c78d31b87851..810c102903cf 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/EntityImplRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/EntityImplRepositoryIT.java @@ -12,24 +12,22 @@ import com.azure.spring.data.cosmos.repository.repository.EntityImplRepository; import com.azure.spring.data.cosmos.repository.repository.ParentEntityRepository; import org.assertj.core.util.Lists; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.util.Iterator; import static org.assertj.core.api.Assertions.assertThat; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class EntityImplRepositoryIT { - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); @Autowired @@ -53,7 +51,7 @@ public class EntityImplRepositoryIT { private final ParentEntity PARENTENTITY_1 = new ParentEntity(); private final ParentEntity PARENTENTITY_2 = new ParentEntity(); - @Before + @BeforeEach public void setUp() { collectionManager.ensureContainersCreatedAndEmpty(template, Address.class); ENTITYIMPL_1.setId("entityImpl1"); diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/MultiCosmosTemplateIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/MultiCosmosTemplateIT.java index dd6f85c54679..d32512bbe743 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/MultiCosmosTemplateIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/MultiCosmosTemplateIT.java @@ -10,23 +10,21 @@ import com.azure.spring.data.cosmos.core.ReactiveCosmosTemplate; import com.azure.spring.data.cosmos.domain.Person; import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; -import org.assertj.core.api.Assertions; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import reactor.core.publisher.Mono; import java.lang.reflect.Field; import static com.azure.spring.data.cosmos.common.TestConstants.AGE; import static com.azure.spring.data.cosmos.common.TestConstants.PASSPORT_IDS_BY_COUNTRY; +import static org.assertj.core.api.Assertions.assertThat; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = {TestRepositoryConfig.class, SecondaryTestRepositoryConfig.class}) public class MultiCosmosTemplateIT { private static final Person PRIMARY_TEST_PERSON = new Person(TestConstants.ID_1, TestConstants.FIRST_NAME, @@ -34,7 +32,7 @@ public class MultiCosmosTemplateIT { private static final Person SECONDARY_TEST_PERSON = new Person(TestConstants.ID_2, TestConstants.NEW_FIRST_NAME, TestConstants.NEW_LAST_NAME, TestConstants.HOBBIES, TestConstants.ADDRESSES, AGE, PASSPORT_IDS_BY_COUNTRY); - @ClassRule + public static final ReactiveIntegrationTestCollectionManager primaryCollectionManager = new ReactiveIntegrationTestCollectionManager(); @Autowired @@ -54,7 +52,7 @@ public void testPrimaryTemplate() { primaryReactiveCosmosTemplate.insert(PRIMARY_TEST_PERSON, new PartitionKey(personInfo.getPartitionKeyFieldValue(PRIMARY_TEST_PERSON))).block(); final Mono findById = primaryReactiveCosmosTemplate.findById(PRIMARY_TEST_PERSON.getId(), Person.class); - Assertions.assertThat(findById.block().getFirstName()).isEqualTo(TestConstants.FIRST_NAME); + assertThat(findById.block().getFirstName()).isEqualTo(TestConstants.FIRST_NAME); } @Test @@ -63,7 +61,7 @@ public void testSecondaryTemplate() { secondaryReactiveCosmosTemplate.insert(SECONDARY_TEST_PERSON, new PartitionKey(personInfo.getPartitionKeyFieldValue(SECONDARY_TEST_PERSON))).block(); final Mono findById = secondaryReactiveCosmosTemplate.findById(SECONDARY_TEST_PERSON.getId(), Person.class); - Assertions.assertThat(findById.block().getFirstName()).isEqualTo(TestConstants.NEW_FIRST_NAME); + assertThat(findById.block().getFirstName()).isEqualTo(TestConstants.NEW_FIRST_NAME); secondaryReactiveCosmosTemplate.deleteAll(Person.class.getSimpleName(), Person.class).block(); secondaryReactiveCosmosTemplate.deleteContainer(personInfo.getContainerName()); } @@ -74,7 +72,7 @@ public void testSecondaryTemplateWithDiffDatabase() { secondaryDiffDatabaseReactiveCosmosTemplate.insert(SECONDARY_TEST_PERSON, new PartitionKey(personInfo.getPartitionKeyFieldValue(SECONDARY_TEST_PERSON))).block(); final Mono findById = secondaryDiffDatabaseReactiveCosmosTemplate.findById(SECONDARY_TEST_PERSON.getId(), Person.class); - Assertions.assertThat(findById.block().getFirstName()).isEqualTo(TestConstants.NEW_FIRST_NAME); + assertThat(findById.block().getFirstName()).isEqualTo(TestConstants.NEW_FIRST_NAME); secondaryDiffDatabaseReactiveCosmosTemplate.deleteAll(Person.class.getSimpleName(), Person.class).block(); secondaryDiffDatabaseReactiveCosmosTemplate.deleteContainer(personInfo.getContainerName()); } @@ -87,6 +85,6 @@ public void testSingleCosmosClientForMultipleCosmosTemplate() throws IllegalAcce CosmosAsyncClient client1 = cosmosFactory1.getCosmosAsyncClient(); CosmosFactory cosmosFactory2 = (CosmosFactory) cosmosFactory.get(secondaryDiffDatabaseReactiveCosmosTemplate); CosmosAsyncClient client2 = cosmosFactory2.getCosmosAsyncClient(); - Assertions.assertThat(client1).isEqualTo(client2); + assertThat(client1).isEqualTo(client2); } } diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/ReactiveUUIDIdDomainRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/ReactiveUUIDIdDomainRepositoryIT.java index 6d45b92fd2c8..ce726a3a3c93 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/ReactiveUUIDIdDomainRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/ReactiveUUIDIdDomainRepositoryIT.java @@ -9,13 +9,12 @@ import com.azure.spring.data.cosmos.exception.CosmosNotFoundException; import com.azure.spring.data.cosmos.repository.repository.ReactiveUUIDIdDomainRepository; import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; @@ -24,8 +23,9 @@ import java.util.Objects; import java.util.UUID; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +import static org.junit.jupiter.api.Assertions.assertThrows; + +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class ReactiveUUIDIdDomainRepositoryIT { @@ -38,7 +38,7 @@ public class ReactiveUUIDIdDomainRepositoryIT { private static final UUIDIdDomain DOMAIN_1 = new UUIDIdDomain(ID_1, NAME_1); private static final UUIDIdDomain DOMAIN_2 = new UUIDIdDomain(ID_2, NAME_2); - @ClassRule + public static final ReactiveIntegrationTestCollectionManager collectionManager = new ReactiveIntegrationTestCollectionManager(); @Autowired @@ -49,7 +49,7 @@ public class ReactiveUUIDIdDomainRepositoryIT { private CosmosEntityInformation entityInformation; - @Before + @BeforeEach public void setUp() { collectionManager.ensureContainersCreatedAndEmpty(template, UUIDIdDomain.class); entityInformation = collectionManager.getEntityInformation(UUIDIdDomain.class); @@ -78,9 +78,10 @@ public void testUUIDIdDomain() { StepVerifier.create(afterDelIdMono).expectNextCount(0).verifyComplete(); } - @Test(expected = IllegalArgumentException.class) + @Test public void testInvalidDomain() { - new CosmosEntityInformation(InvalidDomain.class); + assertThrows(IllegalArgumentException.class, () -> + new CosmosEntityInformation(InvalidDomain.class)); } @Test diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/SimpleCosmosRepositoryIllegalTest.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/SimpleCosmosRepositoryIllegalTest.java index 053ebd265c0c..b3819234d44a 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/SimpleCosmosRepositoryIllegalTest.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/SimpleCosmosRepositoryIllegalTest.java @@ -8,13 +8,15 @@ import com.azure.spring.data.cosmos.domain.Person; import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; import com.azure.spring.data.cosmos.repository.support.SimpleCosmosRepository; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; -@RunWith(MockitoJUnitRunner.class) +import static org.junit.jupiter.api.Assertions.assertThrows; + +@ExtendWith(MockitoExtension.class) public class SimpleCosmosRepositoryIllegalTest { private SimpleCosmosRepository repository; @@ -23,49 +25,49 @@ public class SimpleCosmosRepositoryIllegalTest { @Mock CosmosEntityInformation entityInformation; - @Before + @BeforeEach public void setUp() { CosmosContainerProperties containerProperties = new CosmosContainerProperties("", new PartitionKeyDefinition()); repository = new SimpleCosmosRepository<>(entityInformation, dbOperations); } - @Test(expected = IllegalArgumentException.class) + @Test public void deleteNullShouldFail() { - repository.delete(null); + assertThrows(IllegalArgumentException.class, () -> repository.delete(null)); } - @Test(expected = IllegalArgumentException.class) + @Test public void deleteIterableNullShouldFail() { - repository.deleteAll(null); + assertThrows(IllegalArgumentException.class, () -> repository.deleteAll(null)); } - @Test(expected = IllegalArgumentException.class) + @Test public void deleteNullIdShouldFail() { - repository.deleteById(null); + assertThrows(IllegalArgumentException.class, () -> repository.deleteById(null)); } - @Test(expected = IllegalArgumentException.class) + @Test public void existsNullIdShouldFail() { - repository.existsById(null); + assertThrows(IllegalArgumentException.class, () -> repository.existsById(null)); } - @Test(expected = IllegalArgumentException.class) + @Test public void findNullIterableIdsShouldFail() { - repository.findAllById(null); + assertThrows(IllegalArgumentException.class, () -> repository.findAllById(null)); } - @Test(expected = IllegalArgumentException.class) + @Test public void findByNullIdShouldFail() { - repository.findById(null); + assertThrows(IllegalArgumentException.class, () -> repository.findById(null)); } - @Test(expected = IllegalArgumentException.class) + @Test public void saveNullShouldFail() { - repository.save(null); + assertThrows(IllegalArgumentException.class, () -> repository.save(null)); } - @Test(expected = IllegalArgumentException.class) + @Test public void saveNullIterableShouldFail() { - repository.saveAll(null); + assertThrows(IllegalArgumentException.class, () -> repository.saveAll(null)); } } diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/SimpleCosmosRepositoryUnitTest.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/SimpleCosmosRepositoryUnitTest.java index 74270cf1c380..7315ebc9955d 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/SimpleCosmosRepositoryUnitTest.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/SimpleCosmosRepositoryUnitTest.java @@ -10,23 +10,23 @@ import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; import com.azure.spring.data.cosmos.repository.support.SimpleCosmosRepository; import org.assertj.core.util.Lists; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class SimpleCosmosRepositoryUnitTest { private static final Person TEST_PERSON = new Person(TestConstants.ID_1, TestConstants.FIRST_NAME, TestConstants.LAST_NAME, @@ -41,15 +41,13 @@ public class SimpleCosmosRepositoryUnitTest { @Mock CosmosEntityInformation entityInformation; - @SuppressWarnings("deprecation") - @Rule - public ExpectedException expectedException = ExpectedException.none(); + - @Before + @BeforeEach public void setUp() { when(entityInformation.getJavaType()).thenReturn(Person.class); when(entityInformation.getContainerName()).thenReturn(Person.class.getSimpleName()); - when(cosmosOperations.findAll(anyString(), any())).thenReturn(Arrays.asList(TEST_PERSON)); + lenient().when(cosmosOperations.findAll(anyString(), any())).thenReturn(Arrays.asList(TEST_PERSON)); repository = new SimpleCosmosRepository<>(entityInformation, cosmosOperations); } @@ -75,15 +73,15 @@ public void testFindOne() { @Test public void testFindOneExceptionForPartitioned() { - expectedException.expect(UnsupportedOperationException.class); - expectedException.expectMessage(PARTITION_VALUE_REQUIRED_MSG); - repository.save(TEST_PERSON); when(cosmosOperations.findById(anyString(), anyString(), any())) .thenThrow(new UnsupportedOperationException(PARTITION_VALUE_REQUIRED_MSG)); - final Person result = repository.findById(TEST_PERSON.getId()).get(); + UnsupportedOperationException exception = assertThrows(UnsupportedOperationException.class, () -> { + repository.findById(TEST_PERSON.getId()).get(); + }); + assertEquals(PARTITION_VALUE_REQUIRED_MSG, exception.getMessage()); } @Test diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/config/CosmosRepositoryConfigurationExtensionUnitTest.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/config/CosmosRepositoryConfigurationExtensionUnitTest.java index 73945c6eeee2..ee084a625675 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/config/CosmosRepositoryConfigurationExtensionUnitTest.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/config/CosmosRepositoryConfigurationExtensionUnitTest.java @@ -4,7 +4,7 @@ package com.azure.spring.data.cosmos.repository.config; import com.azure.spring.data.cosmos.repository.CosmosRepository; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.core.env.Environment; import org.springframework.core.env.StandardEnvironment; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/config/ReactiveCosmosRepositoryConfigurationExtensionUnitTest.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/config/ReactiveCosmosRepositoryConfigurationExtensionUnitTest.java index 57e518e03ef6..562bcb39a5c3 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/config/ReactiveCosmosRepositoryConfigurationExtensionUnitTest.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/config/ReactiveCosmosRepositoryConfigurationExtensionUnitTest.java @@ -4,7 +4,7 @@ package com.azure.spring.data.cosmos.repository.config; import com.azure.spring.data.cosmos.repository.ReactiveCosmosRepository; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.core.env.Environment; import org.springframework.core.env.StandardEnvironment; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/AddressRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/AddressRepositoryIT.java index 4dc0bf9260bb..e76518ac9384 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/AddressRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/AddressRepositoryIT.java @@ -2,6 +2,9 @@ // Licensed under the MIT License. package com.azure.spring.data.cosmos.repository.integration; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; + import com.azure.cosmos.models.CosmosPatchItemRequestOptions; import com.azure.cosmos.models.CosmosPatchOperations; import com.azure.cosmos.models.PartitionKey; @@ -16,16 +19,13 @@ import com.azure.spring.data.cosmos.repository.TestRepositoryConfig; import com.azure.spring.data.cosmos.repository.repository.AddressRepository; import org.assertj.core.util.Lists; -import org.junit.Assert; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; + + +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.util.Arrays; import java.util.Comparator; @@ -40,13 +40,13 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.*; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class AddressRepositoryIT { - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); @Autowired @@ -61,9 +61,6 @@ public class AddressRepositoryIT { @Autowired private ResponseDiagnosticsTestUtils responseDiagnosticsTestUtils; - @SuppressWarnings("deprecation") - @Rule - public ExpectedException expectedException = ExpectedException.none(); CosmosPatchOperations patchSetOperation = CosmosPatchOperations .create() @@ -80,7 +77,7 @@ public class AddressRepositoryIT { private static final CosmosPatchItemRequestOptions options = new CosmosPatchItemRequestOptions(); - @Before + @BeforeEach public void setUp() { collectionManager.ensureContainersCreatedAndEmpty(template, Address.class); repository.saveAll(Lists.newArrayList(TEST_ADDRESS1_PARTITION1, TEST_ADDRESS1_PARTITION2, @@ -168,8 +165,8 @@ public void testFindByStreetOrCity() { result.sort(Comparator.comparing(Address::getPostalCode)); reference.sort(Comparator.comparing(Address::getPostalCode)); - Assert.assertEquals(reference.size(), result.size()); - Assert.assertEquals(reference, result); + assertEquals(reference.size(), result.size()); + assertEquals(reference, result); } @Test @@ -184,9 +181,8 @@ public void testCount() { @Test public void deleteWithoutPartitionedColumnShouldFail() { - expectedException.expect(Exception.class); - - repository.deleteById(TEST_ADDRESS1_PARTITION1.getPostalCode()); + assertThrows(Exception.class, () -> + repository.deleteById(TEST_ADDRESS1_PARTITION1.getPostalCode())); } @Test @@ -303,7 +299,7 @@ public void testPatchPreConditionFail() { options.setFilterPredicate("FROM address a WHERE a.city = 'dummy'"); Address patchedAddress = repository.save(TestConstants.POSTAL_CODE, new PartitionKey(CITY), Address.class, patchSetOperation, options); assertThat(patchedAddress.getStreet()).isEqualTo(TestConstants.NEW_STREET); - Assert.fail(); + Assertions.fail(); } catch (CosmosAccessException ex) { assertThat(ex.getCosmosException().getStatusCode()).isEqualTo(TestConstants.PRECONDITION_FAILED_STATUS_CODE); } diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/AddressRepositoryNoMetricsIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/AddressRepositoryNoMetricsIT.java index def09ae4b120..a86dd3896023 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/AddressRepositoryNoMetricsIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/AddressRepositoryNoMetricsIT.java @@ -11,13 +11,12 @@ import com.azure.spring.data.cosmos.repository.TestRepositoryNoMetricsConfig; import com.azure.spring.data.cosmos.repository.repository.AddressRepository; import org.assertj.core.util.Lists; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.util.List; @@ -27,12 +26,11 @@ import static com.azure.spring.data.cosmos.domain.Address.TEST_ADDRESS4_PARTITION3; import static org.assertj.core.api.Assertions.assertThat; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryNoMetricsConfig.class) public class AddressRepositoryNoMetricsIT { - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); @Autowired @@ -48,7 +46,7 @@ public class AddressRepositoryNoMetricsIT { private ResponseDiagnosticsTestUtils responseDiagnosticsTestUtils; - @Before + @BeforeEach public void setUp() { collectionManager.ensureContainersCreatedAndEmpty(template, Address.class); repository.saveAll(Lists.newArrayList(TEST_ADDRESS1_PARTITION1, TEST_ADDRESS1_PARTITION2, diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/AnnotatedQueryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/AnnotatedQueryIT.java index d7d36742504a..9919bd9cb865 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/AnnotatedQueryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/AnnotatedQueryIT.java @@ -12,17 +12,16 @@ import com.azure.spring.data.cosmos.repository.repository.AddressRepository; import com.azure.spring.data.cosmos.repository.repository.AuditableRepository; import com.fasterxml.jackson.databind.JsonNode; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Slice; import org.springframework.data.domain.Sort; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.time.LocalDate; import java.util.ArrayList; @@ -38,12 +37,11 @@ import static com.azure.spring.data.cosmos.common.TestConstants.PAGE_SIZE_2; import static org.assertj.core.api.Assertions.assertThat; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class AnnotatedQueryIT { - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); @Autowired @@ -55,7 +53,7 @@ public class AnnotatedQueryIT { @Autowired private AddressRepository addressRepository; - @Before + @BeforeEach public void setUp() { collectionManager.ensureContainersCreatedAndEmpty(template, Address.class, AuditableEntity.class); } diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/AuditableIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/AuditableIT.java index 906ceb2a3300..8a539413d389 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/AuditableIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/AuditableIT.java @@ -18,14 +18,13 @@ import com.azure.spring.data.cosmos.repository.repository.AuditableIdGeneratedRepository; import com.azure.spring.data.cosmos.repository.repository.AuditableRepository; import org.assertj.core.util.Lists; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.repository.query.parser.Part; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.time.OffsetDateTime; import java.time.ZoneId; @@ -35,15 +34,14 @@ import java.util.UUID; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class AuditableIT { - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); @Autowired @@ -57,7 +55,7 @@ public class AuditableIT { @Autowired private StubAuditorProvider stubAuditorProvider; - @Before + @BeforeEach public void setup() { collectionManager.ensureContainersCreatedAndEmpty(cosmosTemplate, AuditableEntity.class, AuditableIdGeneratedEntity.class); } diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/BasicItemRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/BasicItemRepositoryIT.java index 4250a3263a22..8cc0756773dc 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/BasicItemRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/BasicItemRepositoryIT.java @@ -12,14 +12,13 @@ import com.azure.spring.data.cosmos.repository.TestRepositoryConfig; import com.azure.spring.data.cosmos.repository.repository.BasicItemRepository; import org.assertj.core.util.Lists; -import org.junit.Assert; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.util.ArrayList; import java.util.Arrays; @@ -27,13 +26,13 @@ import static com.azure.spring.data.cosmos.common.TestConstants.ID_1; import static com.azure.spring.data.cosmos.common.TestConstants.ID_2; +import static org.junit.jupiter.api.Assertions.*; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class BasicItemRepositoryIT { - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); @Autowired @@ -52,7 +51,7 @@ public class BasicItemRepositoryIT { private static final BasicItem BASIC_ITEM_2 = new BasicItem(ID_2); - @Before + @BeforeEach public void setUp() { collectionManager.ensureContainersCreatedAndEmpty(template, Address.class); repository.saveAll(Lists.newArrayList(BASIC_ITEM_1, BASIC_ITEM_2)); @@ -62,9 +61,9 @@ public void setUp() { public void testFindAllById() { final Iterable allById = TestUtils.toList(this.repository.findAllById(Arrays.asList(BASIC_ITEM_1.getId(), BASIC_ITEM_2.getId()))); - Assert.assertTrue(((ArrayList) allById).size() == 2); + Assertions.assertTrue(((ArrayList) allById).size() == 2); Iterator it = allById.iterator(); - Assert.assertEquals(BASIC_ITEM_1, it.next()); - Assert.assertEquals(BASIC_ITEM_2, it.next()); + assertEquals(BASIC_ITEM_1, it.next()); + assertEquals(BASIC_ITEM_2, it.next()); } } diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/BigTypeRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/BigTypeRepositoryIT.java index 154687740a8f..f6fb2e6c309c 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/BigTypeRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/BigTypeRepositoryIT.java @@ -3,21 +3,18 @@ package com.azure.spring.data.cosmos.repository.integration; import com.azure.spring.data.cosmos.IntegrationTestCollectionManager; -import com.azure.spring.data.cosmos.common.ResponseDiagnosticsTestUtils; import com.azure.spring.data.cosmos.common.TestUtils; -import com.azure.spring.data.cosmos.config.CosmosConfig; import com.azure.spring.data.cosmos.core.CosmosTemplate; import com.azure.spring.data.cosmos.domain.BigType; import com.azure.spring.data.cosmos.repository.TestRepositoryConfig; import com.azure.spring.data.cosmos.repository.repository.BigTypeRepository; import org.assertj.core.util.Lists; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.math.BigDecimal; import java.math.BigInteger; @@ -25,12 +22,11 @@ import static org.assertj.core.api.Assertions.assertThat; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class BigTypeRepositoryIT { - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); @Autowired @@ -49,7 +45,7 @@ public class BigTypeRepositoryIT { private BigType TEST_BIGTYPES_2 = new BigType("2", "BigType2", bigDecimal2, bigInteger2); - @Before + @BeforeEach public void setUp() { collectionManager.ensureContainersCreatedAndEmpty(template, BigType.class); repository.saveAll(Lists.newArrayList(TEST_BIGTYPES_1, TEST_BIGTYPES_2)); diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/CompositeIndexIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/CompositeIndexIT.java index 33bd3def7a7e..e56206b4bd6f 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/CompositeIndexIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/CompositeIndexIT.java @@ -15,27 +15,25 @@ import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; import com.azure.spring.data.cosmos.repository.support.SimpleCosmosRepository; import com.azure.spring.data.cosmos.repository.support.SimpleReactiveCosmosRepository; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.mockito.Mockito; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.util.ArrayList; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class CompositeIndexIT { - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); @Autowired @@ -46,12 +44,12 @@ public class CompositeIndexIT { CosmosEntityInformation information = new CosmosEntityInformation<>(CompositeIndexEntity.class); - @Before + @BeforeEach public void setup() { collectionManager.ensureContainersCreatedAndEmpty(template, CompositeIndexEntity.class); } - @AfterClass + @AfterAll public static void cleanUp() { collectionManager.deleteContainer(new CosmosEntityInformation<>(CompositeIndexEntity.class)); } diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ContactRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ContactRepositoryIT.java index c8705ef53fbd..235fee153ec0 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ContactRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ContactRepositoryIT.java @@ -10,14 +10,13 @@ import com.azure.spring.data.cosmos.repository.TestRepositoryConfig; import com.azure.spring.data.cosmos.repository.repository.ContactRepository; import org.assertj.core.util.Lists; -import org.junit.Assert; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.util.ArrayList; import java.util.Arrays; @@ -27,9 +26,10 @@ import java.util.concurrent.atomic.AtomicInteger; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertThrows; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class ContactRepositoryIT { @@ -42,7 +42,7 @@ public class ContactRepositoryIT { private static final Contact TEST_CONTACT4 = new Contact("testId4", "faketitle4", INT_VALUE_3, true); private static final Contact TEST_CONTACT5 = new Contact("testId5", "faketitle3", INT_VALUE_3, true); - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); @Autowired @@ -51,7 +51,7 @@ public class ContactRepositoryIT { @Autowired private CosmosTemplate template; - @Before + @BeforeEach public void setUp() { collectionManager.ensureContainersCreatedAndEmpty(template, Contact.class); repository.save(TEST_CONTACT1); @@ -66,7 +66,7 @@ public void testFindAll() { final List result = TestUtils.toList(repository.findAll()); assertThat(result.size()).isEqualTo(5); - Assert.assertEquals(Arrays.asList(TEST_CONTACT1, TEST_CONTACT2, TEST_CONTACT3, TEST_CONTACT4, + assertEquals(Arrays.asList(TEST_CONTACT1, TEST_CONTACT2, TEST_CONTACT3, TEST_CONTACT4, TEST_CONTACT5), result); final Contact contact = repository.findById(TEST_CONTACT1.getLogicId()).get(); @@ -109,7 +109,7 @@ public void testCountAndDeleteEntity() { final List result = TestUtils.toList(repository.findAll()); assertThat(result.size()).isEqualTo(5); - Assert.assertEquals(Arrays.asList(TEST_CONTACT1, TEST_CONTACT2, TEST_CONTACT3, TEST_CONTACT4, + assertEquals(Arrays.asList(TEST_CONTACT1, TEST_CONTACT2, TEST_CONTACT3, TEST_CONTACT4, TEST_CONTACT5), result); assertThat(result.get(0).getLogicId()).isEqualTo(TEST_CONTACT1.getLogicId()); assertThat(result.get(0).getTitle()).isEqualTo(TEST_CONTACT1.getTitle()); @@ -176,66 +176,68 @@ public void testCustomQuery() { public void testFindById() { final Optional optional = repository.findById(TEST_CONTACT1.getLogicId()); - Assert.assertTrue(optional.isPresent()); - Assert.assertEquals(TEST_CONTACT1, optional.get()); - Assert.assertFalse(repository.findById("").isPresent()); + Assertions.assertTrue(optional.isPresent()); + assertEquals(TEST_CONTACT1, optional.get()); + Assertions.assertFalse(repository.findById("").isPresent()); } @Test public void testFindByIdNotFound() { final Optional optional = repository.findById("unknown-id"); - Assert.assertFalse(optional.isPresent()); + Assertions.assertFalse(optional.isPresent()); } @Test public void testShouldFindSingleEntity() { final Contact contact = repository.findOneByTitle(TEST_CONTACT1.getTitle()); - Assert.assertEquals(TEST_CONTACT1, contact); + assertEquals(TEST_CONTACT1, contact); } @Test public void testShouldFindSingleOptionalEntity() { final Optional contact = repository.findOptionallyByTitle(TEST_CONTACT1.getTitle()); - Assert.assertTrue(contact.isPresent()); - Assert.assertEquals(TEST_CONTACT1, contact.get()); + Assertions.assertTrue(contact.isPresent()); + assertEquals(TEST_CONTACT1, contact.get()); - Assert.assertFalse(repository.findOptionallyByTitle("not here").isPresent()); + Assertions.assertFalse(repository.findOptionallyByTitle("not here").isPresent()); } - @Test(expected = CosmosAccessException.class) + @Test public void testShouldFailIfMultipleResultsReturned() { - repository.save(new Contact("testId2", TEST_CONTACT1.getTitle())); + assertThrows(CosmosAccessException.class, () -> { + repository.save(new Contact("testId2", TEST_CONTACT1.getTitle())); - repository.findOneByTitle(TEST_CONTACT1.getTitle()); + repository.findOneByTitle(TEST_CONTACT1.getTitle()); + }); } @Test public void testShouldAllowListAndIterableResponses() { final List contactList = TestUtils.toList(repository.findByTitle(TEST_CONTACT1.getTitle())); - Assert.assertEquals(TEST_CONTACT1, contactList.get(0)); - Assert.assertEquals(1, contactList.size()); + assertEquals(TEST_CONTACT1, contactList.get(0)); + assertEquals(1, contactList.size()); final Iterator contactIterator = repository.findByLogicId(TEST_CONTACT1.getLogicId()).iterator(); - Assert.assertTrue(contactIterator.hasNext()); - Assert.assertEquals(TEST_CONTACT1, contactIterator.next()); - Assert.assertFalse(contactIterator.hasNext()); + Assertions.assertTrue(contactIterator.hasNext()); + assertEquals(TEST_CONTACT1, contactIterator.next()); + Assertions.assertFalse(contactIterator.hasNext()); } // @Test // public void testAnnotatedQueries() { // List valueContacts = repository.getContactsByTitleAndValue(43, TEST_CONTACT5.getTitle()); -// Assert.assertEquals(1, valueContacts.size()); -// Assert.assertEquals(TEST_CONTACT5, valueContacts.get(0)); +// assertEquals(1, valueContacts.size()); +// assertEquals(TEST_CONTACT5, valueContacts.get(0)); // // List contactsWithOffset = repository.getContactsWithOffsetLimit(1, 2); -// Assert.assertEquals(2, contactsWithOffset.size()); -// Assert.assertEquals(TEST_CONTACT2, contactsWithOffset.get(0)); -// Assert.assertEquals(TEST_CONTACT3, contactsWithOffset.get(1)); +// assertEquals(2, contactsWithOffset.size()); +// assertEquals(TEST_CONTACT2, contactsWithOffset.get(0)); +// assertEquals(TEST_CONTACT3, contactsWithOffset.get(1)); // // List groupByContacts = repository.selectGroupBy(); -// Assert.assertEquals(3, groupByContacts.size()); +// assertEquals(3, groupByContacts.size()); // } @Test diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/CosmosAnnotationIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/CosmosAnnotationIT.java index 03f30ae80758..360188db8650 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/CosmosAnnotationIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/CosmosAnnotationIT.java @@ -14,14 +14,12 @@ import com.azure.spring.data.cosmos.domain.TimeToLiveSample; import com.azure.spring.data.cosmos.repository.TestRepositoryConfig; import com.azure.spring.data.cosmos.repository.repository.ReactiveRoleRepository; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.util.Assert; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; @@ -30,9 +28,9 @@ import java.util.stream.Collectors; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertTrue; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class CosmosAnnotationIT { @@ -43,7 +41,7 @@ public class CosmosAnnotationIT { private static final Role TEST_ROLE_3 = new Role(TestConstants.ID_3, true, TestConstants.LEVEL, TestConstants.ROLE_NAME); - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); @Autowired @@ -51,7 +49,7 @@ public class CosmosAnnotationIT { @Autowired private ReactiveRoleRepository repository; - @Before + @BeforeEach public void setUp() throws ClassNotFoundException { collectionManager.ensureContainersCreatedAndEmpty(cosmosTemplate, Role.class, TimeToLiveSample.class); repository.saveAll(Arrays.asList(TEST_ROLE_1, TEST_ROLE_2, TEST_ROLE_3)).collectList().block(); @@ -120,7 +118,7 @@ public void testTimeToLiveAnnotation() { public void testIndexingPolicyAnnotation() { final IndexingPolicy policy = collectionManager.getContainerProperties(Role.class).getIndexingPolicy(); - Assert.isTrue(policy.getIndexingMode() == TestConstants.INDEXING_POLICY_MODE, + assertTrue(policy.getIndexingMode() == TestConstants.INDEXING_POLICY_MODE, "unmatched collection policy indexing mode of class Role"); TestUtils.testIndexingPolicyPathsEquals(policy.getIncludedPaths() diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/CountIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/CountIT.java index a154dd599f8e..bad9cc5bf56e 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/CountIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/CountIT.java @@ -9,23 +9,21 @@ import com.azure.spring.data.cosmos.repository.TestRepositoryConfig; import com.azure.spring.data.cosmos.repository.repository.ContactRepository; import com.azure.spring.data.cosmos.repository.repository.ReactiveCourseRepository; -import org.junit.Assert; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.util.Arrays; +import static org.junit.jupiter.api.Assertions.*; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class CountIT { - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); @Autowired @@ -35,7 +33,7 @@ public class CountIT { @Autowired private CosmosTemplate template; - @Before + @BeforeEach public void setUp() throws ClassNotFoundException { collectionManager.ensureContainersCreatedAndEmpty(template, Contact.class, Course.class); } @@ -48,11 +46,11 @@ public void testCountByField() { Contact contact4 = new Contact("4", "other", 30, true); repository.saveAll(Arrays.asList(contact1, contact2, contact3, contact4)); - Assert.assertEquals(3, repository.countByTitle("title")); - Assert.assertEquals(1, repository.countByTitle("other")); + assertEquals(3, repository.countByTitle("title")); + assertEquals(1, repository.countByTitle("other")); - Assert.assertEquals(Long.valueOf(1), repository.countByTitleAndIntValue("title", 25)); - Assert.assertEquals(Long.valueOf(2), repository.countByTitleAndIntValue("title", 30)); + assertEquals(Long.valueOf(1), repository.countByTitleAndIntValue("title", 25)); + assertEquals(Long.valueOf(2), repository.countByTitleAndIntValue("title", 30)); } @Test @@ -62,11 +60,11 @@ public void testCountByQuery() { Contact contact3 = new Contact("3", "different"); repository.saveAll(Arrays.asList(contact1, contact2, contact3)); - Assert.assertEquals(2, repository.countByQueryWithPrimitive("same")); - Assert.assertEquals(1, repository.countByQueryWithPrimitive("different")); + assertEquals(2, repository.countByQueryWithPrimitive("same")); + assertEquals(1, repository.countByQueryWithPrimitive("different")); - Assert.assertEquals(Long.valueOf(2), repository.countByQueryWithNonPrimitive("same")); - Assert.assertEquals(Long.valueOf(1), repository.countByQueryWithNonPrimitive("different")); + assertEquals(Long.valueOf(2), repository.countByQueryWithNonPrimitive("same")); + assertEquals(Long.valueOf(1), repository.countByQueryWithNonPrimitive("different")); } @Test @@ -76,8 +74,8 @@ public void testReactiveCountByField() { Course course3 = new Course("3", "course2", "department"); reactiveRepository.saveAll(Arrays.asList(course1, course2, course3)).blockLast(); - Assert.assertEquals(Long.valueOf(2), reactiveRepository.countByName("course").block()); - Assert.assertEquals(Long.valueOf(1), reactiveRepository.countByName("course2").block()); + assertEquals(Long.valueOf(2), reactiveRepository.countByName("course").block()); + assertEquals(Long.valueOf(1), reactiveRepository.countByName("course2").block()); } @Test @@ -87,8 +85,8 @@ public void testReactiveCountByQuery() { Course course3 = new Course("3", "course2", "department"); reactiveRepository.saveAll(Arrays.asList(course1, course2, course3)).blockLast(); - Assert.assertEquals(Long.valueOf(2), reactiveRepository.countByQuery("course").block()); - Assert.assertEquals(Long.valueOf(1), reactiveRepository.countByQuery("course2").block()); + assertEquals(Long.valueOf(2), reactiveRepository.countByQuery("course").block()); + assertEquals(Long.valueOf(1), reactiveRepository.countByQuery("course2").block()); } } diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/CustomerRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/CustomerRepositoryIT.java index 6c4932c62d98..5cd89414c62f 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/CustomerRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/CustomerRepositoryIT.java @@ -8,23 +8,23 @@ import com.azure.spring.data.cosmos.repository.TestRepositoryConfig; import com.azure.spring.data.cosmos.repository.repository.CustomerRepository; import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.lang.NonNull; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.util.ArrayList; import java.util.Arrays; import java.util.Comparator; import java.util.List; +import static org.junit.jupiter.api.Assertions.*; -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) @SuppressWarnings("deprecation") public class CustomerRepositoryIT { @@ -51,7 +51,7 @@ public class CustomerRepositoryIT { private static final Customer CUSTOMER_1 = new Customer(CUSTOMER_ID_1, CUSTOMER_LEVEL_1, USER_1); private static final Customer CUSTOMER_2 = new Customer(CUSTOMER_ID_2, CUSTOMER_LEVEL_1, USER_2); - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); @Autowired @@ -60,24 +60,24 @@ public class CustomerRepositoryIT { @Autowired private CosmosTemplate template; - @Before + @BeforeEach public void setUp() { collectionManager.ensureContainersCreatedAndEmpty(template, Customer.class); this.repository.saveAll(Arrays.asList(CUSTOMER_0, CUSTOMER_1, CUSTOMER_2)); } - @AfterClass + @AfterAll public static void cleanUp() { collectionManager.deleteContainer(new CosmosEntityInformation<>(Customer.class)); } private void assertCustomerListEquals(@NonNull List customers, @NonNull List reference) { - Assert.assertEquals(reference.size(), customers.size()); + assertEquals(reference.size(), customers.size()); customers.sort(Comparator.comparing(Customer::getId)); reference.sort(Comparator.comparing(Customer::getId)); - Assert.assertEquals(reference, customers); + assertEquals(reference, customers); } @Test @@ -91,7 +91,7 @@ public void testFindByUserAndLevel() { customers = this.repository.findByUser_Name(FAKE_USER_NAME); - Assert.assertFalse(customers.iterator().hasNext()); + Assertions.assertFalse(customers.iterator().hasNext()); } } diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/EtagIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/EtagIT.java index 3924291cc67b..defeb6e5f92e 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/EtagIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/EtagIT.java @@ -11,15 +11,14 @@ import com.azure.spring.data.cosmos.repository.TestRepositoryConfig; import com.azure.spring.data.cosmos.repository.repository.PersonWithEtagRepository; import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.util.ArrayList; import java.util.List; @@ -32,13 +31,13 @@ import static com.azure.spring.data.cosmos.common.TestConstants.FIRST_NAME; import static com.azure.spring.data.cosmos.common.TestConstants.HOBBIES; import static com.azure.spring.data.cosmos.common.TestConstants.LAST_NAME; +import static org.junit.jupiter.api.Assertions.*; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class EtagIT { - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); @Autowired @@ -46,7 +45,7 @@ public class EtagIT { @Autowired PersonWithEtagRepository personWithEtagRepository; - @Before + @BeforeEach public void setup() { collectionManager.ensureContainersCreatedAndEmpty(template, PersonWithEtag.class); } @@ -55,7 +54,7 @@ private static PersonWithEtag createPersonWithEtag() { return new PersonWithEtag(UUID.randomUUID().toString(), FIRST_NAME, LAST_NAME, HOBBIES, ADDRESSES); } - @AfterClass + @AfterAll public static void cleanUp() { collectionManager.deleteContainer(new CosmosEntityInformation<>(PersonWithEtag.class)); } @@ -63,17 +62,17 @@ public static void cleanUp() { @Test public void testCrudOperationsShouldApplyEtag() { final PersonWithEtag insertedPersonWithEtag = personWithEtagRepository.save(createPersonWithEtag()); - Assert.assertNotNull(insertedPersonWithEtag.getEtag()); + Assertions.assertNotNull(insertedPersonWithEtag.getEtag()); insertedPersonWithEtag.setFirstName(LAST_NAME); final PersonWithEtag updatedPersonWithEtag = personWithEtagRepository.save(insertedPersonWithEtag); - Assert.assertNotNull(updatedPersonWithEtag.getEtag()); - Assert.assertNotEquals(insertedPersonWithEtag.getEtag(), updatedPersonWithEtag.getEtag()); + Assertions.assertNotNull(updatedPersonWithEtag.getEtag()); + Assertions.assertNotEquals(insertedPersonWithEtag.getEtag(), updatedPersonWithEtag.getEtag()); final Optional foundPersonWithEtag = personWithEtagRepository.findById(insertedPersonWithEtag.getId()); - Assert.assertTrue(foundPersonWithEtag.isPresent()); - Assert.assertNotNull(foundPersonWithEtag.get().getEtag()); - Assert.assertEquals(updatedPersonWithEtag.getEtag(), foundPersonWithEtag.get().getEtag()); + Assertions.assertTrue(foundPersonWithEtag.isPresent()); + Assertions.assertNotNull(foundPersonWithEtag.get().getEtag()); + assertEquals(updatedPersonWithEtag.getEtag(), foundPersonWithEtag.get().getEtag()); } @Test @@ -83,16 +82,16 @@ public void testCrudListOperationsShouldApplyEtag() { people.add(createPersonWithEtag()); final List insertedPeople = toList(personWithEtagRepository.saveAll(people)); - insertedPeople.forEach(person -> Assert.assertNotNull(person.getEtag())); + insertedPeople.forEach(person -> Assertions.assertNotNull(person.getEtag())); insertedPeople.forEach(person -> person.setFirstName(LAST_NAME)); final List updatedPeople = toList(personWithEtagRepository.saveAll(insertedPeople)); for (int i = 0; i < updatedPeople.size(); i++) { PersonWithEtag insertedPersonWithEtag = insertedPeople.get(i); PersonWithEtag updatedPersonWithEtag = updatedPeople.get(i); - Assert.assertEquals(insertedPersonWithEtag.getId(), updatedPersonWithEtag.getId()); - Assert.assertNotNull(updatedPersonWithEtag.getEtag()); - Assert.assertNotEquals(insertedPersonWithEtag.getEtag(), updatedPersonWithEtag.getEtag()); + assertEquals(insertedPersonWithEtag.getId(), updatedPersonWithEtag.getId()); + Assertions.assertNotNull(updatedPersonWithEtag.getEtag()); + Assertions.assertNotEquals(insertedPersonWithEtag.getEtag(), updatedPersonWithEtag.getEtag()); } final List peopleIds = updatedPeople.stream() @@ -102,8 +101,8 @@ public void testCrudListOperationsShouldApplyEtag() { for (int i = 0; i < foundPeople.size(); i++) { PersonWithEtag updatedPersonWithEtag = updatedPeople.get(i); PersonWithEtag foundPersonWithEtag = foundPeople.get(i); - Assert.assertNotNull(foundPersonWithEtag.getEtag()); - Assert.assertEquals(updatedPersonWithEtag.getEtag(), foundPersonWithEtag.getEtag()); + Assertions.assertNotNull(foundPersonWithEtag.getEtag()); + assertEquals(updatedPersonWithEtag.getEtag(), foundPersonWithEtag.getEtag()); } } @@ -122,13 +121,13 @@ public void testShouldFailIfEtagDoesNotMatch() { try { personWithEtagRepository.save(updatedPersonWithEtag); - Assert.fail(); + Assertions.fail(); } catch (CosmosPreconditionFailedException ex) { } try { personWithEtagRepository.delete(updatedPersonWithEtag); - Assert.fail(); + Assertions.fail(); } catch (CosmosPreconditionFailedException ex) { } } @@ -139,7 +138,7 @@ public void testBulkShouldFailIfEtagDoesNotMatch() { people.add(createPersonWithEtag()); final List insertedPeople = toList(personWithEtagRepository.saveAll(people)); - insertedPeople.forEach(person -> Assert.assertNotNull(person.getEtag())); + insertedPeople.forEach(person -> Assertions.assertNotNull(person.getEtag())); final List updatedPeople = toList(insertedPeople); updatedPeople.get(0).setFirstName(LAST_NAME); @@ -149,14 +148,14 @@ public void testBulkShouldFailIfEtagDoesNotMatch() { try { List result = toList(personWithEtagRepository.saveAll(updatedPeopleWithEtag)); - Assert.assertEquals(result.size(), 0); + assertEquals(result.size(), 0); } catch (CosmosAccessException ex) { } try { personWithEtagRepository.deleteAll(updatedPeopleWithEtag); List result2 = toList(personWithEtagRepository.findAll()); - Assert.assertEquals(result2.size(), 1); + assertEquals(result2.size(), 1); } catch (CosmosAccessException ex) { } } diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/HierarchicalPartitionKeyRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/HierarchicalPartitionKeyRepositoryIT.java index b217670c1a67..2f24e534e1cd 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/HierarchicalPartitionKeyRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/HierarchicalPartitionKeyRepositoryIT.java @@ -11,15 +11,14 @@ import com.azure.spring.data.cosmos.repository.TestRepositoryConfig; import com.azure.spring.data.cosmos.repository.repository.HierarchicalPartitionKeyRepository; import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.util.Arrays; import java.util.List; @@ -27,8 +26,7 @@ import static org.assertj.core.api.Assertions.assertThat; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class HierarchicalPartitionKeyRepositoryIT { @@ -38,7 +36,7 @@ public class HierarchicalPartitionKeyRepositoryIT { private static final HierarchicalPartitionKeyEntity HIERARCHICAL_ENTITY_2 = new HierarchicalPartitionKeyEntity("id_2", "Michael", "Smith", "23456"); - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); private static CosmosEntityInformation hierarchicalPartitionKeyEntityInformation @@ -50,15 +48,15 @@ public class HierarchicalPartitionKeyRepositoryIT { @Autowired HierarchicalPartitionKeyRepository repository; - @BeforeClass + @BeforeAll public static void init() { } - @Before + @BeforeEach public void setUp() { collectionManager.ensureContainersCreatedAndEmpty(template, HierarchicalPartitionKeyEntity.class); } - @AfterClass + @AfterAll public static void cleanUp() { collectionManager.deleteContainer(hierarchicalPartitionKeyEntityInformation); } diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/IndexPolicyUpdateIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/IndexPolicyUpdateIT.java index 59bf9e27d8b4..3c2c74fc6253 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/IndexPolicyUpdateIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/IndexPolicyUpdateIT.java @@ -16,26 +16,24 @@ import com.azure.spring.data.cosmos.repository.TestRepositoryConfig; import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; import com.azure.spring.data.cosmos.repository.support.SimpleCosmosRepository; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.mockito.Mockito; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.util.Collections; import static org.assertj.core.api.Assertions.assertThat; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class IndexPolicyUpdateIT { - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); @Autowired @@ -52,7 +50,7 @@ public class IndexPolicyUpdateIT { CosmosEntityInformation addressEntityInformation = new CosmosEntityInformation<>(Address.class); - @Before + @BeforeEach public void setup() { collectionManager.ensureContainersCreatedAndEmpty(template, IndexPolicyEntity.class, ComplexIndexPolicyEntity.class, IndexPolicyOverwriteEntity.class, Address.class); } diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/IntegerIdDomainRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/IntegerIdDomainRepositoryIT.java index 66cb22d25815..3240436dbc49 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/IntegerIdDomainRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/IntegerIdDomainRepositoryIT.java @@ -10,16 +10,15 @@ import com.azure.spring.data.cosmos.repository.TestRepositoryConfig; import com.azure.spring.data.cosmos.repository.repository.IntegerIdDomainRepository; import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; -import org.junit.Assert; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Sort; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.util.Collections; import java.util.Iterator; @@ -29,9 +28,9 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.StreamSupport; +import static org.junit.jupiter.api.Assertions.*; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class IntegerIdDomainRepositoryIT { @@ -39,7 +38,7 @@ public class IntegerIdDomainRepositoryIT { private static final String NAME = "panli"; private static final IntegerIdDomain DOMAIN = new IntegerIdDomain(ID, NAME); - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); @Autowired @@ -48,7 +47,7 @@ public class IntegerIdDomainRepositoryIT { @Autowired private IntegerIdDomainRepository repository; - @Before + @BeforeEach public void setUp() { collectionManager.ensureContainersCreatedAndEmpty(template, IntegerIdDomain.class); this.repository.save(DOMAIN); @@ -57,43 +56,44 @@ public void setUp() { @Test public void testIntegerIdDomain() { this.repository.deleteAll(); - Assert.assertFalse(this.repository.findById(ID).isPresent()); + Assertions.assertFalse(this.repository.findById(ID).isPresent()); this.repository.save(DOMAIN); final Optional foundOptional = this.repository.findById(ID); - Assert.assertTrue(foundOptional.isPresent()); - Assert.assertEquals(DOMAIN.getNumber(), foundOptional.get().getNumber()); - Assert.assertEquals(DOMAIN.getName(), foundOptional.get().getName()); + Assertions.assertTrue(foundOptional.isPresent()); + assertEquals(DOMAIN.getNumber(), foundOptional.get().getNumber()); + assertEquals(DOMAIN.getName(), foundOptional.get().getName()); this.repository.delete(DOMAIN); - Assert.assertFalse(this.repository.findById(ID).isPresent()); + Assertions.assertFalse(this.repository.findById(ID).isPresent()); } - @Test(expected = IllegalArgumentException.class) + @Test public void testInvalidDomain() { - new CosmosEntityInformation(InvalidDomain.class); + assertThrows(IllegalArgumentException.class, () -> + new CosmosEntityInformation(InvalidDomain.class)); } @Test public void testBasicQuery() { final IntegerIdDomain save = this.repository.save(DOMAIN); - Assert.assertNotNull(save); + Assertions.assertNotNull(save); } @Test public void testSaveAndFindById() { - Assert.assertNotNull(this.repository.save(DOMAIN)); + Assertions.assertNotNull(this.repository.save(DOMAIN)); final Optional savedEntity = this.repository.findById(DOMAIN.getNumber()); - Assert.assertTrue(savedEntity.isPresent()); - Assert.assertEquals(DOMAIN, savedEntity.get()); + Assertions.assertTrue(savedEntity.isPresent()); + assertEquals(DOMAIN, savedEntity.get()); } @Test public void testSaveAllAndFindAll() { - Assert.assertTrue(this.repository.findAll().iterator().hasNext()); + Assertions.assertTrue(this.repository.findAll().iterator().hasNext()); final Set entitiesToSave = Collections.singleton(DOMAIN); this.repository.saveAll(entitiesToSave); @@ -101,58 +101,62 @@ public void testSaveAllAndFindAll() { final Set savedEntities = StreamSupport.stream(this.repository.findAll().spliterator(), false) .collect(Collectors.toSet()); - Assert.assertTrue(entitiesToSave.containsAll(savedEntities)); + Assertions.assertTrue(entitiesToSave.containsAll(savedEntities)); } @Test public void testFindAllById() { final Iterable allById = this.repository.findAllById(Collections.singleton(DOMAIN.getNumber())); - Assert.assertTrue(allById.iterator().hasNext()); + Assertions.assertTrue(allById.iterator().hasNext()); } @Test public void testCount() { - Assert.assertEquals(1, repository.count()); + assertEquals(1, repository.count()); } @Test public void testDeleteById() { this.repository.save(DOMAIN); this.repository.deleteById(DOMAIN.getNumber()); - Assert.assertEquals(0, this.repository.count()); + assertEquals(0, this.repository.count()); } - @Test(expected = CosmosNotFoundException.class) + @Test public void testDeleteByIdShouldFailIfNothingToDelete() { - this.repository.deleteAll(); - this.repository.deleteById(DOMAIN.getNumber()); + assertThrows(CosmosNotFoundException.class, () -> { + this.repository.deleteAll(); + this.repository.deleteById(DOMAIN.getNumber()); + }); } @Test public void testDelete() { this.repository.save(DOMAIN); this.repository.delete(DOMAIN); - Assert.assertEquals(0, this.repository.count()); + assertEquals(0, this.repository.count()); } - @Test(expected = CosmosNotFoundException.class) + @Test public void testDeleteShouldFailIfNothingToDelete() { - this.repository.deleteAll(); - this.repository.delete(DOMAIN); + assertThrows(CosmosNotFoundException.class, () -> { + this.repository.deleteAll(); + this.repository.delete(DOMAIN); + }); } @Test public void testDeleteAll() { this.repository.save(DOMAIN); this.repository.deleteAll(Collections.singleton(DOMAIN)); - Assert.assertEquals(0, this.repository.count()); + assertEquals(0, this.repository.count()); } @Test public void testExistsById() { this.repository.save(DOMAIN); - Assert.assertTrue(this.repository.existsById(DOMAIN.getNumber())); + Assertions.assertTrue(this.repository.existsById(DOMAIN.getNumber())); } @Test @@ -165,17 +169,17 @@ public void testFindAllSort() { final List ascending = StreamSupport .stream(this.repository.findAll(ascSort).spliterator(), false) .collect(Collectors.toList()); - Assert.assertEquals(2, ascending.size()); - Assert.assertEquals(DOMAIN, ascending.get(0)); - Assert.assertEquals(other, ascending.get(1)); + assertEquals(2, ascending.size()); + assertEquals(DOMAIN, ascending.get(0)); + assertEquals(other, ascending.get(1)); final Sort descSort = Sort.by(Sort.Direction.DESC, "number"); final List descending = StreamSupport .stream(this.repository.findAll(descSort).spliterator(), false) .collect(Collectors.toList()); - Assert.assertEquals(2, descending.size()); - Assert.assertEquals(other, descending.get(0)); - Assert.assertEquals(DOMAIN, descending.get(1)); + assertEquals(2, descending.size()); + assertEquals(other, descending.get(0)); + assertEquals(DOMAIN, descending.get(1)); } @@ -187,13 +191,13 @@ public void testFindAllPageable() { final Page page1 = this.repository.findAll(new CosmosPageRequest(0, 1, null)); final Iterator page1Iterator = page1.iterator(); - Assert.assertTrue(page1Iterator.hasNext()); - Assert.assertEquals(DOMAIN, page1Iterator.next()); + Assertions.assertTrue(page1Iterator.hasNext()); + assertEquals(DOMAIN, page1Iterator.next()); final Page page2 = this.repository.findAll(new CosmosPageRequest(1, 1, null)); final Iterator page2Iterator = page2.iterator(); - Assert.assertTrue(page2Iterator.hasNext()); - Assert.assertEquals(other, page2Iterator.next()); + Assertions.assertTrue(page2Iterator.hasNext()); + assertEquals(other, page2Iterator.next()); } private static class InvalidDomain { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/LongIdDomainRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/LongIdDomainRepositoryIT.java index c001d11210eb..9c3c95679394 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/LongIdDomainRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/LongIdDomainRepositoryIT.java @@ -11,16 +11,15 @@ import com.azure.spring.data.cosmos.repository.TestRepositoryConfig; import com.azure.spring.data.cosmos.repository.repository.LongIdDomainRepository; import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; -import org.junit.Assert; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Sort; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.util.ArrayList; import java.util.Arrays; @@ -33,9 +32,9 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import java.util.stream.StreamSupport; +import static org.junit.jupiter.api.Assertions.*; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class LongIdDomainRepositoryIT { @@ -48,7 +47,7 @@ public class LongIdDomainRepositoryIT { private static final LongIdDomain DOMAIN_1 = new LongIdDomain(ID_1, NAME_1); private static final LongIdDomain DOMAIN_2 = new LongIdDomain(ID_2, NAME_2); - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); @Autowired @@ -57,7 +56,7 @@ public class LongIdDomainRepositoryIT { @Autowired private LongIdDomainRepository repository; - @Before + @BeforeEach public void setUp() { collectionManager.ensureContainersCreatedAndEmpty(template, LongIdDomain.class); this.repository.save(DOMAIN_1); @@ -67,43 +66,44 @@ public void setUp() { @Test public void testLongIdDomain() { this.repository.deleteAll(); - Assert.assertFalse(this.repository.findById(ID_1).isPresent()); + Assertions.assertFalse(this.repository.findById(ID_1).isPresent()); this.repository.save(DOMAIN_1); final Optional foundOptional = this.repository.findById(ID_1); - Assert.assertTrue(foundOptional.isPresent()); - Assert.assertEquals(DOMAIN_1.getNumber(), foundOptional.get().getNumber()); - Assert.assertEquals(DOMAIN_1.getName(), foundOptional.get().getName()); + Assertions.assertTrue(foundOptional.isPresent()); + assertEquals(DOMAIN_1.getNumber(), foundOptional.get().getNumber()); + assertEquals(DOMAIN_1.getName(), foundOptional.get().getName()); this.repository.delete(DOMAIN_1); - Assert.assertFalse(this.repository.findById(ID_1).isPresent()); + Assertions.assertFalse(this.repository.findById(ID_1).isPresent()); } - @Test(expected = IllegalArgumentException.class) + @Test public void testInvalidDomain() { - new CosmosEntityInformation(InvalidDomain.class); + assertThrows(IllegalArgumentException.class, () -> + new CosmosEntityInformation(InvalidDomain.class)); } @Test public void testBasicQuery() { final LongIdDomain save = this.repository.save(DOMAIN_1); - Assert.assertNotNull(save); + Assertions.assertNotNull(save); } @Test public void testSaveAndFindById() { - Assert.assertNotNull(this.repository.save(DOMAIN_1)); + Assertions.assertNotNull(this.repository.save(DOMAIN_1)); final Optional savedEntity = this.repository.findById(DOMAIN_1.getNumber()); - Assert.assertTrue(savedEntity.isPresent()); - Assert.assertEquals(DOMAIN_1, savedEntity.get()); + Assertions.assertTrue(savedEntity.isPresent()); + assertEquals(DOMAIN_1, savedEntity.get()); } @Test public void testSaveAllAndFindAll() { - Assert.assertTrue(this.repository.findAll().iterator().hasNext()); + Assertions.assertTrue(this.repository.findAll().iterator().hasNext()); final Set entitiesToSave = Stream.of(DOMAIN_1, DOMAIN_2).collect(Collectors.toSet()); this.repository.saveAll(entitiesToSave); @@ -111,14 +111,14 @@ public void testSaveAllAndFindAll() { final Set savedEntities = StreamSupport.stream(this.repository.findAll().spliterator(), false) .collect(Collectors.toSet()); - Assert.assertTrue(entitiesToSave.containsAll(savedEntities)); + Assertions.assertTrue(entitiesToSave.containsAll(savedEntities)); } @Test public void testFindAllById() { final Iterable allById = TestUtils.toList(this.repository.findAllById(Arrays.asList(DOMAIN_1.getNumber(), DOMAIN_2.getNumber()))); - Assert.assertTrue(((ArrayList) allById).size() == 2); + Assertions.assertTrue(((ArrayList) allById).size() == 2); Iterator it = allById.iterator(); assertLongIdDomainEquals(Arrays.asList(it.next(), it.next()), Arrays.asList(DOMAIN_1, DOMAIN_2)); } @@ -126,12 +126,12 @@ public void testFindAllById() { private void assertLongIdDomainEquals(List cur, List reference) { cur.sort(Comparator.comparing(LongIdDomain::getNumber)); reference.sort(Comparator.comparing(LongIdDomain::getNumber)); - Assert.assertEquals(reference, cur); + assertEquals(reference, cur); } @Test public void testCount() { - Assert.assertEquals(2, repository.count()); + assertEquals(2, repository.count()); } @Test @@ -140,26 +140,30 @@ public void testDeleteById() { this.repository.save(DOMAIN_2); this.repository.deleteById(DOMAIN_1.getNumber()); this.repository.deleteById(DOMAIN_2.getNumber()); - Assert.assertEquals(0, this.repository.count()); + assertEquals(0, this.repository.count()); } - @Test(expected = CosmosNotFoundException.class) + @Test public void testDeleteByIdShouldFailIfNothingToDelete() { - this.repository.deleteAll(); - this.repository.deleteById(DOMAIN_1.getNumber()); + assertThrows(CosmosNotFoundException.class, () ->{ + this.repository.deleteAll(); + this.repository.deleteById(DOMAIN_1.getNumber()); + }); } @Test public void testDelete() { this.repository.save(DOMAIN_1); this.repository.delete(DOMAIN_1); - Assert.assertEquals(1, this.repository.count()); + assertEquals(1, this.repository.count()); } - @Test(expected = CosmosNotFoundException.class) + @Test public void testDeleteShouldFailIfNothingToDelete() { - this.repository.deleteAll(); - this.repository.delete(DOMAIN_1); + assertThrows(CosmosNotFoundException.class, () ->{ + this.repository.deleteAll(); + this.repository.delete(DOMAIN_1); + }); } @Test @@ -167,13 +171,13 @@ public void testDeleteAll() { this.repository.save(DOMAIN_1); this.repository.save(DOMAIN_2); this.repository.deleteAll(Arrays.asList(DOMAIN_1, DOMAIN_2)); - Assert.assertEquals(0, this.repository.count()); + assertEquals(0, this.repository.count()); } @Test public void testExistsById() { this.repository.save(DOMAIN_1); - Assert.assertTrue(this.repository.existsById(DOMAIN_1.getNumber())); + Assertions.assertTrue(this.repository.existsById(DOMAIN_1.getNumber())); } @Test @@ -186,19 +190,19 @@ public void testFindAllSort() { final List ascending = StreamSupport .stream(this.repository.findAll(ascSort).spliterator(), false) .collect(Collectors.toList()); - Assert.assertEquals(3, ascending.size()); - Assert.assertEquals(DOMAIN_1, ascending.get(0)); - Assert.assertEquals(other, ascending.get(1)); - Assert.assertEquals(DOMAIN_2, ascending.get(2)); + assertEquals(3, ascending.size()); + assertEquals(DOMAIN_1, ascending.get(0)); + assertEquals(other, ascending.get(1)); + assertEquals(DOMAIN_2, ascending.get(2)); final Sort descSort = Sort.by(Sort.Direction.DESC, "number"); final List descending = StreamSupport .stream(this.repository.findAll(descSort).spliterator(), false) .collect(Collectors.toList()); - Assert.assertEquals(3, descending.size()); - Assert.assertEquals(DOMAIN_2, descending.get(0)); - Assert.assertEquals(other, descending.get(1)); - Assert.assertEquals(DOMAIN_1, descending.get(2)); + assertEquals(3, descending.size()); + assertEquals(DOMAIN_2, descending.get(0)); + assertEquals(other, descending.get(1)); + assertEquals(DOMAIN_1, descending.get(2)); } @@ -209,18 +213,18 @@ public void testFindAllPageable() { final Page page1 = this.repository.findAll(new CosmosPageRequest(0, 1, null)); final Iterator page1Iterator = page1.iterator(); - Assert.assertTrue(page1Iterator.hasNext()); - Assert.assertEquals(DOMAIN_1, page1Iterator.next()); + Assertions.assertTrue(page1Iterator.hasNext()); + assertEquals(DOMAIN_1, page1Iterator.next()); final Page page2 = this.repository.findAll(new CosmosPageRequest(1, 1, null)); final Iterator page2Iterator = page2.iterator(); - Assert.assertTrue(page2Iterator.hasNext()); - Assert.assertEquals(DOMAIN_2, page2Iterator.next()); + Assertions.assertTrue(page2Iterator.hasNext()); + assertEquals(DOMAIN_2, page2Iterator.next()); final Page page3 = this.repository.findAll(new CosmosPageRequest(2, 1, null)); final Iterator page3Iterator = page3.iterator(); - Assert.assertTrue(page3Iterator.hasNext()); - Assert.assertEquals(other, page3Iterator.next()); + Assertions.assertTrue(page3Iterator.hasNext()); + assertEquals(other, page3Iterator.next()); } private static class InvalidDomain { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/MemoRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/MemoRepositoryIT.java index 3199d1fba522..1df8763fec82 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/MemoRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/MemoRepositoryIT.java @@ -11,16 +11,15 @@ import com.azure.spring.data.cosmos.exception.CosmosAccessException; import com.azure.spring.data.cosmos.repository.TestRepositoryConfig; import com.azure.spring.data.cosmos.repository.repository.MemoRepository; -import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.ClassRule; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -31,9 +30,9 @@ import java.util.List; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.*; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class MemoRepositoryIT { private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat(TestConstants.DATE_FORMAT); @@ -48,7 +47,7 @@ public class MemoRepositoryIT { private static Memo testMemo2; private static Memo testMemo3; - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); @Autowired @@ -57,7 +56,7 @@ public class MemoRepositoryIT { @Autowired MemoRepository repository; - @BeforeClass + @BeforeAll public static void init() throws ParseException { memoDate = DATE_FORMAT.parse(TestConstants.DATE_STRING); memoDateBefore = DATE_FORMAT.parse(TestConstants.DATE_BEFORE_STRING); @@ -69,7 +68,7 @@ public static void init() throws ParseException { testMemo3 = new Memo(TestConstants.ID_3, TestConstants.NEW_MESSAGE, memoDateAfter, Importance.LOW); } - @Before + @BeforeEach public void setUp() { collectionManager.ensureContainersCreatedAndEmpty(template, Memo.class); repository.saveAll(Arrays.asList(testMemo1, testMemo2, testMemo3)); @@ -109,12 +108,12 @@ private void assertMemoEquals(Memo actual, Memo expected) { public void testFindByBefore() { List memos = TestUtils.toList(this.repository.findByDateBefore(memoDateBefore)); - Assert.assertTrue(memos.isEmpty()); + Assertions.assertTrue(memos.isEmpty()); memos = TestUtils.toList(this.repository.findByDateBefore(memoDate)); - Assert.assertEquals(1, memos.size()); - Assert.assertEquals(testMemo1, memos.get(0)); + assertEquals(1, memos.size()); + assertEquals(testMemo1, memos.get(0)); memos = TestUtils.toList(this.repository.findByDateBefore(memoDateAfter)); final List reference = Arrays.asList(testMemo1, testMemo2); @@ -122,8 +121,8 @@ public void testFindByBefore() { memos.sort(Comparator.comparing(Memo::getId)); reference.sort(Comparator.comparing(Memo::getId)); - Assert.assertEquals(reference.size(), memos.size()); - Assert.assertEquals(reference, memos); + assertEquals(reference.size(), memos.size()); + assertEquals(reference, memos); } @Test @@ -131,12 +130,12 @@ public void testFindByBeforeWithAndOr() { List memos = TestUtils.toList(this.repository.findByDateBeforeAndMessage(memoDate, TestConstants.NEW_MESSAGE)); - Assert.assertTrue(memos.isEmpty()); + Assertions.assertTrue(memos.isEmpty()); memos = TestUtils.toList(this.repository.findByDateBeforeAndMessage(memoDate, TestConstants.MESSAGE)); - Assert.assertEquals(1, memos.size()); - Assert.assertEquals(testMemo1, memos.get(0)); + assertEquals(1, memos.size()); + assertEquals(testMemo1, memos.get(0)); memos = TestUtils.toList(this.repository.findByDateBeforeOrMessage(memoDateAfter, TestConstants.MESSAGE)); final List reference = Arrays.asList(testMemo1, testMemo2); @@ -144,20 +143,20 @@ public void testFindByBeforeWithAndOr() { memos.sort(Comparator.comparing(Memo::getId)); reference.sort(Comparator.comparing(Memo::getId)); - Assert.assertEquals(reference.size(), memos.size()); - Assert.assertEquals(reference, memos); + assertEquals(reference.size(), memos.size()); + assertEquals(reference, memos); } @Test public void testFindByAfter() { List memos = TestUtils.toList(this.repository.findByDateAfter(memoDateAfter)); - Assert.assertTrue(memos.isEmpty()); + Assertions.assertTrue(memos.isEmpty()); memos = TestUtils.toList(this.repository.findByDateAfter(memoDate)); - Assert.assertEquals(1, memos.size()); - Assert.assertEquals(testMemo3, memos.get(0)); + assertEquals(1, memos.size()); + assertEquals(testMemo3, memos.get(0)); memos = TestUtils.toList(this.repository.findByDateAfter(memoDateBefore)); final List reference = Arrays.asList(testMemo2, testMemo3); @@ -165,20 +164,20 @@ public void testFindByAfter() { memos.sort(Comparator.comparing(Memo::getId)); reference.sort(Comparator.comparing(Memo::getId)); - Assert.assertEquals(reference.size(), memos.size()); - Assert.assertEquals(reference, memos); + assertEquals(reference.size(), memos.size()); + assertEquals(reference, memos); } @Test public void testFindByAfterWithAndOr() { List memos = TestUtils.toList(this.repository.findByDateAfterAndMessage(memoDate, TestConstants.MESSAGE)); - Assert.assertTrue(memos.isEmpty()); + Assertions.assertTrue(memos.isEmpty()); memos = TestUtils.toList(this.repository.findByDateAfterAndMessage(memoDate, TestConstants.NEW_MESSAGE)); - Assert.assertEquals(1, memos.size()); - Assert.assertEquals(testMemo3, memos.get(0)); + assertEquals(1, memos.size()); + assertEquals(testMemo3, memos.get(0)); memos = TestUtils.toList(this.repository.findByDateAfterOrMessage(memoDateBefore, TestConstants.MESSAGE)); final List reference = Arrays.asList(testMemo1, testMemo2, testMemo3); @@ -186,8 +185,8 @@ public void testFindByAfterWithAndOr() { memos.sort(Comparator.comparing(Memo::getId)); reference.sort(Comparator.comparing(Memo::getId)); - Assert.assertEquals(reference.size(), memos.size()); - Assert.assertEquals(reference, memos); + assertEquals(reference.size(), memos.size()); + assertEquals(reference, memos); } @Test @@ -227,22 +226,22 @@ private void assertMemoListEquals(List memos, List reference) { memos.sort(Comparator.comparing(Memo::getId)); reference.sort(Comparator.comparing(Memo::getId)); - Assert.assertEquals(reference.size(), memos.size()); - Assert.assertEquals(reference, memos); + assertEquals(reference.size(), memos.size()); + assertEquals(reference, memos); } - @Test(expected = CosmosAccessException.class) - @Ignore // TODO(pan): Ignore this test case for now, will update this from service update. + @Test + @Disabled // TODO(pan): Ignore this test case for now, will update this from service update. public void testFindByStartsWithWithException() { - repository.findByMessageStartsWith(testMemo1.getMessage()); + assertThrows(CosmosAccessException.class, () -> repository.findByMessageStartsWith(testMemo1.getMessage())); } @Test public void testFindByStartsWith() { final List result = TestUtils.toList(repository.findByMessageStartsWith(testMemo1.getMessage().substring(0, 10))); - Assert.assertEquals(testMemo1, result.get(0)); - Assert.assertEquals(1, result.size()); + assertEquals(testMemo1, result.get(0)); + assertEquals(1, result.size()); } } diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/NestedPartitionKeyRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/NestedPartitionKeyRepositoryIT.java index 757875a494fc..ee5fc4dad925 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/NestedPartitionKeyRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/NestedPartitionKeyRepositoryIT.java @@ -10,14 +10,13 @@ import com.azure.spring.data.cosmos.domain.NestedPartitionKeyEntityWithGeneratedValue; import com.azure.spring.data.cosmos.repository.TestRepositoryConfig; import com.azure.spring.data.cosmos.repository.repository.NestedPartitionKeyRepository; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.util.Arrays; import java.util.List; @@ -25,8 +24,7 @@ import static org.assertj.core.api.Assertions.assertThat; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class NestedPartitionKeyRepositoryIT { @@ -36,7 +34,7 @@ public class NestedPartitionKeyRepositoryIT { private static final NestedPartitionKeyEntityWithGeneratedValue NESTED_ENTITY_2 = new NestedPartitionKeyEntityWithGeneratedValue(null, new NestedEntity("partitionKey2")); - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); @Autowired @@ -45,10 +43,10 @@ public class NestedPartitionKeyRepositoryIT { @Autowired NestedPartitionKeyRepository repository; - @BeforeClass + @BeforeAll public static void init() { } - @Before + @BeforeEach public void setUp() { collectionManager.ensureContainersCreatedAndEmpty(template, NestedPartitionKeyEntityWithGeneratedValue.class); } diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PageableAddressRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PageableAddressRepositoryIT.java index 29d86241abe5..249f183af553 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PageableAddressRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PageableAddressRepositoryIT.java @@ -14,15 +14,14 @@ import com.azure.spring.data.cosmos.domain.Address; import com.azure.spring.data.cosmos.repository.TestRepositoryConfig; import com.azure.spring.data.cosmos.repository.repository.PageableAddressRepository; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.data.domain.Page; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import reactor.core.publisher.Flux; import reactor.test.StepVerifier; @@ -39,12 +38,11 @@ import static com.azure.spring.data.cosmos.domain.Address.TEST_ADDRESS4_PARTITION3; import static org.assertj.core.api.Assertions.assertThat; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class PageableAddressRepositoryIT { - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); @Autowired @@ -59,7 +57,7 @@ public class PageableAddressRepositoryIT { @Autowired private CosmosFactory cosmosFactory; - @Before + @BeforeEach public void setUp() { collectionManager.ensureContainersCreatedAndEmpty(template, Address.class); repository.save(TEST_ADDRESS1_PARTITION1); diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PageableMemoRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PageableMemoRepositoryIT.java index 800fc5248244..4bb625fbd45b 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PageableMemoRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PageableMemoRepositoryIT.java @@ -13,17 +13,16 @@ import com.azure.spring.data.cosmos.domain.PageableMemo; import com.azure.spring.data.cosmos.repository.TestRepositoryConfig; import com.azure.spring.data.cosmos.repository.repository.PageableMemoRepository; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Slice; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import reactor.core.publisher.Flux; import reactor.test.StepVerifier; @@ -38,14 +37,13 @@ import static org.assertj.core.api.Assertions.assertThat; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class PageableMemoRepositoryIT { private static final int TOTAL_CONTENT_SIZE = 500; - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); @Autowired @@ -65,7 +63,7 @@ public class PageableMemoRepositoryIT { private static boolean isSetupDone; - @Before + @BeforeEach public void setUp() { collectionManager.ensureContainersCreated(template, PageableMemo.class); diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PageablePersonRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PageablePersonRepositoryIT.java index a89c9fae9ab0..ec134cf81533 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PageablePersonRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PageablePersonRepositoryIT.java @@ -10,15 +10,14 @@ import com.azure.spring.data.cosmos.repository.TestRepositoryConfig; import com.azure.spring.data.cosmos.repository.repository.PageablePersonRepository; import org.apache.commons.lang3.StringUtils; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.util.ArrayList; import java.util.HashSet; @@ -28,15 +27,14 @@ import static org.assertj.core.api.Assertions.assertThat; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class PageablePersonRepositoryIT { private static final int TOTAL_CONTENT_SIZE = 25; public static final int ONE_KB = 1024; - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); @Autowired @@ -49,7 +47,7 @@ public class PageablePersonRepositoryIT { private static boolean isSetupDone; - @Before + @BeforeEach public void setUp() { collectionManager.ensureContainersCreated(template, PageablePerson.class); diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PersistableIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PersistableIT.java index 0bd8bb183a6e..d9fce23c12c1 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PersistableIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PersistableIT.java @@ -11,31 +11,27 @@ import com.azure.spring.data.cosmos.repository.TestRepositoryConfig; import com.azure.spring.data.cosmos.repository.repository.PersistableEntityRepository; import com.azure.spring.data.cosmos.repository.repository.ReactivePersistableEntityRepository; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class PersistableIT { - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); @Autowired @@ -47,11 +43,9 @@ public class PersistableIT { @Autowired private CosmosTemplate template; - @SuppressWarnings("deprecation") - @Rule - public ExpectedException expectedException = ExpectedException.none(); - @Before + + @BeforeEach public void setUp() { collectionManager.ensureContainersCreatedAndEmpty(template, PersistableEntity.class); } diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PersonCrossPartitionIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PersonCrossPartitionIT.java index 50a608b13ffd..326d62599a71 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PersonCrossPartitionIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PersonCrossPartitionIT.java @@ -15,16 +15,15 @@ import com.azure.spring.data.cosmos.repository.repository.AuditableRepository; import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; import org.assertj.core.util.Lists; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Sort; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.util.ArrayList; import java.util.List; @@ -43,12 +42,11 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.data.domain.Sort.Direction.ASC; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class PersonCrossPartitionIT { - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); private static final PersonCrossPartition TEST_PERSON_CP = new PersonCrossPartition(ID_1, FIRST_NAME, LAST_NAME, HOBBIES, @@ -76,7 +74,7 @@ public class PersonCrossPartitionIT { @Autowired private AddressRepository addressRepository; - @Before + @BeforeEach public void setUp() { personCrossPartitionInfo = new CosmosEntityInformation<>(PersonCrossPartition.class); containerName = personCrossPartitionInfo.getContainerName(); @@ -84,7 +82,7 @@ public void setUp() { collectionManager.ensureContainersCreatedAndEmpty(cosmosTemplate, PersonCrossPartition.class); } - @AfterClass + @AfterAll public static void cleanUp() { collectionManager.deleteContainer(personCrossPartitionInfo); } diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ProjectRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ProjectRepositoryIT.java index 85e7c32b40ad..401ec213799b 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ProjectRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ProjectRepositoryIT.java @@ -9,15 +9,14 @@ import com.azure.spring.data.cosmos.domain.Project; import com.azure.spring.data.cosmos.repository.TestRepositoryConfig; import com.azure.spring.data.cosmos.repository.repository.ProjectRepository; -import org.junit.Assert; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.lang.NonNull; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.util.ArrayList; import java.util.Arrays; @@ -27,9 +26,10 @@ import java.util.Optional; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) @SuppressWarnings("deprecation") public class ProjectRepositoryIT { @@ -74,7 +74,7 @@ public class ProjectRepositoryIT { private static final List PROJECTS = Arrays.asList(PROJECT_0, PROJECT_1, PROJECT_2, PROJECT_3, PROJECT_4); - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); @Autowired @@ -83,19 +83,19 @@ public class ProjectRepositoryIT { @Autowired private ProjectRepository repository; - @Before + @BeforeEach public void setUp() { collectionManager.ensureContainersCreatedAndEmpty(template, Project.class); this.repository.saveAll(PROJECTS); } private void assertProjectListEquals(@NonNull List projects, @NonNull List reference) { - Assert.assertEquals(reference.size(), projects.size()); + assertEquals(reference.size(), projects.size()); projects.sort(Comparator.comparing(Project::getId)); reference.sort(Comparator.comparing(Project::getId)); - Assert.assertEquals(reference, projects); + assertEquals(reference, projects); } @Test @@ -106,7 +106,7 @@ public void testFindByWithAnd() { projects = TestUtils.toList(this.repository.findByNameAndStarCount(NAME_0, STAR_COUNT_1)); - Assert.assertTrue(projects.isEmpty()); + Assertions.assertTrue(projects.isEmpty()); projects = TestUtils.toList(this.repository.findByNameAndStarCount(NAME_0, STAR_COUNT_0)); @@ -121,7 +121,7 @@ public void testFindByWithOr() { projects = TestUtils.toList(this.repository.findByNameOrForkCount(FAKE_NAME, FAKE_COUNT)); - Assert.assertTrue(projects.isEmpty()); + Assertions.assertTrue(projects.isEmpty()); projects = TestUtils.toList(this.repository.findByNameOrForkCount(NAME_0, FORK_COUNT_1)); @@ -136,7 +136,7 @@ public void testFindByWithAndPartition() { projects = TestUtils.toList(this.repository.findByNameAndCreator(NAME_0, CREATOR_1)); - Assert.assertTrue(projects.isEmpty()); + Assertions.assertTrue(projects.isEmpty()); projects = TestUtils.toList(this.repository.findByNameAndCreator(NAME_0, CREATOR_0)); @@ -158,7 +158,7 @@ public void testFindByWithOrPartition() { projects = TestUtils.toList(this.repository.findByNameOrCreator(FAKE_NAME, FAKE_CREATOR)); - Assert.assertTrue(projects.isEmpty()); + Assertions.assertTrue(projects.isEmpty()); projects = TestUtils.toList(this.repository.findByNameOrCreator(NAME_0, CREATOR_1)); @@ -174,7 +174,7 @@ public void testFindByWithAndOr() { projects = TestUtils.toList(repository.findByNameAndCreatorOrForkCount(NAME_1, CREATOR_2, FAKE_COUNT)); - Assert.assertTrue(projects.isEmpty()); + Assertions.assertTrue(projects.isEmpty()); projects = TestUtils.toList(repository.findByNameAndCreatorOrForkCount(NAME_1, CREATOR_1, FORK_COUNT_2)); @@ -190,7 +190,7 @@ public void testFindByWithOrAnd() { projects = TestUtils.toList(repository.findByNameOrCreatorAndForkCount(FAKE_NAME, CREATOR_1, FORK_COUNT_2)); - Assert.assertTrue(projects.isEmpty()); + Assertions.assertTrue(projects.isEmpty()); projects = TestUtils.toList(repository.findByNameOrCreatorAndForkCount(NAME_1, CREATOR_2, FORK_COUNT_2)); @@ -206,7 +206,7 @@ public void testFindByWithOrOr() { projects = TestUtils.toList(repository.findByNameOrCreatorOrForkCount(FAKE_NAME, FAKE_CREATOR, FAKE_COUNT)); - Assert.assertTrue(projects.isEmpty()); + Assertions.assertTrue(projects.isEmpty()); } @Test @@ -225,7 +225,7 @@ public void testFindByWithOrAndOr() { projects = TestUtils.toList(repository.findByNameOrCreatorAndForkCountOrStarCount(FAKE_NAME, CREATOR_1, FORK_COUNT_0, FAKE_COUNT)); - Assert.assertTrue(projects.isEmpty()); + Assertions.assertTrue(projects.isEmpty()); } @Test @@ -236,7 +236,7 @@ public void testFindByGreaterThan() { projects = TestUtils.toList(repository.findByForkCountGreaterThan(FAKE_COUNT)); - Assert.assertTrue(projects.isEmpty()); + Assertions.assertTrue(projects.isEmpty()); } @Test @@ -248,7 +248,7 @@ public void testFindByGreaterThanWithAndOr() { projects = TestUtils.toList(repository.findByCreatorAndForkCountGreaterThan(CREATOR_0, FORK_COUNT_1)); - Assert.assertTrue(projects.isEmpty()); + Assertions.assertTrue(projects.isEmpty()); projects = TestUtils.toList(repository.findByCreatorOrForkCountGreaterThan(CREATOR_0, FORK_COUNT_2)); @@ -259,7 +259,7 @@ public void testFindByGreaterThanWithAndOr() { public void testFindByLessThan() { List projects = TestUtils.toList(repository.findByStarCountLessThan(STAR_COUNT_0)); - Assert.assertTrue(projects.isEmpty()); + Assertions.assertTrue(projects.isEmpty()); projects = TestUtils.toList(repository.findByStarCountLessThan(STAR_COUNT_2)); @@ -270,7 +270,7 @@ public void testFindByLessThan() { public void testFindByLessThanEqual() { List projects = TestUtils.toList(repository.findByForkCountLessThanEqual(STAR_COUNT_MIN)); - Assert.assertTrue(projects.isEmpty()); + Assertions.assertTrue(projects.isEmpty()); projects = TestUtils.toList(repository.findByForkCountLessThanEqual(STAR_COUNT_2)); @@ -282,7 +282,7 @@ public void testFindByLessThanAndGreaterThan() { List projects = TestUtils.toList(repository.findByStarCountLessThanAndForkCountGreaterThan(STAR_COUNT_0, FORK_COUNT_3)); - Assert.assertTrue(projects.isEmpty()); + Assertions.assertTrue(projects.isEmpty()); projects = TestUtils.toList(repository.findByStarCountLessThanAndForkCountGreaterThan(STAR_COUNT_3, FORK_COUNT_0)); @@ -295,7 +295,7 @@ public void testFindByLessThanEqualsAndGreaterThanEquals() { List projects = TestUtils.toList(repository.findByForkCountLessThanEqualAndStarCountGreaterThan( STAR_COUNT_MIN, FORK_COUNT_0)); - Assert.assertTrue(projects.isEmpty()); + Assertions.assertTrue(projects.isEmpty()); projects = TestUtils.toList(repository.findByForkCountLessThanEqualAndStarCountGreaterThan(STAR_COUNT_3, FORK_COUNT_0)); @@ -307,7 +307,7 @@ public void testFindByLessThanEqualsAndGreaterThanEquals() { public void testFindByGreaterThanEqual() { List projects = TestUtils.toList(repository.findByStarCountGreaterThanEqual(STAR_COUNT_MAX)); - Assert.assertTrue(projects.isEmpty()); + Assertions.assertTrue(projects.isEmpty()); projects = TestUtils.toList(repository.findByStarCountGreaterThanEqual(STAR_COUNT_2)); @@ -319,7 +319,7 @@ public void testFindByGreaterThanEqualAnd() { List projects = TestUtils.toList(repository .findByForkCountGreaterThanEqualAndCreator(FORK_COUNT_MAX, CREATOR_2)); - Assert.assertTrue(projects.isEmpty()); + Assertions.assertTrue(projects.isEmpty()); projects = TestUtils.toList(repository.findByForkCountGreaterThanEqualAndCreator(FORK_COUNT_0, CREATOR_0)); @@ -363,9 +363,9 @@ public void findByIdWithPartitionKey() { final Optional project = repository.findById(PROJECT_0.getId(), new PartitionKey(collectionManager.getEntityInformation(Project.class).getPartitionKeyFieldValue(PROJECT_0))); - Assert.assertTrue(project.isPresent()); + Assertions.assertTrue(project.isPresent()); - Assert.assertEquals(project.get(), PROJECT_0); + assertEquals(project.get(), PROJECT_0); } @Test @@ -373,7 +373,7 @@ public void findByIdWithPartitionKeyNotFound() { final Optional project = repository.findById("unknown-id", new PartitionKey("unknown-partition-key")); - Assert.assertFalse(project.isPresent()); + Assertions.assertFalse(project.isPresent()); } @@ -381,7 +381,7 @@ public void findByIdWithPartitionKeyNotFound() { public void testFindByIn() { List projects = TestUtils.toList(repository.findByCreatorIn(Collections.singleton(FAKE_CREATOR))); - Assert.assertTrue(projects.isEmpty()); + Assertions.assertTrue(projects.isEmpty()); projects = TestUtils.toList(repository.findByCreatorIn(Arrays.asList(CREATOR_1, CREATOR_2))); @@ -402,7 +402,7 @@ public void testFindByInWithAnd() { CREATOR_1), Arrays.asList(STAR_COUNT_2, STAR_COUNT_3))); - Assert.assertTrue(projects.isEmpty()); + Assertions.assertTrue(projects.isEmpty()); projects = TestUtils.toList(repository.findByCreatorInAndStarCountIn(Arrays.asList(CREATOR_0, CREATOR_1), Arrays.asList(STAR_COUNT_0, STAR_COUNT_2))); @@ -439,7 +439,7 @@ public void testFindByNotIn() { List projects = TestUtils.toList(repository.findByCreatorNotIn( Arrays.asList(CREATOR_0, CREATOR_1, CREATOR_2, CREATOR_3))); - Assert.assertTrue(projects.isEmpty()); + Assertions.assertTrue(projects.isEmpty()); projects = TestUtils.toList(repository.findByCreatorNotIn(Arrays.asList(CREATOR_1, CREATOR_2))); @@ -456,7 +456,7 @@ public void testFindByInWithNotIn() { TestUtils.toList(repository.findByCreatorInAndStarCountNotIn(Collections.singletonList(FAKE_CREATOR), Arrays.asList(STAR_COUNT_2, STAR_COUNT_3))); - Assert.assertTrue(projects.isEmpty()); + Assertions.assertTrue(projects.isEmpty()); projects = TestUtils.toList(repository.findByCreatorInAndStarCountNotIn(Arrays.asList(CREATOR_0, CREATOR_1), Arrays.asList(STAR_COUNT_0, STAR_COUNT_2))); @@ -474,7 +474,7 @@ public void testFindByInWithNotIn() { public void testFindByNameIsNull() { List projects = TestUtils.toList(repository.findByNameIsNull()); - Assert.assertTrue(projects.isEmpty()); + Assertions.assertTrue(projects.isEmpty()); final Project nullNameProject = new Project("id-999", null, CREATOR_0, true, STAR_COUNT_0, FORK_COUNT_0); @@ -496,14 +496,14 @@ public void testFindByNameIsNotNull() { projects = TestUtils.toList(repository.findByNameIsNotNull()); - Assert.assertTrue(projects.isEmpty()); + Assertions.assertTrue(projects.isEmpty()); } @Test public void testFindByNameIsNullWithAnd() { List projects = TestUtils.toList(repository.findByNameIsNullAndForkCount(FORK_COUNT_MAX)); - Assert.assertTrue(projects.isEmpty()); + Assertions.assertTrue(projects.isEmpty()); final Project nullNameProject = new Project("id-999", null, CREATOR_0, true, STAR_COUNT_0, FORK_COUNT_0); @@ -524,7 +524,7 @@ public void testFindByNameIsNotNullWithAnd() { this.repository.save(new Project("id-999", null, CREATOR_0, true, STAR_COUNT_0, FORK_COUNT_0)); projects = TestUtils.toList(repository.findByNameIsNotNullAndHasReleased(true)); - Assert.assertTrue(projects.isEmpty()); + Assertions.assertTrue(projects.isEmpty()); } @Test diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ProjectRepositorySortIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ProjectRepositorySortIT.java index 52ccfde1bad2..d4c5e14826af 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ProjectRepositorySortIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ProjectRepositorySortIT.java @@ -11,17 +11,15 @@ import com.azure.spring.data.cosmos.repository.TestRepositoryConfig; import com.azure.spring.data.cosmos.repository.repository.SortedProjectRepository; import org.assertj.core.util.Lists; -import org.junit.Assert; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.util.Arrays; import java.util.Comparator; @@ -30,9 +28,9 @@ import java.util.stream.StreamSupport; import static com.azure.spring.data.cosmos.common.PageTestUtils.validateLastPage; +import static org.junit.jupiter.api.Assertions.*; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class ProjectRepositorySortIT { @@ -80,7 +78,7 @@ public class ProjectRepositorySortIT { private static final List PROJECTS = Arrays.asList(PROJECT_4, PROJECT_3, PROJECT_2, PROJECT_1, PROJECT_0); - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); @Autowired @@ -89,7 +87,7 @@ public class ProjectRepositorySortIT { @Autowired private SortedProjectRepository repository; - @Before + @BeforeEach public void setUp() { collectionManager.ensureContainersCreatedAndEmpty(template, SortedProject.class); this.repository.saveAll(PROJECTS); @@ -102,8 +100,8 @@ public void testFindAllSortASC() { PROJECTS.sort(Comparator.comparing(SortedProject::getStarCount)); - Assert.assertEquals(PROJECTS.size(), projects.size()); - Assert.assertEquals(PROJECTS, projects); + assertEquals(PROJECTS.size(), projects.size()); + assertEquals(PROJECTS, projects); } @Test @@ -113,8 +111,8 @@ public void testFindAllSortDESC() { PROJECTS.sort(Comparator.comparing(SortedProject::getCreator).reversed()); - Assert.assertEquals(PROJECTS.size(), projects.size()); - Assert.assertEquals(PROJECTS, projects); + assertEquals(PROJECTS.size(), projects.size()); + assertEquals(PROJECTS, projects); } @Test @@ -125,30 +123,36 @@ public void testFindAllUnSorted() { PROJECTS.sort(Comparator.comparing(SortedProject::getId)); projects.sort(Comparator.comparing(SortedProject::getId)); - Assert.assertEquals(PROJECTS.size(), projects.size()); - Assert.assertEquals(PROJECTS, projects); + assertEquals(PROJECTS.size(), projects.size()); + assertEquals(PROJECTS, projects); } - @Test(expected = CosmosBadRequestException.class) + @Test public void testFindAllSortMoreThanOneOrderException() { - final Sort sort = Sort.by(Sort.Direction.ASC, "name", "creator"); + assertThrows(CosmosBadRequestException.class, () -> { + final Sort sort = Sort.by(Sort.Direction.ASC, "name", "creator"); - this.repository.findAll(sort).iterator().next(); + this.repository.findAll(sort).iterator().next(); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void testFindAllSortIgnoreCaseException() { - final Sort.Order order = Sort.Order.by("name").ignoreCase(); - final Sort sort = Sort.by(order); + assertThrows(IllegalArgumentException.class, () -> { + final Sort.Order order = Sort.Order.by("name").ignoreCase(); + final Sort sort = Sort.by(order); - this.repository.findAll(sort); + this.repository.findAll(sort); + }); } - @Test(expected = CosmosAccessException.class) + @Test public void testFindAllSortMissMatchException() { - final Sort sort = Sort.by(Sort.Direction.ASC, "fake-name"); + assertThrows(CosmosAccessException.class, () -> { + final Sort sort = Sort.by(Sort.Direction.ASC, "fake-name"); - this.repository.findAll(sort).iterator().next(); + this.repository.findAll(sort).iterator().next(); + }); } public void testFindAllSortWithIdName() { @@ -160,7 +164,7 @@ public void testFindAllSortWithIdName() { false) .collect(Collectors.toList()); - Assert.assertEquals(projectListSortedById, results); + assertEquals(projectListSortedById, results); } @Test @@ -172,8 +176,8 @@ public void testFindSortWithOr() { references.sort(Comparator.comparing(SortedProject::getStarCount)); - Assert.assertEquals(references.size(), projects.size()); - Assert.assertEquals(references, projects); + assertEquals(references.size(), projects.size()); + assertEquals(references, projects); } @Test @@ -185,8 +189,8 @@ public void testFindSortWithAnd() { references.sort(Comparator.comparing(SortedProject::getStarCount)); - Assert.assertEquals(references.size(), projects.size()); - Assert.assertEquals(references, projects); + assertEquals(references.size(), projects.size()); + assertEquals(references, projects); } @Test @@ -197,8 +201,8 @@ public void testFindSortWithEqual() { references.sort(Comparator.comparing(SortedProject::getName).reversed()); - Assert.assertEquals(references.size(), projects.size()); - Assert.assertEquals(references, projects); + assertEquals(references.size(), projects.size()); + assertEquals(references, projects); } @Test @@ -211,8 +215,8 @@ public void testFindAllWithPageableAndSort() { final List references = Arrays.asList(PROJECT_0, PROJECT_1, PROJECT_2, PROJECT_3, PROJECT_4); references.sort(Comparator.comparing(SortedProject::getName).reversed()); - Assert.assertEquals(references.size(), result.getContent().size()); - Assert.assertEquals(references, result.getContent()); + assertEquals(references.size(), result.getContent().size()); + assertEquals(references, result.getContent()); validateLastPage(result, 5); } @@ -227,8 +231,8 @@ public void testFindWithPageableAndSort() { references.sort(Comparator.comparing(SortedProject::getName).reversed()); - Assert.assertEquals(references.size(), result.getContent().size()); - Assert.assertEquals(references, result.getContent()); + assertEquals(references.size(), result.getContent().size()); + assertEquals(references, result.getContent()); validateLastPage(result, 5); } } diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/QuestionRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/QuestionRepositoryIT.java index db79727bac88..b3516600469f 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/QuestionRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/QuestionRepositoryIT.java @@ -9,23 +9,22 @@ import com.azure.spring.data.cosmos.repository.TestRepositoryConfig; import com.azure.spring.data.cosmos.repository.repository.QuestionRepository; import org.assertj.core.util.Lists; -import org.junit.Assert; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.util.Collections; import java.util.List; import java.util.Optional; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.*; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class QuestionRepositoryIT { @@ -37,7 +36,7 @@ public class QuestionRepositoryIT { private static final Question QUESTION = new Question(QUESTION_ID, QUESTION_URL); - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); @Autowired @@ -49,7 +48,7 @@ public class QuestionRepositoryIT { @Autowired private ResponseDiagnosticsTestUtils responseDiagnosticsTestUtils; - @Before + @BeforeEach public void setUp() { collectionManager.ensureContainersCreatedAndEmpty(template, Question.class); this.repository.save(QUESTION); @@ -59,34 +58,34 @@ public void setUp() { public void testFindById() { final Optional optional = this.repository.findById(QUESTION_ID); assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics()).isNull(); - Assert.assertTrue(optional.isPresent()); - Assert.assertEquals(QUESTION, optional.get()); + Assertions.assertTrue(optional.isPresent()); + assertEquals(QUESTION, optional.get()); } @Test public void testFindByIdNull() { final Optional byId = this.repository.findById(NULL_ID); - Assert.assertFalse(byId.isPresent()); + Assertions.assertFalse(byId.isPresent()); } @Test public void testFindAll() { final List questions = Lists.newArrayList(this.repository.findAll()); - Assert.assertEquals(Collections.singletonList(QUESTION), questions); + assertEquals(Collections.singletonList(QUESTION), questions); } @Test public void testDelete() { Optional optional = this.repository.findById(QUESTION_ID); - Assert.assertTrue(optional.isPresent()); - Assert.assertEquals(QUESTION, optional.get()); + Assertions.assertTrue(optional.isPresent()); + assertEquals(QUESTION, optional.get()); this.repository.delete(QUESTION); optional = this.repository.findById(QUESTION_ID); - Assert.assertFalse(optional.isPresent()); + Assertions.assertFalse(optional.isPresent()); } } diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveAuditableIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveAuditableIT.java index bf676b9f002c..18843d56a619 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveAuditableIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveAuditableIT.java @@ -12,13 +12,12 @@ import com.azure.spring.data.cosmos.repository.repository.ReactiveAuditableIdGeneratedRepository; import com.azure.spring.data.cosmos.repository.repository.ReactiveAuditableRepository; import org.assertj.core.util.Lists; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; @@ -30,12 +29,11 @@ import static org.assertj.core.api.Assertions.assertThat; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class ReactiveAuditableIT { - @ClassRule + public static final ReactiveIntegrationTestCollectionManager collectionManager = new ReactiveIntegrationTestCollectionManager(); @Autowired @@ -49,7 +47,7 @@ public class ReactiveAuditableIT { @Autowired private StubAuditorProvider stubAuditorProvider; - @Before + @BeforeEach public void setup() { collectionManager.ensureContainersCreatedAndEmpty(template, AuditableEntity.class, AuditableIdGeneratedEntity.class); } diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveCourseRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveCourseRepositoryIT.java index 70a4c57a26f4..6a980e9de356 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveCourseRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveCourseRepositoryIT.java @@ -19,16 +19,13 @@ import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.assertj.core.api.Assertions; -import org.junit.Assert; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; @@ -40,9 +37,9 @@ import java.util.concurrent.atomic.AtomicBoolean; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.*; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class ReactiveCourseRepositoryIT { @@ -69,7 +66,7 @@ public class ReactiveCourseRepositoryIT { private static final Course COURSE_4 = new Course(COURSE_ID_4, COURSE_NAME_4, DEPARTMENT_NAME_1); private static final Course COURSE_5 = new Course(COURSE_ID_5, COURSE_NAME_5, DEPARTMENT_NAME_1); - @ClassRule + public static final ReactiveIntegrationTestCollectionManager collectionManager = new ReactiveIntegrationTestCollectionManager(); @Autowired @@ -100,7 +97,7 @@ public class ReactiveCourseRepositoryIT { private static final CosmosPatchItemRequestOptions options = new CosmosPatchItemRequestOptions(); - @Before + @BeforeEach public void setUp() { collectionManager.ensureContainersCreatedAndEmpty(template, Course.class); entityInformation = collectionManager.getEntityInformation(Course.class); @@ -323,7 +320,7 @@ public void testFindByNameAndDepartmentOrNameAndDepartment() { courseResultSet.add(COURSE_1); courseResultSet.add(COURSE_2); StepVerifier.create(findResult).expectNextCount(2).thenConsumeWhile(value -> { - Assertions.assertThat(courseResultSet.contains(value)).isTrue(); + assertThat(courseResultSet.contains(value)).isTrue(); return true; }).verifyComplete(); } @@ -339,9 +336,9 @@ public void testFindByNameOrDepartmentAllIgnoreCase() { public void testFindByNameJsonNode() { final Flux findResult = repository.annotatedFindByName(COURSE_NAME_1); StepVerifier.create(findResult).consumeNextWith(result -> { - Assert.assertEquals(result.findValue("courseId").asText(), COURSE_1.getCourseId()); - Assert.assertEquals(result.findValue("name").asText(), COURSE_1.getName()); - Assert.assertEquals(result.findValue("department").asText(), COURSE_1.getDepartment()); + assertEquals(result.findValue("courseId").asText(), COURSE_1.getCourseId()); + assertEquals(result.findValue("name").asText(), COURSE_1.getName()); + assertEquals(result.findValue("department").asText(), COURSE_1.getDepartment()); }).verifyComplete(); } diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveCourseRepositoryNoMetricsIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveCourseRepositoryNoMetricsIT.java index 2b4e346afff0..3212abdcc440 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveCourseRepositoryNoMetricsIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveCourseRepositoryNoMetricsIT.java @@ -10,13 +10,12 @@ import com.azure.spring.data.cosmos.repository.TestRepositoryNoMetricsConfig; import com.azure.spring.data.cosmos.repository.repository.ReactiveCourseRepository; import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import reactor.core.publisher.Flux; import reactor.test.StepVerifier; @@ -24,8 +23,7 @@ import static org.assertj.core.api.Assertions.assertThat; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryNoMetricsConfig.class) public class ReactiveCourseRepositoryNoMetricsIT { @@ -41,7 +39,7 @@ public class ReactiveCourseRepositoryNoMetricsIT { private static final Course COURSE_1 = new Course(COURSE_ID_1, COURSE_NAME_1, DEPARTMENT_NAME_1); private static final Course COURSE_2 = new Course(COURSE_ID_2, COURSE_NAME_2, DEPARTMENT_NAME_2); - @ClassRule + public static final ReactiveIntegrationTestCollectionManager collectionManager = new ReactiveIntegrationTestCollectionManager(); @Autowired @@ -58,7 +56,7 @@ public class ReactiveCourseRepositoryNoMetricsIT { private CosmosEntityInformation entityInformation; - @Before + @BeforeEach public void setUp() { collectionManager.ensureContainersCreatedAndEmpty(template, Course.class); entityInformation = collectionManager.getEntityInformation(Course.class); diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveEtagIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveEtagIT.java index 10ef86050958..a72042bce9e1 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveEtagIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveEtagIT.java @@ -8,14 +8,13 @@ import com.azure.spring.data.cosmos.exception.CosmosPreconditionFailedException; import com.azure.spring.data.cosmos.repository.TestRepositoryConfig; import com.azure.spring.data.cosmos.repository.repository.ReactiveCourseWithEtagRepository; -import org.junit.Assert; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; @@ -27,13 +26,13 @@ import static com.azure.spring.data.cosmos.common.TestConstants.COURSE_NAME; import static com.azure.spring.data.cosmos.common.TestConstants.DEPARTMENT; +import static org.junit.jupiter.api.Assertions.*; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class ReactiveEtagIT { - @ClassRule + public static final ReactiveIntegrationTestCollectionManager collectionManager = new ReactiveIntegrationTestCollectionManager(); @Autowired @@ -41,7 +40,7 @@ public class ReactiveEtagIT { @Autowired ReactiveCourseWithEtagRepository reactiveCourseWithEtagRepository; - @Before + @BeforeEach public void setup() { collectionManager.ensureContainersCreatedAndEmpty(template, CourseWithEtag.class); } @@ -55,23 +54,23 @@ public void testCrudOperationsShouldApplyEtag() { final Mono insertedCourseWithEtagMono = reactiveCourseWithEtagRepository.save(createCourseWithEtag()); CourseWithEtag insertedCourseWithEtag = insertedCourseWithEtagMono.block(); - Assert.assertNotNull(insertedCourseWithEtag); - Assert.assertNotNull(insertedCourseWithEtag.getEtag()); + Assertions.assertNotNull(insertedCourseWithEtag); + Assertions.assertNotNull(insertedCourseWithEtag.getEtag()); insertedCourseWithEtag.setName("CHANGED"); final Mono updatedCourseWithEtagMono = reactiveCourseWithEtagRepository.save(insertedCourseWithEtag); CourseWithEtag updatedCourseWithEtag = updatedCourseWithEtagMono.block(); - Assert.assertNotNull(updatedCourseWithEtag); - Assert.assertNotNull(updatedCourseWithEtag.getEtag()); - Assert.assertNotEquals(updatedCourseWithEtag.getEtag(), insertedCourseWithEtag.getEtag()); + Assertions.assertNotNull(updatedCourseWithEtag); + Assertions.assertNotNull(updatedCourseWithEtag.getEtag()); + Assertions.assertNotEquals(updatedCourseWithEtag.getEtag(), insertedCourseWithEtag.getEtag()); final Mono foundCourseWithEtagMono = reactiveCourseWithEtagRepository.findById(insertedCourseWithEtag.getCourseId()); CourseWithEtag foundCourseWithEtag = foundCourseWithEtagMono.block(); - Assert.assertNotNull(foundCourseWithEtag); - Assert.assertNotNull(foundCourseWithEtag.getEtag()); - Assert.assertEquals(foundCourseWithEtag.getEtag(), updatedCourseWithEtag.getEtag()); + Assertions.assertNotNull(foundCourseWithEtag); + Assertions.assertNotNull(foundCourseWithEtag.getEtag()); + assertEquals(foundCourseWithEtag.getEtag(), updatedCourseWithEtag.getEtag()); } @Test @@ -83,15 +82,15 @@ public void testCrudListOperationsShouldApplyEtag() { final Flux insertedCourseWithEtagsFlux = reactiveCourseWithEtagRepository.saveAll(courses); List insertedCourseWithEtags = insertedCourseWithEtagsFlux.collectList().block(); - Assert.assertNotNull(insertedCourseWithEtags); - insertedCourseWithEtags.forEach(course -> Assert.assertNotNull(course.getEtag())); + Assertions.assertNotNull(insertedCourseWithEtags); + insertedCourseWithEtags.forEach(course -> Assertions.assertNotNull(course.getEtag())); insertedCourseWithEtags.forEach(course -> course.setName("CHANGED")); final Flux updatedCourseWithEtagsFlux = reactiveCourseWithEtagRepository.saveAll(insertedCourseWithEtags); List updatedCourseWithEtags = updatedCourseWithEtagsFlux.collectList().block(); - Assert.assertNotNull(updatedCourseWithEtags); + Assertions.assertNotNull(updatedCourseWithEtags); insertedCourseWithEtags.sort(Comparator.comparing(CourseWithEtag::getCourseId)); updatedCourseWithEtags.sort(Comparator.comparing(CourseWithEtag::getCourseId)); @@ -99,9 +98,9 @@ public void testCrudListOperationsShouldApplyEtag() { for (int i = 0; i < updatedCourseWithEtags.size(); i++) { CourseWithEtag insertedCourseWithEtag = insertedCourseWithEtags.get(i); CourseWithEtag updatedCourseWithEtag = updatedCourseWithEtags.get(i); - Assert.assertEquals(insertedCourseWithEtag.getCourseId(), updatedCourseWithEtag.getCourseId()); - Assert.assertNotNull(updatedCourseWithEtag.getEtag()); - Assert.assertNotEquals(insertedCourseWithEtag.getEtag(), updatedCourseWithEtag.getEtag()); + assertEquals(insertedCourseWithEtag.getCourseId(), updatedCourseWithEtag.getCourseId()); + Assertions.assertNotNull(updatedCourseWithEtag.getEtag()); + Assertions.assertNotEquals(insertedCourseWithEtag.getEtag(), updatedCourseWithEtag.getEtag()); } } @@ -109,12 +108,12 @@ public void testCrudListOperationsShouldApplyEtag() { public void testShouldFailIfEtagDoesNotMatch() { Mono insertedCourseWithEtagMono = reactiveCourseWithEtagRepository.save(createCourseWithEtag()); CourseWithEtag insertedCourseWithEtag = insertedCourseWithEtagMono.block(); - Assert.assertNotNull(insertedCourseWithEtag); + Assertions.assertNotNull(insertedCourseWithEtag); insertedCourseWithEtag.setName("CHANGED"); Mono updatedCourseWithEtagMono = reactiveCourseWithEtagRepository.save(insertedCourseWithEtag); CourseWithEtag updatedCourseWithEtag = updatedCourseWithEtagMono.block(); - Assert.assertNotNull(updatedCourseWithEtag); + Assertions.assertNotNull(updatedCourseWithEtag); updatedCourseWithEtag.setEtag(insertedCourseWithEtag.getEtag()); @@ -129,23 +128,23 @@ public void testShouldFailIfEtagDoesNotMatch() { public void testBulkShouldFailIfEtagDoesNotMatch() { Flux insertedCourseWithEtagFlux = reactiveCourseWithEtagRepository.saveAll(Flux.just(createCourseWithEtag())); List insertedCourseWithEtag = insertedCourseWithEtagFlux.collectList().block(); - Assert.assertEquals(insertedCourseWithEtag.size(), 1); + assertEquals(insertedCourseWithEtag.size(), 1); insertedCourseWithEtag.get(0).setName("CHANGED"); Flux updatedCourseWithEtagFlux = reactiveCourseWithEtagRepository.saveAll(insertedCourseWithEtag); List updatedCourseWithEtag = updatedCourseWithEtagFlux.collectList().block(); - Assert.assertEquals(updatedCourseWithEtag.size(), 1); + assertEquals(updatedCourseWithEtag.size(), 1); updatedCourseWithEtag.get(0).setEtag(insertedCourseWithEtag.get(0).getEtag()); Flux courseFlux = reactiveCourseWithEtagRepository.saveAll(updatedCourseWithEtag); StepVerifier.create(courseFlux); - Assert.assertEquals(courseFlux.collectList().block().size(), 0); + assertEquals(courseFlux.collectList().block().size(), 0); reactiveCourseWithEtagRepository.deleteAll(updatedCourseWithEtag); Flux courseFlux2 = reactiveCourseWithEtagRepository.findAll(); StepVerifier.create(courseFlux2); - Assert.assertEquals(courseFlux2.collectList().block().size(), 1); + assertEquals(courseFlux2.collectList().block().size(), 1); } } diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveHierarchicalPartitionKeyRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveHierarchicalPartitionKeyRepositoryIT.java index 74040c3b77fd..c2445f7a4e15 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveHierarchicalPartitionKeyRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveHierarchicalPartitionKeyRepositoryIT.java @@ -10,15 +10,14 @@ import com.azure.spring.data.cosmos.repository.TestRepositoryConfig; import com.azure.spring.data.cosmos.repository.repository.ReactiveHierarchicalPartitionKeyRepository; import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; @@ -26,10 +25,9 @@ import java.util.Arrays; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class ReactiveHierarchicalPartitionKeyRepositoryIT { @@ -39,7 +37,7 @@ public class ReactiveHierarchicalPartitionKeyRepositoryIT { private static final HierarchicalPartitionKeyEntity HIERARCHICAL_ENTITY_2 = new HierarchicalPartitionKeyEntity("id_2", "Michael", "Smith", "23456"); - @ClassRule + public static final ReactiveIntegrationTestCollectionManager collectionManager = new ReactiveIntegrationTestCollectionManager(); private static CosmosEntityInformation hierarchicalPartitionKeyEntityInformation @@ -51,15 +49,15 @@ public class ReactiveHierarchicalPartitionKeyRepositoryIT { @Autowired ReactiveHierarchicalPartitionKeyRepository repository; - @BeforeClass + @BeforeAll public static void init() { } - @Before + @BeforeEach public void setUp() { collectionManager.ensureContainersCreatedAndEmpty(reactiveTemplate, HierarchicalPartitionKeyEntity.class); } - @AfterClass + @AfterAll public static void cleanUp() { collectionManager.deleteContainer(hierarchicalPartitionKeyEntityInformation); } diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveIndexPolicyUpdateIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveIndexPolicyUpdateIT.java index 5fdba53b7a4b..bcd15dfa3f0b 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveIndexPolicyUpdateIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveIndexPolicyUpdateIT.java @@ -16,26 +16,24 @@ import com.azure.spring.data.cosmos.repository.TestRepositoryConfig; import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; import com.azure.spring.data.cosmos.repository.support.SimpleReactiveCosmosRepository; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.mockito.Mockito; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.util.Collections; import static org.assertj.core.api.Assertions.assertThat; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class ReactiveIndexPolicyUpdateIT { - @ClassRule + public static final ReactiveIntegrationTestCollectionManager collectionManager = new ReactiveIntegrationTestCollectionManager(); @Autowired @@ -52,7 +50,7 @@ public class ReactiveIndexPolicyUpdateIT { CosmosEntityInformation addressEntityInformation = new CosmosEntityInformation<>(Address.class); - @Before + @BeforeEach public void setup() { collectionManager.ensureContainersCreatedAndEmpty(template, IndexPolicyEntity.class, ComplexIndexPolicyEntity.class, IndexPolicyOverwriteEntity.class); } diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveLongIdDomainPartitionPartitionRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveLongIdDomainPartitionPartitionRepositoryIT.java index 649a1821c5da..e6fe821d1ef0 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveLongIdDomainPartitionPartitionRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveLongIdDomainPartitionPartitionRepositoryIT.java @@ -10,14 +10,13 @@ import com.azure.spring.data.cosmos.repository.TestRepositoryConfig; import com.azure.spring.data.cosmos.repository.repository.ReactiveLongIdDomainPartitionRepository; import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; @@ -25,8 +24,9 @@ import java.util.Arrays; import java.util.Objects; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +import static org.junit.jupiter.api.Assertions.assertThrows; + +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class ReactiveLongIdDomainPartitionPartitionRepositoryIT { @@ -42,7 +42,7 @@ public class ReactiveLongIdDomainPartitionPartitionRepositoryIT { private static final LongIdDomainPartition DOMAIN_2 = new LongIdDomainPartition(ID_2, NAME_2); private static final LongIdDomainPartition DOMAIN_3 = new LongIdDomainPartition(ID_3, NAME_1); - @ClassRule + public static final ReactiveIntegrationTestCollectionManager collectionManager = new ReactiveIntegrationTestCollectionManager(); @Autowired @@ -53,7 +53,7 @@ public class ReactiveLongIdDomainPartitionPartitionRepositoryIT { private CosmosEntityInformation entityInformation; - @Before + @BeforeEach public void setUp() { collectionManager.ensureContainersCreatedAndEmpty(template, LongIdDomainPartition.class); entityInformation = collectionManager.getEntityInformation(LongIdDomainPartition.class); @@ -85,9 +85,10 @@ public void testLongIdDomainPartition() { StepVerifier.create(afterDelIdMono).expectNextCount(0).verifyComplete(); } - @Test(expected = IllegalArgumentException.class) + @Test public void testInvalidDomain() { - new CosmosEntityInformation(InvalidDomain.class); + assertThrows(IllegalArgumentException.class, () -> + new CosmosEntityInformation(InvalidDomain.class)); } @Test diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveNestedPartitionKeyRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveNestedPartitionKeyRepositoryIT.java index 81c0faa585cb..1c34677beb82 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveNestedPartitionKeyRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveNestedPartitionKeyRepositoryIT.java @@ -9,14 +9,13 @@ import com.azure.spring.data.cosmos.domain.NestedPartitionKeyEntity; import com.azure.spring.data.cosmos.repository.TestRepositoryConfig; import com.azure.spring.data.cosmos.repository.repository.ReactiveNestedPartitionKeyRepository; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; @@ -27,8 +26,7 @@ import static org.assertj.core.api.Assertions.assertThat; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class ReactiveNestedPartitionKeyRepositoryIT { @@ -38,7 +36,7 @@ public class ReactiveNestedPartitionKeyRepositoryIT { private static final NestedPartitionKeyEntity NESTED_ENTITY_2 = new NestedPartitionKeyEntity(null, new NestedEntity("partitionKey2")); - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); @Autowired @@ -47,10 +45,10 @@ public class ReactiveNestedPartitionKeyRepositoryIT { @Autowired ReactiveNestedPartitionKeyRepository repository; - @BeforeClass + @BeforeAll public static void init() { } - @Before + @BeforeEach public void setUp() { collectionManager.ensureContainersCreatedAndEmpty(template, NestedPartitionKeyEntity.class); } diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveRoleRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveRoleRepositoryIT.java index 6a91bab9ccb8..af4364dfeefb 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveRoleRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveRoleRepositoryIT.java @@ -8,14 +8,13 @@ import com.azure.spring.data.cosmos.domain.Role; import com.azure.spring.data.cosmos.repository.TestRepositoryConfig; import com.azure.spring.data.cosmos.repository.repository.ReactiveRoleRepository; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; @@ -25,8 +24,7 @@ import java.util.List; import java.util.Optional; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class ReactiveRoleRepositoryIT { @@ -42,7 +40,7 @@ public class ReactiveRoleRepositoryIT { private static final Role TEST_ROLE_5 = new Role(TestConstants.ID_5, true, TestConstants.ROLE_NAME_2, TestConstants.LEVEL_2); - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); @Autowired @@ -50,7 +48,7 @@ public class ReactiveRoleRepositoryIT { @Autowired private ReactiveRoleRepository repository; - @Before + @BeforeEach public void setUp() { collectionManager.ensureContainersCreatedAndEmpty(template, Role.class); final Flux savedFlux = repository.saveAll(Arrays.asList(TEST_ROLE_1, TEST_ROLE_2, TEST_ROLE_3, TEST_ROLE_4)); diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveTeacherRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveTeacherRepositoryIT.java index e6b4a53374f6..b6b9e2bc3a18 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveTeacherRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ReactiveTeacherRepositoryIT.java @@ -8,14 +8,13 @@ import com.azure.spring.data.cosmos.domain.ReactiveTeacher; import com.azure.spring.data.cosmos.repository.TestRepositoryConfig; import com.azure.spring.data.cosmos.repository.repository.ReactiveTeacherRepository; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; @@ -24,8 +23,7 @@ import java.util.Arrays; import java.util.List; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class ReactiveTeacherRepositoryIT { @@ -49,7 +47,7 @@ public class ReactiveTeacherRepositoryIT { private static final ReactiveTeacher TEACHER_3 = new ReactiveTeacher(TEACHER_ID_3, TEACHER_FIRST_NAME_2, DEPARTMENT_LAST_NAME_1); - @ClassRule + public static final ReactiveIntegrationTestCollectionManager collectionManager = new ReactiveIntegrationTestCollectionManager(); @Autowired @@ -58,7 +56,7 @@ public class ReactiveTeacherRepositoryIT { @Autowired private ReactiveTeacherRepository repository; - @Before + @BeforeEach public void setUp() { collectionManager.ensureContainersCreatedAndEmpty(template, ReactiveTeacher.class); final Flux savedFlux = repository.saveAll(Arrays.asList(TEACHER_1)); diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/SpELCosmosAnnotationIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/SpELCosmosAnnotationIT.java index ab4d88dd872c..0e02f5118d3b 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/SpELCosmosAnnotationIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/SpELCosmosAnnotationIT.java @@ -9,23 +9,21 @@ import com.azure.spring.data.cosmos.domain.SpELPropertyStudent; import com.azure.spring.data.cosmos.repository.TestRepositorySpELConfig; import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositorySpELConfig.class) public class SpELCosmosAnnotationIT { - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); private static final SpELPropertyStudent TEST_PROPERTY_STUDENT = new SpELPropertyStudent(TestConstants.ID_1, @@ -34,7 +32,7 @@ public class SpELCosmosAnnotationIT { @Autowired private CosmosTemplate cosmosTemplate; - @Before + @BeforeEach public void setUp() { collectionManager.ensureContainersCreatedAndEmpty(cosmosTemplate, SpELPropertyStudent.class); } diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/SquareRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/SquareRepositoryIT.java index ccc0397c97e9..fe43f90246df 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/SquareRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/SquareRepositoryIT.java @@ -8,27 +8,25 @@ import com.azure.spring.data.cosmos.domain.inheritance.Square; import com.azure.spring.data.cosmos.repository.TestRepositoryConfig; import com.azure.spring.data.cosmos.repository.repository.SquareRepository; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.util.List; import java.util.Optional; import static org.assertj.core.api.Assertions.assertThat; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class SquareRepositoryIT { private Square square1 = new Square("id_1", 1, 1); private Square square2 = new Square("id_2", 2, 4); - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); @Autowired @@ -37,7 +35,7 @@ public class SquareRepositoryIT { @Autowired private SquareRepository repository; - @Before + @BeforeEach public void setUp() { collectionManager.ensureContainersCreatedAndEmpty(template, Square.class); repository.save(square1); diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/StudentRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/StudentRepositoryIT.java index 2781d1d540df..4c2dfa21c0b1 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/StudentRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/StudentRepositoryIT.java @@ -9,25 +9,23 @@ import com.azure.spring.data.cosmos.repository.TestRepositoryConfig; import com.azure.spring.data.cosmos.repository.repository.StudentRepository; import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.util.Arrays; import java.util.Comparator; import java.util.List; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class StudentRepositoryIT { public static final String ID_0 = "id-0"; @@ -60,7 +58,7 @@ public class StudentRepositoryIT { private static final List PEOPLE = Arrays.asList(STUDENT_0, STUDENT_1, STUDENT_2, STUDENT_3, STUDENT_4, STUDENT_5); - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); @Autowired @@ -69,13 +67,13 @@ public class StudentRepositoryIT { @Autowired private StudentRepository repository; - @Before + @BeforeEach public void setUp() { collectionManager.ensureContainersCreatedAndEmpty(template, Student.class); this.repository.saveAll(PEOPLE); } - @AfterClass + @AfterAll public static void teardown() { collectionManager.deleteContainer(new CosmosEntityInformation<>(Student.class)); } @@ -157,7 +155,7 @@ private void assertPeopleEquals(List people, List reference) { people.sort(Comparator.comparing(Student::getId)); reference.sort(Comparator.comparing(Student::getId)); - Assert.assertEquals(reference, people); + assertEquals(reference, people); } @Test diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/TeacherRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/TeacherRepositoryIT.java index 0355f28fbbbd..ccff01a0f465 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/TeacherRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/TeacherRepositoryIT.java @@ -9,25 +9,23 @@ import com.azure.spring.data.cosmos.repository.TestRepositoryConfig; import com.azure.spring.data.cosmos.repository.repository.TeacherRepository; import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; -import org.junit.After; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.util.Optional; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class TeacherRepositoryIT { public static final String ID_0 = "id-0"; @@ -38,7 +36,7 @@ public class TeacherRepositoryIT { private static final Teacher TEACHER_0 = new Teacher(ID_0, FIRST_NAME_0, LAST_NAME_0); - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); @Autowired @@ -47,13 +45,13 @@ public class TeacherRepositoryIT { @Autowired private TeacherRepository repository; - @Before + @BeforeEach public void setUp() { collectionManager.ensureContainersCreatedAndEmpty(template, Teacher.class); this.repository.save(TEACHER_0); } - @After + @AfterEach public void teardown() { collectionManager.deleteContainer(new CosmosEntityInformation<>(Teacher.class)); } diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/UUIDIdDomainRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/UUIDIdDomainRepositoryIT.java index a6ae8c2aa10b..e61ac65bf20b 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/UUIDIdDomainRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/UUIDIdDomainRepositoryIT.java @@ -10,14 +10,13 @@ import com.azure.spring.data.cosmos.repository.TestRepositoryConfig; import com.azure.spring.data.cosmos.repository.repository.UUIDIdDomainRepository; import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; -import org.junit.Assert; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.util.ArrayList; import java.util.Arrays; @@ -31,9 +30,9 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import java.util.stream.StreamSupport; +import static org.junit.jupiter.api.Assertions.*; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class UUIDIdDomainRepositoryIT { @@ -46,7 +45,7 @@ public class UUIDIdDomainRepositoryIT { private static final UUIDIdDomain DOMAIN_1 = new UUIDIdDomain(ID_1, NAME_1); private static final UUIDIdDomain DOMAIN_2 = new UUIDIdDomain(ID_2, NAME_2); - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); @Autowired @@ -55,7 +54,7 @@ public class UUIDIdDomainRepositoryIT { @Autowired private UUIDIdDomainRepository repository; - @Before + @BeforeEach public void setUp() { collectionManager.ensureContainersCreatedAndEmpty(template, UUIDIdDomain.class); this.repository.save(DOMAIN_1); @@ -65,43 +64,45 @@ public void setUp() { @Test public void testUUIDIdDomain() { this.repository.deleteAll(); - Assert.assertFalse(this.repository.findById(ID_1).isPresent()); + Assertions.assertFalse(this.repository.findById(ID_1).isPresent()); this.repository.save(DOMAIN_1); final Optional foundOptional = this.repository.findById(ID_1); - Assert.assertTrue(foundOptional.isPresent()); - Assert.assertEquals(DOMAIN_1.getNumber(), foundOptional.get().getNumber()); - Assert.assertEquals(DOMAIN_1.getName(), foundOptional.get().getName()); + Assertions.assertTrue(foundOptional.isPresent()); + assertEquals(DOMAIN_1.getNumber(), foundOptional.get().getNumber()); + assertEquals(DOMAIN_1.getName(), foundOptional.get().getName()); this.repository.delete(DOMAIN_1); - Assert.assertFalse(this.repository.findById(ID_1).isPresent()); + Assertions.assertFalse(this.repository.findById(ID_1).isPresent()); } - @Test(expected = IllegalArgumentException.class) + @Test public void testInvalidDomain() { - new CosmosEntityInformation(InvalidDomain.class); + assertThrows(IllegalArgumentException.class, () -> + new CosmosEntityInformation(InvalidDomain.class)); + } @Test public void testBasicQuery() { final UUIDIdDomain save = this.repository.save(DOMAIN_1); - Assert.assertNotNull(save); + Assertions.assertNotNull(save); } @Test public void testSaveAndFindById() { - Assert.assertNotNull(this.repository.save(DOMAIN_1)); + Assertions.assertNotNull(this.repository.save(DOMAIN_1)); final Optional savedEntity = this.repository.findById(DOMAIN_1.getNumber()); - Assert.assertTrue(savedEntity.isPresent()); - Assert.assertEquals(DOMAIN_1, savedEntity.get()); + Assertions.assertTrue(savedEntity.isPresent()); + assertEquals(DOMAIN_1, savedEntity.get()); } @Test public void testSaveAllAndFindAll() { - Assert.assertTrue(this.repository.findAll().iterator().hasNext()); + Assertions.assertTrue(this.repository.findAll().iterator().hasNext()); final Set entitiesToSave = Stream.of(DOMAIN_1, DOMAIN_2).collect(Collectors.toSet()); this.repository.saveAll(entitiesToSave); @@ -109,14 +110,14 @@ public void testSaveAllAndFindAll() { final Set savedEntities = StreamSupport.stream(this.repository.findAll().spliterator(), false) .collect(Collectors.toSet()); - Assert.assertTrue(entitiesToSave.containsAll(savedEntities)); + Assertions.assertTrue(entitiesToSave.containsAll(savedEntities)); } @Test public void testFindAllById() { final Iterable allById = TestUtils.toList(this.repository.findAllById(Arrays.asList(DOMAIN_1.getNumber(), DOMAIN_2.getNumber()))); - Assert.assertTrue(((ArrayList) allById).size() == 2); + Assertions.assertTrue(((ArrayList) allById).size() == 2); Iterator it = allById.iterator(); assertUUIDIdDomainEquals(Arrays.asList(it.next(), it.next()), Arrays.asList(DOMAIN_1, DOMAIN_2)); } @@ -124,12 +125,12 @@ public void testFindAllById() { private void assertUUIDIdDomainEquals(List cur, List reference) { cur.sort(Comparator.comparing(UUIDIdDomain::getNumber)); reference.sort(Comparator.comparing(UUIDIdDomain::getNumber)); - Assert.assertEquals(reference, cur); + assertEquals(reference, cur); } @Test public void testCount() { - Assert.assertEquals(2, repository.count()); + assertEquals(2, repository.count()); } @Test @@ -138,26 +139,30 @@ public void testDeleteById() { this.repository.save(DOMAIN_2); this.repository.deleteById(DOMAIN_1.getNumber()); this.repository.deleteById(DOMAIN_2.getNumber()); - Assert.assertEquals(0, this.repository.count()); + assertEquals(0, this.repository.count()); } - @Test(expected = CosmosNotFoundException.class) + @Test public void testDeleteByIdShouldFailIfNothingToDelete() { - this.repository.deleteAll(); - this.repository.deleteById(DOMAIN_1.getNumber()); + assertThrows(CosmosNotFoundException.class, () -> { + this.repository.deleteAll(); + this.repository.deleteById(DOMAIN_1.getNumber()); + }); } @Test public void testDelete() { this.repository.save(DOMAIN_1); this.repository.delete(DOMAIN_1); - Assert.assertEquals(1, this.repository.count()); + assertEquals(1, this.repository.count()); } - @Test(expected = CosmosNotFoundException.class) + @Test public void testDeleteShouldFailIfNothingToDelete() { - this.repository.deleteAll(); - this.repository.delete(DOMAIN_1); + assertThrows(CosmosNotFoundException.class, () -> { + this.repository.deleteAll(); + this.repository.delete(DOMAIN_1); + }); } @Test @@ -165,13 +170,13 @@ public void testDeleteAll() { this.repository.save(DOMAIN_1); this.repository.save(DOMAIN_2); this.repository.deleteAll(Arrays.asList(DOMAIN_1, DOMAIN_2)); - Assert.assertEquals(0, this.repository.count()); + assertEquals(0, this.repository.count()); } @Test public void testExistsById() { this.repository.save(DOMAIN_1); - Assert.assertTrue(this.repository.existsById(DOMAIN_1.getNumber())); + Assertions.assertTrue(this.repository.existsById(DOMAIN_1.getNumber())); } private static class InvalidDomain { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/UniqueKeyPolicyIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/UniqueKeyPolicyIT.java index ade372efaf72..0d7e9314d18d 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/UniqueKeyPolicyIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/UniqueKeyPolicyIT.java @@ -19,14 +19,13 @@ import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; import com.azure.spring.data.cosmos.repository.support.SimpleCosmosRepository; import com.azure.spring.data.cosmos.repository.support.SimpleReactiveCosmosRepository; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.util.Arrays; import java.util.List; @@ -34,12 +33,11 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; -@SuppressWarnings("deprecation") -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) public class UniqueKeyPolicyIT { - @ClassRule + public static final IntegrationTestCollectionManager collectionManager = new IntegrationTestCollectionManager(); private static final UniqueKeyPolicyEntity ENTITY_1 = new UniqueKeyPolicyEntity("id-1", "firstName-1", "lastName" @@ -65,13 +63,13 @@ public class UniqueKeyPolicyIT { private static CosmosEntityInformation information = new CosmosEntityInformation<>(UniqueKeyPolicyEntity.class); - @Before + @BeforeEach public void setup() { collectionManager.ensureContainersCreatedAndEmpty(template, CompositeIndexEntity.class); repository.saveAll(Arrays.asList(ENTITY_1, ENTITY_2, ENTITY_3, ENTITY_4, ENTITY_5)); } - @AfterClass + @AfterAll public static void teardown() { collectionManager.deleteContainer(information); } diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/query/AbstractCosmosQueryUnitTest.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/query/AbstractCosmosQueryUnitTest.java index 33002512f898..4ec575c3c086 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/query/AbstractCosmosQueryUnitTest.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/query/AbstractCosmosQueryUnitTest.java @@ -5,15 +5,15 @@ import com.azure.spring.data.cosmos.core.CosmosOperations; import com.azure.spring.data.cosmos.core.query.CosmosPageRequest; import com.azure.spring.data.cosmos.core.query.CosmosQuery; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.util.Assert; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class AbstractCosmosQueryUnitTest { @Mock diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/query/AbstractReactiveCosmosQueryUnitTest.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/query/AbstractReactiveCosmosQueryUnitTest.java index f64a20601134..b41dfcefd1c9 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/query/AbstractReactiveCosmosQueryUnitTest.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/query/AbstractReactiveCosmosQueryUnitTest.java @@ -4,16 +4,16 @@ import com.azure.spring.data.cosmos.core.ReactiveCosmosOperations; import com.azure.spring.data.cosmos.core.query.CosmosQuery; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; import org.mockito.Mockito; -import org.mockito.junit.MockitoJUnitRunner; import org.springframework.util.Assert; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class AbstractReactiveCosmosQueryUnitTest { @Mock diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/support/CosmosEntityInformationUnitTest.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/support/CosmosEntityInformationUnitTest.java index 555a2383ab22..26600cd8e61d 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/support/CosmosEntityInformationUnitTest.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/support/CosmosEntityInformationUnitTest.java @@ -10,7 +10,7 @@ import com.azure.spring.data.cosmos.domain.Person; import com.azure.spring.data.cosmos.domain.Student; import com.azure.spring.data.cosmos.domain.UUIDIdDomain; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.annotation.Id; import org.springframework.data.annotation.Version; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/support/CosmosRepositoryFactoryBeanUnitTest.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/support/CosmosRepositoryFactoryBeanUnitTest.java index 01d75b321d39..b64a27070728 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/support/CosmosRepositoryFactoryBeanUnitTest.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/support/CosmosRepositoryFactoryBeanUnitTest.java @@ -4,15 +4,15 @@ import com.azure.spring.data.cosmos.core.CosmosTemplate; import com.azure.spring.data.cosmos.repository.repository.PersonRepository; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.data.repository.core.support.RepositoryFactorySupport; import static org.assertj.core.api.Assertions.assertThat; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class CosmosRepositoryFactoryBeanUnitTest { @Mock diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/support/CosmosRepositoryFactoryUnitTest.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/support/CosmosRepositoryFactoryUnitTest.java index 4b58b716e4df..68175a6338e9 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/support/CosmosRepositoryFactoryUnitTest.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/support/CosmosRepositoryFactoryUnitTest.java @@ -4,15 +4,15 @@ import com.azure.spring.data.cosmos.core.CosmosTemplate; import com.azure.spring.data.cosmos.domain.Person; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.data.repository.core.EntityInformation; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class CosmosRepositoryFactoryUnitTest { @Mock diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/support/StringBasedCosmosQueryUnitTest.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/support/StringBasedCosmosQueryUnitTest.java index 84e09b749ccc..081296b18a7e 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/support/StringBasedCosmosQueryUnitTest.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/support/StringBasedCosmosQueryUnitTest.java @@ -4,17 +4,17 @@ import com.azure.spring.data.cosmos.core.CosmosOperations; import com.azure.spring.data.cosmos.repository.query.CosmosQueryMethod; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import static org.assertj.core.api.Assertions.assertThat; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class StringBasedCosmosQueryUnitTest { @Mock CosmosQueryMethod cosmosQueryMethod; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/support/StringBasedReactiveCosmosQueryUnitTest.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/support/StringBasedReactiveCosmosQueryUnitTest.java index 1ef3ca08d498..4627fac171ef 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/support/StringBasedReactiveCosmosQueryUnitTest.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/support/StringBasedReactiveCosmosQueryUnitTest.java @@ -4,17 +4,17 @@ import com.azure.spring.data.cosmos.core.ReactiveCosmosOperations; import com.azure.spring.data.cosmos.repository.query.ReactiveCosmosQueryMethod; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import static org.assertj.core.api.Assertions.assertThat; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class StringBasedReactiveCosmosQueryUnitTest { @Mock ReactiveCosmosQueryMethod reactiveCosmosQueryMethod; From faa168f890420be2dc973b20c8d33488a8fd3cb0 Mon Sep 17 00:00:00 2001 From: muyao Date: Tue, 2 Dec 2025 14:44:59 +0800 Subject: [PATCH 54/76] Fix error --- .../com/azure/spring/data/cosmos/ContainerLockIT.java | 2 +- .../azure/spring/data/cosmos/core/CosmosTemplateIT.java | 2 +- .../data/cosmos/core/CosmosTemplatePartitionIT.java | 2 +- .../cosmos/core/MultiTenantContainerCosmosFactoryIT.java | 2 +- .../data/cosmos/core/MultiTenantDBCosmosFactoryIT.java | 2 +- .../spring/data/cosmos/core/ReactiveCosmosTemplateIT.java | 2 +- .../cosmos/core/ReactiveCosmosTemplatePartitionIT.java | 2 +- .../core/ReactiveMultiTenantContainerCosmosFactoryIT.java | 2 +- .../cosmos/core/ReactiveMultiTenantDBCosmosFactoryIT.java | 2 +- .../core/mapping/BasicCosmosPersistentEntityUnitTest.java | 8 +++----- 10 files changed, 12 insertions(+), 14 deletions(-) diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/ContainerLockIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/ContainerLockIT.java index 2b817a1aba7e..0874f91e7cf6 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/ContainerLockIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/ContainerLockIT.java @@ -22,7 +22,7 @@ @ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestRepositoryConfig.class) -@SuppressWarnings({"rawtypes", "unchecked", "deprecation"}) +@SuppressWarnings({"rawtypes", "unchecked"}) public class ContainerLockIT { private static final Duration SHORT_LEASE_DURATION = Duration.ofSeconds(3); diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIT.java index 9daa3a398ba4..c4273aef6f3a 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIT.java @@ -51,7 +51,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.domain.EntityScanner; +import org.springframework.boot.persistence.autoconfigure.EntityScanner; import org.springframework.context.ApplicationContext; import org.springframework.data.annotation.Persistent; import org.springframework.data.auditing.IsNewAwareAuditingHandler; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplatePartitionIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplatePartitionIT.java index 62beed86c8d1..4f069d418b45 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplatePartitionIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplatePartitionIT.java @@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.domain.EntityScanner; +import org.springframework.boot.persistence.autoconfigure.EntityScanner; import org.springframework.context.ApplicationContext; import org.springframework.data.annotation.Persistent; import org.springframework.data.domain.Page; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantContainerCosmosFactoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantContainerCosmosFactoryIT.java index f087dd4888d0..4ba492852b2c 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantContainerCosmosFactoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantContainerCosmosFactoryIT.java @@ -22,7 +22,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.domain.EntityScanner; +import org.springframework.boot.persistence.autoconfigure.EntityScanner; import org.springframework.context.ApplicationContext; import org.springframework.data.annotation.Persistent; import org.springframework.test.context.ContextConfiguration; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantDBCosmosFactoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantDBCosmosFactoryIT.java index 0de37438ecea..01ad4c86a795 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantDBCosmosFactoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantDBCosmosFactoryIT.java @@ -22,7 +22,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.domain.EntityScanner; +import org.springframework.boot.persistence.autoconfigure.EntityScanner; import org.springframework.context.ApplicationContext; import org.springframework.data.annotation.Persistent; import org.springframework.test.context.ContextConfiguration; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplateIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplateIT.java index 407187e1c35e..9a40db71b592 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplateIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplateIT.java @@ -53,7 +53,7 @@ import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.autoconfigure.domain.EntityScanner; +import org.springframework.boot.persistence.autoconfigure.EntityScanner; import org.springframework.context.ApplicationContext; import org.springframework.data.annotation.Persistent; import org.springframework.data.auditing.IsNewAwareAuditingHandler; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplatePartitionIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplatePartitionIT.java index ffbfe5068841..1e5852078ca1 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplatePartitionIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplatePartitionIT.java @@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.domain.EntityScanner; +import org.springframework.boot.persistence.autoconfigure.EntityScanner; import org.springframework.context.ApplicationContext; import org.springframework.data.annotation.Persistent; import org.springframework.data.repository.query.parser.Part; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantContainerCosmosFactoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantContainerCosmosFactoryIT.java index 77eef43b221b..81970d39fc50 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantContainerCosmosFactoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantContainerCosmosFactoryIT.java @@ -22,7 +22,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.domain.EntityScanner; +import org.springframework.boot.persistence.autoconfigure.EntityScanner; import org.springframework.context.ApplicationContext; import org.springframework.data.annotation.Persistent; import org.springframework.test.context.ContextConfiguration; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantDBCosmosFactoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantDBCosmosFactoryIT.java index 56bc2acd0499..d05f905f4f1f 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantDBCosmosFactoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantDBCosmosFactoryIT.java @@ -22,7 +22,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.domain.EntityScanner; +import org.springframework.boot.persistence.autoconfigure.EntityScanner; import org.springframework.context.ApplicationContext; import org.springframework.data.annotation.Persistent; import org.springframework.test.context.ContextConfiguration; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/BasicCosmosPersistentEntityUnitTest.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/BasicCosmosPersistentEntityUnitTest.java index 345457579818..ac0f86f67c98 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/BasicCosmosPersistentEntityUnitTest.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/BasicCosmosPersistentEntityUnitTest.java @@ -5,25 +5,23 @@ import com.azure.spring.data.cosmos.domain.Person; import org.junit.jupiter.api.Test; -import org.springframework.data.util.ClassTypeInformation; +import org.springframework.data.core.TypeInformation; import static org.assertj.core.api.Assertions.assertThat; public class BasicCosmosPersistentEntityUnitTest { - @SuppressWarnings({"deprecation", "removal"}) @Test public void testGetCollection() { final BasicCosmosPersistentEntity entity = new BasicCosmosPersistentEntity( - ClassTypeInformation.from(Person.class)); + TypeInformation.of(Person.class)); assertThat(entity.getContainer()).isEqualTo(""); } - @SuppressWarnings({"deprecation", "removal"}) @Test public void testGetLanguage() { final BasicCosmosPersistentEntity entity = new BasicCosmosPersistentEntity( - ClassTypeInformation.from(Person.class)); + TypeInformation.of(Person.class)); assertThat(entity.getLanguage()).isEqualTo(""); } From 463a26e98ac541bb6afca70c04f849750693f94e Mon Sep 17 00:00:00 2001 From: muyao Date: Tue, 2 Dec 2025 14:51:37 +0800 Subject: [PATCH 55/76] skip monitor for not support Spring Boot 4 --- sdk/spring/ci.yml | 22 +++++++++++----------- sdk/spring/pom.xml | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/sdk/spring/ci.yml b/sdk/spring/ci.yml index 0fdab4736a25..1e036c6b8ff0 100644 --- a/sdk/spring/ci.yml +++ b/sdk/spring/ci.yml @@ -244,10 +244,10 @@ parameters: displayName: 'spring-cloud-azure-starter-appconfiguration-config' type: boolean default: true -- name: release_springcloudazurestartermonitor - displayName: 'spring-cloud-azure-starter-monitor' - type: boolean - default: true +#- name: release_springcloudazurestartermonitor +# displayName: 'spring-cloud-azure-starter-monitor' +# type: boolean +# default: true extends: @@ -603,12 +603,12 @@ extends: skipPublishDocMs: true skipVerifyChangelog: true releaseInBatch: ${{ parameters.release_springcloudazurestarterappconfigurationconfig }} - - name: spring-cloud-azure-starter-monitor - groupId: com.azure.spring - safeName: springcloudazurestartermonitor - skipPublishDocGithubIo: true - skipPublishDocMs: true - skipVerifyChangelog: true - releaseInBatch: ${{ parameters.release_springcloudazurestartermonitor }} +# - name: spring-cloud-azure-starter-monitor +# groupId: com.azure.spring +# safeName: springcloudazurestartermonitor +# skipPublishDocGithubIo: true +# skipPublishDocMs: true +# skipVerifyChangelog: true +# releaseInBatch: ${{ parameters.release_springcloudazurestartermonitor }} MatrixFilters: - JavaTestVersion=^(?!1.8|1.11).* diff --git a/sdk/spring/pom.xml b/sdk/spring/pom.xml index 005b5bc5c160..b21a8cac2f43 100644 --- a/sdk/spring/pom.xml +++ b/sdk/spring/pom.xml @@ -70,8 +70,8 @@ spring-cloud-azure-feature-management-web spring-cloud-azure-starter-appconfiguration-config azure-spring-data-cosmos - spring-cloud-azure-starter-monitor - spring-cloud-azure-starter-monitor-test + + From 36f685cb48c2a17e9d89648420c8facdf94ad1a6 Mon Sep 17 00:00:00 2001 From: muyao Date: Tue, 2 Dec 2025 15:08:24 +0800 Subject: [PATCH 56/76] fix --- eng/versioning/external_dependencies.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index 2179ea0b4911..e8991c438080 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -322,7 +322,6 @@ springboot4_io.projectreactor:reactor-test;3.8.0 springboot4_jakarta.servlet:jakarta.servlet-api;6.1.0 springboot4_jakarta.validation:jakarta.validation-api;3.1.1 springboot4_javax.annotation:javax.annotation-api;1.3.2 -springboot4_junit:junit;4.13.2 springboot4_net.bytebuddy:byte-buddy-agent;1.17.8 springboot4_net.bytebuddy:byte-buddy;1.17.8 springboot4_org.apache.commons:commons-lang3;3.19.0 @@ -338,7 +337,6 @@ springboot4_org.assertj:assertj-core;3.27.6 springboot4_org.hibernate.validator:hibernate-validator;9.0.1.Final springboot4_org.javatuples:javatuples;1.2 springboot4_org.junit.jupiter:junit-jupiter;6.0.1 -springboot4_org.junit.vintage:junit-vintage-engine;6.0.1 springboot4_org.messaginghub:pooled-jms;3.1.7 springboot4_org.mockito:mockito-core;5.20.0 springboot4_org.postgresql:postgresql;42.7.8 From bd8c064d4e130e8b14c2efead522d2e70270b7f7 Mon Sep 17 00:00:00 2001 From: muyao Date: Tue, 2 Dec 2025 15:56:16 +0800 Subject: [PATCH 57/76] fix --- sdk/spring/azure-spring-data-cosmos/pom.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sdk/spring/azure-spring-data-cosmos/pom.xml b/sdk/spring/azure-spring-data-cosmos/pom.xml index 156af3b37992..092e161d48a8 100644 --- a/sdk/spring/azure-spring-data-cosmos/pom.xml +++ b/sdk/spring/azure-spring-data-cosmos/pom.xml @@ -54,12 +54,6 @@ org.springframework spring-core 7.0.1 - - - commons-logging - commons-logging - - org.springframework From 2e60d55db848b6a4dc29663914f44646453a84f0 Mon Sep 17 00:00:00 2001 From: muyao Date: Wed, 3 Dec 2025 10:02:21 +0800 Subject: [PATCH 58/76] Revert "replace alwaysApplyingWhenNonNull() with always()" This reverts commit ee56cc09dc7d9c03665879244c2016186facb857. --- ...eEventHubsConsumerClientConfiguration.java | 6 +- .../properties/AzureEventHubsProperties.java | 90 ++++++------- .../properties/AzureServiceBusProperties.java | 118 +++++++++--------- 3 files changed, 107 insertions(+), 107 deletions(-) diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/AzureEventHubsConsumerClientConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/AzureEventHubsConsumerClientConfiguration.java index 957abf7303c6..f1a8bc145d36 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/AzureEventHubsConsumerClientConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/AzureEventHubsConsumerClientConfiguration.java @@ -51,9 +51,9 @@ static class SharedConsumerConnectionConfiguration { SharedConsumerConnectionConfiguration(AzureEventHubsProperties properties, EventHubClientBuilder builder) { this.builder = builder; - PropertyMapper mapper = PropertyMapper.get(); - mapper.from(properties.getConsumer().getConsumerGroup()).always().to(builder::consumerGroup); - mapper.from(properties.getConsumer().getPrefetchCount()).always().to(builder::prefetchCount); + PropertyMapper mapper = PropertyMapper.get().alwaysApplyingWhenNonNull(); + mapper.from(properties.getConsumer().getConsumerGroup()).to(builder::consumerGroup); + mapper.from(properties.getConsumer().getPrefetchCount()).to(builder::prefetchCount); } @Bean diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/properties/AzureEventHubsProperties.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/properties/AzureEventHubsProperties.java index d595fe48e8be..a0ca762af1e2 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/properties/AzureEventHubsProperties.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/properties/AzureEventHubsProperties.java @@ -44,82 +44,82 @@ public class AzureEventHubsProperties extends AzureEventHubsCommonProperties private final Processor processor = new Processor(); public Producer buildProducerProperties() { - PropertyMapper propertyMapper = PropertyMapper.get(); + PropertyMapper propertyMapper = PropertyMapper.get().alwaysApplyingWhenNonNull(); Producer properties = new Producer(); AzurePropertiesUtils.mergeAzureCommonProperties(this, this.producer, properties); - propertyMapper.from(this.getDomainName()).always().to(properties::setDomainName); - propertyMapper.from(this.getNamespace()).always().to(properties::setNamespace); - propertyMapper.from(this.getEventHubName()).always().to(properties::setEventHubName); - propertyMapper.from(this.getConnectionString()).always().to(properties::setConnectionString); - propertyMapper.from(this.getCustomEndpointAddress()).always().to(properties::setCustomEndpointAddress); + propertyMapper.from(this.getDomainName()).to(properties::setDomainName); + propertyMapper.from(this.getNamespace()).to(properties::setNamespace); + propertyMapper.from(this.getEventHubName()).to(properties::setEventHubName); + propertyMapper.from(this.getConnectionString()).to(properties::setConnectionString); + propertyMapper.from(this.getCustomEndpointAddress()).to(properties::setCustomEndpointAddress); - propertyMapper.from(this.producer.getDomainName()).always().to(properties::setDomainName); - propertyMapper.from(this.producer.getNamespace()).always().to(properties::setNamespace); - propertyMapper.from(this.producer.getEventHubName()).always().to(properties::setEventHubName); - propertyMapper.from(this.producer.getConnectionString()).always().to(properties::setConnectionString); - propertyMapper.from(this.producer.getCustomEndpointAddress()).always().to(properties::setCustomEndpointAddress); + propertyMapper.from(this.producer.getDomainName()).to(properties::setDomainName); + propertyMapper.from(this.producer.getNamespace()).to(properties::setNamespace); + propertyMapper.from(this.producer.getEventHubName()).to(properties::setEventHubName); + propertyMapper.from(this.producer.getConnectionString()).to(properties::setConnectionString); + propertyMapper.from(this.producer.getCustomEndpointAddress()).to(properties::setCustomEndpointAddress); return properties; } public Consumer buildConsumerProperties() { - PropertyMapper propertyMapper = PropertyMapper.get(); + PropertyMapper propertyMapper = PropertyMapper.get().alwaysApplyingWhenNonNull(); Consumer properties = new Consumer(); AzurePropertiesUtils.mergeAzureCommonProperties(this, this.consumer, properties); - propertyMapper.from(this.getDomainName()).always().to(properties::setDomainName); - propertyMapper.from(this.getNamespace()).always().to(properties::setNamespace); - propertyMapper.from(this.getEventHubName()).always().to(properties::setEventHubName); - propertyMapper.from(this.getConnectionString()).always().to(properties::setConnectionString); - propertyMapper.from(this.getCustomEndpointAddress()).always().to(properties::setCustomEndpointAddress); + propertyMapper.from(this.getDomainName()).to(properties::setDomainName); + propertyMapper.from(this.getNamespace()).to(properties::setNamespace); + propertyMapper.from(this.getEventHubName()).to(properties::setEventHubName); + propertyMapper.from(this.getConnectionString()).to(properties::setConnectionString); + propertyMapper.from(this.getCustomEndpointAddress()).to(properties::setCustomEndpointAddress); - propertyMapper.from(this.consumer.getDomainName()).always().to(properties::setDomainName); - propertyMapper.from(this.consumer.getNamespace()).always().to(properties::setNamespace); - propertyMapper.from(this.consumer.getEventHubName()).always().to(properties::setEventHubName); - propertyMapper.from(this.consumer.getConnectionString()).always().to(properties::setConnectionString); - propertyMapper.from(this.consumer.getCustomEndpointAddress()).always().to(properties::setCustomEndpointAddress); - propertyMapper.from(this.consumer.getPrefetchCount()).always().to(properties::setPrefetchCount); - propertyMapper.from(this.consumer.getConsumerGroup()).always().to(properties::setConsumerGroup); + propertyMapper.from(this.consumer.getDomainName()).to(properties::setDomainName); + propertyMapper.from(this.consumer.getNamespace()).to(properties::setNamespace); + propertyMapper.from(this.consumer.getEventHubName()).to(properties::setEventHubName); + propertyMapper.from(this.consumer.getConnectionString()).to(properties::setConnectionString); + propertyMapper.from(this.consumer.getCustomEndpointAddress()).to(properties::setCustomEndpointAddress); + propertyMapper.from(this.consumer.getPrefetchCount()).to(properties::setPrefetchCount); + propertyMapper.from(this.consumer.getConsumerGroup()).to(properties::setConsumerGroup); return properties; } public Processor buildProcessorProperties() { - PropertyMapper propertyMapper = PropertyMapper.get(); + PropertyMapper propertyMapper = PropertyMapper.get().alwaysApplyingWhenNonNull(); Processor properties = new Processor(); AzurePropertiesUtils.mergeAzureCommonProperties(this, this.processor, properties); - propertyMapper.from(this.getDomainName()).always().to(properties::setDomainName); - propertyMapper.from(this.getNamespace()).always().to(properties::setNamespace); - propertyMapper.from(this.getEventHubName()).always().to(properties::setEventHubName); - propertyMapper.from(this.getConnectionString()).always().to(properties::setConnectionString); - propertyMapper.from(this.getCustomEndpointAddress()).always().to(properties::setCustomEndpointAddress); - - propertyMapper.from(this.processor.getDomainName()).always().to(properties::setDomainName); - propertyMapper.from(this.processor.getNamespace()).always().to(properties::setNamespace); - propertyMapper.from(this.processor.getEventHubName()).always().to(properties::setEventHubName); - propertyMapper.from(this.processor.getConnectionString()).always().to(properties::setConnectionString); - propertyMapper.from(this.processor.getCustomEndpointAddress()).always().to(properties::setCustomEndpointAddress); - propertyMapper.from(this.processor.getPrefetchCount()).always().to(properties::setPrefetchCount); - propertyMapper.from(this.processor.getConsumerGroup()).always().to(properties::setConsumerGroup); - - propertyMapper.from(this.processor.trackLastEnqueuedEventProperties).always().to(properties::setTrackLastEnqueuedEventProperties); + propertyMapper.from(this.getDomainName()).to(properties::setDomainName); + propertyMapper.from(this.getNamespace()).to(properties::setNamespace); + propertyMapper.from(this.getEventHubName()).to(properties::setEventHubName); + propertyMapper.from(this.getConnectionString()).to(properties::setConnectionString); + propertyMapper.from(this.getCustomEndpointAddress()).to(properties::setCustomEndpointAddress); + + propertyMapper.from(this.processor.getDomainName()).to(properties::setDomainName); + propertyMapper.from(this.processor.getNamespace()).to(properties::setNamespace); + propertyMapper.from(this.processor.getEventHubName()).to(properties::setEventHubName); + propertyMapper.from(this.processor.getConnectionString()).to(properties::setConnectionString); + propertyMapper.from(this.processor.getCustomEndpointAddress()).to(properties::setCustomEndpointAddress); + propertyMapper.from(this.processor.getPrefetchCount()).to(properties::setPrefetchCount); + propertyMapper.from(this.processor.getConsumerGroup()).to(properties::setConsumerGroup); + + propertyMapper.from(this.processor.trackLastEnqueuedEventProperties).to(properties::setTrackLastEnqueuedEventProperties); propertyMapper.from(this.processor.initialPartitionEventPosition).when(c -> !CollectionUtils.isEmpty(c)) - .always().to(m -> { + .to(m -> { Map eventPositionMap = m.entrySet() .stream() .filter(entry -> entry.getValue() != null) .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); properties.getInitialPartitionEventPosition().putAll(eventPositionMap); }); - propertyMapper.from(this.processor.batch.getMaxSize()).always().to(properties.batch::setMaxSize); - propertyMapper.from(this.processor.batch.getMaxWaitTime()).always().to(properties.batch::setMaxWaitTime); - propertyMapper.from(this.processor.loadBalancing.getStrategy()).always().to(properties.loadBalancing::setStrategy); - propertyMapper.from(this.processor.loadBalancing.getUpdateInterval()).always().to(properties.loadBalancing::setUpdateInterval); + propertyMapper.from(this.processor.batch.getMaxSize()).to(properties.batch::setMaxSize); + propertyMapper.from(this.processor.batch.getMaxWaitTime()).to(properties.batch::setMaxWaitTime); + propertyMapper.from(this.processor.loadBalancing.getStrategy()).to(properties.loadBalancing::setStrategy); + propertyMapper.from(this.processor.loadBalancing.getUpdateInterval()).to(properties.loadBalancing::setUpdateInterval); AzurePropertiesUtils.mergeAzureCommonProperties(properties, this.processor.getCheckpointStore(), properties.checkpointStore); BeanUtils.copyProperties(this.processor.checkpointStore, properties.checkpointStore); diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/servicebus/properties/AzureServiceBusProperties.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/servicebus/properties/AzureServiceBusProperties.java index f63f951ee087..780d0168ea0c 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/servicebus/properties/AzureServiceBusProperties.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/servicebus/properties/AzureServiceBusProperties.java @@ -57,91 +57,91 @@ public Processor getProcessor() { } public Producer buildProducerProperties() { - PropertyMapper propertyMapper = PropertyMapper.get(); + PropertyMapper propertyMapper = PropertyMapper.get().alwaysApplyingWhenNonNull(); Producer properties = new Producer(); AzurePropertiesUtils.mergeAzureCommonProperties(this, this.producer, properties); - propertyMapper.from(this.getDomainName()).always().to(properties::setDomainName); - propertyMapper.from(this.getCustomEndpointAddress()).always().to(properties::setCustomEndpointAddress); - propertyMapper.from(this.getNamespace()).always().to(properties::setNamespace); - propertyMapper.from(this.getConnectionString()).always().to(properties::setConnectionString); - propertyMapper.from(this.getEntityName()).always().to(properties::setEntityName); - propertyMapper.from(this.getEntityType()).always().to(properties::setEntityType); + propertyMapper.from(this.getDomainName()).to(properties::setDomainName); + propertyMapper.from(this.getCustomEndpointAddress()).to(properties::setCustomEndpointAddress); + propertyMapper.from(this.getNamespace()).to(properties::setNamespace); + propertyMapper.from(this.getConnectionString()).to(properties::setConnectionString); + propertyMapper.from(this.getEntityName()).to(properties::setEntityName); + propertyMapper.from(this.getEntityType()).to(properties::setEntityType); - propertyMapper.from(this.producer.getDomainName()).always().to(properties::setDomainName); - propertyMapper.from(this.producer.getCustomEndpointAddress()).always().to(properties::setCustomEndpointAddress); - propertyMapper.from(this.producer.getNamespace()).always().to(properties::setNamespace); - propertyMapper.from(this.producer.getConnectionString()).always().to(properties::setConnectionString); - propertyMapper.from(this.producer.getEntityType()).always().to(properties::setEntityType); - propertyMapper.from(this.producer.getEntityName()).always().to(properties::setEntityName); + propertyMapper.from(this.producer.getDomainName()).to(properties::setDomainName); + propertyMapper.from(this.producer.getCustomEndpointAddress()).to(properties::setCustomEndpointAddress); + propertyMapper.from(this.producer.getNamespace()).to(properties::setNamespace); + propertyMapper.from(this.producer.getConnectionString()).to(properties::setConnectionString); + propertyMapper.from(this.producer.getEntityType()).to(properties::setEntityType); + propertyMapper.from(this.producer.getEntityName()).to(properties::setEntityName); return properties; } public Consumer buildConsumerProperties() { - PropertyMapper propertyMapper = PropertyMapper.get(); + PropertyMapper propertyMapper = PropertyMapper.get().alwaysApplyingWhenNonNull(); Consumer properties = new Consumer(); AzurePropertiesUtils.mergeAzureCommonProperties(this, this.consumer, properties); - propertyMapper.from(this.getDomainName()).always().to(properties::setDomainName); - propertyMapper.from(this.getCustomEndpointAddress()).always().to(properties::setCustomEndpointAddress); - propertyMapper.from(this.getNamespace()).always().to(properties::setNamespace); - propertyMapper.from(this.getConnectionString()).always().to(properties::setConnectionString); - propertyMapper.from(this.getEntityName()).always().to(properties::setEntityName); - propertyMapper.from(this.getEntityType()).always().to(properties::setEntityType); - - propertyMapper.from(this.consumer.getDomainName()).always().to(properties::setDomainName); - propertyMapper.from(this.consumer.getCustomEndpointAddress()).always().to(properties::setCustomEndpointAddress); - propertyMapper.from(this.consumer.getNamespace()).always().to(properties::setNamespace); - propertyMapper.from(this.consumer.getConnectionString()).always().to(properties::setConnectionString); - propertyMapper.from(this.consumer.getEntityType()).always().to(properties::setEntityType); - propertyMapper.from(this.consumer.getEntityName()).always().to(properties::setEntityName); - - propertyMapper.from(this.consumer.getSessionEnabled()).always().to(properties::setSessionEnabled); - propertyMapper.from(this.consumer.getAutoComplete()).always().to(properties::setAutoComplete); - propertyMapper.from(this.consumer.getPrefetchCount()).always().to(properties::setPrefetchCount); - propertyMapper.from(this.consumer.getSubQueue()).always().to(properties::setSubQueue); - propertyMapper.from(this.consumer.getReceiveMode()).always().to(properties::setReceiveMode); - propertyMapper.from(this.consumer.getSubscriptionName()).always().to(properties::setSubscriptionName); - propertyMapper.from(this.consumer.getMaxAutoLockRenewDuration()).always().to(properties::setMaxAutoLockRenewDuration); + propertyMapper.from(this.getDomainName()).to(properties::setDomainName); + propertyMapper.from(this.getCustomEndpointAddress()).to(properties::setCustomEndpointAddress); + propertyMapper.from(this.getNamespace()).to(properties::setNamespace); + propertyMapper.from(this.getConnectionString()).to(properties::setConnectionString); + propertyMapper.from(this.getEntityName()).to(properties::setEntityName); + propertyMapper.from(this.getEntityType()).to(properties::setEntityType); + + propertyMapper.from(this.consumer.getDomainName()).to(properties::setDomainName); + propertyMapper.from(this.consumer.getCustomEndpointAddress()).to(properties::setCustomEndpointAddress); + propertyMapper.from(this.consumer.getNamespace()).to(properties::setNamespace); + propertyMapper.from(this.consumer.getConnectionString()).to(properties::setConnectionString); + propertyMapper.from(this.consumer.getEntityType()).to(properties::setEntityType); + propertyMapper.from(this.consumer.getEntityName()).to(properties::setEntityName); + + propertyMapper.from(this.consumer.getSessionEnabled()).to(properties::setSessionEnabled); + propertyMapper.from(this.consumer.getAutoComplete()).to(properties::setAutoComplete); + propertyMapper.from(this.consumer.getPrefetchCount()).to(properties::setPrefetchCount); + propertyMapper.from(this.consumer.getSubQueue()).to(properties::setSubQueue); + propertyMapper.from(this.consumer.getReceiveMode()).to(properties::setReceiveMode); + propertyMapper.from(this.consumer.getSubscriptionName()).to(properties::setSubscriptionName); + propertyMapper.from(this.consumer.getMaxAutoLockRenewDuration()).to(properties::setMaxAutoLockRenewDuration); return properties; } public Processor buildProcessorProperties() { - PropertyMapper propertyMapper = PropertyMapper.get(); + PropertyMapper propertyMapper = PropertyMapper.get().alwaysApplyingWhenNonNull(); Processor properties = new Processor(); AzurePropertiesUtils.mergeAzureCommonProperties(this, this.processor, properties); - propertyMapper.from(this.getDomainName()).always().to(properties::setDomainName); - propertyMapper.from(this.getCustomEndpointAddress()).always().to(properties::setCustomEndpointAddress); - propertyMapper.from(this.getNamespace()).always().to(properties::setNamespace); - propertyMapper.from(this.getConnectionString()).always().to(properties::setConnectionString); - propertyMapper.from(this.getEntityName()).always().to(properties::setEntityName); - propertyMapper.from(this.getEntityType()).always().to(properties::setEntityType); - - propertyMapper.from(this.processor.getDomainName()).always().to(properties::setDomainName); - propertyMapper.from(this.processor.getCustomEndpointAddress()).always().to(properties::setCustomEndpointAddress); - propertyMapper.from(this.processor.getNamespace()).always().to(properties::setNamespace); - propertyMapper.from(this.processor.getConnectionString()).always().to(properties::setConnectionString); - propertyMapper.from(this.processor.getEntityType()).always().to(properties::setEntityType); - propertyMapper.from(this.processor.getEntityName()).always().to(properties::setEntityName); - - propertyMapper.from(this.processor.getSessionEnabled()).always().to(properties::setSessionEnabled); - propertyMapper.from(this.processor.getAutoComplete()).always().to(properties::setAutoComplete); - propertyMapper.from(this.processor.getPrefetchCount()).always().to(properties::setPrefetchCount); - propertyMapper.from(this.processor.getSubQueue()).always().to(properties::setSubQueue); - propertyMapper.from(this.processor.getReceiveMode()).always().to(properties::setReceiveMode); - propertyMapper.from(this.processor.getSubscriptionName()).always().to(properties::setSubscriptionName); - propertyMapper.from(this.processor.getMaxAutoLockRenewDuration()).always().to(properties::setMaxAutoLockRenewDuration); - propertyMapper.from(this.processor.getMaxConcurrentCalls()).always().to(properties::setMaxConcurrentCalls); - propertyMapper.from(this.processor.getMaxConcurrentSessions()).always().to(properties::setMaxConcurrentSessions); + propertyMapper.from(this.getDomainName()).to(properties::setDomainName); + propertyMapper.from(this.getCustomEndpointAddress()).to(properties::setCustomEndpointAddress); + propertyMapper.from(this.getNamespace()).to(properties::setNamespace); + propertyMapper.from(this.getConnectionString()).to(properties::setConnectionString); + propertyMapper.from(this.getEntityName()).to(properties::setEntityName); + propertyMapper.from(this.getEntityType()).to(properties::setEntityType); + + propertyMapper.from(this.processor.getDomainName()).to(properties::setDomainName); + propertyMapper.from(this.processor.getCustomEndpointAddress()).to(properties::setCustomEndpointAddress); + propertyMapper.from(this.processor.getNamespace()).to(properties::setNamespace); + propertyMapper.from(this.processor.getConnectionString()).to(properties::setConnectionString); + propertyMapper.from(this.processor.getEntityType()).to(properties::setEntityType); + propertyMapper.from(this.processor.getEntityName()).to(properties::setEntityName); + + propertyMapper.from(this.processor.getSessionEnabled()).to(properties::setSessionEnabled); + propertyMapper.from(this.processor.getAutoComplete()).to(properties::setAutoComplete); + propertyMapper.from(this.processor.getPrefetchCount()).to(properties::setPrefetchCount); + propertyMapper.from(this.processor.getSubQueue()).to(properties::setSubQueue); + propertyMapper.from(this.processor.getReceiveMode()).to(properties::setReceiveMode); + propertyMapper.from(this.processor.getSubscriptionName()).to(properties::setSubscriptionName); + propertyMapper.from(this.processor.getMaxAutoLockRenewDuration()).to(properties::setMaxAutoLockRenewDuration); + propertyMapper.from(this.processor.getMaxConcurrentCalls()).to(properties::setMaxConcurrentCalls); + propertyMapper.from(this.processor.getMaxConcurrentSessions()).to(properties::setMaxConcurrentSessions); return properties; } From 20cff88816a7dd8f19d6c5acd009be326fb2df67 Mon Sep 17 00:00:00 2001 From: muyao Date: Wed, 3 Dec 2025 10:07:51 +0800 Subject: [PATCH 59/76] remove alwaysApplyingWhenNonNull() --- .../AzureEventHubsConsumerClientConfiguration.java | 2 +- .../eventhubs/properties/AzureEventHubsProperties.java | 6 +++--- .../servicebus/properties/AzureServiceBusProperties.java | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/AzureEventHubsConsumerClientConfiguration.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/AzureEventHubsConsumerClientConfiguration.java index f1a8bc145d36..a7fd2cbd2b76 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/AzureEventHubsConsumerClientConfiguration.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/AzureEventHubsConsumerClientConfiguration.java @@ -51,7 +51,7 @@ static class SharedConsumerConnectionConfiguration { SharedConsumerConnectionConfiguration(AzureEventHubsProperties properties, EventHubClientBuilder builder) { this.builder = builder; - PropertyMapper mapper = PropertyMapper.get().alwaysApplyingWhenNonNull(); + PropertyMapper mapper = PropertyMapper.get(); mapper.from(properties.getConsumer().getConsumerGroup()).to(builder::consumerGroup); mapper.from(properties.getConsumer().getPrefetchCount()).to(builder::prefetchCount); } diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/properties/AzureEventHubsProperties.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/properties/AzureEventHubsProperties.java index a0ca762af1e2..0b55ae5ae3a4 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/properties/AzureEventHubsProperties.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/properties/AzureEventHubsProperties.java @@ -44,7 +44,7 @@ public class AzureEventHubsProperties extends AzureEventHubsCommonProperties private final Processor processor = new Processor(); public Producer buildProducerProperties() { - PropertyMapper propertyMapper = PropertyMapper.get().alwaysApplyingWhenNonNull(); + PropertyMapper propertyMapper = PropertyMapper.get(); Producer properties = new Producer(); AzurePropertiesUtils.mergeAzureCommonProperties(this, this.producer, properties); @@ -65,7 +65,7 @@ public Producer buildProducerProperties() { } public Consumer buildConsumerProperties() { - PropertyMapper propertyMapper = PropertyMapper.get().alwaysApplyingWhenNonNull(); + PropertyMapper propertyMapper = PropertyMapper.get(); Consumer properties = new Consumer(); AzurePropertiesUtils.mergeAzureCommonProperties(this, this.consumer, properties); @@ -88,7 +88,7 @@ public Consumer buildConsumerProperties() { } public Processor buildProcessorProperties() { - PropertyMapper propertyMapper = PropertyMapper.get().alwaysApplyingWhenNonNull(); + PropertyMapper propertyMapper = PropertyMapper.get(); Processor properties = new Processor(); AzurePropertiesUtils.mergeAzureCommonProperties(this, this.processor, properties); diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/servicebus/properties/AzureServiceBusProperties.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/servicebus/properties/AzureServiceBusProperties.java index 780d0168ea0c..314f938cef45 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/servicebus/properties/AzureServiceBusProperties.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/servicebus/properties/AzureServiceBusProperties.java @@ -57,7 +57,7 @@ public Processor getProcessor() { } public Producer buildProducerProperties() { - PropertyMapper propertyMapper = PropertyMapper.get().alwaysApplyingWhenNonNull(); + PropertyMapper propertyMapper = PropertyMapper.get(); Producer properties = new Producer(); @@ -81,7 +81,7 @@ public Producer buildProducerProperties() { } public Consumer buildConsumerProperties() { - PropertyMapper propertyMapper = PropertyMapper.get().alwaysApplyingWhenNonNull(); + PropertyMapper propertyMapper = PropertyMapper.get(); Consumer properties = new Consumer(); @@ -113,7 +113,7 @@ public Consumer buildConsumerProperties() { } public Processor buildProcessorProperties() { - PropertyMapper propertyMapper = PropertyMapper.get().alwaysApplyingWhenNonNull(); + PropertyMapper propertyMapper = PropertyMapper.get(); Processor properties = new Processor(); From 353481dead202d0cdba6706f25a6b57f7f870e51 Mon Sep 17 00:00:00 2001 From: muyao Date: Fri, 5 Dec 2025 10:36:59 +0800 Subject: [PATCH 60/76] fix --- eng/versioning/external_dependencies.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index f1635ed7d56f..e8991c438080 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -8,7 +8,7 @@ # Format; # groupId:artifactId;dependency-version ch.qos.logback:logback-classic;1.3.14 -com.azure:azure-servicebus-jms;2.1.0 +com.azure:azure-servicebus-jms;2.0.0 com.azure.tools:azure-autorest-customization;1.0.0-beta.11 com.fasterxml:aalto-xml;1.3.3 com.fasterxml.jackson.core:jackson-annotations;2.18.4 From 77268f01996b844f20a532f75c2ee070e60c19ab Mon Sep 17 00:00:00 2001 From: Copilot <198982749+copilot@users.noreply.github.com> Date: Wed, 3 Dec 2025 09:51:41 +0800 Subject: [PATCH 61/76] fix --- eng/versioning/external_dependencies.txt | 2 +- sdk/spring/spring-cloud-azure-autoconfigure/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index e8991c438080..f1635ed7d56f 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -8,7 +8,7 @@ # Format; # groupId:artifactId;dependency-version ch.qos.logback:logback-classic;1.3.14 -com.azure:azure-servicebus-jms;2.0.0 +com.azure:azure-servicebus-jms;2.1.0 com.azure.tools:azure-autorest-customization;1.0.0-beta.11 com.fasterxml:aalto-xml;1.3.3 com.fasterxml.jackson.core:jackson-annotations;2.18.4 diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml index 2c9bbd2838dc..bc50d277728b 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml +++ b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml @@ -547,7 +547,7 @@ - com.azure:azure-servicebus-jms:[2.0.0] + com.azure:azure-servicebus-jms:[2.1.0] com.mysql:mysql-connector-j:[9.5.0] com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.20.1] io.lettuce:lettuce-core:[6.8.1.RELEASE] From f390890cb1cad3c0829f714c2e3b08d2e381276f Mon Sep 17 00:00:00 2001 From: muyao Date: Mon, 8 Dec 2025 08:45:38 +0800 Subject: [PATCH 62/76] replace with jackson2 --- eng/versioning/external_dependencies.txt | 2 +- .../spring-cloud-azure-autoconfigure/pom.xml | 14 +++----------- ...reEventHubsMessagingAutoConfigurationTests.java | 14 +++++++++----- ...eServiceBusMessagingAutoConfigurationTests.java | 14 +++++++++----- ...torageQueueMessagingAutoConfigurationTests.java | 14 +++++++++----- 5 files changed, 31 insertions(+), 27 deletions(-) diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index f1635ed7d56f..abc4f83cea04 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -352,7 +352,7 @@ springboot4_org.springframework.boot:spring-boot-data-redis;4.0.0 springboot4_org.springframework.boot:spring-boot-docker-compose;4.0.0 springboot4_org.springframework.boot:spring-boot-health;4.0.0 springboot4_org.springframework.boot:spring-boot-http-converter;4.0.0 -springboot4_org.springframework.boot:spring-boot-jackson;4.0.0 +springboot4_org.springframework.boot:spring-boot-jackson2;4.0.0 springboot4_org.springframework.boot:spring-boot-jdbc;4.0.0 springboot4_org.springframework.boot:spring-boot-jms;4.0.0 springboot4_org.springframework.boot:spring-boot-kafka;4.0.0 diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml index bc50d277728b..39e0fb18d748 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml +++ b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml @@ -181,15 +181,8 @@ org.springframework.boot - spring-boot-jackson - 4.0.0 - true - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - 2.20.1 - true + spring-boot-jackson2 + 4.0.0 @@ -549,7 +542,6 @@ com.azure:azure-servicebus-jms:[2.1.0] com.mysql:mysql-connector-j:[9.5.0] - com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.20.1] io.lettuce:lettuce-core:[6.8.1.RELEASE] jakarta.servlet:jakarta.servlet-api:[6.1.0] jakarta.validation:jakarta.validation-api:[3.1.1] @@ -562,7 +554,7 @@ org.springframework.boot:spring-boot-data-redis:[4.0.0] org.springframework.boot:spring-boot-http-converter:[4.0.0] org.springframework.boot:spring-boot-kafka:[4.0.0] - org.springframework.boot:spring-boot-jackson:[4.0.0] + org.springframework.boot:spring-boot-jackson2:[4.0.0] org.springframework.boot:spring-boot-jdbc:[4.0.0] org.springframework.boot:spring-boot-jms:[4.0.0] org.springframework.boot:spring-boot-restclient:[4.0.0] diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/AzureEventHubsMessagingAutoConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/AzureEventHubsMessagingAutoConfigurationTests.java index 6dc0da517750..9f83e87f095f 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/AzureEventHubsMessagingAutoConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/eventhubs/AzureEventHubsMessagingAutoConfigurationTests.java @@ -11,7 +11,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration; +import org.springframework.boot.jackson2.autoconfigure.Jackson2AutoConfiguration; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.runner.ApplicationContextRunner; @@ -77,10 +77,11 @@ void connectionInfoAndCheckpointStoreProvidedShouldConfigure() { } @Test + @SuppressWarnings("removal") void withoutObjectMapperShouldNotConfigure() { this.contextRunner .withClassLoader(new FilteredClassLoader(ObjectMapper.class)) - .withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class)) + .withConfiguration(AutoConfigurations.of(Jackson2AutoConfiguration.class)) .withPropertyValues( "spring.cloud.azure.eventhubs.connection-string=" + String.format(CONNECTION_STRING_FORMAT, "test-namespace") ) @@ -89,11 +90,12 @@ void withoutObjectMapperShouldNotConfigure() { } @Test + @SuppressWarnings("removal") void withIsolatedObjectMapper() { this.contextRunner .withPropertyValues("spring.cloud.azure.eventhubs.connection-string=" + String.format(CONNECTION_STRING_FORMAT, "test-namespace")) .withUserConfiguration(AzureEventHubsPropertiesTestConfiguration.class) - .withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class)) + .withConfiguration(AutoConfigurations.of(Jackson2AutoConfiguration.class)) .run(context -> { assertThat(context).hasBean("defaultEventHubsMessageConverter"); assertThat(context).hasSingleBean(EventHubsMessageConverter.class); @@ -102,12 +104,13 @@ void withIsolatedObjectMapper() { } @Test + @SuppressWarnings("removal") void withNonIsolatedObjectMapper() { this.contextRunner .withPropertyValues("spring.cloud.azure.eventhubs.connection-string=" + String.format(CONNECTION_STRING_FORMAT, "test-namespace"), "spring.cloud.azure.message-converter.isolated-object-mapper=false") .withUserConfiguration(AzureEventHubsPropertiesTestConfiguration.class) - .withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class)) + .withConfiguration(AutoConfigurations.of(Jackson2AutoConfiguration.class)) .run(context -> { assertThat(context).hasBean("eventHubsMessageConverter"); assertThat(context).hasSingleBean(EventHubsMessageConverter.class); @@ -116,13 +119,14 @@ void withNonIsolatedObjectMapper() { } @Test + @SuppressWarnings("removal") void withUserProvidedObjectMapper() { this.contextRunner .withPropertyValues("spring.cloud.azure.eventhubs.connection-string=" + String.format(CONNECTION_STRING_FORMAT, "test-namespace"), "spring.cloud.azure.message-converter.isolated-object-mapper=false") .withUserConfiguration(AzureEventHubsPropertiesTestConfiguration.class) .withBean("userObjectMapper", ObjectMapper.class, () -> new ObjectMapper()) - .withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class)) + .withConfiguration(AutoConfigurations.of(Jackson2AutoConfiguration.class)) .run(context -> { assertThat(context).hasBean("userObjectMapper"); assertThat(context).hasSingleBean(ObjectMapper.class); diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/servicebus/AzureServiceBusMessagingAutoConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/servicebus/AzureServiceBusMessagingAutoConfigurationTests.java index 35c89584c37e..6995f5d7ce6c 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/servicebus/AzureServiceBusMessagingAutoConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/servicebus/AzureServiceBusMessagingAutoConfigurationTests.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration; +import org.springframework.boot.jackson2.autoconfigure.Jackson2AutoConfiguration; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.runner.ApplicationContextRunner; @@ -73,23 +73,25 @@ void connectionInfoProvidedShouldConfigure() { } @Test + @SuppressWarnings("removal") void withoutObjectMapperShouldNotConfigure() { this.contextRunner .withClassLoader(new FilteredClassLoader(ObjectMapper.class)) .withPropertyValues( "spring.cloud.azure.servicebus.connection-string=" + String.format(CONNECTION_STRING_FORMAT, "test-namespace") ) - .withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class)) + .withConfiguration(AutoConfigurations.of(Jackson2AutoConfiguration.class)) .withUserConfiguration(AzureServiceBusPropertiesTestConfiguration.class) .run(context -> assertThatIllegalStateException()); } @Test + @SuppressWarnings("removal") void withIsolatedObjectMapper() { this.contextRunner .withPropertyValues("spring.cloud.azure.servicebus.connection-string=" + String.format(CONNECTION_STRING_FORMAT, "test-namespace")) .withUserConfiguration(AzureServiceBusPropertiesTestConfiguration.class) - .withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class)) + .withConfiguration(AutoConfigurations.of(Jackson2AutoConfiguration.class)) .run(context -> { assertThat(context).hasBean("defaultServiceBusMessageConverter"); assertThat(context).hasSingleBean(ServiceBusMessageConverter.class); @@ -98,12 +100,13 @@ void withIsolatedObjectMapper() { } @Test + @SuppressWarnings("removal") void withNonIsolatedObjectMapper() { this.contextRunner .withPropertyValues("spring.cloud.azure.servicebus.connection-string=" + String.format(CONNECTION_STRING_FORMAT, "test-namespace"), "spring.cloud.azure.message-converter.isolated-object-mapper=false") .withUserConfiguration(AzureServiceBusPropertiesTestConfiguration.class) - .withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class)) + .withConfiguration(AutoConfigurations.of(Jackson2AutoConfiguration.class)) .run(context -> { assertThat(context).hasBean("serviceBusMessageConverter"); assertThat(context).hasSingleBean(ServiceBusMessageConverter.class); @@ -112,13 +115,14 @@ void withNonIsolatedObjectMapper() { } @Test + @SuppressWarnings("removal") void withUserProvidedObjectMapper() { this.contextRunner .withPropertyValues("spring.cloud.azure.servicebus.connection-string=" + String.format(CONNECTION_STRING_FORMAT, "test-namespace"), "spring.cloud.azure.message-converter.isolated-object-mapper=false") .withUserConfiguration(AzureServiceBusPropertiesTestConfiguration.class) .withBean("userObjectMapper", ObjectMapper.class, () -> new ObjectMapper()) - .withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class)) + .withConfiguration(AutoConfigurations.of(Jackson2AutoConfiguration.class)) .run(context -> { assertThat(context).hasBean("userObjectMapper"); assertThat(context).hasSingleBean(ObjectMapper.class); diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/storage/AzureStorageQueueMessagingAutoConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/storage/AzureStorageQueueMessagingAutoConfigurationTests.java index 46fe552e1d0e..8e350f23b9d2 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/storage/AzureStorageQueueMessagingAutoConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/storage/AzureStorageQueueMessagingAutoConfigurationTests.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration; +import org.springframework.boot.jackson2.autoconfigure.Jackson2AutoConfiguration; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.runner.ApplicationContextRunner; @@ -25,20 +25,22 @@ public class AzureStorageQueueMessagingAutoConfigurationTests { .withConfiguration(AutoConfigurations.of(AzureStorageQueueMessagingAutoConfiguration.class)); @Test + @SuppressWarnings("removal") void withoutObjectMapperShouldNotConfigure() { this.contextRunner .withClassLoader(new FilteredClassLoader(ObjectMapper.class)) - .withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class)) + .withConfiguration(AutoConfigurations.of(Jackson2AutoConfiguration.class)) .withPropertyValues("spring.cloud.azure.storage.queue.enabled=true") .withUserConfiguration(AzureStorageQueuePropertiesTestConfiguration.class) .run(context -> assertThatIllegalStateException()); } @Test + @SuppressWarnings("removal") void withIsolatedObjectMapper() { this.contextRunner .withPropertyValues("spring.cloud.azure.storage.queue.enabled=true") - .withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class)) + .withConfiguration(AutoConfigurations.of(Jackson2AutoConfiguration.class)) .withUserConfiguration(AzureStorageQueuePropertiesTestConfiguration.class) .run(context -> { assertThat(context).hasBean("defaultStorageQueueMessageConverter"); @@ -48,11 +50,12 @@ void withIsolatedObjectMapper() { } @Test + @SuppressWarnings("removal") void withNonIsolatedObjectMapper() { this.contextRunner .withPropertyValues("spring.cloud.azure.storage.queue.enabled=true", "spring.cloud.azure.message-converter.isolated-object-mapper=false") - .withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class)) + .withConfiguration(AutoConfigurations.of(Jackson2AutoConfiguration.class)) .withUserConfiguration(AzureStorageQueuePropertiesTestConfiguration.class) .run(context -> { assertThat(context).hasBean("storageQueueMessageConverter"); @@ -62,11 +65,12 @@ void withNonIsolatedObjectMapper() { } @Test + @SuppressWarnings("removal") void withUserProvidedObjectMapper() { this.contextRunner .withPropertyValues("spring.cloud.azure.storage.queue.enabled=true", "spring.cloud.azure.message-converter.isolated-object-mapper=false") - .withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class)) + .withConfiguration(AutoConfigurations.of(Jackson2AutoConfiguration.class)) .withUserConfiguration(AzureStorageQueuePropertiesTestConfiguration.class) .withBean("userObjectMapper", ObjectMapper.class, () -> new ObjectMapper()) .run(context -> { From 652e9673f997009d3b84227c20125e15de174288 Mon Sep 17 00:00:00 2001 From: muyao Date: Mon, 8 Dec 2025 09:39:12 +0800 Subject: [PATCH 63/76] replace spring.jms.listener.concurrency with spring.jms.listener.minConcurrency --- .../jms/ServiceBusJmsAutoConfigurationTests.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsAutoConfigurationTests.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsAutoConfigurationTests.java index 5a238e70c5a4..6c4c362497f3 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsAutoConfigurationTests.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jms/ServiceBusJmsAutoConfigurationTests.java @@ -234,7 +234,7 @@ void jmsPropertiesConfiguredCorrectly(String pricingTier) { "spring.jms.servicebus.pricing-tier=" + pricingTier, "spring.jms.listener.autoStartup=false", "spring.jms.listener.session.acknowledge-mode=client", - "spring.jms.listener.concurrency=2", + "spring.jms.listener.minConcurrency=2", "spring.jms.listener.receiveTimeout=2s", "spring.jms.listener.maxConcurrency=10", "spring.jms.servicebus.connection-string=" + CONNECTION_STRING @@ -275,7 +275,7 @@ void jmsListenerContainerFactoryConfiguredCorrectly(String pricingTier) { "spring.jms.servicebus.pricing-tier=" + pricingTier, "spring.jms.listener.autoStartup=false", "spring.jms.listener.session.acknowledge-mode=client", - "spring.jms.listener.concurrency=2", + "spring.jms.listener.minConcurrency=2", "spring.jms.listener.receiveTimeout=2s", "spring.jms.listener.maxConcurrency=10", "spring.jms.servicebus.connection-string=" + CONNECTION_STRING, From 808de61f1fb5b8a760751adff4a55f1154d96e96 Mon Sep 17 00:00:00 2001 From: muyao Date: Mon, 8 Dec 2025 11:16:28 +0800 Subject: [PATCH 64/76] Fix --- eng/versioning/external_dependencies.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index abc4f83cea04..9d69ec5aaf40 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -302,7 +302,6 @@ springboot4_com.diffplug.spotless:spotless-maven-plugin;2.30.0 springboot4_com.fasterxml.jackson.core:jackson-annotations;2.20 springboot4_com.fasterxml.jackson.core:jackson-databind;2.20.1 springboot4_com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.20.1 -springboot4_com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.20.1 springboot4_com.fasterxml.jackson.module:jackson-module-parameter-names;2.20.1 springboot4_com.github.spotbugs:spotbugs-maven-plugin;4.8.2.0 springboot4_com.google.code.findbugs:jsr305;3.0.2 From 0ad7863ef37b9e4586c649239966d4d65f257d6a Mon Sep 17 00:00:00 2001 From: muyao Date: Mon, 8 Dec 2025 12:46:09 +0800 Subject: [PATCH 65/76] Update compatibility --- .../AzureSpringBootVersionVerifier.java | 17 ++++---------- .../AzureCompatibilityVerifierProperties.java | 2 +- .../AzureSpringBootVersionVerifierTest.java | 22 +++++++++---------- 3 files changed, 16 insertions(+), 25 deletions(-) diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/compatibility/AzureSpringBootVersionVerifier.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/compatibility/AzureSpringBootVersionVerifier.java index 7a9eedd74ec5..acdcd0857c37 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/compatibility/AzureSpringBootVersionVerifier.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/compatibility/AzureSpringBootVersionVerifier.java @@ -18,14 +18,10 @@ public class AzureSpringBootVersionVerifier { private static final Logger LOGGER = LoggerFactory.getLogger(AzureSpringBootVersionVerifier.class); - static final String SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_3_0 = "org.springframework.boot.autoconfigure.validation.ValidationConfigurationCustomizer"; - static final String SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_3_1 = "org.springframework.boot.autoconfigure.validation.ValidationConfigurationCustomizer.ValidationConfigurationCustomizer,setIgnoreRegistrationFailure,"; - static final String SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_3_2 = "org.springframework.boot.autoconfigure.web.client.RestClientSsl"; - static final String SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_3_3 = "org.springframework.boot.autoconfigure.ldap.PropertiesLdapConnectionDetails"; - static final String SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_3_4 = "org.springframework.boot.autoconfigure.http.client.HttpClientProperties"; - static final String SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_3_5 = "org.springframework.boot.autoconfigure.http.codec.HttpCodecsProperties"; + static final String SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_4_0 = "org.springframework.boot.autoconfigure.preinitialize.BackgroundPreinitializer"; + /** - * Versions supported by Spring Cloud Azure, for present is [3.0, 3.1, 3.2, 3.3, 3.4, 3.5]. Update this value if needed. + * Versions supported by Spring Cloud Azure, for present is [4.0]. Update this value if needed. */ private final Map supportedVersions = new HashMap<>(); @@ -47,12 +43,7 @@ public AzureSpringBootVersionVerifier(List acceptedVersions, ClassNameRe * Init default supported Spring Boot Version compatibility check meta data. */ private void initDefaultSupportedBootVersionCheckMeta() { - supportedVersions.put("3.0", SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_3_0); - supportedVersions.put("3.1", SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_3_1); - supportedVersions.put("3.2", SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_3_2); - supportedVersions.put("3.3", SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_3_3); - supportedVersions.put("3.4", SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_3_4); - supportedVersions.put("3.5", SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_3_5); + supportedVersions.put("4.0", SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_4_0); } /** diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/compatibility/properties/AzureCompatibilityVerifierProperties.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/compatibility/properties/AzureCompatibilityVerifierProperties.java index 6b5d92fa3381..bf80ec79cc08 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/compatibility/properties/AzureCompatibilityVerifierProperties.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/compatibility/properties/AzureCompatibilityVerifierProperties.java @@ -18,7 +18,7 @@ public class AzureCompatibilityVerifierProperties { /** * Comma-delimited list of Spring Boot versions that are compatible with current Spring Cloud Azure's version. */ - private List compatibleBootVersions = Arrays.asList("3.0.x", "3.1.x", "3.2.x", "3.3.x", "3.4.x", "3.5.x"); + private List compatibleBootVersions = Arrays.asList("4.0.x"); public boolean isEnabled() { return this.enabled; diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/compatibility/AzureSpringBootVersionVerifierTest.java b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/compatibility/AzureSpringBootVersionVerifierTest.java index eee0c8cb66be..7c174f17e3e1 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/compatibility/AzureSpringBootVersionVerifierTest.java +++ b/sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/compatibility/AzureSpringBootVersionVerifierTest.java @@ -15,7 +15,7 @@ import java.util.Collections; import java.util.List; -import static com.azure.spring.cloud.autoconfigure.implementation.compatibility.AzureSpringBootVersionVerifier.SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_3_0; +import static com.azure.spring.cloud.autoconfigure.implementation.compatibility.AzureSpringBootVersionVerifier.SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_4_0; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -60,11 +60,11 @@ String getVersionFromManifest() { @ParameterizedTest - @ValueSource(strings = { "3.0", "3.0.x" }) + @ValueSource(strings = { "4.0", "4.0.x" }) void shouldMatchWhenManifestNumberNotPresentAndAcceptedNumberSpecifiedCase1(String acceptedVersion) { List acceptedVersions = Collections.singletonList(acceptedVersion); ClassNameResolverPredicate mockResolver = mock(ClassNameResolverPredicate.class); - when(mockResolver.resolve(SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_3_0)).thenReturn(true); + when(mockResolver.resolve(SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_4_0)).thenReturn(true); AzureSpringBootVersionVerifier versionVerifier = new AzureSpringBootVersionVerifier(acceptedVersions, mockResolver) { @@ -81,11 +81,11 @@ String getVersionFromManifest() { @ParameterizedTest - @ValueSource(strings = { "3.1", "3.1.x" }) + @ValueSource(strings = { "4.1", "4.1.x" }) void shouldNotMatchWhenManifestNumberNotPresentAndAcceptedNumberSpecifiedCase1(String acceptedVersion) { List acceptedVersions = Collections.singletonList(acceptedVersion); ClassNameResolverPredicate mockResolver = mock(ClassNameResolverPredicate.class); - when(mockResolver.resolve(SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_3_0)).thenReturn(true); + when(mockResolver.resolve(SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_4_0)).thenReturn(true); AzureSpringBootVersionVerifier versionVerifier = new AzureSpringBootVersionVerifier(acceptedVersions, mockResolver) { @@ -98,11 +98,11 @@ String getVersionFromManifest() { } @ParameterizedTest - @ValueSource(strings = { "3.0.0-M3" }) + @ValueSource(strings = { "4.0.0-M3" }) void shouldNotMatchWhenManifestNumberNotPresentAndAcceptedNumberSpecifiedCase2(String acceptedVersion) { List acceptedVersions = Collections.singletonList(acceptedVersion); ClassNameResolverPredicate mockResolver = mock(ClassNameResolverPredicate.class); - when(mockResolver.resolve(SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_3_0)).thenReturn(true); + when(mockResolver.resolve(SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_4_0)).thenReturn(true); AzureSpringBootVersionVerifier versionVerifier = new AzureSpringBootVersionVerifier(acceptedVersions, mockResolver) { @@ -115,11 +115,11 @@ String getVersionFromManifest() { } @ParameterizedTest - @ValueSource(strings = { "3.0.0-M4" }) + @ValueSource(strings = { "4.0.0-M4" }) void shouldNotMatchWhenManifestNumberNotPresentAndAcceptedNumberSpecifiedCase3(String acceptedVersion) { List acceptedVersions = Collections.singletonList(acceptedVersion); ClassNameResolverPredicate mockResolver = mock(ClassNameResolverPredicate.class); - when(mockResolver.resolve(SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_3_0)).thenReturn(true); + when(mockResolver.resolve(SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_4_0)).thenReturn(true); AzureSpringBootVersionVerifier versionVerifier = new AzureSpringBootVersionVerifier(acceptedVersions, mockResolver) { @@ -133,11 +133,11 @@ String getVersionFromManifest() { @ParameterizedTest - @ValueSource(strings = { "3.0", "3.0.x" }) + @ValueSource(strings = { "4.0", "4.0.x" }) void shouldNotMatchWhenManifestNumberNotPresentAndAcceptedNumberSpecifiedCase4(String acceptedVersion) { List acceptedVersions = Collections.singletonList(acceptedVersion); ClassNameResolverPredicate mockResolver = mock(ClassNameResolverPredicate.class); - when(mockResolver.resolve(SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_3_0)).thenReturn(false); + when(mockResolver.resolve(SPRINGBOOT_CONDITIONAL_CLASS_NAME_OF_4_0)).thenReturn(false); AzureSpringBootVersionVerifier versionVerifier = new AzureSpringBootVersionVerifier(acceptedVersions, mockResolver) { From e910378cdda545abddfc99576b6c335f18933fa1 Mon Sep 17 00:00:00 2001 From: muyao Date: Mon, 8 Dec 2025 12:55:42 +0800 Subject: [PATCH 66/76] Update compatibility --- .../pipeline/spring-cloud-azure-supported-spring.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sdk/spring/pipeline/spring-cloud-azure-supported-spring.json b/sdk/spring/pipeline/spring-cloud-azure-supported-spring.json index 1f8e747b1507..b30e58ee8902 100644 --- a/sdk/spring/pipeline/spring-cloud-azure-supported-spring.json +++ b/sdk/spring/pipeline/spring-cloud-azure-supported-spring.json @@ -4,6 +4,14 @@ "releaseStatus" : "GENERAL_AVAILABILITY", "snapshot" : false, "supportStatus" : "SUPPORTED", + "spring-boot-version" : "4.0.0", + "spring-cloud-version" : "2025.1.0" + }, + { + "current" : true, + "releaseStatus" : "GENERAL_AVAILABILITY", + "snapshot" : false, + "supportStatus" : "END_OF_LIFE", "spring-boot-version" : "3.5.7", "spring-cloud-version" : "2025.0.0" }, From 42c43f4290876eb15a7c16cb86fb21140876f50e Mon Sep 17 00:00:00 2001 From: muyao Date: Mon, 8 Dec 2025 14:44:48 +0800 Subject: [PATCH 67/76] Add jackson-databind --- sdk/spring/spring-cloud-azure-docker-compose/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sdk/spring/spring-cloud-azure-docker-compose/pom.xml b/sdk/spring/spring-cloud-azure-docker-compose/pom.xml index b514c2dfa6e6..644dbe79eac2 100644 --- a/sdk/spring/spring-cloud-azure-docker-compose/pom.xml +++ b/sdk/spring/spring-cloud-azure-docker-compose/pom.xml @@ -83,6 +83,11 @@ spring-boot-docker-compose 4.0.0 + + com.fasterxml.jackson.core + jackson-databind + 2.20.1 + From 01f43022fa3b1d502a4cde94c97cc8f106388f8c Mon Sep 17 00:00:00 2001 From: muyao Date: Tue, 9 Dec 2025 16:45:29 +0800 Subject: [PATCH 68/76] fix --- sdk/spring/spring-cloud-azure-docker-compose/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/spring/spring-cloud-azure-docker-compose/pom.xml b/sdk/spring/spring-cloud-azure-docker-compose/pom.xml index 644dbe79eac2..63e07dc556fb 100644 --- a/sdk/spring/spring-cloud-azure-docker-compose/pom.xml +++ b/sdk/spring/spring-cloud-azure-docker-compose/pom.xml @@ -165,6 +165,7 @@ + com.fasterxml.jackson.core:jackson-databind:[2.20.1] org.springframework.boot:spring-boot-docker-compose:[4.0.0] From 4f751cdaac926d54da7490f7e25d2161a886e8ac Mon Sep 17 00:00:00 2001 From: muyao Date: Wed, 10 Dec 2025 15:30:10 +0800 Subject: [PATCH 69/76] fix binder tests --- .../spring-cloud-azure-stream-binder-eventhubs-core/pom.xml | 4 ++++ .../implementation/EventHubsHealthIndicatorTests.java | 1 + .../implementation/EventHubsMessageChannelBinderTests.java | 4 +++- .../implementation/ServiceBusHealthIndicatorTests.java | 6 ++++++ .../implementation/ServiceBusMessageChannelBinderTest.java | 1 + 5 files changed, 15 insertions(+), 1 deletion(-) 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 2e09532d69d7..8716a8a731ed 100644 --- a/sdk/spring/spring-cloud-azure-stream-binder-eventhubs-core/pom.xml +++ b/sdk/spring/spring-cloud-azure-stream-binder-eventhubs-core/pom.xml @@ -46,6 +46,10 @@ org.springframework.integration spring-integration-core + + io.projectreactor + reactor-core + 5.0.0 diff --git a/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/src/test/java/com/azure/spring/cloud/stream/binder/eventhubs/implementation/EventHubsHealthIndicatorTests.java b/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/src/test/java/com/azure/spring/cloud/stream/binder/eventhubs/implementation/EventHubsHealthIndicatorTests.java index 280f02623e77..9f13966f25ac 100644 --- a/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/src/test/java/com/azure/spring/cloud/stream/binder/eventhubs/implementation/EventHubsHealthIndicatorTests.java +++ b/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/src/test/java/com/azure/spring/cloud/stream/binder/eventhubs/implementation/EventHubsHealthIndicatorTests.java @@ -78,6 +78,7 @@ public class EventHubsHealthIndicatorTests { public void init() { MockitoAnnotations.openMocks(this); GenericApplicationContext context = new GenericApplicationContext(); + context.refresh(); binder.setApplicationContext(context); healthIndicator = new EventHubsHealthIndicator(binder); } diff --git a/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/src/test/java/com/azure/spring/cloud/stream/binder/eventhubs/implementation/EventHubsMessageChannelBinderTests.java b/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/src/test/java/com/azure/spring/cloud/stream/binder/eventhubs/implementation/EventHubsMessageChannelBinderTests.java index 066e030c936b..e86f04fe63e5 100644 --- a/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/src/test/java/com/azure/spring/cloud/stream/binder/eventhubs/implementation/EventHubsMessageChannelBinderTests.java +++ b/sdk/spring/spring-cloud-azure-stream-binder-eventhubs/src/test/java/com/azure/spring/cloud/stream/binder/eventhubs/implementation/EventHubsMessageChannelBinderTests.java @@ -42,7 +42,9 @@ class EventHubsMessageChannelBinderTests { void init() { MockitoAnnotations.openMocks(this); when(producerDestination.getName()).thenReturn("producer-test"); - binder.setApplicationContext(new GenericApplicationContext()); + GenericApplicationContext context = new GenericApplicationContext(); + context.refresh(); + binder.setApplicationContext(context); } @Test diff --git a/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/test/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/ServiceBusHealthIndicatorTests.java b/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/test/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/ServiceBusHealthIndicatorTests.java index a42412dfb815..e44123f5b039 100644 --- a/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/test/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/ServiceBusHealthIndicatorTests.java +++ b/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/test/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/ServiceBusHealthIndicatorTests.java @@ -28,6 +28,8 @@ import org.springframework.cloud.stream.provisioning.ConsumerDestination; import org.springframework.cloud.stream.provisioning.ProducerDestination; import org.springframework.context.support.GenericApplicationContext; +import org.springframework.expression.spel.support.StandardEvaluationContext; +import org.springframework.integration.context.IntegrationContextUtils; import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.MessageChannel; import org.springframework.test.util.ReflectionTestUtils; @@ -74,6 +76,10 @@ class ServiceBusHealthIndicatorTests { void init() { MockitoAnnotations.openMocks(this); GenericApplicationContext context = new GenericApplicationContext(); + StandardEvaluationContext sec = new StandardEvaluationContext(); + when(beanFactory.containsBean(IntegrationContextUtils.INTEGRATION_EVALUATION_CONTEXT_BEAN_NAME)).thenReturn(true); + when(beanFactory.getBean(IntegrationContextUtils.INTEGRATION_EVALUATION_CONTEXT_BEAN_NAME, StandardEvaluationContext.class)).thenReturn(sec); + context.refresh(); binder.setApplicationContext(context); serviceBusHealthIndicator = new ServiceBusHealthIndicator(binder); } diff --git a/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/test/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/ServiceBusMessageChannelBinderTest.java b/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/test/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/ServiceBusMessageChannelBinderTest.java index 75e3b905ccd0..749e16e2329b 100644 --- a/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/test/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/ServiceBusMessageChannelBinderTest.java +++ b/sdk/spring/spring-cloud-azure-stream-binder-servicebus/src/test/java/com/azure/spring/cloud/stream/binder/servicebus/implementation/ServiceBusMessageChannelBinderTest.java @@ -64,6 +64,7 @@ class ServiceBusMessageChannelBinderTest { void init() { MockitoAnnotations.openMocks(this); GenericApplicationContext context = new GenericApplicationContext(); + context.refresh(); binder.setApplicationContext(context); } From fc8b7ca6f5830fec422330256e49027b39ecd6d2 Mon Sep 17 00:00:00 2001 From: muyao Date: Tue, 16 Dec 2025 13:29:46 +0800 Subject: [PATCH 70/76] Fix scripts --- .../compatibility_update_supported_version_matrix_json.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk/spring/scripts/compatibility_update_supported_version_matrix_json.py b/sdk/spring/scripts/compatibility_update_supported_version_matrix_json.py index 10db8da158c5..5cd577479ff0 100644 --- a/sdk/spring/scripts/compatibility_update_supported_version_matrix_json.py +++ b/sdk/spring/scripts/compatibility_update_supported_version_matrix_json.py @@ -15,7 +15,7 @@ import argparse from compatibility_get_spring_cloud_version import get_spring_cloud_version -from _constants import SPRING_BOOT_MAJOR_2_VERSION_NAME, SPRING_BOOT_MAJOR_3_VERSION_NAME +from _constants import SPRING_BOOT_MAJOR_2_VERSION_NAME, SPRING_BOOT_MAJOR_3_VERSION_NAME, SPRING_BOOT_MAJOR_4_VERSION_NAME def get_args(): @@ -26,9 +26,9 @@ def get_args(): '-sbmvn', '--spring-boot-major-version-number', type=str, - choices=[SPRING_BOOT_MAJOR_2_VERSION_NAME, SPRING_BOOT_MAJOR_3_VERSION_NAME], - default=SPRING_BOOT_MAJOR_3_VERSION_NAME, - help='Which major version of Spring Boot to use. The default is ' + SPRING_BOOT_MAJOR_3_VERSION_NAME + '.' + choices=[SPRING_BOOT_MAJOR_2_VERSION_NAME, SPRING_BOOT_MAJOR_3_VERSION_NAME, SPRING_BOOT_MAJOR_4_VERSION_NAME], + default=SPRING_BOOT_MAJOR_4_VERSION_NAME, + help='Which major version of Spring Boot to use. The default is ' + SPRING_BOOT_MAJOR_4_VERSION_NAME + '.' ) parser.add_argument('-mcp', '--matrix-config-path', type=str, default='sdk/spring/pipeline/supported-version-matrix.json') parser.add_argument( From a573fd4cb645c892b41ce9654891b29e6d1ca423 Mon Sep 17 00:00:00 2001 From: muyao Date: Wed, 17 Dec 2025 10:58:24 +0800 Subject: [PATCH 71/76] Fix JMS IT --- .../tests/servicebus/jms/ServiceBusJmsConnectionStringIT.java | 4 ++-- .../application-servicebus-jms-passwordless-caching.yml | 3 +++ .../application-servicebus-jms-passwordless-pool.yml | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/servicebus/jms/ServiceBusJmsConnectionStringIT.java b/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/servicebus/jms/ServiceBusJmsConnectionStringIT.java index bfafe08d71dc..2a97d3844206 100644 --- a/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/servicebus/jms/ServiceBusJmsConnectionStringIT.java +++ b/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/servicebus/jms/ServiceBusJmsConnectionStringIT.java @@ -2,11 +2,11 @@ // Licensed under the MIT License. package com.azure.spring.cloud.integration.tests.servicebus.jms; +import com.azure.servicebus.jms.ServiceBusJmsConnectionFactory; import jakarta.jms.ConnectionFactory; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; -import org.messaginghub.pooled.jms.JmsPoolConnectionFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -36,7 +36,7 @@ public ServiceBusJmsConnectionStringIT() { @Test @Timeout(70) void testJmsOperationViaConnStringAndCachingConnection() throws InterruptedException { - Assertions.assertSame(JmsPoolConnectionFactory.class, connectionFactory.getClass()); + Assertions.assertSame(ServiceBusJmsConnectionFactory.class, connectionFactory.getClass()); LOGGER.info("ServiceBusJmsConnectionStringIT begin."); this.exchangeMessage(jmsTemplate, CONNECTION_STRING_POOL_API_QUEUE_NAME); LOGGER.info("ServiceBusJmsConnectionStringIT end."); diff --git a/sdk/spring/spring-cloud-azure-integration-tests/src/test/resources/application-servicebus-jms-passwordless-caching.yml b/sdk/spring/spring-cloud-azure-integration-tests/src/test/resources/application-servicebus-jms-passwordless-caching.yml index 8e63cf1e26b8..2b8ca5c54cf1 100644 --- a/sdk/spring/spring-cloud-azure-integration-tests/src/test/resources/application-servicebus-jms-passwordless-caching.yml +++ b/sdk/spring/spring-cloud-azure-integration-tests/src/test/resources/application-servicebus-jms-passwordless-caching.yml @@ -4,6 +4,9 @@ spring: credential: token-credential-bean-name: integrationTestTokenCredential jms: + cache: + enabled: + true servicebus: pool: enabled: false diff --git a/sdk/spring/spring-cloud-azure-integration-tests/src/test/resources/application-servicebus-jms-passwordless-pool.yml b/sdk/spring/spring-cloud-azure-integration-tests/src/test/resources/application-servicebus-jms-passwordless-pool.yml index 4154ed97a9a5..70fbf7b20195 100644 --- a/sdk/spring/spring-cloud-azure-integration-tests/src/test/resources/application-servicebus-jms-passwordless-pool.yml +++ b/sdk/spring/spring-cloud-azure-integration-tests/src/test/resources/application-servicebus-jms-passwordless-pool.yml @@ -9,3 +9,5 @@ spring: pricing-tier: standard passwordless-enabled: true namespace: ${AZURE_SERVICE_BUS_NAMESPACE} + pool: + enabled: true From 636a1b9e690fda06eec1c1a4d180b4af61f030c8 Mon Sep 17 00:00:00 2001 From: muyao Date: Thu, 18 Dec 2025 15:31:21 +0800 Subject: [PATCH 72/76] Fix and update --- eng/versioning/external_dependencies.txt | 1 + sdk/spring/azure-spring-data-cosmos/pom.xml | 1 - .../pom.xml | 7 --- .../spring-cloud-azure-actuator/pom.xml | 1 - .../spring-cloud-azure-autoconfigure/pom.xml | 54 ++++++------------- ...zureCloudTypeEnvironmentPostProcessor.java | 2 +- .../test/resources/META-INF/spring.factories | 4 +- .../pom.xml | 29 +++++----- .../pom.xml | 17 +++--- .../pom.xml | 6 +-- .../pom.xml | 6 +++ .../pom.xml | 6 +++ .../pom.xml | 6 +-- 13 files changed, 66 insertions(+), 74 deletions(-) diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index 9d69ec5aaf40..b1f6b1a6519f 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -360,6 +360,7 @@ springboot4_org.springframework.boot:spring-boot-restclient;4.0.0 springboot4_org.springframework.boot:spring-boot-resttestclient;4.0.0 springboot4_org.springframework.boot:spring-boot-security;4.0.0 springboot4_org.springframework.boot:spring-boot-security-oauth2-client;4.0.0 +springboot4_org.springframework.boot:spring-boot-security-oauth2-resource-server;4.0.0 springboot4_org.springframework.boot:spring-boot-starter-actuator;4.0.0 springboot4_org.springframework.boot:spring-boot-starter-data-jdbc;4.0.0 springboot4_org.springframework.boot:spring-boot-starter-integration;4.0.0 diff --git a/sdk/spring/azure-spring-data-cosmos/pom.xml b/sdk/spring/azure-spring-data-cosmos/pom.xml index 09cacef6a35c..d8af383f3a12 100644 --- a/sdk/spring/azure-spring-data-cosmos/pom.xml +++ b/sdk/spring/azure-spring-data-cosmos/pom.xml @@ -95,7 +95,6 @@ org.springframework.boot spring-boot-persistence 4.0.0 - test com.azure diff --git a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/pom.xml b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/pom.xml index 358dd3db23de..4d795930dc2b 100644 --- a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/pom.xml +++ b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/pom.xml @@ -44,12 +44,6 @@ 4.0.0 compile - - org.springframework.boot - spring-boot-health - 4.0.0 - true - com.fasterxml.jackson.core jackson-databind @@ -208,7 +202,6 @@ com.fasterxml.jackson.core:jackson-databind:[2.20.1] org.springframework.boot:spring-boot-actuator:[4.0.0] org.springframework.boot:spring-boot-actuator-autoconfigure:[4.0.0] - org.springframework.boot:spring-boot-health:[4.0.0] diff --git a/sdk/spring/spring-cloud-azure-actuator/pom.xml b/sdk/spring/spring-cloud-azure-actuator/pom.xml index 91f317b47737..5b610b636c51 100644 --- a/sdk/spring/spring-cloud-azure-actuator/pom.xml +++ b/sdk/spring/spring-cloud-azure-actuator/pom.xml @@ -52,7 +52,6 @@ org.springframework.boot spring-boot-health 4.0.0 - true diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml index 15b4287e8902..165020877731 100644 --- a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml +++ b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml @@ -170,14 +170,6 @@ true - - - org.springframework.boot - spring-boot-security - 4.0.0 - true - - org.springframework.boot @@ -352,30 +344,30 @@ 4.0.0 true - - - org.springframework.security - spring-security-oauth2-client - 7.0.0 + org.springframework.boot + spring-boot-http-converter + 4.0.0 true + + - org.springframework.security - spring-security-oauth2-resource-server - 7.0.0 + org.springframework.boot + spring-boot-security + 4.0.0 true - org.springframework.security - spring-security-oauth2-jose - 7.0.0 + org.springframework.boot + spring-boot-security-oauth2-client + 4.0.0 true - org.springframework.security - spring-security-config - 7.0.0 + org.springframework.boot + spring-boot-security-oauth2-resource-server + 4.0.0 true @@ -415,18 +407,6 @@ - - org.springframework.boot - spring-boot-security-oauth2-client - 4.0.0 - test - - - org.springframework.boot - spring-boot-http-converter - 4.0.0 - test - org.springframework.boot spring-boot-starter-test @@ -559,11 +539,9 @@ org.springframework.boot:spring-boot-jms:[4.0.0] org.springframework.boot:spring-boot-restclient:[4.0.0] org.springframework.boot:spring-boot-security:[4.0.0] + org.springframework.boot:spring-boot-security-oauth2-client:[4.0.0] + org.springframework.boot:spring-boot-security-oauth2-resource-server:[4.0.0] org.springframework.cloud:spring-cloud-starter-stream-kafka:[5.0.0] - org.springframework.security:spring-security-config:[7.0.0] - org.springframework.security:spring-security-oauth2-client:[7.0.0] - org.springframework.security:spring-security-oauth2-jose:[7.0.0] - org.springframework.security:spring-security-oauth2-resource-server:[7.0.0] org.springframework:spring-context-support:[7.0.1] org.springframework:spring-tx:[7.0.1] diff --git a/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/AzureCloudTypeEnvironmentPostProcessor.java b/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/AzureCloudTypeEnvironmentPostProcessor.java index 5a357212f50c..1f7d8de43065 100644 --- a/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/AzureCloudTypeEnvironmentPostProcessor.java +++ b/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/AzureCloudTypeEnvironmentPostProcessor.java @@ -7,7 +7,7 @@ import com.azure.spring.cloud.core.provider.AzureProfileOptionsProvider; import org.apache.commons.logging.Log; import org.springframework.boot.SpringApplication; -import org.springframework.boot.env.EnvironmentPostProcessor; +import org.springframework.boot.EnvironmentPostProcessor; import org.springframework.boot.logging.DeferredLog; import org.springframework.core.Ordered; import org.springframework.core.env.ConfigurableEnvironment; diff --git a/sdk/spring/spring-cloud-azure-integration-tests/src/test/resources/META-INF/spring.factories b/sdk/spring/spring-cloud-azure-integration-tests/src/test/resources/META-INF/spring.factories index cb9011b2f326..bc96fcb50b32 100644 --- a/sdk/spring/spring-cloud-azure-integration-tests/src/test/resources/META-INF/spring.factories +++ b/sdk/spring/spring-cloud-azure-integration-tests/src/test/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ -org.springframework.boot.env.EnvironmentPostProcessor=com.azure.spring.cloud.integration.tests.AzureCloudTypeEnvironmentPostProcessor -org.springframework.boot.BootstrapRegistryInitializer=com.azure.spring.cloud.integration.tests.keyvault.secret.TestBootstrapRegistryInitializer +org.springframework.boot.EnvironmentPostProcessor=com.azure.spring.cloud.integration.tests.AzureCloudTypeEnvironmentPostProcessor +org.springframework.boot.bootstrap.BootstrapRegistryInitializer=com.azure.spring.cloud.integration.tests.keyvault.secret.TestBootstrapRegistryInitializer diff --git a/sdk/spring/spring-cloud-azure-starter-active-directory-b2c/pom.xml b/sdk/spring/spring-cloud-azure-starter-active-directory-b2c/pom.xml index 963233cade39..cd16945bae8c 100644 --- a/sdk/spring/spring-cloud-azure-starter-active-directory-b2c/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-active-directory-b2c/pom.xml @@ -93,24 +93,29 @@ 6.1.0-beta.1 - org.springframework.security - spring-security-config - 7.0.0 + org.springframework.boot + spring-boot-restclient + 4.0.0 - org.springframework.security - spring-security-oauth2-client - 7.0.0 + org.springframework.boot + spring-boot-security + 4.0.0 - org.springframework.security - spring-security-oauth2-jose - 7.0.0 + org.springframework.boot + spring-boot-security-oauth2-client + 4.0.0 - org.springframework.security - spring-security-oauth2-resource-server - 7.0.0 + org.springframework.boot + spring-boot-security-oauth2-resource-server + 4.0.0 + + + org.springframework.boot + spring-boot-http-converter + 4.0.0 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 7a9ebb483ba0..f7e39a4ec33a 100644 --- a/sdk/spring/spring-cloud-azure-starter-active-directory/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-active-directory/pom.xml @@ -92,14 +92,19 @@ 6.1.0-beta.1 - org.springframework.security - spring-security-web - 7.0.0 + org.springframework.boot + spring-boot-restclient + 4.0.0 - org.springframework.security - spring-security-config - 7.0.0 + org.springframework.boot + spring-boot-security + 4.0.0 + + + org.springframework.boot + spring-boot-http-converter + 4.0.0 com.nimbusds diff --git a/sdk/spring/spring-cloud-azure-starter-data-redis-lettuce/pom.xml b/sdk/spring/spring-cloud-azure-starter-data-redis-lettuce/pom.xml index c5e31d62f20c..c75af4984cca 100644 --- a/sdk/spring/spring-cloud-azure-starter-data-redis-lettuce/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-data-redis-lettuce/pom.xml @@ -93,9 +93,9 @@ - org.springframework.data - spring-data-redis - 4.0.0 + org.springframework.boot + spring-boot-data-redis + 4.0.0 diff --git a/sdk/spring/spring-cloud-azure-starter-jdbc-mysql/pom.xml b/sdk/spring/spring-cloud-azure-starter-jdbc-mysql/pom.xml index 368ea925b3f0..e9a8ed41efed 100644 --- a/sdk/spring/spring-cloud-azure-starter-jdbc-mysql/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-jdbc-mysql/pom.xml @@ -103,6 +103,12 @@ mysql-connector-j 9.5.0 + + + org.springframework.boot + spring-boot-jdbc + 4.0.0 + diff --git a/sdk/spring/spring-cloud-azure-starter-jdbc-postgresql/pom.xml b/sdk/spring/spring-cloud-azure-starter-jdbc-postgresql/pom.xml index d567ba95bb13..a0f1a0599be8 100644 --- a/sdk/spring/spring-cloud-azure-starter-jdbc-postgresql/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-jdbc-postgresql/pom.xml @@ -103,6 +103,12 @@ postgresql 42.7.8 + + + org.springframework.boot + spring-boot-jdbc + 4.0.0 + diff --git a/sdk/spring/spring-cloud-azure-starter-servicebus-jms/pom.xml b/sdk/spring/spring-cloud-azure-starter-servicebus-jms/pom.xml index 3b467c8d7339..f81acf8b92e4 100644 --- a/sdk/spring/spring-cloud-azure-starter-servicebus-jms/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-servicebus-jms/pom.xml @@ -94,9 +94,9 @@ - org.springframework - spring-jms - 7.0.1 + org.springframework.boot + spring-boot-jms + 4.0.0 org.messaginghub From c4e6922fedd0951a6ff335a5656c38e2da65d25c Mon Sep 17 00:00:00 2001 From: muyao Date: Fri, 19 Dec 2025 13:00:13 +0800 Subject: [PATCH 73/76] fix --- eng/versioning/external_dependencies.txt | 7 ------- .../spring-cloud-azure-starter-data-redis-lettuce/pom.xml | 2 +- .../spring-cloud-azure-starter-servicebus-jms/pom.xml | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index b1f6b1a6519f..25f48a5f5071 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -376,21 +376,14 @@ springboot4_org.springframework.cloud:spring-cloud-starter-stream-kafka;5.0.0 springboot4_org.springframework.cloud:spring-cloud-stream-test-binder;5.0.0 springboot4_org.springframework.cloud:spring-cloud-stream;5.0.0 springboot4_org.springframework.data:spring-data-commons;4.0.0 -springboot4_org.springframework.data:spring-data-redis;4.0.0 springboot4_org.springframework.integration:spring-integration-core;7.0.0 springboot4_org.springframework.retry:spring-retry;2.0.12 -springboot4_org.springframework.security:spring-security-config;7.0.0 -springboot4_org.springframework.security:spring-security-oauth2-client;7.0.0 -springboot4_org.springframework.security:spring-security-oauth2-jose;7.0.0 -springboot4_org.springframework.security:spring-security-oauth2-resource-server;7.0.0 -springboot4_org.springframework.security:spring-security-web;7.0.0 springboot4_org.springframework:spring-beans;7.0.1 springboot4_org.springframework:spring-context-support;7.0.1 springboot4_org.springframework:spring-context;7.0.1 springboot4_org.springframework:spring-core-test;7.0.1 springboot4_org.springframework:spring-core;7.0.1 springboot4_org.springframework:spring-expression;7.0.1 -springboot4_org.springframework:spring-jms;7.0.1 springboot4_org.springframework:spring-messaging;7.0.1 springboot4_org.springframework:spring-test;7.0.1 springboot4_org.springframework:spring-tx;7.0.1 diff --git a/sdk/spring/spring-cloud-azure-starter-data-redis-lettuce/pom.xml b/sdk/spring/spring-cloud-azure-starter-data-redis-lettuce/pom.xml index d5167e7d4530..48d508844db6 100644 --- a/sdk/spring/spring-cloud-azure-starter-data-redis-lettuce/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-data-redis-lettuce/pom.xml @@ -95,7 +95,7 @@ org.springframework.boot spring-boot-data-redis - 4.0.0 + 4.0.0 diff --git a/sdk/spring/spring-cloud-azure-starter-servicebus-jms/pom.xml b/sdk/spring/spring-cloud-azure-starter-servicebus-jms/pom.xml index bb342fe88758..1f34942418a9 100644 --- a/sdk/spring/spring-cloud-azure-starter-servicebus-jms/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-servicebus-jms/pom.xml @@ -96,7 +96,7 @@ org.springframework.boot spring-boot-jms - 4.0.0 + 4.0.0 org.messaginghub From c9f1924d4c58b804b5ef21e75de9d9784cb3f45d Mon Sep 17 00:00:00 2001 From: muyao Date: Fri, 19 Dec 2025 14:07:06 +0800 Subject: [PATCH 74/76] fix --- .../test-resources/cosmos-spring/test-resources.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/spring/spring-cloud-azure-integration-tests/test-resources/cosmos-spring/test-resources.json b/sdk/spring/spring-cloud-azure-integration-tests/test-resources/cosmos-spring/test-resources.json index d96fc0f599fe..ae625011a033 100644 --- a/sdk/spring/spring-cloud-azure-integration-tests/test-resources/cosmos-spring/test-resources.json +++ b/sdk/spring/spring-cloud-azure-integration-tests/test-resources/cosmos-spring/test-resources.json @@ -44,7 +44,7 @@ "newAccountName": "[toLower(concat(parameters('baseName'), '2'))]", "resourceId": "[resourceId('Microsoft.DocumentDB/databaseAccounts', variables('accountName'))]", "newResourceId": "[resourceId('Microsoft.DocumentDB/databaseAccounts', variables('newAccountName'))]", - "location": "westcentralus" + "location": "[resourceGroup().location]" }, "resources": [ { From 88b3dd29dd33d5bc08af6d2c170a150373574063 Mon Sep 17 00:00:00 2001 From: muyao Date: Mon, 22 Dec 2025 14:13:24 +0800 Subject: [PATCH 75/76] update comments --- sdk/spring/README.md | 12 ++++++++---- sdk/spring/ci.yml | 2 ++ sdk/spring/scripts/_constants.py | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/sdk/spring/README.md b/sdk/spring/README.md index 972b196c52be..354a92e412f1 100644 --- a/sdk/spring/README.md +++ b/sdk/spring/README.md @@ -1,9 +1,9 @@ > [!WARNING] -> [Spring Cloud Azure 4.19.0](https://github.com/Azure/azure-sdk-for-java/tree/spring-cloud-azure_4.19.0) is the final release in the 4.x series. We will continue to provide support for this version until June 2025. After June 2025 we will stop all support for Spring Cloud Azure 4.x +> [Spring Cloud Azure 4.20.0](https://github.com/Azure/azure-sdk-for-java/tree/spring-cloud-azure_4.20.0) is the final release in the 4.x series. We will continue to provide support for this version until June 2025. After June 2025 we will stop all support for Spring Cloud Azure 4.x > [!NOTE] -> Spring Cloud Azure 5.x now fully supports Spring Boot 3.3.0 and later versions, we strongly encourage you to upgrade. For more information, please refer to [Which Version of Spring Cloud Azure Should I Use](https://github.com/Azure/azure-sdk-for-java/wiki/Spring-Versions-Mapping#which-version-of-spring-cloud-azure-should-i-use). +> Spring Cloud Azure 5.x is fully aligned with Spring Boot 3.x, version 6.x supports Spring Boot 3.5.x, and version 7.x is designed for Spring Boot 4. To take advantage of the latest features, performance improvements, and security updates, we strongly recommend upgrading. For more information, please refer to [Which Version of Spring Cloud Azure Should I Use](https://github.com/Azure/azure-sdk-for-java/wiki/Spring-Versions-Mapping#which-version-of-spring-cloud-azure-should-i-use). # Spring Cloud Azure @@ -72,7 +72,7 @@ This module contains the auto-configuration code for Azure services. ### spring-cloud-azure-starters -Spring Cloud Azure Starters are a set of convenient dependency descriptors to include in your application. It boosts your Spring Boot application developement with Azure services. For example, if you want to get started using Spring and Azure Cosmos DB for data persistence, include the `spring-cloud-azure-starter-cosmos` dependency in your project. +Spring Cloud Azure Starters are a set of convenient dependency descriptors to include in your application. It boosts your Spring Boot application development with Azure services. For example, if you want to get started using Spring and Azure Cosmos DB for data persistence, include the `spring-cloud-azure-starter-cosmos` dependency in your project. The following application starters are provided by Spring Cloud Azure under the `com.azure.spring` group: @@ -120,7 +120,7 @@ This provides auto-configuration for actuator endpoints based on the content of Spring Integration Extension for Azure provides Spring Integration adapters for the various services provided by the [Azure SDK for Java](https://github.com/Azure/azure-sdk-for-java/). Below is a list of supported adapters: -- spring-integration-azure-eventhbus +- spring-integration-azure-eventhubs - spring-integration-azure-servicebus - spring-integration-azure-storage-queue @@ -226,6 +226,10 @@ You have to create a `custom.security file` in `src/main/resources` with the fol jdk.jar.disabledAlgorithms=MD2, MD5, RSA, DSA ``` +## Spring Boot 4 Support + +The source code of Spring Cloud Azure for Spring Boot 4.x can be found on the [feature/springcloudazure-7.x](https://github.com/Azure/azure-sdk-for-java/tree/feature/springcloudazure-7.x) branch. + ## Contributing This project welcomes contributions and suggestions. Most contributions require you to agree to a Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us the rights to use your contribution. For details, visit https://cla.microsoft.com. diff --git a/sdk/spring/ci.yml b/sdk/spring/ci.yml index 9240a0dc3b92..dd7d87e691fe 100644 --- a/sdk/spring/ci.yml +++ b/sdk/spring/ci.yml @@ -244,6 +244,7 @@ parameters: displayName: 'spring-cloud-azure-starter-appconfiguration-config' type: boolean default: true +# todo: add back when monitor support Spring Boot 4 #- name: release_springcloudazurestartermonitor # displayName: 'spring-cloud-azure-starter-monitor' # type: boolean @@ -603,6 +604,7 @@ extends: skipPublishDocMs: true skipVerifyChangeLog: true releaseInBatch: ${{ parameters.release_springcloudazurestarterappconfigurationconfig }} +# todo: add back when monitor support Spring Boot 4 # - name: spring-cloud-azure-starter-monitor # groupId: com.azure.spring # safeName: springcloudazurestartermonitor diff --git a/sdk/spring/scripts/_constants.py b/sdk/spring/scripts/_constants.py index 43ab25b12867..bff58806cb2f 100644 --- a/sdk/spring/scripts/_constants.py +++ b/sdk/spring/scripts/_constants.py @@ -25,10 +25,10 @@ def get_spring_boot_version_tag_prefix(spring_boot_version): # Since Spring Cloud Azure uses multiple versions of external dependencies managed by Spring Boot, # the modules that still use Spring Boot 2 to manage dependencies will be skipped. -# SKIP_ADDING_DEPENDENCY_MANAGEMENT_ARTIFACTS = [ +SKIP_ADDING_DEPENDENCY_MANAGEMENT_ARTIFACTS = [ # 'spring-cloud-azure-starter-monitor-test', # 'spring-cloud-azure-starter-monitor' -# ] +] # Since some features are based on a higher Spring Boot version, it is sufficient to let the modules # corresponding to these special Spring Boot versions use the latest Spring Boot version. SKIP_ADDING_DEPENDENCY_MANAGEMENT_ARTIFACTS_WITH_SPRING_BOOT_VERSION = { From 46e68c74db18f930a8b7f73c3da6deae5fb85218 Mon Sep 17 00:00:00 2001 From: muyao Date: Mon, 22 Dec 2025 15:06:11 +0800 Subject: [PATCH 76/76] Fix links --- sdk/spring/azure-spring-data-cosmos/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/spring/azure-spring-data-cosmos/README.md b/sdk/spring/azure-spring-data-cosmos/README.md index 5f1414961986..0c658925b287 100644 --- a/sdk/spring/azure-spring-data-cosmos/README.md +++ b/sdk/spring/azure-spring-data-cosmos/README.md @@ -281,8 +281,8 @@ java -javaagent:"" -jar #### Using database provisioned throughput -Cosmos supports both [container](https://learn.microsoft.com/azure/cosmos-db/sql/how-to-provision-container-throughput) -and [database](https://learn.microsoft.com/azure/cosmos-db/sql/how-to-provision-database-throughput) provisioned +Cosmos supports both [container](https://learn.microsoft.com/azure/cosmos-db/how-to-provision-container-throughput) +and [database](https://learn.microsoft.com/azure/cosmos-db/how-to-provision-database-throughput) provisioned throughput. By default, spring-data-cosmos will provision throughput for each container created. If you prefer to share throughput between containers, you can enable database provisioned throughput via CosmosConfig. @@ -609,7 +609,7 @@ public class MyItem { String _etag; } ``` -- Read more about Optimistic Locking [here](https://learn.microsoft.com/azure/cosmos-db/sql/database-transactions-optimistic-concurrency#optimistic-concurrency-control) +- Read more about Optimistic Locking [here](https://learn.microsoft.com/azure/cosmos-db/database-transactions-optimistic-concurrency#optimistic-concurrency-control) ### Spring Data custom query, pageable and sorting - Azure-spring-data-cosmos supports [spring data custom queries][spring_data_custom_query]