diff --git a/jcpp-app-bootstrap/src/test/java/sanbing/jcpp/infrastructure/cache/RedisCacheConfigurationIT.java b/jcpp-app-bootstrap/src/test/java/sanbing/jcpp/infrastructure/cache/RedisCacheConfigurationIT.java index edd93f6..ae5640e 100644 --- a/jcpp-app-bootstrap/src/test/java/sanbing/jcpp/infrastructure/cache/RedisCacheConfigurationIT.java +++ b/jcpp-app-bootstrap/src/test/java/sanbing/jcpp/infrastructure/cache/RedisCacheConfigurationIT.java @@ -7,6 +7,7 @@ package sanbing.jcpp.infrastructure.cache; import jakarta.annotation.Resource; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import org.springframework.data.redis.core.*; import sanbing.jcpp.AbstractTestBase; @@ -16,6 +17,7 @@ import java.util.Objects; import java.util.concurrent.CountDownLatch; import java.util.stream.IntStream; +@EnabledIfSystemProperty(named = "cache.type", matches = "redis") class RedisCacheConfigurationIT extends AbstractTestBase { @Resource diff --git a/jcpp-app-bootstrap/src/test/resources/app-service-test.properties b/jcpp-app-bootstrap/src/test/resources/app-service-test.properties index 9e61ffc..b397d7b 100644 --- a/jcpp-app-bootstrap/src/test/resources/app-service-test.properties +++ b/jcpp-app-bootstrap/src/test/resources/app-service-test.properties @@ -1,2 +1,3 @@ redis.connection.type=cluster redis.cluster.nodes=10.102.12.101:30700,10.102.12.101:32027,10.102.12.101:30767,10.102.12.101:30250,10.102.12.101:30612,10.102.12.101:32303 +service.protocols.yunkuaichongV150.listener.tcp.bind-port=0 \ No newline at end of file diff --git a/pom.xml b/pom.xml index bd91b22..37e6903 100644 --- a/pom.xml +++ b/pom.xml @@ -36,6 +36,8 @@ 33.3.0-jre 0.8.12 + + 1.7.0 3.4.4 3.21.9 @@ -52,18 +54,18 @@ - + dev true - true - true + true + true - + unit-test @@ -71,7 +73,7 @@ true - + integration-test @@ -79,7 +81,7 @@ false - + test-all @@ -368,7 +370,7 @@ -XX:+UseStringDeduplication -XX:MaxGCPauseMillis=20 --add-opens java.base/java.lang.reflect=ALL-UNNAMED - ${skip.unit.test} + ${skip.unit.tests} 1 filesystem @@ -392,11 +394,19 @@ surefire-junit47 ${maven-surefire-plugin.version} + + org.apache.maven.surefire + surefire-junit-platform + ${maven-surefire-plugin.version} + org.apache.maven.plugins maven-failsafe-plugin + + ${skip.integration.tests} + integration-tests @@ -405,7 +415,6 @@ verify - ${skip.integration.test} **/*IntegrationTest.java **/IT*.java