Merge pull request apache#2936 from PurelyApplied/geode-6123

GEODE-6123: Be consistent in dependency declaration style.

buildSrc/build.gradle

@@ -22,15 +22,15 @@ repositories {
 }
 
 dependencies {
-  compile (group: 'org.apache.geode', name: 'geode-junit', version: '1.3.0') {
+  compile ('org.apache.geode:geode-junit:1.3.0') {
     exclude group: 'org.apache.logging.log4j'
   }
   compile gradleApi()
   compile 'org.apache.commons:commons-lang3:3.3.2'
   compile 'org.apache.maven:maven-artifact:3.3.3'
   compile 'com.github.docker-java:docker-java:3.1.2-GEODE'
 
-  compile group: 'junit', name: 'junit', version: '4.12'
+  compile 'junit:junit:4.12'
 
   testAnnotationProcessor this.project
 }

extensions/geode-modules-session/build.gradle

@@ -37,9 +37,9 @@ dependencies {
   }
   integrationTestCompile('commons-io:commons-io:' + project.'commons-io.version')
   integrationTestCompile('javax.servlet:javax.servlet-api:' + project.'javax.servlet-api.version')
-  integrationTestCompile('junit:junit:4.12')
+  integrationTestCompile('junit:junit:' + project.'junit.version')
   integrationTestCompile('org.apache.tomcat:jasper:' + project.'tomcat6.version')
-  integrationTestCompile('org.assertj:assertj-core:3.10.0')
+  integrationTestCompile('org.assertj:assertj-core:' + project.'assertj-core.version')
   integrationTestCompile('org.eclipse.jetty:jetty-http:' + project.'jetty.version' + ':tests')
   integrationTestCompile('org.eclipse.jetty:jetty-server:' + project.'jetty.version')
   integrationTestCompile('org.eclipse.jetty:jetty-servlet:' + project.'jetty.version' + ':tests')

geode-assembly/build.gradle

@@ -177,7 +177,7 @@ dependencies {
   distributedTestRuntime(project(':extensions:geode-modules-session-internal')) {
     exclude group: 'org.apache.tomcat'
   }
-  distributedTestRuntime(group: 'org.codehaus.cargo', name: 'cargo-core-uberjar', version: '1.6.3')
+  distributedTestRuntime('org.codehaus.cargo:cargo-core-uberjar:' + project.'uberjar.version')
 
 
   acceptanceTestCompile(project(':geode-core'))
@@ -209,17 +209,17 @@ dependencies {
 
   upgradeTestRuntime(project(':geode-old-versions'))
   upgradeTestRuntime(project(':extensions:session-testing-war'))
-  upgradeTestRuntime(group: 'org.codehaus.cargo', name: 'cargo-core-uberjar', version: '1.6.3')
+  upgradeTestRuntime('org.codehaus.cargo:cargo-core-uberjar:' + project.'uberjar.version')
   upgradeTestRuntime('org.apache.httpcomponents:httpclient:' + project.'httpclient.version')
   upgradeTestRuntime files({ downloadWebServers } )
 
   //Web servers used for session module testing
-  webServerTomcat6 group: 'apache', name: 'tomcat', version: project.'tomcat6.version', ext: 'zip'
-  webServerTomcat7 group: 'org.apache.tomcat', name: 'tomcat', version: project.'tomcat7.version', ext: 'zip'
-  webServerTomcat8 group: 'org.apache.tomcat', name: 'tomcat', version: project.'tomcat8.version', ext: 'zip'
-  webServerTomcat9 group: 'org.apache.tomcat', name: 'tomcat', version: project.'tomcat9.version', ext: 'zip'
-  webServerJetty group: 'org.eclipse.jetty', name: 'jetty-distribution', version: project.'jetty.version', ext: 'zip'
-
+  webServerTomcat6('apache:tomcat:' + project.'tomcat6.version' + '@zip')
+  webServerTomcat7('org.apache.tomcat:tomcat:' + project.'tomcat7.version' + '@zip')
+  webServerTomcat8('org.apache.tomcat:tomcat:' + project.'tomcat8.version' + '@zip')
+  webServerTomcat9('org.apache.tomcat:tomcat:' + project.'tomcat9.version' + '@zip')
+  webServerJetty('org.eclipse.jetty:jetty-distribution:' + project.'jetty.version' + '@zip')
+  
   gfshDependencies ('org.springframework:spring-web:' + project.'springframework.version'){
     exclude module: 'spring-core'
     exclude module: 'commons-logging'

geode-assembly/geode-assembly-test/build.gradle

@@ -26,7 +26,7 @@ dependencies {
   compileOnly('org.apache.httpcomponents:httpclient:' + project.'httpclient.version')
   compileOnly('org.apache.logging.log4j:log4j-api:' + project.'log4j.version')
   compileOnly('org.assertj:assertj-core:' + project.'assertj-core.version')
-  compileOnly(group: 'org.codehaus.cargo', name: 'cargo-core-uberjar', version: '1.6.3')
+  compileOnly('org.codehaus.cargo:cargo-core-uberjar:' + project.'uberjar.version')
 }
 
 disableMavenPublishing()

geode-connectors/build.gradle

@@ -49,7 +49,7 @@ dependencies {
     exclude module: 'geode-core'
   }
 
-  compile('com.zaxxer:HikariCP:3.2.0')
+  compile('com.zaxxer:HikariCP:' + project.'HikariCP.version')
   compile('org.apache.commons:commons-lang3:' + project.'commons-lang3.version')
   compile('javax.xml.bind:jaxb-api:' + project.'jaxb.version')
   compile('org.apache.logging.log4j:log4j-api:' + project.'log4j.version')
@@ -70,13 +70,12 @@ dependencies {
   testCompile('pl.pragmatists:JUnitParams:' + project.'JUnitParams.version')
 
   integrationTestCompile('junit:junit:' + project.'junit.version')
-  integrationTestCompile('junit:junit:4.12')
   integrationTestCompile('org.assertj:assertj-core:' + project.'assertj-core.version')
   integrationTestCompile('pl.pragmatists:JUnitParams:' + project.'JUnitParams.version')
 
   distributedTestCompile('junit:junit:' + project.'junit.version')
   distributedTestCompile('org.assertj:assertj-core:' + project.'assertj-core.version')
-  distributedTestCompile('org.mockito:mockito-core:2.19.1')
+  distributedTestCompile('org.mockito:mockito-core:' + project.'mockito-core.version')
   distributedTestCompile('pl.pragmatists:JUnitParams:' + project.'JUnitParams.version')
   distributedTestRuntime('org.apache.derby:derby:' + project.'derby.version')
 
@@ -87,13 +86,13 @@ dependencies {
   acceptanceTestCompile('org.assertj:assertj-core:' + project.'assertj-core.version')
   acceptanceTestCompile('org.awaitility:awaitility:' + project.'awaitility.version')
   acceptanceTestCompile('org.mockito:mockito-core:' + project.'mockito-core.version')
-  acceptanceTestCompile(group: 'com.palantir.docker.compose', name: 'docker-compose-rule-core', version: '0.31.1')
+  acceptanceTestCompile('com.palantir.docker.compose:docker-compose-rule-core:' + project.'docker-compose-rule.version')
   acceptanceTestCompile('pl.pragmatists:JUnitParams:' + project.'JUnitParams.version')
-  acceptanceTestCompile(group: 'com.palantir.docker.compose', name: 'docker-compose-rule-junit4', version: '0.31.1')
+  acceptanceTestCompile('com.palantir.docker.compose:docker-compose-rule-junit4:' + project.'docker-compose-rule.version')
 
-  acceptanceTestRuntime(group: 'mysql', name: 'mysql-connector-java', version: '5.1.46')
-  acceptanceTestRuntime(group: 'org.apache.derby', name: 'derby', version: project.'derby.version')
-  acceptanceTestRuntime(group: 'org.postgresql', name: 'postgresql', version: '42.2.2')
+  acceptanceTestRuntime('mysql:mysql-connector-java:' + project.'mysql-connector.version')
+  acceptanceTestRuntime('org.apache.derby:derby:' + project.'derby.version')
+  acceptanceTestRuntime('org.postgresql:postgresql:' + project.'postgresql.version')
 }
 
 integrationTest.forkEvery 0

geode-lucene/geode-lucene-test/build.gradle

@@ -17,7 +17,7 @@
 
 
 dependencies {
-  compile('org.apache.lucene:lucene-core:6.6.2')
+  compile('org.apache.lucene:lucene-core:' + project.'lucene.version')
   compile(project(':geode-core'))
   compileOnly(project(':geode-lucene'))
 

gradle/dependency-versions.properties

@@ -33,6 +33,7 @@ commons-lang3.version = 3.8.1
 commons-logging.version = 1.2
 commons-modeler.version = 2.0.1
 commons-validator.version = 1.6
+docker-compose-rule.version = 0.31.1
 HikariCP.version = 3.2.0
 derby.version = 10.14.2.0
 dom4j.version = 1.6.1
@@ -78,8 +79,10 @@ mortbay-jetty-servlet-api.version=3.0.20100224
 mx4j.version = 3.0.2
 mx4j-remote.version = 3.0.2
 mx4j-tools.version = 3.0.1
+mysql-connector.version = 5.1.46
 netty-all.version = 4.1.31.Final
 open-json.version = 1.8
+postgresql.version = 42.2.2
 powermock.version = 2.0.0-beta.5
 protobuf-gradle-plugin.version = 0.8.6
 protobuf-java.version = 3.6.1
@@ -106,4 +109,5 @@ tomcat6.version = 6.0.37
 tomcat7.version = 7.0.90
 tomcat8.version = 8.5.34
 tomcat9.version = 9.0.12
+uberjar.version = 1.6.3
 xercesImpl.version = 2.12.0

gradle/test.gradle

@@ -108,13 +108,13 @@ subprojects {
 
     // This 'apt' configuration to be removed by GEODE-5606.
     apt files("${rootProject.projectDir}/buildSrc/build/libs/buildSrc.jar")
-    apt(group: 'junit', name: 'junit', version: project.'junit.version') {
+    apt('junit:junit:' + project.'junit.version') {
       transitive = false
     }
     // Because EnsureCorrectRunsWithProcessor needs access to
     // CategoryWithParameterizedRunnerFactory.
     // buildSrc uses version 1.3.0, so we use it here instead of the local geode-junit project
-    apt(group: 'org.apache.geode', name: 'geode-junit', version: '1.3.0') {
+    apt('org.apache.geode:geode-junit:1.3.0') {
       transitive = false
     }