Merge branch '1.2.x'

wilkinsona · wilkinsona · commit 1df2d168257a · 2019-06-18T13:42:13.000+01:00
diff --git a/build.gradle b/build.gradle
@@ -8,8 +8,8 @@ buildscript {
 	}
 	dependencies {
 		classpath 'org.springframework.build.gradle:propdeps-plugin:0.0.7'
-		classpath 'io.spring.gradle:spring-io-plugin:0.0.8.RELEASE'
 		classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.6.2'
+		classpath 'io.spring.gradle:dependency-management-plugin:1.0.8.RELEASE'
 		classpath "io.spring.javaformat:spring-javaformat-gradle-plugin:$javaFormatVersion"
 		classpath 'io.spring.nohttp:nohttp-gradle:0.0.2.RELEASE'
 	}

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@ buildscript {`
`8`	`8`	`}`
`9`	`9`	`dependencies {`
`10`	`10`	`classpath 'org.springframework.build.gradle:propdeps-plugin:0.0.7'`
`11`		`- classpath 'io.spring.gradle:spring-io-plugin:0.0.8.RELEASE'`
`12`	`11`	`classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.6.2'`
	`12`	`+ classpath 'io.spring.gradle:dependency-management-plugin:1.0.8.RELEASE'`
`13`	`13`	`classpath "io.spring.javaformat:spring-javaformat-gradle-plugin:$javaFormatVersion"`
`14`	`14`	`classpath 'io.spring.nohttp:nohttp-gradle:0.0.2.RELEASE'`
`15`	`15`	`}`