Skip to content

Commit 05452cf

Browse files
mp911demp911de
committed
Upgrade to Testcontainers 2.0.
See spring-projects/spring-data-build#2688
1 parent 57a8b26 commit 05452cf

File tree

6 files changed

+32
-39
lines changed

6 files changed

+32
-39
lines changed

‎pom.xml‎

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -130,13 +130,6 @@
130130
<type>pom</type>
131131
<scope>import</scope>
132132
</dependency>
133-
<dependency>
134-
<groupId>org.testcontainers</groupId>
135-
<artifactId>testcontainers-bom</artifactId>
136-
<version>${testcontainers}</version>
137-
<type>pom</type>
138-
<scope>import</scope>
139-
</dependency>
140133
<dependency>
141134
<groupId>com.google.code.findbugs</groupId>
142135
<artifactId>jsr305</artifactId>
@@ -403,22 +396,6 @@
403396
<version>1.1.0.RELEASE</version>
404397
<scope>test</scope>
405398
</dependency>
406-
<dependency>
407-
<groupId>org.testcontainers</groupId>
408-
<artifactId>junit-jupiter</artifactId>
409-
<scope>test</scope>
410-
<exclusions>
411-
<exclusion>
412-
<groupId>org.jetbrains</groupId>
413-
<artifactId>annotations</artifactId>
414-
</exclusion>
415-
</exclusions>
416-
</dependency>
417-
<dependency>
418-
<groupId>org.testcontainers</groupId>
419-
<artifactId>neo4j</artifactId>
420-
<scope>test</scope>
421-
</dependency>
422399
<dependency>
423400
<groupId>org.testcontainers</groupId>
424401
<artifactId>testcontainers</artifactId>
@@ -439,6 +416,22 @@
439416
</exclusion>
440417
</exclusions>
441418
</dependency>
419+
<dependency>
420+
<groupId>org.testcontainers</groupId>
421+
<artifactId>testcontainers-junit-jupiter</artifactId>
422+
<scope>test</scope>
423+
<exclusions>
424+
<exclusion>
425+
<groupId>org.jetbrains</groupId>
426+
<artifactId>annotations</artifactId>
427+
</exclusion>
428+
</exclusions>
429+
</dependency>
430+
<dependency>
431+
<groupId>org.testcontainers</groupId>
432+
<artifactId>testcontainers-neo4j</artifactId>
433+
<scope>test</scope>
434+
</dependency>
442435
</dependencies>
443436

444437
<!-- The Spring Data Commons tooling removes this (ok), but adds it back unsorted, so we just ignore this part completely. -->

