Skip to content

Commit 074b6db

Browse files
philwebbsnicoll
authored andcommitted
Move Redis Docker Compose support into spring-boot-data-redis
1 parent 46a2573 commit 074b6db

File tree

14 files changed

+7
-6
lines changed

14 files changed

+7
-6
lines changed

spring-boot-project/spring-boot-data-redis/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,17 @@ dependencies {
1818

1919
implementation(project(":spring-boot-project:spring-boot-netty"))
2020

21-
optional(project(":spring-boot-project:spring-boot-autoconfigure"))
2221
optional(project(":spring-boot-project:spring-boot-actuator"))
2322
optional(project(":spring-boot-project:spring-boot-autoconfigure"))
23+
optional(project(":spring-boot-project:spring-boot-docker-compose"))
2424
optional(project(":spring-boot-project:spring-boot-testcontainers"))
2525
optional("com.redis:testcontainers-redis")
2626
optional("redis.clients:jedis")
2727

2828
dockerTestImplementation(project(":spring-boot-project:spring-boot-test"))
2929
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
3030
dockerTestImplementation(testFixtures(project(":spring-boot-project:spring-boot-autoconfigure")))
31+
dockerTestImplementation(testFixtures(project(":spring-boot-project:spring-boot-docker-compose")))
3132
dockerTestImplementation(testFixtures(project(":spring-boot-project:spring-boot-testcontainers")))
3233
dockerTestImplementation("ch.qos.logback:logback-classic")
3334
dockerTestImplementation("org.testcontainers:junit-jupiter")

spring-boot-project/spring-boot-docker-compose-all/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/redis/RedisDockerComposeConnectionDetailsFactoryIntegrationTests.java renamed to spring-boot-project/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/docker/compose/RedisDockerComposeConnectionDetailsFactoryIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.docker.compose.service.connection.redis;
17+
package org.springframework.boot.data.redis.docker.compose;
1818

1919
import javax.net.ssl.SSLContext;
2020

spring-boot-project/spring-boot-docker-compose-all/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/redis/ca.crt renamed to spring-boot-project/spring-boot-data-redis/src/dockerTest/resources/org/springframework/boot/data/redis/docker/compose/ca.crt

File renamed without changes.

spring-boot-project/spring-boot-docker-compose-all/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/redis/client.crt renamed to spring-boot-project/spring-boot-data-redis/src/dockerTest/resources/org/springframework/boot/data/redis/docker/compose/client.crt

File renamed without changes.

spring-boot-project/spring-boot-docker-compose-all/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/redis/client.key renamed to spring-boot-project/spring-boot-data-redis/src/dockerTest/resources/org/springframework/boot/data/redis/docker/compose/client.key

File renamed without changes.

spring-boot-project/spring-boot-docker-compose-all/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/redis/redis-bitnami-compose.yaml renamed to spring-boot-project/spring-boot-data-redis/src/dockerTest/resources/org/springframework/boot/data/redis/docker/compose/redis-bitnami-compose.yaml

File renamed without changes.

spring-boot-project/spring-boot-docker-compose-all/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/redis/redis-compose.yaml renamed to spring-boot-project/spring-boot-data-redis/src/dockerTest/resources/org/springframework/boot/data/redis/docker/compose/redis-compose.yaml

File renamed without changes.

spring-boot-project/spring-boot-docker-compose-all/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/redis/redis-ssl-compose.yaml renamed to spring-boot-project/spring-boot-data-redis/src/dockerTest/resources/org/springframework/boot/data/redis/docker/compose/redis-ssl-compose.yaml

File renamed without changes.

spring-boot-project/spring-boot-docker-compose-all/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/redis/server.crt renamed to spring-boot-project/spring-boot-data-redis/src/dockerTest/resources/org/springframework/boot/data/redis/docker/compose/server.crt

File renamed without changes.

spring-boot-project/spring-boot-docker-compose-all/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/redis/server.key renamed to spring-boot-project/spring-boot-data-redis/src/dockerTest/resources/org/springframework/boot/data/redis/docker/compose/server.key

File renamed without changes.

0 commit comments

Comments
 (0)