Upgrade to Spring Boot 1.5.4 (#155)

Netflix · Jun 21, 2017 · ff0cd73 · ff0cd73
1 parent fb784b1
commit ff0cd73
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,7 @@
 language: java
 sudo: required
 dist: trusty
+group: deprecated-2017Q2
 jdk:
  - oraclejdk8
 services:

diff --git a/gradle.properties b/gradle.properties
@@ -19,9 +19,9 @@
 ## Spring Dependency Versions
 
 # Used in documentation and for including the Gradle plugin
-spring_boot_version=1.5.3.RELEASE
+spring_boot_version=1.5.4.RELEASE
 spring_cloud_version=Dalston.SR1
-spring_platform_version=Brussels-SR2
+spring_platform_version=Brussels-SR3
 
 ## Override Spring Platform IO Versions
 
@@ -35,4 +35,6 @@ tomcat.version=8.0.22
 
 hive_version=1.2.1
 
+## Gradle Properties
+
 org.gradle.parallel=true
diff --git a/metacat-functional-tests/build.gradle b/metacat-functional-tests/build.gradle
@@ -143,7 +143,7 @@ task metacatPorts {
 }
 
 task functionalTest(type: Test) {
- testClassesDir = sourceSets.functionalTest.output.classesDir
+ testClassesDirs = sourceSets.functionalTest.output.classesDirs
  classpath = sourceSets.functionalTest.runtimeClasspath
  outputs.upToDateWhen { false }
 

diff --git a/metacat-main/build.gradle b/metacat-main/build.gradle
@@ -18,6 +18,7 @@
 
 configurations {
  all*.exclude module: "jsr311-api"
+ all*.exclude module: "slf4j-log4j12"
 }
 
 dependencies {
@@ -73,6 +74,7 @@ dependencies {
  runtime("io.springfox:springfox-swagger-ui")
  runtime("org.webjars:hal-browser")
  runtime("org.springframework:spring-aspects")
+
  /*******************************
  * Test Dependencies
  *******************************/

diff --git a/metacat-war/build.gradle b/metacat-war/build.gradle
@@ -20,6 +20,7 @@ apply plugin: "war"
 
 configurations {
  all*.exclude module: "jsr311-api"
+ all*.exclude module: "slf4j-log4j12"
 }
 
 dependencies {
@@ -42,6 +43,7 @@ dependencies {
  /*******************************
  * Runtime Dependencies
  *******************************/
+
  runtime("org.springframework:spring-aspects")
 
  /*******************************