diff --git a/jetcache-test/pom.xml b/jetcache-test/pom.xml index cdaab9ea..e690f678 100644 --- a/jetcache-test/pom.xml +++ b/jetcache-test/pom.xml @@ -17,6 +17,13 @@ + + org.junit + junit-bom + ${junit.version} + pom + import + org.springframework.boot spring-boot-dependencies diff --git a/jetcache-test/src/test/java/com/alicp/jetcache/redis/springdata/RedisSpringDataCacheTest.java b/jetcache-test/src/test/java/com/alicp/jetcache/redis/springdata/RedisSpringDataCacheTest.java index 22e5d6d8..c8aa6e79 100644 --- a/jetcache-test/src/test/java/com/alicp/jetcache/redis/springdata/RedisSpringDataCacheTest.java +++ b/jetcache-test/src/test/java/com/alicp/jetcache/redis/springdata/RedisSpringDataCacheTest.java @@ -8,8 +8,11 @@ import com.alicp.jetcache.support.KryoValueDecoder; import com.alicp.jetcache.support.KryoValueEncoder; import com.alicp.jetcache.test.external.AbstractExternalCacheTest; -import org.junit.Ignore; -import org.junit.Test; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledForJreRange; +import org.junit.jupiter.api.condition.DisabledOnJre; +import org.junit.jupiter.api.condition.JRE; import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.connection.RedisStandaloneConfiguration; import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; @@ -26,7 +29,8 @@ public class RedisSpringDataCacheTest extends AbstractExternalCacheTest { @Test - // @Ignore("boot2.x need jedis 3.x") + @DisabledForJreRange(max = JRE.JAVA_16, + disabledReason = "in profile for java8 to 16, we use spring boot 2.x, it need jedis 3") public void jedisTest() throws Exception { JedisConnectionFactory connectionFactory = new JedisConnectionFactory(); connectionFactory.afterPropertiesSet(); diff --git a/jetcache-test/src/test/java/com/alicp/jetcache/redis/springdata/SpringDataBroadcastManagerTest.java b/jetcache-test/src/test/java/com/alicp/jetcache/redis/springdata/SpringDataBroadcastManagerTest.java index a2880bbe..b4cf74eb 100644 --- a/jetcache-test/src/test/java/com/alicp/jetcache/redis/springdata/SpringDataBroadcastManagerTest.java +++ b/jetcache-test/src/test/java/com/alicp/jetcache/redis/springdata/SpringDataBroadcastManagerTest.java @@ -6,8 +6,10 @@ import com.alicp.jetcache.SimpleCacheManager; import com.alicp.jetcache.redis.AbstractBroadcastManagerTest; import com.alicp.jetcache.support.BroadcastManager; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledForJreRange; +import org.junit.jupiter.api.condition.DisabledOnJre; +import org.junit.jupiter.api.condition.JRE; import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.connection.RedisStandaloneConfiguration; import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; @@ -45,7 +47,8 @@ public void testLettuce() throws Exception { } @Test - @Ignore("need jedis 3.x") + @DisabledForJreRange(max = JRE.JAVA_16, + disabledReason = "in profile for java8 to 16, we use spring boot 2.x, it need jedis 3") public void testJedis() throws Exception { RedisStandaloneConfiguration config = new RedisStandaloneConfiguration("127.0.0.1", 6379); Constructor c = JedisConnectionFactory.class.getConstructor(RedisStandaloneConfiguration.class); diff --git a/pom.xml b/pom.xml index 1b2086fc..9a994000 100644 --- a/pom.xml +++ b/pom.xml @@ -61,17 +61,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - 8 - 8 - 8 - -parameters - - maven-surefire-plugin 2.22.2 @@ -224,28 +213,34 @@ --> 2.15.2 + 5.9.3 + 2.0.9 + 1.4.11 - + + org.junit + junit-bom + ${junit.version} + pom + import + org.slf4j slf4j-api - - 2.0.9 + ${slf4j.version} ch.qos.logback logback-classic - - 1.4.11 + ${logback.version} ch.qos.logback logback-core - - 1.4.11 + ${logback.version} @@ -311,15 +306,6 @@ 2.9.3 - - - org.junit - junit-bom - 5.8.2 - pom - import - - @@ -360,6 +346,64 @@ https://github.com/alibaba/jetcache + + compiler_java9+ + + [9,) + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.10.1 + + 8 + 8 + 8 + -parameters + + + + + + + compiler_java8 + + 1.8 + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.10.1 + + 8 + 8 + + -parameters + + + + + + + spring_boot_2.x_for_java8_to_16 + + (,16] + + + 5.3.23 + 2.7.5 + 6.1.10.RELEASE + 1.7.36 + 1.2.11 + + release