diff --git a/build.gradle b/build.gradle index b84516b7..48d03e96 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { classpath("org.springframework.build.gradle:propdeps-plugin:0.0.7") classpath('org.asciidoctor:asciidoctor-gradle-plugin:1.5.2') classpath("io.spring.gradle:docbook-reference-plugin:0.3.1") - classpath("org.springframework.boot:spring-boot-gradle-plugin:1.4.1.RELEASE") + classpath("org.springframework.boot:spring-boot-gradle-plugin:1.5.19.RELEASE") } } @@ -365,6 +365,7 @@ project('spring-statemachine-build-tests') { testCompile project(":spring-statemachine-data-common:spring-statemachine-data-mongodb") testRuntime "org.springframework.boot:spring-boot-starter-data-redis:$springBootVersion" testCompile "org.springframework.boot:spring-boot-starter-data-jpa:$springBootVersion" + testCompile "org.mongodb:mongodb-driver:$mongoDbVersion" testCompile "com.h2database:h2:$h2Version" testCompile "org.springframework.boot:spring-boot-starter:$springBootVersion" testCompile "org.springframework:spring-test:$springVersion" diff --git a/gradle.properties b/gradle.properties index d5072e6f..2a53b720 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,26 +2,27 @@ kryoVersion=3.0.3 springCloudClusterVersion=1.0.0.RELEASE servletApiVersion=3.0.1 version=1.2.13.BUILD-SNAPSHOT -springDataRedisVersion=1.7.3.RELEASE +springDataRedisVersion=1.8.18.RELEASE eclipseEmfXmiVersion=2.11.1-v20150805-0538 eclipseUml2CommonVersion=2.0.0-v20140602-0749 junitVersion=4.12 -commonsPool2Version=2.4.2 -springBootVersion=1.4.1.RELEASE +commonsPool2Version=2.4.3 +springBootVersion=1.5.19.RELEASE mockitoVersion=1.9.5 -springSessionVersion=1.0.2.RELEASE +springSessionVersion=1.3.5.RELEASE eclipseEmfEcoreVersion=2.11.1-v20150805-0538 -tomcatEmbedVersion=8.5.5 -springSecurityVersion=4.0.3.RELEASE +tomcatEmbedVersion=8.5.37 +springSecurityVersion=4.2.11.RELEASE eclipseEmfCommonVersion=2.11.0-v20150805-0538 -springVersion=4.3.3.RELEASE +springVersion=4.3.22.RELEASE eclipseUml2TypesVersion=2.0.0-v20140602-0749 hsqlVersion=2.3.1 jsonpathVersion=2.0.0 log4jVersion=1.2.17 -springDataMongoDbVersion=1.9.3.RELEASE +mongoDbVersion=3.4.3 +springDataMongoDbVersion=1.10.18.RELEASE eclipsePersistenceVersion=2.1.1 -springDataCommonsVersion=1.12.3.RELEASE +springDataCommonsVersion=1.13.18.RELEASE jedisVersion=2.7.3 curatorVersion=2.8.0 h2Version=1.4.190 @@ -29,5 +30,5 @@ eclipseUml2UmlVersion=5.0.0-v20140602-0749 hamcrestVersion=1.3 springShellVersion=1.1.0.RELEASE jackson2Version=2.8.3 -springDataJpaVersion=1.10.3.RELEASE +springDataJpaVersion=1.11.18.RELEASE snifferVersion=1.16 diff --git a/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/mongodb/MongoDbRule.java b/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/mongodb/MongoDbRule.java index b1cf8233..4341317c 100644 --- a/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/mongodb/MongoDbRule.java +++ b/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/mongodb/MongoDbRule.java @@ -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() { diff --git a/spring-statemachine-data/build.gradle b/spring-statemachine-data/build.gradle index b59453d0..255e21e8 100644 --- a/spring-statemachine-data/build.gradle +++ b/spring-statemachine-data/build.gradle @@ -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") diff --git a/spring-statemachine-data/mongodb/src/test/java/org/springframework/statemachine/data/mongodb/MongoDbRule.java b/spring-statemachine-data/mongodb/src/test/java/org/springframework/statemachine/data/mongodb/MongoDbRule.java index 8709ba05..1e73cfe9 100644 --- a/spring-statemachine-data/mongodb/src/test/java/org/springframework/statemachine/data/mongodb/MongoDbRule.java +++ b/spring-statemachine-data/mongodb/src/test/java/org/springframework/statemachine/data/mongodb/MongoDbRule.java @@ -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() {