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
5b9d8bfc
Commit
5b9d8bfc
authored
Apr 14, 2020
by
dreis2211
Committed by
Stephane Nicoll
Apr 15, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrade to Testcontainers 1.14.0
See gh-20936
parent
17e5b08c
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
509 deletions
+6
-509
build.gradle
spring-boot-project/spring-boot-autoconfigure/build.gradle
+1
-0
CouchbaseAutoConfigurationIntegrationTests.java
...couchbase/CouchbaseAutoConfigurationIntegrationTests.java
+4
-3
CouchbaseContainer.java
...work/boot/autoconfigure/couchbase/CouchbaseContainer.java
+0
-504
build.gradle
spring-boot-project/spring-boot-parent/build.gradle
+1
-1
checkstyle-suppressions.xml
src/checkstyle/checkstyle-suppressions.xml
+0
-1
No files found.
spring-boot-project/spring-boot-autoconfigure/build.gradle
View file @
5b9d8bfc
...
@@ -180,6 +180,7 @@ dependencies {
...
@@ -180,6 +180,7 @@ dependencies {
testImplementation
(
"org.springframework.kafka:spring-kafka-test"
)
testImplementation
(
"org.springframework.kafka:spring-kafka-test"
)
testImplementation
(
"org.springframework.security:spring-security-test"
)
testImplementation
(
"org.springframework.security:spring-security-test"
)
testImplementation
(
"org.testcontainers:cassandra"
)
testImplementation
(
"org.testcontainers:cassandra"
)
testImplementation
(
"org.testcontainers:couchbase"
)
testImplementation
(
"org.testcontainers:elasticsearch"
)
testImplementation
(
"org.testcontainers:elasticsearch"
)
testImplementation
(
"org.testcontainers:junit-jupiter"
)
testImplementation
(
"org.testcontainers:junit-jupiter"
)
testImplementation
(
"org.testcontainers:testcontainers"
)
testImplementation
(
"org.testcontainers:testcontainers"
)
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationIntegrationTests.java
View file @
5b9d8bfc
...
@@ -23,8 +23,9 @@ import com.couchbase.client.core.diagnostics.DiagnosticsResult;
...
@@ -23,8 +23,9 @@ import com.couchbase.client.core.diagnostics.DiagnosticsResult;
import
com.couchbase.client.java.Bucket
;
import
com.couchbase.client.java.Bucket
;
import
com.couchbase.client.java.Cluster
;
import
com.couchbase.client.java.Cluster
;
import
com.couchbase.client.java.env.ClusterEnvironment
;
import
com.couchbase.client.java.env.ClusterEnvironment
;
import
com.couchbase.client.java.manager.bucket.BucketSettings
;
import
org.junit.jupiter.api.Test
;
import
org.junit.jupiter.api.Test
;
import
org.testcontainers.couchbase.BucketDefinition
;
import
org.testcontainers.couchbase.CouchbaseContainer
;
import
org.testcontainers.junit.jupiter.Container
;
import
org.testcontainers.junit.jupiter.Container
;
import
org.testcontainers.junit.jupiter.Testcontainers
;
import
org.testcontainers.junit.jupiter.Testcontainers
;
...
@@ -45,9 +46,9 @@ class CouchbaseAutoConfigurationIntegrationTests {
...
@@ -45,9 +46,9 @@ class CouchbaseAutoConfigurationIntegrationTests {
private
static
final
String
BUCKET_NAME
=
"cbbucket"
;
private
static
final
String
BUCKET_NAME
=
"cbbucket"
;
@Container
@Container
static
final
CouchbaseContainer
couchbase
=
new
CouchbaseContainer
().
withC
lusterAdmin
(
"spring"
,
"password"
)
static
final
CouchbaseContainer
couchbase
=
new
CouchbaseContainer
().
withC
redentials
(
"spring"
,
"password"
)
.
withStartupAttempts
(
5
).
withStartupTimeout
(
Duration
.
ofMinutes
(
10
))
.
withStartupAttempts
(
5
).
withStartupTimeout
(
Duration
.
ofMinutes
(
10
))
.
with
NewBucket
(
BucketSettings
.
create
(
BUCKET_NAME
));
.
with
Bucket
(
new
BucketDefinition
(
BUCKET_NAME
));
private
final
ApplicationContextRunner
contextRunner
=
new
ApplicationContextRunner
()
private
final
ApplicationContextRunner
contextRunner
=
new
ApplicationContextRunner
()
.
withConfiguration
(
AutoConfigurations
.
of
(
CouchbaseAutoConfiguration
.
class
))
.
withConfiguration
(
AutoConfigurations
.
of
(
CouchbaseAutoConfiguration
.
class
))
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseContainer.java
deleted
100644 → 0
View file @
17e5b08c
This diff is collapsed.
Click to expand it.
spring-boot-project/spring-boot-parent/build.gradle
View file @
5b9d8bfc
...
@@ -12,7 +12,7 @@ javaPlatform {
...
@@ -12,7 +12,7 @@ javaPlatform {
dependencies
{
dependencies
{
api
(
enforcedPlatform
(
project
(
":spring-boot-project:spring-boot-dependencies"
)))
api
(
enforcedPlatform
(
project
(
":spring-boot-project:spring-boot-dependencies"
)))
api
(
enforcedPlatform
(
"org.testcontainers:testcontainers-bom:1.1
3
.0"
))
api
(
enforcedPlatform
(
"org.testcontainers:testcontainers-bom:1.1
4
.0"
))
constraints
{
constraints
{
api
(
"com.vaadin.external.google:android-json:0.0.20131108.vaadin1"
)
api
(
"com.vaadin.external.google:android-json:0.0.20131108.vaadin1"
)
...
...
src/checkstyle/checkstyle-suppressions.xml
View file @
5b9d8bfc
...
@@ -46,5 +46,4 @@
...
@@ -46,5 +46,4 @@
<suppress
files=
"[\\/]src[\\/]intTest[\\/]java[\\/]"
checks=
"SpringJavadoc"
message=
"\@since"
/>
<suppress
files=
"[\\/]src[\\/]intTest[\\/]java[\\/]"
checks=
"SpringJavadoc"
message=
"\@since"
/>
<suppress
files=
"LinuxDomainSocket"
checks=
"FinalClass"
message=
"SockaddrUn"
/>
<suppress
files=
"LinuxDomainSocket"
checks=
"FinalClass"
message=
"SockaddrUn"
/>
<suppress
files=
"BsdDomainSocket"
checks=
"FinalClass"
message=
"SockaddrUn"
/>
<suppress
files=
"BsdDomainSocket"
checks=
"FinalClass"
message=
"SockaddrUn"
/>
<suppress
files=
"[\\/]org.springframework.boot.autoconfigure.couchbase.CouchbaseContainer.java$"
checks=
".*"
/>
</suppressions>
</suppressions>
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