From d5a1f1822e37ffc66866ab42db9b0b45628b4e67 Mon Sep 17 00:00:00 2001
From: John Blum <jblum@pivotal.io>
Date: Thu, 5 Oct 2017 15:27:16 -0700
Subject: [PATCH] Upgrade to Mockito 2.10.0.

Upgrade to WebJars JQuery 1.12.4.

Upgrade to Spring Build Conventions Gradle Plugin 0.0.4.

Create Gradle properties for all dependency versions other than WebJars.
---
 build.gradle                        |  2 +-
 gradle.properties                   |  6 +++++-
 gradle/dependency-management.gradle | 18 +++++++++---------
 gradle/dependency-management.tmpl   | 22 ++++++++++------------
 4 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/build.gradle b/build.gradle
index 577f696..945f740 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	dependencies {
-		classpath 'io.spring.gradle:spring-build-conventions:0.0.3.RELEASE'
+		classpath 'io.spring.gradle:spring-build-conventions:0.0.4.RELEASE'
 		classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion"
 	}
 	repositories {
diff --git a/gradle.properties b/gradle.properties
index 554d191..dcdcdb1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,9 +1,13 @@
+antlrVersion=2.7.7
 apacheGeodeVersion=1.2.1
 assertjVersion=3.8.0
+hamcrestVersion=1.3
 junitVersion=4.12
-mockitoVersion=2.8.9
+logbackVersion=1.2.3
+mockitoVersion=2.10.0
 multithreadedtcVersion=1.01
 pivotalGemFireVersion=9.1.1
+slf4jVersion=1.7.25
 springVersion=5.0.0.RELEASE
 springBootVersion=2.0.0.M4
 springDataGemFireVersion=2.0.0.RELEASE
diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle
index dbb2068..557e74a 100644
--- a/gradle/dependency-management.gradle
+++ b/gradle/dependency-management.gradle
@@ -5,22 +5,22 @@ dependencyManagement {
 		mavenBom "org.springframework.security:spring-security-bom:$springSecurityVersion"
 	}
 	dependencies {
-		dependency 'antlr:antlr:2.7.7'
-		dependency 'ch.qos.logback:logback-classic:1.2.3'
-		dependency 'ch.qos.logback:logback-core:1.2.3'
+		dependency "antlr:antlr:$antlrVersion"
+		dependency "ch.qos.logback:logback-classic:$logbackVersion"
+		dependency "ch.qos.logback:logback-core:$logbackVersion"
 		dependency "edu.umd.cs.mtc:multithreadedtc:$multithreadedtcVersion"
 		dependency "junit:junit:$junitVersion"
 		dependency "org.assertj:assertj-core:$assertjVersion"
-		dependency 'org.hamcrest:hamcrest-core:1.3'
-		dependency 'org.hamcrest:hamcrest-library:1.3'
+		dependency "org.hamcrest:hamcrest-core:$hamcrestVersion"
+		dependency "org.hamcrest:hamcrest-library:$hamcrestVersion"
 		dependency "org.mockito:mockito-core:$mockitoVersion"
-		dependency 'org.slf4j:jcl-over-slf4j:1.7.25'
-		dependency 'org.slf4j:jul-to-slf4j:1.7.25'
-		dependency 'org.slf4j:log4j-over-slf4j:1.7.25'
+		dependency "org.slf4j:jcl-over-slf4j:$slf4jVersion"
+		dependency "org.slf4j:jul-to-slf4j:$slf4jVersion"
+		dependency "org.slf4j:log4j-over-slf4j:$slf4jVersion"
 		dependency "org.springframework.shell:spring-shell:$springShellVersion"
 		dependency 'org.webjars:bootstrap:2.3.2'
 		dependency 'org.webjars:html5shiv:3.7.3'
-		dependency 'org.webjars:jquery:1.9.0'
+		dependency 'org.webjars:jquery:1.12.4'
 		dependency 'org.webjars:knockout:2.3.0'
 		dependency 'org.webjars:sockjs-client:0.3.4'
 		dependency 'org.webjars:stomp-websocket:2.3.0'
diff --git a/gradle/dependency-management.tmpl b/gradle/dependency-management.tmpl
index e51b488..ab4c78f 100644
--- a/gradle/dependency-management.tmpl
+++ b/gradle/dependency-management.tmpl
@@ -5,27 +5,25 @@ dependencyManagement {
 		mavenBom "org.springframework.security:spring-security-bom:$springSecurityVersion"
 	}
 	dependencies {
+		dependency "antlr:antlr:$antlrVersion"
+		dependency "ch.qos.logback:logback-classic:$slf4jVersion"
+		dependency "ch.qos.logback:logback-core:$slf4jVersion"
 		dependency "edu.umd.cs.mtc:multithreadedtc:$multithreadedtcVersion"
 		dependency "junit:junit:$junitVersion"
-		dependency "org.apache.geode:geode-core:$apacheGeodeVersion"
-		dependency "org.apache.geode:geode-cq:$apacheGeodeVersion"
-		dependency "org.apache.geode:geode-wan:$apacheGeodeVersion"
-		dependency 'org.hamcrest:hamcrest-core:1.3'
-		dependency 'org.hamcrest:hamcrest-library:1.3'
+		dependency "org.assertj:assertj-core:$assertjVersion"
+		dependency "org.hamcrest:hamcrest-core:$hamcrestVersion"
+		dependency "org.hamcrest:hamcrest-library:$hamcrestVersion"
 		dependency "org.mockito:mockito-core:$mockitoVersion"
-		dependency 'org.slf4j:jcl-over-slf4j:1.7.25'
-		dependency 'org.slf4j:jul-to-slf4j:1.7.25'
-		dependency 'org.slf4j:log4j-over-slf4j:1.7.25'
-		dependency 'org.slf4j:slf4j-api:1.7.25'
+		dependency "org.slf4j:jcl-over-slf4j:$slf4jVersion"
+		dependency "org.slf4j:jul-to-slf4j:$slf4jVersion"
+		dependency "org.slf4j:log4j-over-slf4j:$slf4jVersion"
 		dependency "org.springframework.shell:spring-shell:$springShellVersion"
 		dependency 'org.webjars:bootstrap:2.3.2'
 		dependency 'org.webjars:html5shiv:3.7.3'
-		dependency 'org.webjars:jquery:1.9.0'
+		dependency 'org.webjars:jquery:1.12.4'
 		dependency 'org.webjars:knockout:2.3.0'
 		dependency 'org.webjars:sockjs-client:0.3.4'
 		dependency 'org.webjars:stomp-websocket:2.3.0'
-		dependency 'org.webjars:webjars-locator:0.32-1'
-		dependency 'org.webjars:webjars-locator-core:0.32'
 		dependency 'org.webjars:webjars-taglib:0.3'
 	}
 }