Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
6d8f07d8
Commit
6d8f07d8
authored
Jan 08, 2020
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '2.1.x' into 2.2.x
Closes gh-19570
parents
e0405565
bdffa860
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
12 additions
and
12 deletions
+12
-12
CouchbaseAutoConfigurationIntegrationTests.java
...couchbase/CouchbaseAutoConfigurationIntegrationTests.java
+1
-1
CassandraDataAutoConfigurationIntegrationTests.java
...andra/CassandraDataAutoConfigurationIntegrationTests.java
+1
-1
ElasticsearchAutoConfigurationTests.java
...ta/elasticsearch/ElasticsearchAutoConfigurationTests.java
+1
-1
ElasticsearchDataAutoConfigurationTests.java
...lasticsearch/ElasticsearchDataAutoConfigurationTests.java
+1
-1
ElasticsearchRepositoriesAutoConfigurationTests.java
...arch/ElasticsearchRepositoriesAutoConfigurationTests.java
+1
-1
ReactiveElasticsearchRepositoriesAutoConfigurationTests.java
...ctiveElasticsearchRepositoriesAutoConfigurationTests.java
+1
-1
ReactiveRestClientAutoConfigurationTests.java
...asticsearch/ReactiveRestClientAutoConfigurationTests.java
+1
-1
RedisRepositoriesAutoConfigurationTests.java
...e/data/redis/RedisRepositoriesAutoConfigurationTests.java
+1
-1
JestAutoConfigurationTests.java
...figure/elasticsearch/jest/JestAutoConfigurationTests.java
+1
-1
RestClientAutoConfigurationTests.java
.../elasticsearch/rest/RestClientAutoConfigurationTests.java
+1
-1
SessionAutoConfigurationRedisTests.java
...configure/session/SessionAutoConfigurationRedisTests.java
+1
-1
SysVinitLaunchScriptIT.java
...ngframework/boot/launchscript/SysVinitLaunchScriptIT.java
+1
-1
No files found.
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationIntegrationTests.java
View file @
6d8f07d8
...
...
@@ -53,7 +53,7 @@ class CouchbaseAutoConfigurationIntegrationTests {
static
final
CouchbaseContainer
couchbase
=
new
CouchbaseContainer
().
withClusterAdmin
(
"spring"
,
"password"
)
.
withNewBucket
(
DefaultBucketSettings
.
builder
().
enableFlush
(
true
).
name
(
"default"
).
password
(
"secret"
)
.
quota
(
100
).
replicas
(
0
).
type
(
BucketType
.
COUCHBASE
).
build
())
.
withStartupAttempts
(
5
).
withStartupTimeout
(
Duration
.
ofMinutes
(
2
));
.
withStartupAttempts
(
5
).
withStartupTimeout
(
Duration
.
ofMinutes
(
10
));
private
AnnotationConfigApplicationContext
context
;
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationIntegrationTests.java
View file @
6d8f07d8
...
...
@@ -48,7 +48,7 @@ class CassandraDataAutoConfigurationIntegrationTests {
@Container
static
final
CassandraContainer
<?>
cassandra
=
new
CassandraContainer
<>().
withStartupAttempts
(
5
)
.
withStartupTimeout
(
Duration
.
ofMinutes
(
2
));
.
withStartupTimeout
(
Duration
.
ofMinutes
(
10
));
private
AnnotationConfigApplicationContext
context
;
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchAutoConfigurationTests.java
View file @
6d8f07d8
...
...
@@ -48,7 +48,7 @@ class ElasticsearchAutoConfigurationTests {
@Container
public
static
ElasticsearchContainer
elasticsearch
=
new
ElasticsearchContainer
().
withStartupAttempts
(
5
)
.
withStartupTimeout
(
Duration
.
ofMinutes
(
2
));
.
withStartupTimeout
(
Duration
.
ofMinutes
(
10
));
private
AnnotationConfigApplicationContext
context
;
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfigurationTests.java
View file @
6d8f07d8
...
...
@@ -54,7 +54,7 @@ class ElasticsearchDataAutoConfigurationTests {
@Container
static
ElasticsearchContainer
elasticsearch
=
new
ElasticsearchContainer
().
withStartupAttempts
(
5
)
.
withStartupTimeout
(
Duration
.
ofMinutes
(
2
));
.
withStartupTimeout
(
Duration
.
ofMinutes
(
10
));
private
ApplicationContextRunner
contextRunner
=
new
ApplicationContextRunner
().
withConfiguration
(
AutoConfigurations
.
of
(
ElasticsearchAutoConfiguration
.
class
,
RestClientAutoConfiguration
.
class
,
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfigurationTests.java
View file @
6d8f07d8
...
...
@@ -49,7 +49,7 @@ class ElasticsearchRepositoriesAutoConfigurationTests {
@Container
static
final
ElasticsearchContainer
elasticsearch
=
new
ElasticsearchContainer
().
withStartupAttempts
(
5
)
.
withStartupTimeout
(
Duration
.
ofMinutes
(
2
));
.
withStartupTimeout
(
Duration
.
ofMinutes
(
10
));
private
ApplicationContextRunner
contextRunner
=
new
ApplicationContextRunner
()
.
withConfiguration
(
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ReactiveElasticsearchRepositoriesAutoConfigurationTests.java
View file @
6d8f07d8
...
...
@@ -48,7 +48,7 @@ public class ReactiveElasticsearchRepositoriesAutoConfigurationTests {
@Container
static
ElasticsearchContainer
elasticsearch
=
new
ElasticsearchContainer
().
withStartupAttempts
(
5
)
.
withStartupTimeout
(
Duration
.
ofMinutes
(
2
));
.
withStartupTimeout
(
Duration
.
ofMinutes
(
10
));
private
ApplicationContextRunner
contextRunner
=
new
ApplicationContextRunner
()
.
withConfiguration
(
AutoConfigurations
.
of
(
ReactiveRestClientAutoConfiguration
.
class
,
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ReactiveRestClientAutoConfigurationTests.java
View file @
6d8f07d8
...
...
@@ -48,7 +48,7 @@ public class ReactiveRestClientAutoConfigurationTests {
@Container
static
ElasticsearchContainer
elasticsearch
=
new
ElasticsearchContainer
().
withStartupAttempts
(
5
)
.
withStartupTimeout
(
Duration
.
ofMinutes
(
2
));
.
withStartupTimeout
(
Duration
.
ofMinutes
(
10
));
private
ApplicationContextRunner
contextRunner
=
new
ApplicationContextRunner
()
.
withConfiguration
(
AutoConfigurations
.
of
(
ReactiveRestClientAutoConfiguration
.
class
));
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisRepositoriesAutoConfigurationTests.java
View file @
6d8f07d8
...
...
@@ -48,7 +48,7 @@ class RedisRepositoriesAutoConfigurationTests {
@Container
public
static
RedisContainer
redis
=
new
RedisContainer
().
withStartupAttempts
(
5
)
.
withStartupTimeout
(
Duration
.
ofMinutes
(
2
));
.
withStartupTimeout
(
Duration
.
ofMinutes
(
10
));
private
AnnotationConfigApplicationContext
context
=
new
AnnotationConfigApplicationContext
();
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/jest/JestAutoConfigurationTests.java
View file @
6d8f07d8
...
...
@@ -56,7 +56,7 @@ class JestAutoConfigurationTests {
@Container
static
final
ElasticsearchContainer
elasticsearch
=
new
ElasticsearchContainer
().
withStartupAttempts
(
5
)
.
withStartupTimeout
(
Duration
.
ofMinutes
(
2
));
.
withStartupTimeout
(
Duration
.
ofMinutes
(
10
));
private
ApplicationContextRunner
contextRunner
=
new
ApplicationContextRunner
()
.
withConfiguration
(
AutoConfigurations
.
of
(
GsonAutoConfiguration
.
class
,
JestAutoConfiguration
.
class
));
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/rest/RestClientAutoConfigurationTests.java
View file @
6d8f07d8
...
...
@@ -51,7 +51,7 @@ class RestClientAutoConfigurationTests {
@Container
static
final
ElasticsearchContainer
elasticsearch
=
new
ElasticsearchContainer
().
withStartupAttempts
(
5
)
.
withStartupTimeout
(
Duration
.
ofMinutes
(
2
));
.
withStartupTimeout
(
Duration
.
ofMinutes
(
10
));
private
ApplicationContextRunner
contextRunner
=
new
ApplicationContextRunner
()
.
withConfiguration
(
AutoConfigurations
.
of
(
RestClientAutoConfiguration
.
class
));
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationRedisTests.java
View file @
6d8f07d8
...
...
@@ -56,7 +56,7 @@ class SessionAutoConfigurationRedisTests extends AbstractSessionAutoConfiguratio
@Container
public
static
RedisContainer
redis
=
new
RedisContainer
().
withStartupAttempts
(
5
)
.
withStartupTimeout
(
Duration
.
ofMinutes
(
2
));
.
withStartupTimeout
(
Duration
.
ofMinutes
(
10
));
protected
final
WebApplicationContextRunner
contextRunner
=
new
WebApplicationContextRunner
()
.
withConfiguration
(
AutoConfigurations
.
of
(
SessionAutoConfiguration
.
class
));
...
...
spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIT.java
View file @
6d8f07d8
...
...
@@ -339,7 +339,7 @@ class SysVinitLaunchScriptIT {
withCopyFileToContainer
(
MountableFile
.
forHostPath
(
"src/test/resources/scripts/"
+
testScript
),
"/"
+
testScript
);
withCommand
(
"/bin/bash"
,
"-c"
,
"chmod +x "
+
testScript
+
" && ./"
+
testScript
);
withStartupTimeout
(
Duration
.
ofMinutes
(
5
));
withStartupTimeout
(
Duration
.
ofMinutes
(
10
));
}
private
static
File
findApplication
()
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment