Browse Source

Merge branch '3.0.x'

Closes gh-34941
pull/34945/head
Stephane Nicoll 3 years ago
parent
commit
c559bb2b69
  1. 4
      spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/testing/testcontainers/dynamicproperties/MyIntegrationTests.java
  2. 2
      spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/testing/testcontainers/serviceconnections/MyIntegrationTests.java
  3. 4
      spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/testing/testcontainers/vanilla/MyIntegrationTests.java
  4. 2
      spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/testing/testcontainers/dynamicproperties/MyIntegrationTests.kt
  5. 2
      spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/testing/testcontainers/serviceconnections/MyIntegrationTests.kt
  6. 2
      spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/testing/testcontainers/vanilla/MyIntegrationTests.kt

4
spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/testing/testcontainers/dynamicproperties/MyIntegrationTests.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2012-2021 the original author or authors.
* Copyright 2012-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -30,7 +30,7 @@ import org.springframework.test.context.DynamicPropertySource; @@ -30,7 +30,7 @@ import org.springframework.test.context.DynamicPropertySource;
class MyIntegrationTests {
@Container
static Neo4jContainer<?> neo4j = new Neo4jContainer<>("neo4j:4.2");
static Neo4jContainer<?> neo4j = new Neo4jContainer<>("neo4j:5");
@Test
void myTest() {

2
spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/testing/testcontainers/serviceconnections/MyIntegrationTests.java

@ -30,7 +30,7 @@ class MyIntegrationTests { @@ -30,7 +30,7 @@ class MyIntegrationTests {
@Container
@Neo4jServiceConnection
static Neo4jContainer<?> neo4j = new Neo4jContainer<>("neo4j:4.2");
static Neo4jContainer<?> neo4j = new Neo4jContainer<>("neo4j:5");
@Test
void myTest() {

4
spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/testing/testcontainers/vanilla/MyIntegrationTests.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2012-2021 the original author or authors.
* Copyright 2012-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -28,7 +28,7 @@ import org.springframework.boot.test.context.SpringBootTest; @@ -28,7 +28,7 @@ import org.springframework.boot.test.context.SpringBootTest;
class MyIntegrationTests {
@Container
static Neo4jContainer<?> neo4j = new Neo4jContainer<>("neo4j:4.2");
static Neo4jContainer<?> neo4j = new Neo4jContainer<>("neo4j:5");
@Test
void myTest() {

2
spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/testing/testcontainers/dynamicproperties/MyIntegrationTests.kt

@ -36,7 +36,7 @@ internal class MyIntegrationTests { @@ -36,7 +36,7 @@ internal class MyIntegrationTests {
companion object {
@Container
var neo4j: Neo4jContainer<*> = Neo4jContainer<Nothing>("neo4j:4.2")
var neo4j: Neo4jContainer<*> = Neo4jContainer<Nothing>("neo4j:5")
@DynamicPropertySource
fun neo4jProperties(registry: DynamicPropertyRegistry) {

2
spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/testing/testcontainers/serviceconnections/MyIntegrationTests.kt

@ -38,7 +38,7 @@ internal class MyIntegrationTests { @@ -38,7 +38,7 @@ internal class MyIntegrationTests {
@Container
@Neo4jServiceConnection
var neo4j: Neo4jContainer<*> = Neo4jContainer<Nothing>("neo4j:4.2")
var neo4j: Neo4jContainer<*> = Neo4jContainer<Nothing>("neo4j:5")
}

2
spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/testing/testcontainers/vanilla/MyIntegrationTests.kt

@ -33,7 +33,7 @@ internal class MyIntegrationTests { @@ -33,7 +33,7 @@ internal class MyIntegrationTests {
companion object {
@Container
var neo4j: Neo4jContainer<*> = Neo4jContainer<Nothing>("neo4j:4.2")
var neo4j: Neo4jContainer<*> = Neo4jContainer<Nothing>("neo4j:5")
}
}

Loading…
Cancel
Save