Spring/spring-statemachine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to boot 1.5.19

Browse Source 
- Focus of this change is to get latest deps from boot 1.5.x
  and framework 4.3.x.
- This commit changes baseline from boot 1.4.x to 1.5.x and
  effectively causes below changes:

  -springDataRedisVersion=1.7.3.RELEASE
  +springDataRedisVersion=1.8.18.RELEASE

  -commonsPool2Version=2.4.2
  +commonsPool2Version=2.4.3

  -springBootVersion=1.4.1.RELEASE
  +springBootVersion=1.5.19.RELEASE

  -springSessionVersion=1.0.2.RELEASE
  +springSessionVersion=1.3.5.RELEASE

  -tomcatEmbedVersion=8.5.5
  +tomcatEmbedVersion=8.5.37

  -springSecurityVersion=4.0.3.RELEASE
  +springSecurityVersion=4.2.11.RELEASE

  -springVersion=4.3.3.RELEASE
  +springVersion=4.3.22.RELEASE

  -springDataMongoDbVersion=1.9.3.RELEASE
  +springDataMongoDbVersion=1.10.18.RELEASE

  -springDataCommonsVersion=1.12.3.RELEASE
  +springDataCommonsVersion=1.13.18.RELEASE

  -springDataJpaVersion=1.10.3.RELEASE
  +springDataJpaVersion=1.11.18.RELEASE

- Fix MongoDbRule so that it detects non existend mongo faster.
- Fixes #698
This commit is contained in:
Janne Valkealahti
2019-03-25 10:06:16 +00:00
parent 8da913ccf1
commit d427d2a72d
5 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-statemachine-data/build.gradle
View File

@@ -33,7 +33,10 @@ project('spring-statemachine-data-mongodb') {
description = "Spring State Machine Data MongoDB"
dependencies {
compile project(":spring-statemachine-data-common")
compile "org.springframework.data:spring-data-mongodb:$springDataMongoDbVersion"
compile("org.springframework.data:spring-data-mongodb:$springDataMongoDbVersion") { dep ->
exclude group: "org.mongodb", module: "mongo-java-driver"
}
testCompile "org.mongodb:mongodb-driver:$mongoDbVersion"
testCompile project(":spring-statemachine-test")
optional "org.eclipse.persistence:javax.persistence:$eclipsePersistenceVersion"
testCompile project(path:":spring-statemachine-data-common", configuration:"testArtifacts")

4
spring-statemachine-data/mongodb/src/test/java/org/springframework/statemachine/data/mongodb/MongoDbRule.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016 the original author or authors.
* Copyright 2016-2019 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.
@@ -35,7 +35,7 @@ public class MongoDbRule extends TestWatcher implements TestRule {
public Statement apply(Statement base, Description description) {
MongoClient client = null;
try {
client = new MongoClient(new ServerAddress(), MongoClientOptions.builder().connectTimeout(50).build());
client = new MongoClient(new ServerAddress(), MongoClientOptions.builder().connectTimeout(50).serverSelectionTimeout(50).build());
client.getAddress();
} catch (Exception e) {
return super.apply(new Statement() {