Merge branch '1.2.x'

Author: wilkinsona

build.gradle

@@ -7,14 +7,9 @@ buildscript {
 	}
 	dependencies {
 		classpath 'org.springframework.build.gradle:propdeps-plugin:0.0.7'
-		classpath 'io.spring.gradle:spring-io-plugin:0.0.8.BUILD-SNAPSHOT'
+		classpath 'io.spring.gradle:spring-io-plugin:0.0.8.RELEASE'
 		classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.2.1'
 	}
-	configurations.classpath.resolutionStrategy.eachDependency {
-		if (it.requested.name == 'dependency-management-plugin') {
-			it.useVersion '1.0.1.RELEASE'
-		}
-	}
 }
 
 allprojects {
@@ -40,7 +35,7 @@ sonarqube {
 }
 
 ext {
-	springVersion = '5.0.0.RC1'
+	springVersion = '5.0.0.RC4'
 	javadocLinks = [
 		'http://docs.oracle.com/javase/8/docs/api/',
 		"http://docs.spring.io/spring-framework/docs/$springVersion/javadoc-api/",
@@ -66,23 +61,23 @@ subprojects {
 			mavenBom "org.springframework:spring-framework-bom:$springVersion"
 		}
 		dependencies {
-			dependency 'com.fasterxml.jackson.core:jackson-databind:2.9.0.pr3'
+			dependency 'com.fasterxml.jackson.core:jackson-databind:2.9.1'
 			dependency 'com.samskivert:jmustache:1.12'
 			dependency 'commons-codec:commons-codec:1.10'
 			dependency 'javax.servlet:javax.servlet-api:3.1.0'
 			dependency 'javax.validation:validation-api:1.1.0.Final'
 			dependency 'junit:junit:4.12'
-			dependency 'io.rest-assured:rest-assured:3.0.2'
-			dependency 'org.apache.pdfbox:pdfbox:2.0.6'
-			dependency 'org.asciidoctor:asciidoctorj:1.5.5'
-			dependency 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.15'
+			dependency 'io.rest-assured:rest-assured:3.0.3'
+			dependency 'org.apache.pdfbox:pdfbox:2.0.7'
+			dependency 'org.asciidoctor:asciidoctorj:1.5.6'
+			dependency 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.16'
 			dependency 'org.hamcrest:hamcrest-core:1.3'
 			dependency 'org.hamcrest:hamcrest-library:1.3'
 			dependency 'org.hibernate:hibernate-validator:5.4.1.Final'
 			dependency 'org.mockito:mockito-core:1.10.19'
 			dependency 'org.junit.jupiter:junit-jupiter-api:5.0.0-M4'
 			dependency 'org.springframework.hateoas:spring-hateoas:0.23.0.RELEASE'
-			dependency 'org.jacoco:org.jacoco.agent:0.7.7.201606060606'
+			dependency 'org.jacoco:org.jacoco.agent:0.7.9'
 		}
 	}