Switch to better dependency management (Netflix#525)

Move versions out of properties file into dependencyManagement closure

build.gradle

@@ -74,6 +74,28 @@ configure(javaProjects) {
             mavenBom "io.spring.platform:platform-bom:${spring_platform_version}"
             mavenBom "org.springframework.cloud:spring-cloud-dependencies:${spring_cloud_version}"
         }
+        dependencies {
+            dependency("cglib:cglib-nodep:3.2.4")
+            dependency("com.github.fge:json-patch:1.9")
+            dependency("com.github.springtestdbunit:spring-test-dbunit:1.3.0")
+            dependencySet(group: "com.squareup.retrofit2", version: "2.1.0") {
+                entry "retrofit"
+                entry "converter-jackson"
+            }
+            dependency("com.netflix.spectator:spectator-api:0.30.0")
+            dependencySet(group: "io.springfox", version: "2.7.0") {
+                entry "springfox-swagger2"
+                entry "springfox-swagger-ui"
+                entry "springfox-bean-validators"
+            }
+            dependency("commons-validator:commons-validator:1.5.1")
+            dependency("net.sf.jtidy:jtidy:r938")
+            dependency("org.apache.commons:commons-configuration2:2.1")
+            dependency("org.apache.commons:commons-exec:1.3")
+            dependency("org.bitbucket.b_c:jose4j:0.5.4")
+            dependency("org.dbunit:dbunit:2.5.3")
+            dependency("org.springframework.security.extensions:spring-security-saml2-core:1.0.2.RELEASE")
+        }
     }
 
     ext {
@@ -119,7 +141,7 @@ configure(javaProjects) {
          * Test Dependencies
          *******************************/
 
-        testCompile("cglib:cglib-nodep:${cglib_nodep_version}")
+        testCompile("cglib:cglib-nodep")
         testCompile("org.spockframework:spock-core")
         testCompile("org.spockframework:spock-spring")
         testCompile("org.springframework.boot:spring-boot-starter-test")

genie-client/build.gradle

@@ -7,15 +7,15 @@ dependencies {
 
     compile("commons-beanutils:commons-beanutils")
     compile("com.squareup.okhttp3:okhttp")
-    compile("com.squareup.retrofit2:retrofit:${retrofit_version}")
-    compile("com.squareup.retrofit2:converter-jackson:${retrofit_version}")
-    compile("org.apache.commons:commons-configuration2:${commons_configuration2_version}")
+    compile("com.squareup.retrofit2:retrofit")
+    compile("com.squareup.retrofit2:converter-jackson")
+    compile("org.apache.commons:commons-configuration2")
 
     // Logging
     compile("org.slf4j:slf4j-api")
 
     // JSON Patch Support
-    compile("com.github.fge:json-patch:${json_patch_version}")
+    compile("com.github.fge:json-patch")
 
     /*******************************
      * Provided Dependencies

genie-core/build.gradle

@@ -14,15 +14,15 @@ dependencies {
     compile project(":genie-common")
 
     // JSON Patch Support
-    compile("com.github.fge:json-patch:${json_patch_version}")
+    compile("com.github.fge:json-patch")
 
     // Commons Libs
     compile("commons-httpclient:commons-httpclient")
     compile("commons-io:commons-io")
-    compile("org.apache.commons:commons-exec:${commons_exec_version}")
+    compile("org.apache.commons:commons-exec")
 
     // Netflix Libs
-    compile("com.netflix.spectator:spectator-api:${spectator_version}")
+    compile("com.netflix.spectator:spectator-api")
 
     // Spring Libs
     compile("org.springframework.boot:spring-boot-starter-aop")
@@ -52,8 +52,8 @@ dependencies {
      *******************************/
 
     testCompile(project(":genie-test"))
-    testCompile("org.dbunit:dbunit:${dbunit_version}")
-    testCompile("com.github.springtestdbunit:spring-test-dbunit:${spring_test_dbunit_version}")
+    testCompile("org.dbunit:dbunit")
+    testCompile("com.github.springtestdbunit:spring-test-dbunit")
 
     /*******************************
      * JPA Model Gen Dependencies

genie-web/build.gradle

@@ -18,17 +18,17 @@ dependencies {
     compile(project(":genie-core"))
 
     // Swagger libs
-    compile("io.springfox:springfox-swagger2:${springfox_version}")
-    compile("io.springfox:springfox-swagger-ui:${springfox_version}")
-    compile("io.springfox:springfox-bean-validators:${springfox_version}")
+    compile("io.springfox:springfox-swagger2")
+    compile("io.springfox:springfox-swagger-ui")
+    compile("io.springfox:springfox-bean-validators")
 
     // Commons
-    compile("org.apache.commons:commons-exec:${commons_exec_version}")
+    compile("org.apache.commons:commons-exec")
     compile("org.apache.httpcomponents:httpclient")
-    compile("commons-validator:commons-validator:${commons_validator_version}")
+    compile("commons-validator:commons-validator")
 
     // JWT JOSE implementation lib
-    compile("org.bitbucket.b_c:jose4j:${jose4j_version}")
+    compile("org.bitbucket.b_c:jose4j")
 
     // Spring Libs
     compile("org.springframework.boot:spring-boot-starter-actuator")
@@ -44,7 +44,7 @@ dependencies {
     compile("org.springframework.cloud:spring-cloud-starter-eureka")
     compile("org.springframework.cloud:spring-cloud-starter-spectator")
     compile("org.springframework.security:spring-security-jwt")
-    compile("org.springframework.security.extensions:spring-security-saml2-core:${spring_security_saml_version}") {
+    compile("org.springframework.security.extensions:spring-security-saml2-core") {
         exclude group: "org.bouncycastle", module: "bcprov-jdk15"
     }
     compile("org.springframework.security.oauth:spring-security-oauth2")
@@ -72,11 +72,11 @@ dependencies {
      *******************************/
 
     testCompile(project(":genie-test"))
-    testCompile("com.github.springtestdbunit:spring-test-dbunit:${spring_test_dbunit_version}")
+    testCompile("com.github.springtestdbunit:spring-test-dbunit")
     testCompile("com.github.tomakehurst:wiremock")
     testCompile("com.jayway.jsonpath:json-path")
-    testCompile("net.sf.jtidy:jtidy:${jtidy_version}")
-    testCompile("org.dbunit:dbunit:${dbunit_version}")
+    testCompile("net.sf.jtidy:jtidy")
+    testCompile("org.dbunit:dbunit")
     testCompile("org.springframework.boot:spring-boot-starter-jetty")
     testCompile("org.springframework.restdocs:spring-restdocs-core")
     testCompile("org.springframework.restdocs:spring-restdocs-mockmvc")

gradle.properties

@@ -27,33 +27,3 @@ spring_platform_version=Brussels-SR2
 
 # Back bouncy castle down to 1.47 as 1.56 breaks SAML dependency
 bouncycastle.version=1.47
-
-## Un-versioned Spring Platform IO Library Versions
-
-commons_exec_version=1.3
-commons_configuration2_version=2.1
-commons_validator_version=1.5.1
-
-# JWT Related Libraries
-jose4j_version=0.5.4
-
-# JSON Patch Libraries
-json_patch_version=1.9
-
-# Spring Libraries NOT Covered by IO Platform
-spring_security_saml_version=1.0.2.RELEASE
-
-# Netflix Libraries
-spectator_version=0.30.0
-
-# Retrofit Libraries
-retrofit_version=2.1.0
-
-# Swagger Libraries
-springfox_version=2.7.0
-
-# Test Libraries
-dbunit_version=2.5.3
-jtidy_version=r938
-spring_test_dbunit_version=1.3.0
-cglib_nodep_version=3.2.4