Skip to content

Commit ccb0b29

Browse files
committed
Update spring-boot-smoke-test-cache to use docker-test plugin
See gh-41228
1 parent 24e797f commit ccb0b29

File tree

3 files changed

+15
-21
lines changed

3 files changed

+15
-21
lines changed

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/build.gradle

+15-21
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
id "java"
33
id "org.springframework.boot.conventions"
4+
id "org.springframework.boot.docker-test"
45
}
56

67
description = "Spring Boot cache smoke test"
@@ -21,25 +22,29 @@ configurations {
2122
}
2223

2324
dependencies {
24-
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-actuator"))
25-
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-cache"))
26-
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web"))
27-
28-
testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
29-
3025
caffeine(enforcedPlatform(project(":spring-boot-project:spring-boot-dependencies")))
3126
caffeine("com.github.ben-manes.caffeine:caffeine")
3227

3328
couchbase(enforcedPlatform(project(":spring-boot-project:spring-boot-dependencies")))
3429
couchbase(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-couchbase"))
35-
30+
31+
dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-redis"))
32+
dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
33+
dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers"))
34+
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
35+
dockerTestImplementation("org.testcontainers:junit-jupiter")
36+
3637
ehcache(enforcedPlatform(project(":spring-boot-project:spring-boot-dependencies")))
3738
ehcache("javax.cache:cache-api")
3839
ehcache("org.ehcache:ehcache::jakarta")
3940

4041
hazelcast(enforcedPlatform(project(":spring-boot-project:spring-boot-dependencies")))
4142
hazelcast("com.hazelcast:hazelcast")
4243
hazelcast("com.hazelcast:hazelcast-spring")
44+
45+
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-actuator"))
46+
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-cache"))
47+
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web"))
4348

4449
infinispan(enforcedPlatform(project(":spring-boot-project:spring-boot-dependencies")))
4550
infinispan("javax.cache:cache-api")
@@ -55,13 +60,8 @@ dependencies {
5560
replacedBy("org.infinispan:infinispan-core-jakarta", "Java EE 9 baseline")
5661
}
5762
}
58-
59-
redisTestImplementation(enforcedPlatform(project(":spring-boot-project:spring-boot-parent")))
60-
redisTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-redis"))
61-
redisTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
62-
redisTestImplementation(project(":spring-boot-project:spring-boot-testcontainers"))
63-
redisTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
64-
redisTestImplementation("org.testcontainers:junit-jupiter")
63+
64+
testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
6565
}
6666

6767
def testCaffeine = tasks.register("testCaffeine", Test) {
@@ -91,12 +91,6 @@ def testInfinispan = tasks.register("testInfinispan", Test) {
9191
systemProperties = ["spring.cache.jcache.config" : "classpath:infinispan.xml"]
9292
}
9393

94-
def testRedis = tasks.register("testRedis", Test) {
95-
description = "Runs the tests against Redis"
96-
classpath = sourceSets.redisTest.runtimeClasspath
97-
testClassesDirs = sourceSets.redisTest.output.classesDirs
98-
}
99-
10094
tasks.named("check").configure {
101-
dependsOn testCaffeine, testCouchbase, testEhcache, testHazelcast, testInfinispan, testRedis
95+
dependsOn testCaffeine, testCouchbase, testEhcache, testHazelcast, testInfinispan
10296
}

0 commit comments

Comments
 (0)