From 90e6dc57ce8233b925e6fc6b5bef0d72d5ab49e2 Mon Sep 17 00:00:00 2001 From: zrlw Date: Sat, 18 Oct 2025 16:51:02 +0800 Subject: [PATCH 1/4] reset spring version of dubbo-test-spring4.1 and dubbo-test-spring4.2 for compatible testing --- dubbo-test/dubbo-test-spring4.1/pom.xml | 3 ++- dubbo-test/dubbo-test-spring4.2/pom.xml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dubbo-test/dubbo-test-spring4.1/pom.xml b/dubbo-test/dubbo-test-spring4.1/pom.xml index 855593b59830..d0aea4dce307 100644 --- a/dubbo-test/dubbo-test-spring4.1/pom.xml +++ b/dubbo-test/dubbo-test-spring4.1/pom.xml @@ -28,7 +28,8 @@ true - 5.3.39 + + 4.1.9.RELEASE diff --git a/dubbo-test/dubbo-test-spring4.2/pom.xml b/dubbo-test/dubbo-test-spring4.2/pom.xml index ad204ff05334..692930eb2fab 100644 --- a/dubbo-test/dubbo-test-spring4.2/pom.xml +++ b/dubbo-test/dubbo-test-spring4.2/pom.xml @@ -28,7 +28,8 @@ true - 5.3.39 + + 4.2.9.RELEASE From 4cf5ddef0b7a38af35c74f8e4074f16a9a5730b4 Mon Sep 17 00:00:00 2001 From: zrlw Date: Mon, 20 Oct 2025 08:06:17 +0800 Subject: [PATCH 2/4] Reset dubbo-test-spring3.2 spring version to 3.2.8.RELEASE and add profile for testing spring3 and spring4 --- dubbo-test/dubbo-test-spring/pom.xml | 2 +- dubbo-test/dubbo-test-spring3.2/pom.xml | 25 ++----------------------- dubbo-test/dubbo-test-spring4.1/pom.xml | 22 ---------------------- dubbo-test/dubbo-test-spring4.2/pom.xml | 22 ---------------------- dubbo-test/pom.xml | 17 ++++++++++++++--- 5 files changed, 17 insertions(+), 71 deletions(-) diff --git a/dubbo-test/dubbo-test-spring/pom.xml b/dubbo-test/dubbo-test-spring/pom.xml index b7164f413f2c..abbec1d0743a 100644 --- a/dubbo-test/dubbo-test-spring/pom.xml +++ b/dubbo-test/dubbo-test-spring/pom.xml @@ -31,7 +31,7 @@ 3.2.18.RELEASE - + diff --git a/dubbo-test/dubbo-test-spring3.2/pom.xml b/dubbo-test/dubbo-test-spring3.2/pom.xml index 8f078cae2dc7..f6db8c79180c 100644 --- a/dubbo-test/dubbo-test-spring3.2/pom.xml +++ b/dubbo-test/dubbo-test-spring3.2/pom.xml @@ -28,7 +28,8 @@ true - 5.3.39 + + 3.2.18.RELEASE @@ -83,26 +84,4 @@ - - - jdk15ge-simple - - - - org.apache.maven.plugins - maven-surefire-plugin - - true - 1 - - - - - - - - - - - diff --git a/dubbo-test/dubbo-test-spring4.1/pom.xml b/dubbo-test/dubbo-test-spring4.1/pom.xml index d0aea4dce307..4dde0276bdc7 100644 --- a/dubbo-test/dubbo-test-spring4.1/pom.xml +++ b/dubbo-test/dubbo-test-spring4.1/pom.xml @@ -84,26 +84,4 @@ - - - jdk15ge-simple - - - - org.apache.maven.plugins - maven-surefire-plugin - - true - 1 - - - - - - - - - - - diff --git a/dubbo-test/dubbo-test-spring4.2/pom.xml b/dubbo-test/dubbo-test-spring4.2/pom.xml index 692930eb2fab..953b6399fc0f 100644 --- a/dubbo-test/dubbo-test-spring4.2/pom.xml +++ b/dubbo-test/dubbo-test-spring4.2/pom.xml @@ -84,26 +84,4 @@ - - - jdk15ge-simple - - - - org.apache.maven.plugins - maven-surefire-plugin - - true - 1 - - - - - - - - - - - diff --git a/dubbo-test/pom.xml b/dubbo-test/pom.xml index 80807b77ad9a..e9e6900fefdc 100644 --- a/dubbo-test/pom.xml +++ b/dubbo-test/pom.xml @@ -30,9 +30,6 @@ dubbo-test-check dubbo-test-common dubbo-test-spring - dubbo-test-spring3.2 - dubbo-test-spring4.1 - dubbo-test-spring4.2 dubbo-dependencies-all dubbo-test-modules @@ -41,4 +38,18 @@ true + + + test-spring3-and-spring4 + + [1.7, 17) + + + dubbo-test-spring3.2 + dubbo-test-spring4.1 + dubbo-test-spring4.2 + + + + From c10310731199431d71c6fe43f3c3a21390885f4a Mon Sep 17 00:00:00 2001 From: zrlw Date: Mon, 20 Oct 2025 08:11:45 +0800 Subject: [PATCH 3/4] Fix dubbo-dependencies-all pom.xml --- dubbo-test/dubbo-dependencies-all/pom.xml | 39 +++++++++++++---------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/dubbo-test/dubbo-dependencies-all/pom.xml b/dubbo-test/dubbo-dependencies-all/pom.xml index fcdc9b593bb2..2389723ffe70 100644 --- a/dubbo-test/dubbo-dependencies-all/pom.xml +++ b/dubbo-test/dubbo-dependencies-all/pom.xml @@ -465,25 +465,32 @@ dubbo-test-spring ${project.version} - - org.apache.dubbo - dubbo-test-spring3.2 - ${project.version} - - - org.apache.dubbo - dubbo-test-spring4.1 - ${project.version} - - - org.apache.dubbo - dubbo-test-spring4.2 - ${project.version} - - + + jdk-version-lt-17 + + [1.7,17) + + + + org.apache.dubbo + dubbo-test-spring3.2 + ${project.version} + + + org.apache.dubbo + dubbo-test-spring4.1 + ${project.version} + + + org.apache.dubbo + dubbo-test-spring4.2 + ${project.version} + + + jdk-version-ge-17 From b9ddcfe4e34f85bd6538155d32b970e190b593e6 Mon Sep 17 00:00:00 2001 From: zrlw Date: Mon, 20 Oct 2025 10:02:21 +0800 Subject: [PATCH 4/4] add dubbo-test-spring3.2, dubbo-test-spring4.1, dubbo-test-spring4.2 to ignoredModules --- .../src/test/java/org/apache/dubbo/dependency/FileTest.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dubbo-test/dubbo-test-modules/src/test/java/org/apache/dubbo/dependency/FileTest.java b/dubbo-test/dubbo-test-modules/src/test/java/org/apache/dubbo/dependency/FileTest.java index 74c9e75b1b6e..94000986d92d 100644 --- a/dubbo-test/dubbo-test-modules/src/test/java/org/apache/dubbo/dependency/FileTest.java +++ b/dubbo-test/dubbo-test-modules/src/test/java/org/apache/dubbo/dependency/FileTest.java @@ -59,6 +59,9 @@ class FileTest { ignoredModules.add(Pattern.compile("dubbo-spring-boot-3-autoconfigure")); ignoredModules.add(Pattern.compile("dubbo-plugin-loom.*")); ignoredModules.add(Pattern.compile("dubbo-mutiny.*")); + ignoredModules.add(Pattern.compile("dubbo-test-spring3.2")); + ignoredModules.add(Pattern.compile("dubbo-test-spring4.1")); + ignoredModules.add(Pattern.compile("dubbo-test-spring4.2")); ignoredArtifacts.add(Pattern.compile("dubbo-demo.*")); ignoredArtifacts.add(Pattern.compile("dubbo-test.*"));