mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '2.0.x'
This commit is contained in:
commit
20acd2a89b
@ -261,7 +261,7 @@ jobs:
|
||||
- put: repo-status-jdk9-build
|
||||
params: { state: "failure", commit: "git-repo" }
|
||||
- task: determine-email-body
|
||||
image: spring-boot-ci-image
|
||||
image: spring-boot-jdk9-ci-image
|
||||
file: git-repo/ci/tasks/determine-email-body.yml
|
||||
params:
|
||||
STATE: failure
|
||||
@ -274,7 +274,7 @@ jobs:
|
||||
body: email-details/body
|
||||
- do:
|
||||
- task: determine-email-body
|
||||
image: spring-boot-ci-image
|
||||
image: spring-boot-jdk9-ci-image
|
||||
file: git-repo/ci/tasks/determine-email-body.yml
|
||||
params:
|
||||
STATE: success
|
||||
@ -320,7 +320,7 @@ jobs:
|
||||
- put: repo-status-jdk10-build
|
||||
params: { state: "failure", commit: "git-repo" }
|
||||
- task: determine-email-body
|
||||
image: spring-boot-ci-image
|
||||
image: spring-boot-jdk10-ci-image
|
||||
file: git-repo/ci/tasks/determine-email-body.yml
|
||||
params:
|
||||
STATE: failure
|
||||
@ -333,7 +333,7 @@ jobs:
|
||||
body: email-details/body
|
||||
- do:
|
||||
- task: determine-email-body
|
||||
image: spring-boot-ci-image
|
||||
image: spring-boot-jdk10-ci-image
|
||||
file: git-repo/ci/tasks/determine-email-body.yml
|
||||
params:
|
||||
STATE: success
|
||||
|
@ -44,7 +44,7 @@ public class CassandraContainer extends Container {
|
||||
private static class WaitStrategy extends HostPortWaitStrategy {
|
||||
|
||||
@Override
|
||||
protected void waitUntilReady() {
|
||||
public void waitUntilReady(GenericContainer container) {
|
||||
super.waitUntilReady();
|
||||
|
||||
try {
|
||||
@ -59,7 +59,7 @@ public class CassandraContainer extends Container {
|
||||
private Callable<Boolean> checkConnection() {
|
||||
return () -> {
|
||||
try (Cluster cluster = Cluster.builder()
|
||||
.withPort(this.container.getMappedPort(PORT))
|
||||
.withPort(container.getMappedPort(PORT))
|
||||
.addContactPoint("localhost").build()) {
|
||||
cluster.connect();
|
||||
return true;
|
||||
|
@ -42,10 +42,10 @@ public class Neo4jContainer extends Container {
|
||||
private static class WaitStrategy extends HostPortWaitStrategy {
|
||||
|
||||
@Override
|
||||
protected void waitUntilReady() {
|
||||
public void waitUntilReady(GenericContainer container) {
|
||||
super.waitUntilReady();
|
||||
Configuration configuration = new Configuration.Builder()
|
||||
.uri("bolt://localhost:" + this.container.getMappedPort(7687))
|
||||
.uri("bolt://localhost:" + container.getMappedPort(7687))
|
||||
.build();
|
||||
SessionFactory sessionFactory = new SessionFactory(configuration,
|
||||
"org.springframework.boot.test.autoconfigure.data.neo4j");
|
||||
|
Loading…
Reference in New Issue
Block a user