From d71c07d75a4995e0a53c37305c32b3a2796f1f12 Mon Sep 17 00:00:00 2001 From: Rujun Chen Date: Thu, 12 Feb 2026 10:10:33 +0800 Subject: [PATCH 1/7] Fix java - spring - tests by changing the position of inseted spring-boot-dependencies --- ...mpatibility_insert_dependencymanagement.py | 34 ++++++++++++------- .../pom.xml | 1 + 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/sdk/spring/scripts/compatibility_insert_dependencymanagement.py b/sdk/spring/scripts/compatibility_insert_dependencymanagement.py index f2fe93c6790f..5c9e15487d25 100644 --- a/sdk/spring/scripts/compatibility_insert_dependencymanagement.py +++ b/sdk/spring/scripts/compatibility_insert_dependencymanagement.py @@ -156,14 +156,26 @@ def add_dependency_management_for_file(file_path, spring_boot_dependencies_versi # dependencyManagement already exists, insert new dependencies inside it log.info("Found existing dependencyManagement in " + file_path + ". Inserting new dependencies.") dependencies_in_dm_start = pom_file_content.find('', dependency_management_start) - if dependencies_in_dm_start == -1: - log.warn("No dependencies section found in dependencyManagement for " + file_path + ". Skipping.") - return - # Find the position to insert (after opening tag) - insert_position = dependencies_in_dm_start + len('') - insert_content = get_dependency_content_for_existing_management() - dependency_content = pom_file_content[:insert_position] + insert_content + pom_file_content[insert_position:] + if dependencies_in_dm_start == -1: + # No dependencies section in dependencyManagement, create one + log.info("No dependencies section found in dependencyManagement for " + file_path + ". Creating new dependencies section.") + dependency_management_end = pom_file_content.find('', dependency_management_start) + if dependency_management_end == -1: + log.warn("No closing dependencyManagement tag found for " + file_path + ". Skipping.") + return + insert_position = dependency_management_end + insert_content = " \n{} \n".format(get_dependency_content_for_existing_management()) + dependency_content = pom_file_content[:insert_position] + insert_content + pom_file_content[insert_position:] + else: + # Find the position to insert (before closing tag) + dependencies_in_dm_end = pom_file_content.find('', dependencies_in_dm_start) + if dependencies_in_dm_end == -1: + log.warn("No closing dependencies tag found in dependencyManagement for " + file_path + ". Skipping.") + return + insert_position = dependencies_in_dm_end + insert_content = get_dependency_content_for_existing_management() + dependency_content = pom_file_content[:insert_position] + insert_content + pom_file_content[insert_position:] else: # No dependencyManagement exists, create new one log.info("No existing dependencyManagement in " + file_path + ". Creating new one.") @@ -211,8 +223,7 @@ def update_spring_boot_starter_parent_for_file(file_path, spring_boot_dependenci def get_dependencies_content(): """Returns the dependency entries without any wrapping tags.""" - return """ - + return """ org.springframework.boot spring-boot-dependencies ${spring.boot.version} @@ -226,7 +237,7 @@ def get_dependencies_content(): pom import -""" + """ def get_dependency_management_content(): @@ -254,8 +265,7 @@ def get_properties_contend_with_tag(spring_boot_dependencies_version, spring_clo def get_properties_contend(spring_boot_dependencies_version, spring_cloud_dependencies_version): - return """ - {} + return """ {} {} """.format(spring_boot_dependencies_version, spring_cloud_dependencies_version) diff --git a/sdk/spring/spring-cloud-azure-integration-tests/pom.xml b/sdk/spring/spring-cloud-azure-integration-tests/pom.xml index 98a46fb34f03..184da3792ef1 100644 --- a/sdk/spring/spring-cloud-azure-integration-tests/pom.xml +++ b/sdk/spring/spring-cloud-azure-integration-tests/pom.xml @@ -38,6 +38,7 @@ true + From 78013178a89de146ebfca5b4ac96cbaf47c7f75b Mon Sep 17 00:00:00 2001 From: Rujun Chen Date: Thu, 12 Feb 2026 13:35:22 +0800 Subject: [PATCH 2/7] Change timeout from 30 to 100 second --- .../tests/servicebus/binder/TestServiceBusMultiBinders.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/servicebus/binder/TestServiceBusMultiBinders.java b/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/servicebus/binder/TestServiceBusMultiBinders.java index 5ede74cf628e..673a30040925 100644 --- a/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/servicebus/binder/TestServiceBusMultiBinders.java +++ b/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/servicebus/binder/TestServiceBusMultiBinders.java @@ -100,7 +100,7 @@ protected void exchangeMessageAndVerify(String activeProfile, LOGGER.info("Send a message:" + message + " to the topic."); manyTopic.emitNext(genericMessage, Sinks.EmitFailureHandler.FAIL_FAST); - assertThat(LATCH.get(activeProfile).await(30, TimeUnit.SECONDS)).isTrue(); + assertThat(LATCH.get(activeProfile).await(100, TimeUnit.SECONDS)).isTrue(); } } From e8d04e5defa6ad192ffa47a11300ca67919e0370 Mon Sep 17 00:00:00 2001 From: Rujun Chen Date: Thu, 12 Feb 2026 15:24:37 +0800 Subject: [PATCH 3/7] Try to fix the test failure by adding Thread.sleep --- .../tests/servicebus/binder/TestServiceBusMultiBinders.java | 2 ++ .../tests/servicebus/binder/TestServiceBusSingleBinder.java | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/servicebus/binder/TestServiceBusMultiBinders.java b/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/servicebus/binder/TestServiceBusMultiBinders.java index 673a30040925..66e75701c95d 100644 --- a/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/servicebus/binder/TestServiceBusMultiBinders.java +++ b/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/servicebus/binder/TestServiceBusMultiBinders.java @@ -95,6 +95,8 @@ protected void exchangeMessageAndVerify(String activeProfile, Sinks.Many> manyTopic) throws InterruptedException { GenericMessage genericMessage = new GenericMessage<>(message); + Thread.sleep(2000); + LOGGER.info("Send a message:" + message + " to the queue."); manyQueue.emitNext(genericMessage, Sinks.EmitFailureHandler.FAIL_FAST); LOGGER.info("Send a message:" + message + " to the topic."); diff --git a/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/servicebus/binder/TestServiceBusSingleBinder.java b/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/servicebus/binder/TestServiceBusSingleBinder.java index 585c2d697953..a9f60f68c002 100644 --- a/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/servicebus/binder/TestServiceBusSingleBinder.java +++ b/sdk/spring/spring-cloud-azure-integration-tests/src/test/java/com/azure/spring/cloud/integration/tests/servicebus/binder/TestServiceBusSingleBinder.java @@ -95,11 +95,13 @@ protected void exchangeMessageAndVerify(String activeProfile, Sinks.Many> manyTopic) throws InterruptedException { GenericMessage genericMessage = new GenericMessage<>(MESSAGE); + Thread.sleep(2000); + LOGGER.info("Send a message:" + MESSAGE + " to the queue."); manyQueue.emitNext(genericMessage, Sinks.EmitFailureHandler.FAIL_FAST); LOGGER.info("Send a message:" + MESSAGE + " to the topic."); manyTopic.emitNext(genericMessage, Sinks.EmitFailureHandler.FAIL_FAST); - assertThat(TestServiceBusSingleBinder.LATCH.get(activeProfile).await(30, TimeUnit.SECONDS)).isTrue(); + assertThat(TestServiceBusSingleBinder.LATCH.get(activeProfile).await(100, TimeUnit.SECONDS)).isTrue(); } } From a7c057d35c5434ed3b059b7e658138875e2b6de4 Mon Sep 17 00:00:00 2001 From: Rujun Chen Date: Thu, 12 Feb 2026 16:04:18 +0800 Subject: [PATCH 4/7] Accelerate the test by parallel --- sdk/spring/azure-spring-data-cosmos/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sdk/spring/azure-spring-data-cosmos/pom.xml b/sdk/spring/azure-spring-data-cosmos/pom.xml index e0bcddc23816..dcbf5f1447e2 100644 --- a/sdk/spring/azure-spring-data-cosmos/pom.xml +++ b/sdk/spring/azure-spring-data-cosmos/pom.xml @@ -300,6 +300,10 @@ src/test/resources/application.properties ${skip.integration.tests} + + classes + 3 + true From aa483b2889346ce9dc2aab837bf7fe0344d65338 Mon Sep 17 00:00:00 2001 From: Rujun Chen Date: Thu, 12 Feb 2026 16:36:34 +0800 Subject: [PATCH 5/7] Delete dependencyManagement section to check whether it can pass test --- .../pom.xml | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/sdk/spring/spring-cloud-azure-integration-tests/pom.xml b/sdk/spring/spring-cloud-azure-integration-tests/pom.xml index 184da3792ef1..ac77323aca71 100644 --- a/sdk/spring/spring-cloud-azure-integration-tests/pom.xml +++ b/sdk/spring/spring-cloud-azure-integration-tests/pom.xml @@ -38,26 +38,6 @@ true - - - - - io.projectreactor - reactor-bom - 2024.0.9 - pom - import - - - io.netty - netty-bom - 4.1.130.Final - pom - import - - - - com.azure.spring From 12a8a4ad53171d42d4d8a0d5bb4574ca9893fe89 Mon Sep 17 00:00:00 2001 From: Rujun Chen Date: Thu, 12 Feb 2026 16:49:31 +0800 Subject: [PATCH 6/7] Delete unused items in eng/versioning/external_dependencies.txt --- 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 240cb6336f95..0bd425e8ff0e 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -43,7 +43,6 @@ commons-net:commons-net;3.9.0 io.cloudevents:cloudevents-api;2.2.0 io.cloudevents:cloudevents-core;2.2.0 io.fabric8:kubernetes-client;6.12.1 -io.netty:netty-bom;4.1.130.Final io.netty:netty-buffer;4.1.130.Final io.netty:netty-common;4.1.130.Final io.netty:netty-codec;4.1.130.Final @@ -58,7 +57,6 @@ io.netty:netty-transport;4.1.130.Final io.netty:netty-transport-native-epoll;4.1.130.Final io.netty:netty-transport-native-unix-common;4.1.130.Final io.netty:netty-transport-native-kqueue;4.1.130.Final -io.projectreactor:reactor-bom;2024.0.9 io.projectreactor.netty:reactor-netty-http;1.2.13 io.projectreactor:reactor-core;3.7.14 io.vertx:vertx-codegen;4.5.23 From 5423e6760e3d384859cb35eccbfa0f98a2fe5084 Mon Sep 17 00:00:00 2001 From: Rujun Chen Date: Thu, 12 Feb 2026 16:51:00 +0800 Subject: [PATCH 7/7] Delete parallel related configuration --- sdk/spring/azure-spring-data-cosmos/pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sdk/spring/azure-spring-data-cosmos/pom.xml b/sdk/spring/azure-spring-data-cosmos/pom.xml index dcbf5f1447e2..e0bcddc23816 100644 --- a/sdk/spring/azure-spring-data-cosmos/pom.xml +++ b/sdk/spring/azure-spring-data-cosmos/pom.xml @@ -300,10 +300,6 @@ src/test/resources/application.properties ${skip.integration.tests} - - classes - 3 - true