GEODE-6532: Use implementation, not compile, as build configuration (a…

…pache#4720)
rnsasg · Feb 26, 2020 · 4cffa58 · 4cffa58
1 parent 5f7312a
commit 4cffa58
Show file tree

Hide file tree

Showing 59 changed files with 936 additions and 849 deletions.
diff --git a/boms/geode-all-bom/src/test/resources/expected-pom.xml b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -301,6 +301,18 @@
         <version>5.0.4</version>
         <scope>compile</scope>
       </dependency>
+      <dependency>
+        <groupId>net.sourceforge.pmd</groupId>
+        <artifactId>pmd-java</artifactId>
+        <version>6.20.0</version>
+        <scope>compile</scope>
+      </dependency>
+      <dependency>
+        <groupId>net.sourceforge.pmd</groupId>
+        <artifactId>pmd-test</artifactId>
+        <version>6.20.0</version>
+        <scope>compile</scope>
+      </dependency>
       <dependency>
         <groupId>net.spy</groupId>
         <artifactId>spymemcached</artifactId>

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -25,17 +25,17 @@ repositories {
 }
 
 dependencies {
-  testRuntime ('org.apache.geode:geode-junit:1.3.0') {
+  testRuntime('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.0.14'
+  implementation(gradleApi())
+  implementation('org.apache.commons:commons-lang3:3.3.2')
+  implementation('org.apache.maven:maven-artifact:3.3.3')
+  implementation('com.github.docker-java:docker-java:3.0.14')
 
-  compile 'junit:junit:4.12'
+  implementation('junit:junit:4.12')
 
-  testAnnotationProcessor this.project
+  testAnnotationProcessor(this.project)
 }
 
 sourceSets {

diff --git a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
@@ -128,6 +128,8 @@ class DependencyConstraints implements Plugin<Project> {
         api(group: 'net.java.dev.jna', name: 'jna-platform', version: '5.5.0')
         api(group: 'net.openhft', name: 'compiler', version: '2.3.4')
         api(group: 'net.sf.jopt-simple', name: 'jopt-simple', version: '5.0.4')
+        api(group: 'net.sourceforge.pmd', name: 'pmd-java', version: '6.20.0')
+        api(group: 'net.sourceforge.pmd', name: 'pmd-test', version: '6.20.0')
         api(group: 'net.spy', name: 'spymemcached', version: '2.12.3')
         api(group: 'org.apache.bcel', name: 'bcel', version: '6.2')
         api(group: 'org.apache.commons', name: 'commons-lang3', version: get('commons-lang3.version'))

diff --git a/extensions/geode-modules-session-internal/build.gradle b/extensions/geode-modules-session-internal/build.gradle
@@ -27,10 +27,10 @@ dependencies {
   compile(project(':geode-core'))
   implementation(project(':geode-logging'))
 
-  compile('javax.servlet:javax.servlet-api')
-  compile('mx4j:mx4j')
-  compile('org.apache.tomcat:servlet-api:' + DependencyConstraints.get('tomcat6.version'))
-  compile('org.slf4j:slf4j-api')
+  implementation('javax.servlet:javax.servlet-api')
+  implementation('mx4j:mx4j')
+  implementation('org.apache.tomcat:servlet-api:' + DependencyConstraints.get('tomcat6.version'))
+  implementation('org.slf4j:slf4j-api')
 }
 
 jar {

diff --git a/extensions/geode-modules-session/build.gradle b/extensions/geode-modules-session/build.gradle
@@ -29,38 +29,38 @@ dependencies {
     exclude module: 'geode-modules'
   }
   compile(project(':geode-core'))
-  integrationTestCompile(project(':extensions:geode-modules'))
-  integrationTestCompile(project(':geode-dunit')) {
+  integrationTestImplementation(project(':extensions:geode-modules'))
+  integrationTestImplementation(project(':geode-dunit')) {
     exclude module: 'geode-core'
   }
   integrationTestImplementation(project(':geode-logging'))
 
-  compile('javax.servlet:javax.servlet-api')
-  compile('org.apache.tomcat:servlet-api:' + DependencyConstraints.get('tomcat6.version'))
-  compile('org.slf4j:slf4j-api')
+  implementation('javax.servlet:javax.servlet-api')
+  implementation('org.apache.tomcat:servlet-api:' + DependencyConstraints.get('tomcat6.version'))
+  implementation('org.slf4j:slf4j-api')
 
-  integrationTestCompile('com.mockrunner:mockrunner-servlet') {
+  integrationTestImplementation('com.mockrunner:mockrunner-servlet') {
     exclude group: 'jboss'
     exclude group: 'xerces'
   }
-  integrationTestCompile('commons-io:commons-io')
-  integrationTestCompile('javax.servlet:javax.servlet-api')
-  integrationTestCompile('junit:junit')
-  integrationTestCompile('org.apache.tomcat:jasper:' + DependencyConstraints.get('tomcat6.version'))
-  integrationTestCompile('org.assertj:assertj-core')
-  integrationTestCompile('org.eclipse.jetty:jetty-http:' + DependencyConstraints.get('jetty.version') + ':tests')
-  integrationTestCompile('org.eclipse.jetty:jetty-server')
-  integrationTestCompile('org.eclipse.jetty:jetty-servlet:' + DependencyConstraints.get('jetty.version') + ':tests')
-  integrationTestCompile('org.eclipse.jetty:jetty-servlet:' + DependencyConstraints.get('jetty.version'))
-  integrationTestCompile('org.eclipse.jetty:jetty-util')
-  integrationTestCompile('org.httpunit:httpunit') {
+  integrationTestImplementation('commons-io:commons-io')
+  integrationTestImplementation('javax.servlet:javax.servlet-api')
+  integrationTestImplementation('junit:junit')
+  integrationTestImplementation('org.apache.tomcat:jasper:' + DependencyConstraints.get('tomcat6.version'))
+  integrationTestImplementation('org.assertj:assertj-core')
+  integrationTestImplementation('org.eclipse.jetty:jetty-http:' + DependencyConstraints.get('jetty.version') + ':tests')
+  integrationTestImplementation('org.eclipse.jetty:jetty-server')
+  integrationTestImplementation('org.eclipse.jetty:jetty-servlet:' + DependencyConstraints.get('jetty.version') + ':tests')
+  integrationTestImplementation('org.eclipse.jetty:jetty-servlet:' + DependencyConstraints.get('jetty.version'))
+  integrationTestImplementation('org.eclipse.jetty:jetty-util')
+  integrationTestImplementation('org.httpunit:httpunit') {
     exclude group: 'javax.servlet'
     // this version of httpunit contains very outdated xercesImpl
     exclude group: 'xerces'
   }
-  integrationTestCompile('org.slf4j:slf4j-api')
+  integrationTestImplementation('org.slf4j:slf4j-api')
 
-  integrationTestRuntime('xerces:xercesImpl')
+  integrationTestRuntimeOnly('xerces:xercesImpl')
 }
 
 jar {

diff --git a/extensions/geode-modules-test/build.gradle b/extensions/geode-modules-test/build.gradle
@@ -34,10 +34,13 @@ dependencies {
     exclude module: 'geode-core'
   }
 
-  compile('commons-io:commons-io')
-  compile('javax.servlet:javax.servlet-api')
-  compile('junit:junit')
-  compile('org.httpunit:httpunit') {
+  implementation('org.assertj:assertj-core')
+  implementation('org.springframework:spring-core')
+  implementation('org.mockito:mockito-core')
+  implementation('commons-io:commons-io')
+  implementation('javax.servlet:javax.servlet-api')
+  implementation('junit:junit')
+  implementation('org.httpunit:httpunit') {
     // this version of httpunit contains very outdated xercesImpl
     exclude group: 'xerces'
   }

diff --git a/extensions/geode-modules-tomcat7/build.gradle b/extensions/geode-modules-tomcat7/build.gradle
@@ -26,43 +26,43 @@ evaluationDependsOn(":geode-core")
 dependencies {
   compile(platform(project(':boms:geode-all-bom')))
   compile(project(':geode-core'))
-  compile('mx4j:mx4j')
-  compile('javax.servlet:javax.servlet-api')
-  integrationTestCompile('org.httpunit:httpunit')
-  integrationTestCompile('junit:junit')
+  implementation('mx4j:mx4j')
+  implementation('javax.servlet:javax.servlet-api')
+  integrationTestImplementation('org.httpunit:httpunit')
+  integrationTestImplementation('junit:junit')
   compile(project(':extensions:geode-modules')) {
     // Remove everything related to Tomcat 6.x
     exclude group: 'org.apache.tomcat'
   }
-  testCompile(project(':extensions:geode-modules')) {
+  testImplementation(project(':extensions:geode-modules')) {
     // Remove everything related to Tomcat 6.x
     exclude group: 'org.apache.tomcat'
   }
 
-  compile('org.apache.tomcat:tomcat-catalina:' + DependencyConstraints.get('tomcat7.version')) {
+  implementation('org.apache.tomcat:tomcat-catalina:' + DependencyConstraints.get('tomcat7.version')) {
     exclude module: 'tomcat-annotations-api'
     exclude module: 'tomcat-servlet-api'
   }
-  compile('org.apache.tomcat:tomcat-coyote:' + DependencyConstraints.get('tomcat7.version')) {
+  implementation('org.apache.tomcat:tomcat-coyote:' + DependencyConstraints.get('tomcat7.version')) {
     exclude module: 'tomcat-servlet-api'
   }
-  compile('org.apache.tomcat:tomcat-juli:' + DependencyConstraints.get('tomcat7.version'))
+  implementation('org.apache.tomcat:tomcat-juli:' + DependencyConstraints.get('tomcat7.version'))
 
-  testCompile('org.httpunit:httpunit')
-  testCompile('junit:junit')
-  testCompile('org.assertj:assertj-core')
-  testCompile('org.mockito:mockito-core')
-  testCompile(project(':extensions:geode-modules-test'))
-  integrationTestCompile(project(':geode-dunit')) {
+  testImplementation('org.httpunit:httpunit')
+  testImplementation('junit:junit')
+  testImplementation('org.assertj:assertj-core')
+  testImplementation('org.mockito:mockito-core')
+  testImplementation(project(':extensions:geode-modules-test'))
+  integrationTestImplementation(project(':geode-dunit')) {
     exclude module: 'geode-core'
   }
-  integrationTestCompile(project(':extensions:geode-modules-test'))
+  integrationTestImplementation(project(':extensions:geode-modules-test'))
 
-  integrationTestRuntime('javax.annotation:jsr250-api')
-  integrationTestRuntime('javax.ejb:ejb-api')
-  integrationTestRuntime('javax.servlet:javax.servlet-api')
-  integrationTestRuntime('org.eclipse.persistence:javax.persistence')
-  integrationTestRuntime('xerces:xercesImpl')
+  integrationTestRuntimeOnly('javax.annotation:jsr250-api')
+  integrationTestRuntimeOnly('javax.ejb:ejb-api')
+  integrationTestRuntimeOnly('javax.servlet:javax.servlet-api')
+  integrationTestRuntimeOnly('org.eclipse.persistence:javax.persistence')
+  integrationTestRuntimeOnly('xerces:xercesImpl')
 }
 
 eclipse.classpath.file {

diff --git a/extensions/geode-modules-tomcat8/build.gradle b/extensions/geode-modules-tomcat8/build.gradle
@@ -25,58 +25,59 @@ evaluationDependsOn(":geode-core")
 
 dependencies {
   compile(platform(project(':boms:geode-all-bom')))
-  distributedTestCompile('junit:junit')
-  compile('mx4j:mx4j')
+  distributedTestImplementation('junit:junit')
+  implementation('mx4j:mx4j')
   distributedTestImplementation(project(':geode-logging'))
-  testCompile('org.httpunit:httpunit')
-  testCompile('org.apache.tomcat:tomcat-jaspic-api:' + DependencyConstraints.get('tomcat8.version'))
-  testCompile('org.httpunit:httpunit')
-  testCompile('junit:junit')
-  testCompile('org.assertj:assertj-core')
-  testCompile('org.mockito:mockito-core')
-  testCompile(project(':extensions:geode-modules-test'))
-  distributedTestCompile('org.httpunit:httpunit')
-  distributedTestCompile('org.apache.tomcat:tomcat-jaspic-api:' + DependencyConstraints.get('tomcat8.version'))
+  testImplementation('org.httpunit:httpunit')
+  testImplementation('org.apache.tomcat:tomcat-jaspic-api:' + DependencyConstraints.get('tomcat8.version'))
+  testImplementation('org.httpunit:httpunit')
+  testImplementation('junit:junit')
+  testImplementation('org.assertj:assertj-core')
+  testImplementation('org.mockito:mockito-core')
+  testImplementation(project(':extensions:geode-modules-test'))
+  distributedTestImplementation('org.httpunit:httpunit')
+  distributedTestImplementation('org.apache.tomcat:tomcat-jaspic-api:' + DependencyConstraints.get('tomcat8.version'))
+  distributedTestImplementation('org.springframework:spring-core')
   compile(project(':geode-core'))
   compile(project(':extensions:geode-modules')) {
     exclude group: 'org.apache.tomcat'
   }
-  testCompile(project(':extensions:geode-modules')) {
+  testImplementation(project(':extensions:geode-modules')) {
     exclude group: 'org.apache.tomcat'
   }
 
 
-  compile('org.apache.tomcat:tomcat-catalina:' + DependencyConstraints.get('tomcat8.version')) {
+  implementation('org.apache.tomcat:tomcat-catalina:' + DependencyConstraints.get('tomcat8.version')) {
     exclude module: 'tomcat-annotations-api'
     exclude module: 'tomcat-servlet-api'
   }
-  compile('org.apache.tomcat:tomcat-coyote:' + DependencyConstraints.get('tomcat8.version')) {
+  implementation('org.apache.tomcat:tomcat-coyote:' + DependencyConstraints.get('tomcat8.version')) {
     exclude module: 'tomcat-servlet-api'
   }
-  compile('org.apache.tomcat:tomcat-juli:' + DependencyConstraints.get('tomcat8.version'))
-  compile('javax.servlet:javax.servlet-api')
+  implementation('org.apache.tomcat:tomcat-juli:' + DependencyConstraints.get('tomcat8.version'))
+  implementation('javax.servlet:javax.servlet-api')
 
-  integrationTestCompile(project(':geode-dunit')) {
+  integrationTestImplementation(project(':geode-dunit')) {
     exclude module: 'geode-core'
   }
-  integrationTestCompile(project(':geode-junit')) {
+  integrationTestImplementation(project(':geode-junit')) {
     exclude module: 'geode-core'
   }
-  integrationTestCompile(project(':extensions:geode-modules-test'))
-  integrationTestRuntime('xerces:xercesImpl')
-  integrationTestRuntime('javax.annotation:javax.annotation-api')
+  integrationTestImplementation(project(':extensions:geode-modules-test'))
+  integrationTestRuntimeOnly('xerces:xercesImpl')
+  integrationTestRuntimeOnly('javax.annotation:javax.annotation-api')
 
-  distributedTestCompile(project(':geode-dunit')) {
+  distributedTestImplementation(project(':geode-dunit')) {
     exclude module: 'geode-core'
   }
 
-  distributedTestCompile(project(':geode-junit')) {
+  distributedTestImplementation(project(':geode-junit')) {
     exclude module: 'geode-core'
   }
-  distributedTestCompile(project(':extensions:geode-modules-test'))
+  distributedTestImplementation(project(':extensions:geode-modules-test'))
 
-  distributedTestRuntime('xerces:xercesImpl')
-  distributedTestRuntime('javax.annotation:javax.annotation-api')
+  distributedTestRuntimeOnly('xerces:xercesImpl')
+  distributedTestRuntimeOnly('javax.annotation:javax.annotation-api')
 }
 
 eclipse.classpath.file {

diff --git a/extensions/geode-modules-tomcat9/build.gradle b/extensions/geode-modules-tomcat9/build.gradle
@@ -25,33 +25,33 @@ evaluationDependsOn(":geode-core")
 
 dependencies {
   compile(platform(project(':boms:geode-all-bom')))
-  compile(project(':extensions:geode-modules')) {
-    exclude group: 'org.apache.tomcat'
-  }
-  testCompile(project(':extensions:geode-modules')) {
+  api(project(':extensions:geode-modules')) {
     exclude group: 'org.apache.tomcat'
   }
+//  testImplementation(project(':extensions:geode-modules')) {
+//    exclude group: 'org.apache.tomcat'
+//  }
 
-  compile('org.apache.tomcat:tomcat-catalina:' + DependencyConstraints.get('tomcat9.version')) {
+  implementation('org.apache.tomcat:tomcat-catalina:' + DependencyConstraints.get('tomcat9.version')) {
     exclude module: 'tomcat-annotations-api'
     exclude module: 'tomcat-servlet-api'
   }
-  compile('org.apache.tomcat:tomcat-coyote:' + DependencyConstraints.get('tomcat9.version')) {
+  implementation('org.apache.tomcat:tomcat-coyote:' + DependencyConstraints.get('tomcat9.version')) {
     exclude module: 'tomcat-servlet-api'
   }
-  compile('org.apache.tomcat:tomcat-juli:' + DependencyConstraints.get('tomcat9.version'))
-  compile('javax.servlet:javax.servlet-api:' + '3.1.0')
+  implementation('org.apache.tomcat:tomcat-juli:' + DependencyConstraints.get('tomcat9.version'))
+  implementation('javax.servlet:javax.servlet-api:' + '3.1.0')
 
-  testCompile('org.httpunit:httpunit')
-  testCompile('junit:junit')
-  testCompile('org.assertj:assertj-core')
-  testCompile('org.mockito:mockito-core')
-  testCompile(project(':extensions:geode-modules-test')) 
+  testImplementation('org.httpunit:httpunit')
+  testImplementation('junit:junit')
+  testImplementation('org.assertj:assertj-core')
+  testImplementation('org.mockito:mockito-core')
+  testImplementation(project(':extensions:geode-modules-test'))
 
-  distributedTestCompile(project(':extensions:geode-modules-test'))
+  distributedTestImplementation(project(':extensions:geode-modules-test'))
 
-  distributedTestRuntime('xerces:xercesImpl')
-  distributedTestRuntime('javax.annotation:javax.annotation-api')
+  distributedTestRuntimeOnly('xerces:xercesImpl')
+  distributedTestRuntimeOnly('javax.annotation:javax.annotation-api')
 }
 
 eclipse.classpath.file {