This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch test/codecov
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/test/codecov by this push:
new 03e8599ae7 Fix ut
03e8599ae7 is described below
commit 03e8599ae780d5a26bb25ae29d267f3e121e437e
Author: Albumen Kevin <[email protected]>
AuthorDate: Fri Dec 6 15:34:23 2024 +0800
Fix ut
---
.../dubbo-spring-boot-compatible/pom.xml | 14 +++++++++-----
dubbo-test/dubbo-test-spring3.2/pom.xml | 14 +++++++++-----
dubbo-test/dubbo-test-spring4.1/pom.xml | 14 +++++++++-----
dubbo-test/dubbo-test-spring4.2/pom.xml | 14 +++++++++-----
4 files changed, 36 insertions(+), 20 deletions(-)
diff --git a/dubbo-spring-boot-project/dubbo-spring-boot-compatible/pom.xml
b/dubbo-spring-boot-project/dubbo-spring-boot-compatible/pom.xml
index d82f7da43d..2df055e915 100644
--- a/dubbo-spring-boot-project/dubbo-spring-boot-compatible/pom.xml
+++ b/dubbo-spring-boot-project/dubbo-spring-boot-compatible/pom.xml
@@ -95,10 +95,18 @@
</properties>
</profile>
<profile>
- <id>jdk15ge-simple</id>
+ <id>jdk15ge-add-open</id>
<activation>
<jdk>[15,</jdk>
</activation>
+ <properties>
+ <argLine>--add-opens java.base/java.lang=ALL-UNNAMED
+ --add-opens java.base/java.math=ALL-UNNAMED
+ --add-opens java.base/java.util=ALL-UNNAMED</argLine>
+ </properties>
+ </profile>
+ <profile>
+ <id>jdk15ge-simple</id>
<build>
<plugins>
<plugin>
@@ -107,10 +115,6 @@
<configuration>
<useSystemClassLoader>true</useSystemClassLoader>
<forkCount>1</forkCount>
- <argLine>${argline} ${jacocoArgLine}
- --add-opens java.base/java.lang=ALL-UNNAMED
- --add-opens java.base/java.math=ALL-UNNAMED
- --add-opens
java.base/java.util=ALL-UNNAMED</argLine>
<systemProperties>
<!-- common shared -->
</systemProperties>
diff --git a/dubbo-test/dubbo-test-spring3.2/pom.xml
b/dubbo-test/dubbo-test-spring3.2/pom.xml
index 6ed794c784..dd1f545855 100644
--- a/dubbo-test/dubbo-test-spring3.2/pom.xml
+++ b/dubbo-test/dubbo-test-spring3.2/pom.xml
@@ -85,10 +85,18 @@
<profiles>
<profile>
- <id>jdk15ge-simple</id>
+ <id>jdk15ge-add-open</id>
<activation>
<jdk>[15,</jdk>
</activation>
+ <properties>
+ <argLine>--add-opens java.base/java.lang=ALL-UNNAMED
+ --add-opens java.base/java.math=ALL-UNNAMED
+ --add-opens java.base/java.util=ALL-UNNAMED</argLine>
+ </properties>
+ </profile>
+ <profile>
+ <id>jdk15ge-simple</id>
<build>
<plugins>
<plugin>
@@ -97,10 +105,6 @@
<configuration>
<useSystemClassLoader>true</useSystemClassLoader>
<forkCount>1</forkCount>
- <argLine>${argline} ${jacocoArgLine}
- --add-opens java.base/java.lang=ALL-UNNAMED
- --add-opens java.base/java.math=ALL-UNNAMED
- --add-opens
java.base/java.util=ALL-UNNAMED</argLine>
<systemProperties>
<!-- common shared -->
</systemProperties>
diff --git a/dubbo-test/dubbo-test-spring4.1/pom.xml
b/dubbo-test/dubbo-test-spring4.1/pom.xml
index 499fbd9934..819de7442f 100644
--- a/dubbo-test/dubbo-test-spring4.1/pom.xml
+++ b/dubbo-test/dubbo-test-spring4.1/pom.xml
@@ -85,10 +85,18 @@
<profiles>
<profile>
- <id>jdk15ge-simple</id>
+ <id>jdk15ge-add-open</id>
<activation>
<jdk>[15,</jdk>
</activation>
+ <properties>
+ <argLine>--add-opens java.base/java.lang=ALL-UNNAMED
+ --add-opens java.base/java.math=ALL-UNNAMED
+ --add-opens java.base/java.util=ALL-UNNAMED</argLine>
+ </properties>
+ </profile>
+ <profile>
+ <id>jdk15ge-simple</id>
<build>
<plugins>
<plugin>
@@ -97,10 +105,6 @@
<configuration>
<useSystemClassLoader>true</useSystemClassLoader>
<forkCount>1</forkCount>
- <argLine>${argline} ${jacocoArgLine}
- --add-opens java.base/java.lang=ALL-UNNAMED
- --add-opens java.base/java.math=ALL-UNNAMED
- --add-opens
java.base/java.util=ALL-UNNAMED</argLine>
<systemProperties>
<!-- common shared -->
</systemProperties>
diff --git a/dubbo-test/dubbo-test-spring4.2/pom.xml
b/dubbo-test/dubbo-test-spring4.2/pom.xml
index b3e19f14c1..9010804e97 100644
--- a/dubbo-test/dubbo-test-spring4.2/pom.xml
+++ b/dubbo-test/dubbo-test-spring4.2/pom.xml
@@ -85,10 +85,18 @@
<profiles>
<profile>
- <id>jdk15ge-simple</id>
+ <id>jdk15ge-add-open</id>
<activation>
<jdk>[15,</jdk>
</activation>
+ <properties>
+ <argLine>--add-opens java.base/java.lang=ALL-UNNAMED
+ --add-opens java.base/java.math=ALL-UNNAMED
+ --add-opens java.base/java.util=ALL-UNNAMED</argLine>
+ </properties>
+ </profile>
+ <profile>
+ <id>jdk15ge-simple</id>
<build>
<plugins>
<plugin>
@@ -97,10 +105,6 @@
<configuration>
<useSystemClassLoader>true</useSystemClassLoader>
<forkCount>1</forkCount>
- <argLine>${argline} ${jacocoArgLine}
- --add-opens java.base/java.lang=ALL-UNNAMED
- --add-opens java.base/java.math=ALL-UNNAMED
- --add-opens
java.base/java.util=ALL-UNNAMED</argLine>
<systemProperties>
<!-- common shared -->
</systemProperties>
