GEODE-8327: buildSrc depends directly on guava. Declare it. Misc othe…

…r build fixups (apache#5339)

buildSrc/build.gradle

@@ -34,6 +34,7 @@ dependencies {
   implementation(gradleApi())
   implementation('org.apache.commons:commons-lang3:3.3.2')
   implementation('org.apache.maven:maven-artifact:3.3.3')
+  implementation('com.google.guava:guava:28.2-jre')
   implementation('com.github.docker-java:docker-java:3.0.14')
   implementation('me.champeau.gradle:japicmp-gradle-plugin:0.2.9')
 

extensions/geode-modules-assembly/build.gradle

@@ -239,3 +239,7 @@ tasks.register('distTcServer30', Zip) {
 task dist(type: Task, dependsOn: ['distTcServer', 'distTcServer30', 'distTomcat', 'distAppServer'])
 
 build.dependsOn dist
+
+sonarqube {
+  skipProject = true
+}

extensions/geode-modules-session/build.gradle

@@ -70,3 +70,6 @@ jar {
   baseName = 'geode-modules-session'
 }
 
+sonarqube {
+  skipProject = true
+}

extensions/geode-modules-tomcat7/build.gradle

@@ -72,3 +72,6 @@ eclipse.classpath.file {
   }
 }
 
+sonarqube {
+  skipProject = true
+}

extensions/geode-modules/build.gradle

@@ -73,3 +73,6 @@ dependencies {
   }
 }
 
+sonarqube {
+  skipProject = true
+}

geode-gfsh/build.gradle

@@ -75,4 +75,4 @@ dependencies {
         exclude module: 'spring-context-support'
         exclude module: 'spring-core'
     }
-}
+}

geode-membership/build.gradle

@@ -24,47 +24,52 @@ dependencies {
 
     // Geode-common has annotations and other pieces used by geode-logging
     api(project(':geode-common'))
+
     implementation(project(':geode-logging'))
+    implementation(project(':geode-serialization'))
+    implementation(project(':geode-tcp-server'))
+
     implementation('org.apache.logging.log4j:log4j-api')
     implementation('org.jgroups:jgroups')
     implementation('org.apache.commons:commons-lang3')
     implementation('it.unimi.dsi:fastutil')
     implementation('com.github.stephenc.findbugs:findbugs-annotations')
     //Commons validator is used to validate inet addresses in membership
     implementation('commons-validator:commons-validator')
-
-    implementation(project(':geode-serialization'))
-    implementation(project(':geode-tcp-server'))
     //Jgroups is a core component of our membership system.
     implementation('org.jgroups:jgroups')
 
+
     testImplementation(project(':geode-junit'))
     testImplementation(project(':geode-concurrency-test'))
 
     testImplementation('org.mockito:mockito-core')
     testImplementation('junit:junit')
     testImplementation('org.assertj:assertj-core')
+    testImplementation('com.tngtech.archunit:archunit-junit4')
 
     testRuntime(project(path: ':geode-old-versions', configuration: 'testOutput'))
 
+
     integrationTestImplementation(project(':geode-junit'))
+    integrationTestImplementation('com.tngtech.archunit:archunit-junit4')
     integrationTestImplementation('pl.pragmatists:JUnitParams')
+
+    integrationTestRuntime('org.apache.logging.log4j:log4j-core')
+
+
     distributedTestImplementation(project(':geode-junit'))
     distributedTestImplementation(project(':geode-dunit'))
-    integrationTestRuntime('org.apache.logging.log4j:log4j-core')
     distributedTestImplementation('pl.pragmatists:JUnitParams')
+
     distributedTestRuntimeOnly(project(path: ':geode-old-versions', configuration: 'testOutput'))
-    upgradeTestRuntimeOnly(project(path: ':geode-old-versions', configuration: 'testOutput'))
 
-    testImplementation('com.tngtech.archunit:archunit-junit4')
 
-    integrationTestImplementation('com.tngtech.archunit:archunit-junit4')
-
+    upgradeTestRuntimeOnly(project(path: ':geode-old-versions', configuration: 'testOutput'))
 }
 
 distributedTest {
     // Some tests have inner tests that should be ignored
     exclude "**/*\$*.class"
 }
 
-

gradle/java.gradle

@@ -112,3 +112,5 @@ javadoc {
 
   classpath += configurations.compileOnly
 }
+
+

gradle/publish-java.gradle

@@ -73,3 +73,4 @@ gradle.taskGraph.whenReady({ graph ->
   }
 })
 
+

gradle/sonar.gradle

@@ -29,27 +29,3 @@ sonarqube {
     property "sonar.projectDescription", "Apache Geode"
   }
 }
-
-project("extensions:geode-modules") {
-  sonarqube {
-    skipProject = true
-  }
-}
-
-project("extensions:geode-modules-assembly") {
-  sonarqube {
-    skipProject = true
-  }
-}
-
-project("extensions:geode-modules-session") {
-  sonarqube {
-    skipProject = true
-  }
-}
-
-project("extensions:geode-modules-tomcat7") {
-  sonarqube {
-    skipProject = true
-  }
-}

gradle/standard-subproject-configuration.gradle

@@ -33,17 +33,4 @@ def thisProjectScoped = project
   }
 }
 
-thisProjectScoped.tasks.named('assemble').configure {
-  // This is a semi-lazy hook so that our test sources are compiled most of the time.
-  dependsOn(
-    [
-      thisProjectScoped.tasks.named('compileTestJava'),
-      thisProjectScoped.tasks.named('compileIntegrationTestJava'),
-      thisProjectScoped.tasks.named('compileDistributedTestJava'),
-      thisProjectScoped.tasks.named('compileAcceptanceTestJava'),
-      thisProjectScoped.tasks.named('compileUiTestJava'),
-      thisProjectScoped.tasks.named('compilePerformanceTestJava'),
-      thisProjectScoped.tasks.named('compileUpgradeTestJava'),
-    ]
-  )
-}
+

gradle/test.gradle

@@ -265,3 +265,18 @@ tasks.withType(Test).plus([build, check]).each {
   it.finalizedBy rootProject.tasks.combineReports
   rootProject.tasks.combineReports.mustRunAfter it
 }
+
+project.tasks.named('assemble').configure {
+  // This is a semi-lazy hook so that our test sources are compiled most of the time.
+  dependsOn(
+    [
+      project.tasks.named('compileTestJava'),
+      project.tasks.named('compileIntegrationTestJava'),
+      project.tasks.named('compileDistributedTestJava'),
+      project.tasks.named('compileAcceptanceTestJava'),
+      project.tasks.named('compileUiTestJava'),
+      project.tasks.named('compilePerformanceTestJava'),
+      project.tasks.named('compileUpgradeTestJava'),
+    ]
+  )
+}