Move LDAP testcontainers support into spring-boot-ldap

See gh-46108

spring-boot-project/spring-boot-ldap/build.gradle

@@ -20,6 +20,7 @@ plugins {
 	id "org.springframework.boot.auto-configuration"
 	id "org.springframework.boot.configuration-properties"
 	id "org.springframework.boot.deployed"
+	id "org.springframework.boot.docker-test"
 	id "org.springframework.boot.optional-dependencies"
 }
 
@@ -33,9 +34,16 @@ dependencies {
 
 	optional(project(":spring-boot-project:spring-boot-actuator-autoconfigure"))
 	optional(project(":spring-boot-project:spring-boot-autoconfigure"))
+	optional(project(":spring-boot-project:spring-boot-testcontainers"))
 	optional("com.unboundid:unboundid-ldapsdk")
+	optional("org.testcontainers:ldap")
+
+	dockerTestImplementation(project(":spring-boot-project:spring-boot-test"))
+	dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
+	dockerTestImplementation("org.testcontainers:junit-jupiter")
 
 	testCompileOnly("com.fasterxml.jackson.core:jackson-annotations")
+
 	testImplementation(project(":spring-boot-project:spring-boot-test"))
 	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
 

spring-boot-project/spring-boot-ldap/src/dockerTest/java/org/springframework/boot/ldap/testcontainers/LLdapContainerConnectionDetailsFactoryIntegrationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.testcontainers.service.connection.ldap;
+package org.springframework.boot.ldap.testcontainers;
 
 import java.util.List;
 

spring-boot-project/spring-boot-ldap/src/dockerTest/java/org/springframework/boot/ldap/testcontainers/OpenLdapContainerConnectionDetailsFactoryIntegrationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.testcontainers.service.connection.ldap;
+package org.springframework.boot.ldap.testcontainers;
 
 import java.util.List;
 

spring-boot-project/spring-boot-ldap/src/dockerTest/resources/logback-test.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+	<include resource="org/springframework/boot/logging/logback/base.xml"/>
+</configuration>

spring-boot-project/spring-boot-ldap/src/dockerTest/resources/spring.properties

@@ -0,0 +1 @@
+spring.test.context.cache.maxSize=1

spring-boot-project/spring-boot-ldap/src/main/java/org/springframework/boot/ldap/testcontainers/LLdapContainerConnectionDetailsFactory.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.testcontainers.service.connection.ldap;
+package org.springframework.boot.ldap.testcontainers;
 
 import org.testcontainers.ldap.LLdapContainer;
 

spring-boot-project/spring-boot-ldap/src/main/java/org/springframework/boot/ldap/testcontainers/OpenLdapContainerConnectionDetailsFactory.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.testcontainers.service.connection.ldap;
+package org.springframework.boot.ldap.testcontainers;
 
 import java.util.Arrays;
 import java.util.Map;

spring-boot-project/spring-boot-ldap/src/main/java/org/springframework/boot/ldap/testcontainers/package-info.java

@@ -17,4 +17,4 @@
 /**
  * Support for testcontainers Ldap service connections.
  */
-package org.springframework.boot.testcontainers.service.connection.ldap;
+package org.springframework.boot.ldap.testcontainers;

spring-boot-project/spring-boot-ldap/src/main/resources/META-INF/spring.factories

@@ -0,0 +1,4 @@
+# Connection Details Factories
+org.springframework.boot.autoconfigure.service.connection.ConnectionDetailsFactory=\
+org.springframework.boot.ldap.testcontainers.LLdapContainerConnectionDetailsFactory,\
+org.springframework.boot.ldap.testcontainers.OpenLdapContainerConnectionDetailsFactory

spring-boot-project/spring-boot-testcontainers-all/build.gradle

@@ -46,7 +46,6 @@ dependencies {
 	dockerTestImplementation("org.springframework:spring-core-test")
 	dockerTestImplementation("org.springframework:spring-jdbc")
 	dockerTestImplementation("org.springframework.data:spring-data-redis")
-	dockerTestImplementation("org.springframework.ldap:spring-ldap-core")
 	dockerTestImplementation("org.springframework.pulsar:spring-pulsar")
 	dockerTestImplementation("org.testcontainers:junit-jupiter")
 
@@ -58,7 +57,6 @@ dependencies {
 	optional(project(":spring-boot-project:spring-boot-actuator-autoconfigure-all"))
 	optional(project(":spring-boot-project:spring-boot-data-redis"))
 	optional(project(":spring-boot-project:spring-boot-jdbc"))
-	optional(project(":spring-boot-project:spring-boot-ldap"))
 	optional(project(":spring-boot-project:spring-boot-mongodb"))
 	optional(project(":spring-boot-project:spring-boot-neo4j"))
 	optional(project(":spring-boot-project:spring-boot-pulsar"))
@@ -70,7 +68,6 @@ dependencies {
 	optional("org.testcontainers:clickhouse")
 	optional("org.testcontainers:grafana")
 	optional("org.testcontainers:jdbc")
-	optional("org.testcontainers:ldap")
 	optional("org.testcontainers:mariadb")
 	optional("org.testcontainers:mongodb")
 	optional("org.testcontainers:mssqlserver")

spring-boot-project/spring-boot-testcontainers-all/src/main/resources/META-INF/spring.factories

@@ -1,7 +1,5 @@
 # Connection Details Factories
 org.springframework.boot.autoconfigure.service.connection.ConnectionDetailsFactory=\
-org.springframework.boot.testcontainers.service.connection.ldap.LLdapContainerConnectionDetailsFactory,\
-org.springframework.boot.testcontainers.service.connection.ldap.OpenLdapContainerConnectionDetailsFactory,\
 org.springframework.boot.testcontainers.service.connection.mongo.MongoContainerConnectionDetailsFactory,\
 org.springframework.boot.testcontainers.service.connection.neo4j.Neo4jContainerConnectionDetailsFactory,\
 org.springframework.boot.testcontainers.service.connection.otlp.GrafanaOpenTelemetryLoggingContainerConnectionDetailsFactory,\