Move Hazelcast testcontainers support into spring-boot-hazelcast
See gh-46099
This commit is contained in:
parent
5528d1fbfe
commit
e29c46388d
|
@ -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"
|
||||
}
|
||||
|
||||
|
@ -34,12 +35,19 @@ 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-jpa"))
|
||||
optional(project(":spring-boot-project:spring-boot-testcontainers"))
|
||||
optional("com.hazelcast:hazelcast-spring")
|
||||
optional("org.slf4j:slf4j-api")
|
||||
|
||||
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"))
|
||||
testImplementation(testFixtures(project(":spring-boot-project:spring-boot-testcontainers")))
|
||||
|
||||
testRuntimeOnly("com.h2database:h2")
|
||||
testRuntimeOnly("ch.qos.logback:logback-classic")
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.boot.testcontainers.service.connection.hazelcast;
|
||||
package org.springframework.boot.hazelcast.testcontainers;
|
||||
|
||||
import java.util.UUID;
|
||||
import java.util.function.Consumer;
|
|
@ -14,7 +14,7 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.boot.testcontainers.service.connection.hazelcast;
|
||||
package org.springframework.boot.hazelcast.testcontainers;
|
||||
|
||||
import java.util.UUID;
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<configuration>
|
||||
<include resource="org/springframework/boot/logging/logback/base.xml"/>
|
||||
</configuration>
|
|
@ -0,0 +1 @@
|
|||
spring.test.context.cache.maxSize=1
|
|
@ -14,7 +14,7 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.boot.testcontainers.service.connection.hazelcast;
|
||||
package org.springframework.boot.hazelcast.testcontainers;
|
||||
|
||||
import java.util.Map;
|
||||
|
|
@ -17,4 +17,4 @@
|
|||
/**
|
||||
* Support for testcontainers Hazelcast service connections.
|
||||
*/
|
||||
package org.springframework.boot.testcontainers.service.connection.hazelcast;
|
||||
package org.springframework.boot.hazelcast.testcontainers;
|
|
@ -0,0 +1,3 @@
|
|||
# Connection Details Factories
|
||||
org.springframework.boot.autoconfigure.service.connection.ConnectionDetailsFactory=\
|
||||
org.springframework.boot.hazelcast.testcontainers.HazelcastContainerConnectionDetailsFactory
|
|
@ -14,7 +14,7 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.boot.testcontainers.service.connection.hazelcast;
|
||||
package org.springframework.boot.hazelcast.testcontainers;
|
||||
|
||||
import com.hazelcast.client.config.ClientConfig;
|
||||
import org.junit.jupiter.api.Test;
|
|
@ -59,7 +59,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-hazelcast"))
|
||||
optional(project(":spring-boot-project:spring-boot-jdbc"))
|
||||
optional(project(":spring-boot-project:spring-boot-kafka"))
|
||||
optional(project(":spring-boot-project:spring-boot-ldap"))
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
# Connection Details Factories
|
||||
org.springframework.boot.autoconfigure.service.connection.ConnectionDetailsFactory=\
|
||||
org.springframework.boot.testcontainers.service.connection.hazelcast.HazelcastContainerConnectionDetailsFactory,\
|
||||
org.springframework.boot.testcontainers.service.connection.kafka.ApacheKafkaContainerConnectionDetailsFactory,\
|
||||
org.springframework.boot.testcontainers.service.connection.kafka.ConfluentKafkaContainerConnectionDetailsFactory,\
|
||||
org.springframework.boot.testcontainers.service.connection.kafka.DeprecatedConfluentKafkaContainerConnectionDetailsFactory,\
|
||||
|
|
Loading…
Reference in New Issue