Skip to content

Commit 99b71ad

Browse files
committed
Reset dubbo-test-spring3.2 spring version to 3.2.8.RELEASE and add profile for testing spring3 and spring4
1 parent 67d58e8 commit 99b71ad

File tree

5 files changed

+17
-71
lines changed

5 files changed

+17
-71
lines changed

dubbo-test/dubbo-test-spring/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<spring_version>3.2.18.RELEASE</spring_version>
3232
<!--<spring_version>4.0.9.RELEASE</spring_version>-->
3333
<!--<spring_version>4.1.9.RELEASE</spring_version>-->
34-
<!--<spring_version>4.2.4.RELEASE</spring_version>-->
34+
<!--<spring_version>4.2.9.RELEASE</spring_version>-->
3535
</properties>
3636

3737
<dependencyManagement>

dubbo-test/dubbo-test-spring3.2/pom.xml

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828

2929
<properties>
3030
<skip_maven_deploy>true</skip_maven_deploy>
31-
<spring_version>5.3.39</spring_version>
31+
<!-- DON'T UPGRADE SPRING VERSION (4.1.9.RELEASE) OF THIS PROJECT !!! -->
32+
<spring_version>3.2.18.RELEASE</spring_version>
3233
</properties>
3334

3435
<dependencyManagement>
@@ -83,26 +84,4 @@
8384
</plugins>
8485
</build>
8586

86-
<profiles>
87-
<profile>
88-
<id>jdk15ge-simple</id>
89-
<build>
90-
<plugins>
91-
<plugin>
92-
<groupId>org.apache.maven.plugins</groupId>
93-
<artifactId>maven-surefire-plugin</artifactId>
94-
<configuration>
95-
<useSystemClassLoader>true</useSystemClassLoader>
96-
<forkCount>1</forkCount>
97-
<systemProperties>
98-
<!-- common shared -->
99-
</systemProperties>
100-
<!-- Activate the use of TCP to transmit events to the plugin to fix Corrupted STDOUT issue -->
101-
<forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory" />
102-
</configuration>
103-
</plugin>
104-
</plugins>
105-
</build>
106-
</profile>
107-
</profiles>
10887
</project>

dubbo-test/dubbo-test-spring4.1/pom.xml

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -84,26 +84,4 @@
8484
</plugins>
8585
</build>
8686

87-
<profiles>
88-
<profile>
89-
<id>jdk15ge-simple</id>
90-
<build>
91-
<plugins>
92-
<plugin>
93-
<groupId>org.apache.maven.plugins</groupId>
94-
<artifactId>maven-surefire-plugin</artifactId>
95-
<configuration>
96-
<useSystemClassLoader>true</useSystemClassLoader>
97-
<forkCount>1</forkCount>
98-
<systemProperties>
99-
<!-- common shared -->
100-
</systemProperties>
101-
<!-- Activate the use of TCP to transmit events to the plugin to fix Corrupted STDOUT issue -->
102-
<forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory" />
103-
</configuration>
104-
</plugin>
105-
</plugins>
106-
</build>
107-
</profile>
108-
</profiles>
10987
</project>

dubbo-test/dubbo-test-spring4.2/pom.xml

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -84,26 +84,4 @@
8484
</plugins>
8585
</build>
8686

87-
<profiles>
88-
<profile>
89-
<id>jdk15ge-simple</id>
90-
<build>
91-
<plugins>
92-
<plugin>
93-
<groupId>org.apache.maven.plugins</groupId>
94-
<artifactId>maven-surefire-plugin</artifactId>
95-
<configuration>
96-
<useSystemClassLoader>true</useSystemClassLoader>
97-
<forkCount>1</forkCount>
98-
<systemProperties>
99-
<!-- common shared -->
100-
</systemProperties>
101-
<!-- Activate the use of TCP to transmit events to the plugin to fix Corrupted STDOUT issue -->
102-
<forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory" />
103-
</configuration>
104-
</plugin>
105-
</plugins>
106-
</build>
107-
</profile>
108-
</profiles>
10987
</project>

dubbo-test/pom.xml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@
3030
<module>dubbo-test-check</module>
3131
<module>dubbo-test-common</module>
3232
<module>dubbo-test-spring</module>
33-
<module>dubbo-test-spring3.2</module>
34-
<module>dubbo-test-spring4.1</module>
35-
<module>dubbo-test-spring4.2</module>
3633
<module>dubbo-dependencies-all</module>
3734
<module>dubbo-test-modules</module>
3835
</modules>
@@ -41,4 +38,18 @@
4138
<skip_maven_deploy>true</skip_maven_deploy>
4239
</properties>
4340

41+
<profiles>
42+
<profile>
43+
<id>test-spring3-and-spring4</id>
44+
<activation>
45+
<jdk>[1.7, 17)</jdk>
46+
</activation>
47+
<modules>
48+
<module>dubbo-test-spring3.2</module>
49+
<module>dubbo-test-spring4.1</module>
50+
<module>dubbo-test-spring4.2</module>
51+
</modules>
52+
</profile>
53+
</profiles>
54+
4455
</project>

0 commit comments

Comments
 (0)