From d8f96874f9250d3ba6c2159b185e50e71fa225aa Mon Sep 17 00:00:00 2001
From: John Blum <jblum@vmware.com>
Date: Tue, 18 May 2021 21:45:13 -0700
Subject: [PATCH] Replace Spring Boot dependency management with explicit
 dependency management.

Declaere the Spring Framework BOM.

Declare the Spring Data BOM.

Declare dependency management for javax.servlet:javax.servlet-api.

Declare dependency management for the following libs:

* AssertJ
* JUnit
* Mockito
* JCL to SLF4J
* Log4J to SLF4J
* Logback
* Selenium HtmlUnit
* SLF4J
* Spring Security
---
 gradle.properties                   |  9 +++++++++
 gradle/dependency-management.gradle | 21 ++++++++++++++++-----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 327880d..3473d35 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,9 +3,17 @@ deployDocsHost=docs-ip.spring.io
 antlrVersion=2.7.7
 apacheGeodeVersion=1.13.2
 apacheTaglibsStandardVersion=1.2.5
+assertjVersion=3.19.0
 findbugsVersion=3.0.2
+javaxServletApiVersion=4.0.1
 javaxServletJspJstlApiVersion=1.2.2
+junitVersion=4.13.2
+log4jVersion=2.14.1
+logbackVersion=1.2.3
+mockitoVersion=3.10.0
 multithreadedtcVersion=1.01
+seleniumHtmlUnitVersion=2.50.0
+slf4jVersion=1.7.30
 # The Spring Boot & Spring Session version are the only required version properties.
 # The other Spring version properties are for overriding/testing purposes.
 springVersion=5.3.7
@@ -14,6 +22,7 @@ springDataBomVersion=2021.0.1
 springDataCommonsVersion=2.5.1
 springDataGeodeVersion=2.5.1
 springDataGeodeTestVersion=0.0.25
+springSecurityVersion=5.5.0
 springSessionVersion=2.5.0
 springSessionBomVersion=2021.0.0-SNAPSHOT
 springShellVersion=1.2.0.RELEASE
diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle
index e1c750a..3131b53 100644
--- a/gradle/dependency-management.gradle
+++ b/gradle/dependency-management.gradle
@@ -1,23 +1,34 @@
 dependencyManagement {
 	imports {
-		mavenBom "org.springframework.boot:spring-boot-dependencies:$springBootVersion"
-//		mavenBom "org.springframework:spring-framework-bom:${springVersion}"
-//		mavenBom "org.springframework.data:spring-data-bom:${springDataBomVersion}"
+//		mavenBom "org.springframework.boot:spring-boot-dependencies:$springBootVersion"
+		mavenBom "org.springframework:spring-framework-bom:${springVersion}"
+		mavenBom "org.springframework.data:spring-data-bom:${springDataBomVersion}"
 //		mavenBom "org.springframework.session:spring-session-bom:${springSessionBomVersion}"
 	}
 	dependencies {
-		dependency "antlr:antlr:$antlrVersion"
-		dependency "edu.umd.cs.mtc:multithreadedtc:$multithreadedtcVersion"
+		dependency "javax.servlet:javax.servlet-api:$javaxServletApiVersion"
 		dependency "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$javaxServletJspJstlApiVersion"
+		dependency "antlr:antlr:$antlrVersion"
+		dependency "ch.qos.logback:logback-classic:$logbackVersion"
+		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-lucene:$apacheGeodeVersion"
 //		dependency "org.apache.geode:geode-wan:$apacheGeodeVersion"
+		dependency "org.apache.logging.log4j:log4j-to-slf4j:$log4jVersion"
 		dependency "org.apache.taglibs:taglibs-standard-impl:$apacheTaglibsStandardVersion"
 		dependency "org.apache.taglibs:taglibs-standard-jstlel:$apacheTaglibsStandardVersion"
 		dependency "org.apache.taglibs:taglibs-standard-spec:$apacheTaglibsStandardVersion"
+		dependency "org.assertj:assertj-core:$assertjVersion"
+		dependency "org.mockito:mockito-core:$mockitoVersion"
+		dependency "org.seleniumhq.selenium:htmlunit-driver:$seleniumHtmlUnitVersion"
+		dependency "org.slf4j:jcl-over-slf4j:$slf4jVersion"
+		dependency "org.slf4j:log4j-over-slf4j:$slf4jVersion"
 		dependency "org.springframework.data:spring-data-geode:$springDataGeodeVersion"
 		dependency "org.springframework.data:spring-data-geode-test:$springDataGeodeTestVersion"
+		dependency "org.springframework.security:spring-security-test:$springSecurityVersion"
+		dependency "org.springframework.security:spring-security-web:$springSecurityVersion"
 		dependency "org.springframework.session:spring-session-core:$springSessionVersion"
 		dependency "org.springframework.shell:spring-shell:$springShellVersion"
 		dependency 'org.webjars:bootstrap:2.3.2'