Skip to content

Commit 0d81b4d

Browse files
committed
Merge branch '2.3.x' into 2.4.x
Closes gh-26108
2 parents 0cedbf6 + 0fb4825 commit 0d81b4d

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jRepositoriesAutoConfigurationIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class Neo4jRepositoriesAutoConfigurationIntegrationTests {
4747

4848
@Container
4949
private static final Neo4jContainer<?> neo4jServer = new Neo4jContainer<>(DockerImageNames.neo4j())
50-
.withStartupTimeout(Duration.ofMinutes(10));
50+
.withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(10));
5151

5252
@DynamicPropertySource
5353
static void neo4jProperties(DynamicPropertyRegistry registry) {

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/neo4j/Neo4jAutoConfigurationIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class Neo4jAutoConfigurationIntegrationTests {
4949

5050
@Container
5151
private static final Neo4jContainer<?> neo4jServer = new Neo4jContainer<>(DockerImageNames.neo4j())
52-
.withStartupTimeout(Duration.ofMinutes(10));
52+
.withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(10));
5353

5454
@DynamicPropertySource
5555
static void neo4jProperties(DynamicPropertyRegistry registry) {

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2020 the original author or authors.
2+
* Copyright 2012-2021 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@ class DataNeo4jTestIntegrationTests {
4747

4848
@Container
4949
static final Neo4jContainer<?> neo4j = new Neo4jContainer<>(DockerImageNames.neo4j()).withoutAuthentication()
50-
.withStartupTimeout(Duration.ofMinutes(10));
50+
.withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(10));
5151

5252
@DynamicPropertySource
5353
static void neo4jProperties(DynamicPropertyRegistry registry) {

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestPropertiesIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2020 the original author or authors.
2+
* Copyright 2012-2021 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -43,7 +43,7 @@ class DataNeo4jTestPropertiesIntegrationTests {
4343

4444
@Container
4545
static final Neo4jContainer<?> neo4j = new Neo4jContainer<>(DockerImageNames.neo4j()).withoutAuthentication()
46-
.withStartupTimeout(Duration.ofMinutes(10));
46+
.withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(10));
4747

4848
@DynamicPropertySource
4949
static void neo4jProperties(DynamicPropertyRegistry registry) {

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestReactiveIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2020 the original author or authors.
2+
* Copyright 2012-2021 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -56,7 +56,7 @@ class DataNeo4jTestReactiveIntegrationTests {
5656

5757
@Container
5858
static final Neo4jContainer<?> neo4j = new Neo4jContainer<>(DockerImageNames.neo4j()).withoutAuthentication()
59-
.withStartupTimeout(Duration.ofMinutes(10));
59+
.withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(10));
6060

6161
@DynamicPropertySource
6262
static void neo4jProperties(DynamicPropertyRegistry registry) {

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestWithIncludeFilterIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2020 the original author or authors.
2+
* Copyright 2012-2021 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ class DataNeo4jTestWithIncludeFilterIntegrationTests {
4444

4545
@Container
4646
static final Neo4jContainer<?> neo4j = new Neo4jContainer<>(DockerImageNames.neo4j()).withoutAuthentication()
47-
.withStartupTimeout(Duration.ofMinutes(10));
47+
.withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(10));
4848

4949
@DynamicPropertySource
5050
static void neo4jProperties(DynamicPropertyRegistry registry) {

0 commit comments

Comments
 (0)