Upgrade to Spring Boot 2.1.x

- Simple boot 2.1.x upgrade
- Pump up gradle to 4.4 as required
- Allow one test to override bean as that's what it does
- Fixes #602
This commit is contained in:
Janne Valkealahti
2018-11-11 07:48:06 +00:00
parent efce68bab0
commit 2c9d951f99
5 changed files with 6 additions and 5 deletions

View File

@@ -1,7 +1,7 @@
buildscript {
ext {
log4jVersion = '1.2.17'
springBootVersion = '2.0.3.RELEASE'
springBootVersion = '2.1.0.RELEASE'
eclipsePersistenceVersion = '2.1.1'
kryoVersion = '3.0.3'
springCloudClusterVersion = '1.0.2.RELEASE'
@@ -661,7 +661,7 @@ configure(rootProject) {
task wrapper(type: Wrapper) {
description = 'Generates gradlew[.bat] scripts'
gradleVersion = '4.1'
gradleVersion = '4.4.1'
}
}

View File

@@ -1 +1 @@
version=2.0.4.BUILD-SNAPSHOT
version=2.1.0.BUILD-SNAPSHOT

Binary file not shown.

View File

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip

View File

@@ -46,7 +46,8 @@ import demo.eventservice.StateMachineConfig.Events;
import demo.eventservice.StateMachineConfig.States;
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = { Application.class, Config.class })
@SpringBootTest(classes = { Application.class,
Config.class }, properties = "spring.main.allow-bean-definition-overriding=true")
@WebAppConfiguration
@DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD)
public class EventServiceTests {