‎src/main/antora/modules/ROOT/pages/faq.adoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -908,7 +908,7 @@ And here is the reactive version, omitting the setup for brevity:
908908
import java.util.Collections;
909909
910910
import org.junit.jupiter.api.Test;
911-
import org.testcontainers.containers.Neo4jContainer;
911+
import org.testcontainers.neo4j.Neo4jContainer;
912912
import org.testcontainers.junit.jupiter.Container;
913913
import org.testcontainers.junit.jupiter.Testcontainers;
914914
import reactor.test.StepVerifier;
@@ -927,7 +927,7 @@ import org.springframework.test.context.DynamicPropertySource;
927927
class ReactiveTemplateExampleTest {
928928
929929
@Container
930-
private static Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:5");
930+
private static Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:5");
931931
932932
@DynamicPropertySource
933933
static void neo4jProperties(DynamicPropertyRegistry registry) {

‎src/main/antora/modules/ROOT/pages/testing/testing-with-spring-boot.adoc‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,8 @@ You need the following dependencies:
227227
----
228228
<dependency>
229229
<groupId>org.testcontainers</groupId>
230-
<artifactId>neo4j</artifactId>
231-
<version>1.17.6</version>
230+
<artifactId>testcontainers-neo4j</artifactId>
231+
<version>${testcontainers.version}</version>
232232
<scope>test</scope>
233233
</dependency>
234234
----
@@ -251,17 +251,17 @@ import org.springframework.boot.test.autoconfigure.data.neo4j.DataNeo4jTest;
251251
import org.springframework.data.neo4j.core.Neo4jClient;
252252
import org.springframework.test.context.DynamicPropertyRegistry;
253253
import org.springframework.test.context.DynamicPropertySource;
254-
import org.testcontainers.containers.Neo4jContainer;
254+
import org.testcontainers.neo4j.Neo4jContainer;
255255
256256
@DataNeo4jTest
257257
class MovieRepositoryTCTest {
258258
259-
private static Neo4jContainer<?> neo4jContainer;
259+
private static Neo4jContainer neo4jContainer;
260260
261261
@BeforeAll
262262
static void initializeNeo4j() {
263263
264-
neo4jContainer = new Neo4jContainer<>()
264+
neo4jContainer = new Neo4jContainer()
265265
.withAdminPassword("somePassword");
266266
neo4jContainer.start();
267267
}
@@ -322,12 +322,12 @@ If you want to use the properties but cannot use a `@DynamicPropertySource`, you
322322
@DataNeo4jTest
323323
class PriorToBoot226Test {
324324
325-
private static Neo4jContainer<?> neo4jContainer;
325+
private static Neo4jContainer neo4jContainer;
326326
327327
@BeforeAll
328328
static void initializeNeo4j() {
329329
330-
neo4jContainer = new Neo4jContainer<>()
330+
neo4jContainer = new Neo4jContainer()
331331
.withAdminPassword("somePassword");
332332
neo4jContainer.start();
333333
}

‎src/test/java/org/springframework/data/neo4j/documentation/spring_boot/ReactiveTemplateExampleIT.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919

2020
import org.junit.jupiter.api.Disabled;
2121
import org.junit.jupiter.api.Test;
22-
import org.testcontainers.containers.Neo4jContainer;
2322
import org.testcontainers.junit.jupiter.Container;
2423
import org.testcontainers.junit.jupiter.Testcontainers;
24+
import org.testcontainers.neo4j.Neo4jContainer;
2525
import reactor.test.StepVerifier;
2626

2727
import org.springframework.beans.factory.annotation.Autowired;
@@ -40,7 +40,7 @@
4040
class ReactiveTemplateExampleIT {
4141

4242
@Container
43-
private static Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:5");
43+
private static Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:5");
4444

4545
@DynamicPropertySource
4646
static void neo4jProperties(DynamicPropertyRegistry registry) {

‎src/test/java/org/springframework/data/neo4j/integration/multiple_ctx_imperative/MultipleContextsIT.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
import org.neo4j.driver.GraphDatabase;
2626
import org.neo4j.driver.Logging;
2727
import org.neo4j.driver.Session;
28-
import org.testcontainers.containers.Neo4jContainer;
2928
import org.testcontainers.junit.jupiter.Container;
3029
import org.testcontainers.junit.jupiter.Testcontainers;
30+
import org.testcontainers.neo4j.Neo4jContainer;
3131

3232
import org.springframework.beans.factory.annotation.Autowired;
3333
import org.springframework.data.neo4j.integration.multiple_ctx_imperative.domain1.Domain1Config;
@@ -54,10 +54,10 @@
5454
public class MultipleContextsIT {
5555

5656
@Container
57-
private static Neo4jContainer container1 = new Neo4jContainer<>("neo4j:5").withAdminPassword("verysecret1");
57+
private static Neo4jContainer container1 = new Neo4jContainer("neo4j:5").withAdminPassword("verysecret1");
5858

5959
@Container
60-
private static Neo4jContainer container2 = new Neo4jContainer<>("neo4j:5").withAdminPassword("verysecret2");
60+
private static Neo4jContainer container2 = new Neo4jContainer("neo4j:5").withAdminPassword("verysecret2");
6161

6262
@DynamicPropertySource
6363
static void neo4jSettings(DynamicPropertyRegistry registry) {

‎src/test/java/org/springframework/data/neo4j/test/Neo4jExtension.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
import org.neo4j.driver.internal.SecuritySettings;
4848
import org.neo4j.driver.internal.security.SecurityPlan;
4949
import org.neo4j.driver.internal.security.SecurityPlans;
50-
import org.testcontainers.containers.Neo4jContainer;
50+
import org.testcontainers.neo4j.Neo4jContainer;
5151
import org.testcontainers.utility.TestcontainersConfiguration;
5252

5353
import org.springframework.core.log.LogMessage;
@@ -382,7 +382,7 @@ static class ContainerAdapter implements AutoCloseable {
382382
private static final boolean forceReuse = Boolean
383383
.parseBoolean(System.getenv(SYS_PROPERTY_FORCE_CONTAINER_REUSE));
384384

385-
private static final Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>(repository + ":" + imageVersion)
385+
private static final Neo4jContainer neo4jContainer = new Neo4jContainer(repository + ":" + imageVersion)
386386
.withoutAuthentication()
387387
.withEnv("NEO4J_ACCEPT_LICENSE_AGREEMENT",
388388
Optional.ofNullable(System.getenv(SYS_PROPERTY_NEO4J_ACCEPT_COMMERCIAL_EDITION)).orElse("no"))

0 commit comments

Comments
 (0)