Move LDAP Docker Compose support into spring-boot-ldap
Issue: 46108
This commit is contained in:
parent
f83c4563cc
commit
9d50cfd22b
|
@ -1,8 +1,6 @@
|
||||||
# Connection Details Factories
|
# Connection Details Factories
|
||||||
org.springframework.boot.autoconfigure.service.connection.ConnectionDetailsFactory=\
|
org.springframework.boot.autoconfigure.service.connection.ConnectionDetailsFactory=\
|
||||||
org.springframework.boot.docker.compose.service.connection.clickhouse.ClickHouseR2dbcDockerComposeConnectionDetailsFactory,\
|
org.springframework.boot.docker.compose.service.connection.clickhouse.ClickHouseR2dbcDockerComposeConnectionDetailsFactory,\
|
||||||
org.springframework.boot.docker.compose.service.connection.ldap.LLdapDockerComposeConnectionDetailsFactory,\
|
|
||||||
org.springframework.boot.docker.compose.service.connection.ldap.OpenLdapDockerComposeConnectionDetailsFactory,\
|
|
||||||
org.springframework.boot.docker.compose.service.connection.mariadb.MariaDbR2dbcDockerComposeConnectionDetailsFactory,\
|
org.springframework.boot.docker.compose.service.connection.mariadb.MariaDbR2dbcDockerComposeConnectionDetailsFactory,\
|
||||||
org.springframework.boot.docker.compose.service.connection.mongo.MongoDockerComposeConnectionDetailsFactory,\
|
org.springframework.boot.docker.compose.service.connection.mongo.MongoDockerComposeConnectionDetailsFactory,\
|
||||||
org.springframework.boot.docker.compose.service.connection.mysql.MySqlR2dbcDockerComposeConnectionDetailsFactory,\
|
org.springframework.boot.docker.compose.service.connection.mysql.MySqlR2dbcDockerComposeConnectionDetailsFactory,\
|
||||||
|
|
|
@ -34,12 +34,14 @@ dependencies {
|
||||||
|
|
||||||
optional(project(":spring-boot-project:spring-boot-actuator-autoconfigure"))
|
optional(project(":spring-boot-project:spring-boot-actuator-autoconfigure"))
|
||||||
optional(project(":spring-boot-project:spring-boot-autoconfigure"))
|
optional(project(":spring-boot-project:spring-boot-autoconfigure"))
|
||||||
|
optional(project(":spring-boot-project:spring-boot-docker-compose"))
|
||||||
optional(project(":spring-boot-project:spring-boot-testcontainers"))
|
optional(project(":spring-boot-project:spring-boot-testcontainers"))
|
||||||
optional("com.unboundid:unboundid-ldapsdk")
|
optional("com.unboundid:unboundid-ldapsdk")
|
||||||
optional("org.testcontainers:ldap")
|
optional("org.testcontainers:ldap")
|
||||||
|
|
||||||
dockerTestImplementation(project(":spring-boot-project:spring-boot-test"))
|
dockerTestImplementation(project(":spring-boot-project:spring-boot-test"))
|
||||||
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
|
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
|
||||||
|
dockerTestImplementation(testFixtures(project(":spring-boot-project:spring-boot-docker-compose")))
|
||||||
dockerTestImplementation("org.testcontainers:junit-jupiter")
|
dockerTestImplementation("org.testcontainers:junit-jupiter")
|
||||||
|
|
||||||
testCompileOnly("com.fasterxml.jackson.core:jackson-annotations")
|
testCompileOnly("com.fasterxml.jackson.core:jackson-annotations")
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.boot.docker.compose.service.connection.ldap;
|
package org.springframework.boot.ldap.docker.compose;
|
||||||
|
|
||||||
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
|
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
|
||||||
import org.springframework.boot.ldap.autoconfigure.LdapConnectionDetails;
|
import org.springframework.boot.ldap.autoconfigure.LdapConnectionDetails;
|
|
@ -14,7 +14,7 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.boot.docker.compose.service.connection.ldap;
|
package org.springframework.boot.ldap.docker.compose;
|
||||||
|
|
||||||
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
|
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
|
||||||
import org.springframework.boot.ldap.autoconfigure.LdapConnectionDetails;
|
import org.springframework.boot.ldap.autoconfigure.LdapConnectionDetails;
|
|
@ -14,7 +14,7 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.boot.docker.compose.service.connection.ldap;
|
package org.springframework.boot.ldap.docker.compose;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.boot.docker.compose.service.connection.ldap;
|
package org.springframework.boot.ldap.docker.compose;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
|
@ -15,6 +15,6 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Auto-configuration for Docker Compose LDAP service connections.
|
* Support for Docker Compose LDAP service connections.
|
||||||
*/
|
*/
|
||||||
package org.springframework.boot.docker.compose.service.connection.ldap;
|
package org.springframework.boot.ldap.docker.compose;
|
|
@ -1,4 +1,6 @@
|
||||||
# Connection Details Factories
|
# Connection Details Factories
|
||||||
org.springframework.boot.autoconfigure.service.connection.ConnectionDetailsFactory=\
|
org.springframework.boot.autoconfigure.service.connection.ConnectionDetailsFactory=\
|
||||||
|
org.springframework.boot.ldap.docker.compose.LLdapDockerComposeConnectionDetailsFactory,\
|
||||||
|
org.springframework.boot.ldap.docker.compose.OpenLdapDockerComposeConnectionDetailsFactory,\
|
||||||
org.springframework.boot.ldap.testcontainers.LLdapContainerConnectionDetailsFactory,\
|
org.springframework.boot.ldap.testcontainers.LLdapContainerConnectionDetailsFactory,\
|
||||||
org.springframework.boot.ldap.testcontainers.OpenLdapContainerConnectionDetailsFactory
|
org.springframework.boot.ldap.testcontainers.OpenLdapContainerConnectionDetailsFactory
|
||||||
|
|
Loading…
Reference in New Issue