Skip to content

[3.3] Reset spring version of dubbo-test-spring3.2, dubbo-test-spring4.1 and dubbo-test-spring4.2 for compatible testing #15715

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: 3.3
Choose a base branch
from
Open

[3.3] Reset spring version of dubbo-test-spring3.2, dubbo-test-spring4.1 and dubbo-test-spring4.2 for compatible testing #15715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
90e6dc5
reset spring version of dubbo-test-spring4.1 and dubbo-test-spring4.2…
zrlw Oct 18, 2025
67d58e8
Merge branch '3.3' into 3.3-remove-dubbo-test-spring4.1and4.2
zrlw Oct 19, 2025
4cf5dde
Reset dubbo-test-spring3.2 spring version to 3.2.8.RELEASE and add pr…
zrlw Oct 20, 2025
c103107
Fix dubbo-dependencies-all pom.xml
zrlw Oct 20, 2025
b9ddcfe
add dubbo-test-spring3.2, dubbo-test-spring4.1, dubbo-test-spring4.2 …
zrlw Oct 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 23 additions & 16 deletions dubbo-test/dubbo-dependencies-all/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,25 +465,32 @@
<artifactId>dubbo-test-spring</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-test-spring3.2</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-test-spring4.1</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-test-spring4.2</artifactId>
<version>${project.version}</version>
</dependency>

</dependencies>

<profiles>
<profile>
<id>jdk-version-lt-17</id>
<activation>
<jdk>[1.7,17)</jdk>
</activation>
<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-test-spring3.2</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-test-spring4.1</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-test-spring4.2</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>
<profile>
<id>jdk-version-ge-17</id>
<activation>
Expand Down
3 changes: 3 additions & 0 deletions dubbo-test/dubbo-test-modules/src/test/java/org/apache/dubbo/dependency/FileTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*"));
Expand Down
2 changes: 1 addition & 1 deletion dubbo-test/dubbo-test-spring/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<spring_version>3.2.18.RELEASE</spring_version>
<!--<spring_version>4.0.9.RELEASE</spring_version>-->
<!--<spring_version>4.1.9.RELEASE</spring_version>-->
<!--<spring_version>4.2.4.RELEASE</spring_version>-->
<!--<spring_version>4.2.9.RELEASE</spring_version>-->
</properties>

<dependencyManagement>
Expand Down
25 changes: 2 additions & 23 deletions dubbo-test/dubbo-test-spring3.2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@

<properties>
<skip_maven_deploy>true</skip_maven_deploy>
<spring_version>5.3.39</spring_version>
<!-- DON'T UPGRADE SPRING VERSION (3.2.18.RELEASE) OF THIS PROJECT !!! -->
<spring_version>3.2.18.RELEASE</spring_version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -83,26 +84,4 @@
</plugins>
</build>

<profiles>
<profile>
<id>jdk15ge-simple</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<useSystemClassLoader>true</useSystemClassLoader>
<forkCount>1</forkCount>
<systemProperties>
<!-- common shared -->
</systemProperties>
<!-- Activate the use of TCP to transmit events to the plugin to fix Corrupted STDOUT issue -->
<forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory" />
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
25 changes: 2 additions & 23 deletions dubbo-test/dubbo-test-spring4.1/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@

<properties>
<skip_maven_deploy>true</skip_maven_deploy>
<spring_version>5.3.39</spring_version>
<!-- DON'T UPGRADE SPRING VERSION (4.1.9.RELEASE) OF THIS PROJECT !!! -->
<spring_version>4.1.9.RELEASE</spring_version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -83,26 +84,4 @@
</plugins>
</build>

<profiles>
<profile>
<id>jdk15ge-simple</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<useSystemClassLoader>true</useSystemClassLoader>
<forkCount>1</forkCount>
<systemProperties>
<!-- common shared -->
</systemProperties>
<!-- Activate the use of TCP to transmit events to the plugin to fix Corrupted STDOUT issue -->
<forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory" />
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
25 changes: 2 additions & 23 deletions dubbo-test/dubbo-test-spring4.2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@

<properties>
<skip_maven_deploy>true</skip_maven_deploy>
<spring_version>5.3.39</spring_version>
<!-- DON'T UPGRADE SPRING VERSION (4.2.9.RELEASE) OF THIS PROJECT !!! -->
<spring_version>4.2.9.RELEASE</spring_version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -83,26 +84,4 @@
</plugins>
</build>

<profiles>
<profile>
<id>jdk15ge-simple</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<useSystemClassLoader>true</useSystemClassLoader>
<forkCount>1</forkCount>
<systemProperties>
<!-- common shared -->
</systemProperties>
<!-- Activate the use of TCP to transmit events to the plugin to fix Corrupted STDOUT issue -->
<forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory" />
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
17 changes: 14 additions & 3 deletions dubbo-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@
<module>dubbo-test-check</module>
<module>dubbo-test-common</module>
<module>dubbo-test-spring</module>
<module>dubbo-test-spring3.2</module>
<module>dubbo-test-spring4.1</module>
<module>dubbo-test-spring4.2</module>
<module>dubbo-dependencies-all</module>
<module>dubbo-test-modules</module>
</modules>
Expand All @@ -41,4 +38,18 @@
<skip_maven_deploy>true</skip_maven_deploy>
</properties>

<profiles>
<profile>
<id>test-spring3-and-spring4</id>
<activation>
<jdk>[1.7, 17)</jdk>
</activation>
<modules>
<module>dubbo-test-spring3.2</module>
<module>dubbo-test-spring4.1</module>
<module>dubbo-test-spring4.2</module>
</modules>
</profile>
</profiles>

</project>
Loading