GEODE-6383: All subprojects should opt into configuration. (apache#3403)

* The collection of java.gradle, ide.gradle, spotless.gradle et al have been collected to standard-subproject-configuration.gradle. * This configuration is applied to every subproject to be consistent with previous behavior. This will be audited and adjusted in GEODE-6611. * Several cross-subproject evaluation dependencies have been made explicit.
ringles · Apr 8, 2019 · 63bd991 · 63bd991
1 parent 50c3747
commit 63bd991
Show file tree

Hide file tree

Showing 52 changed files with 778 additions and 651 deletions.
diff --git a/boms/build.gradle b/boms/build.gradle
@@ -15,5 +15,7 @@
  * limitations under the License.
  */
 
+apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
+
 jar.enabled = false
 
diff --git a/boms/geode-all-bom/build.gradle b/boms/geode-all-bom/build.gradle
@@ -16,10 +16,12 @@
  */
 
 plugins {
-  id 'geode-dependency-constraints'
   id 'maven-publish'
 }
 
+apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
+apply plugin: 'geode-dependency-constraints'
+
 apply from: "${project.projectDir}/../../gradle/publish.gradle"
 
 jar.enabled = false

diff --git a/boms/geode-client-bom/build.gradle b/boms/geode-client-bom/build.gradle
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
+
 apply plugin: "io.spring.dependency-management"
 apply from: "${project.projectDir}/../../gradle/publish.gradle"
 

diff --git a/build.gradle b/build.gradle
@@ -37,6 +37,18 @@ buildscript {
 
 apply plugin: 'wrapper'
 apply plugin: 'nebula.facet'
+apply plugin: 'java-library'
+apply plugin: 'idea'
+apply plugin: 'eclipse'
+
+apply from: "${scriptDir}/lint.gradle"
+apply from: "${scriptDir}/resolve-dependencies.gradle"
+apply from: "${scriptDir}/sonar.gradle"
+apply from: "${scriptDir}/rat.gradle"
+
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
+compileJava.options.encoding = 'UTF-8'
 
 wrapper {
   gradleVersion = minimumGradleVersion
@@ -62,36 +74,15 @@ allprojects {
   }
 }
 
-apply from: "${scriptDir}/java.gradle"
-apply from: "${scriptDir}/ide.gradle"
-apply from: "${scriptDir}/dependency-resolution.gradle"
-apply from: "${scriptDir}/test.gradle"
-apply from: "${scriptDir}/code-analysis.gradle"
-apply from: "${scriptDir}/sonar.gradle"
-apply from: "${scriptDir}/rat.gradle"
-apply from: "${scriptDir}/docker.gradle"
-apply from: "${scriptDir}/spotless.gradle"
-apply from: "${scriptDir}/lint.gradle"
-apply from: "${scriptDir}/resolve-dependencies.gradle"
-
-subprojects {
-  apply plugin: 'com.github.ben-manes.versions'
-}
+task combineReports(type: TestReport) {
+  description 'Combines the test reports.'
+  destinationDir = file "${rootProject.buildDir}/reports/combined"
 
-check.dependsOn rat
-
-task devBuild(dependsOn: [":assemble"]) {
-  description "A convenience target for a typical developer workflow: apply spotless and assemble all classes."
-  // spotless targets are not available until after evaluation.
-  subprojects {
-    afterEvaluate {
-      this.devBuild.dependsOn(project.spotlessApply)
-    }
+  doLast {
+    println "All test reports at ${rootProject.buildDir}/reports/combined"
   }
 }
 
-
-
 ext.readScmInfo = { proj ->
   // Attempt to read git information, or else return UNKNOWN
   try {
@@ -121,7 +112,7 @@ ext.readScmInfo = { proj ->
   }
 }
 
-task writeBuildInfo {
+tasks.register('writeBuildInfo') {
   def buildInfo = file "$buildDir/.buildinfo"
   def scmInfo = this.readScmInfo("geode-core")
 
@@ -135,6 +126,12 @@ task writeBuildInfo {
   }
 }
 
+tasks.register('devBuild') {
+  description "A convenience target for a typical developer workflow: apply spotless and assemble all classes."
+  dependsOn tasks.named('assemble')
+  // Each subproject injects its SpotlessApply as a dependency to this task in the standard config
+}
+
 tasks.register('generate') {
   group = 'Build'
   description = "Top-level target for all source generation. Helps IDE integration"
@@ -180,9 +177,8 @@ if (project.hasProperty('askpass')) {
   }
 }
 
-// Explicitly chain generic tasks -- composite builds do not cascade these tasks by default.
-['clean', 'check', 'test'].each { chainedTask ->
-  rootProject.tasks.named(chainedTask).configure {
-    dependsOn(subprojects*.tasks*.named(chainedTask))
-  }
-}
+gradle.taskGraph.whenReady({ graph ->
+  tasks.getByName('combineReports').reportOn rootProject.subprojects.collect {
+    it.tasks.withType(Test)
+  }.flatten()
+})
diff --git a/extensions/build.gradle b/extensions/build.gradle
@@ -14,3 +14,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
diff --git a/extensions/geode-modules-assembly/build.gradle b/extensions/geode-modules-assembly/build.gradle
@@ -15,6 +15,16 @@
  * limitations under the License.
  */
 
+evaluationDependsOn(':extensions:geode-modules')
+evaluationDependsOn(':extensions:geode-modules-tomcat7')
+evaluationDependsOn(':extensions:geode-modules-tomcat8')
+evaluationDependsOn(':extensions:geode-modules-tomcat9')
+evaluationDependsOn(':extensions:geode-modules-session')
+evaluationDependsOn(':extensions:geode-modules-session-internal')
+
+
+apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
+
 import org.apache.geode.gradle.plugins.DependencyConstraints
 import org.apache.tools.ant.filters.ReplaceTokens
 apply plugin: 'maven-publish'

diff --git a/extensions/geode-modules-session-internal/build.gradle b/extensions/geode-modules-session-internal/build.gradle
@@ -17,6 +17,8 @@ import org.apache.geode.gradle.plugins.DependencyConstraints
  * limitations under the License.
  */
 
+apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
+
 
 
 dependencies {

diff --git a/extensions/geode-modules-session/build.gradle b/extensions/geode-modules-session/build.gradle
@@ -17,6 +17,8 @@ import org.apache.geode.gradle.plugins.DependencyConstraints
  * limitations under the License.
  */
 
+apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
+
 evaluationDependsOn(":geode-core")
 
 

diff --git a/extensions/geode-modules-test/build.gradle b/extensions/geode-modules-test/build.gradle
@@ -17,6 +17,8 @@ import org.apache.geode.gradle.plugins.DependencyConstraints
  * limitations under the License.
  */
 
+apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
+
 
 
 dependencies {

diff --git a/extensions/geode-modules-tomcat7/build.gradle b/extensions/geode-modules-tomcat7/build.gradle
@@ -17,6 +17,8 @@ import org.apache.geode.gradle.plugins.DependencyConstraints
  * limitations under the License.
  */
 
+apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
+
 evaluationDependsOn(":geode-core")
 
 

diff --git a/extensions/geode-modules-tomcat8/build.gradle b/extensions/geode-modules-tomcat8/build.gradle
@@ -17,6 +17,8 @@ import org.apache.geode.gradle.plugins.DependencyConstraints
  * limitations under the License.
  */
 
+apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
+
 evaluationDependsOn(":geode-core")
 
 

diff --git a/extensions/geode-modules-tomcat9/build.gradle b/extensions/geode-modules-tomcat9/build.gradle
@@ -17,6 +17,8 @@ import org.apache.geode.gradle.plugins.DependencyConstraints
  * limitations under the License.
  */
 
+apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
+
 evaluationDependsOn(":geode-core")
 
 

diff --git a/extensions/geode-modules/build.gradle b/extensions/geode-modules/build.gradle
@@ -17,6 +17,8 @@ import org.apache.geode.gradle.plugins.DependencyConstraints
  * limitations under the License.
  */
 
+apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
+
 evaluationDependsOn(":geode-core")
 
 

diff --git a/extensions/session-testing-war/build.gradle b/extensions/session-testing-war/build.gradle
@@ -14,6 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
+
 apply plugin: 'war'
 
 

diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
@@ -15,14 +15,24 @@
  * limitations under the License.
  */
 
+apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
+
 
 import org.apache.geode.gradle.plugins.DependencyConstraints
 
 import java.nio.file.Paths
 
-evaluationDependsOn(":geode-core")
-evaluationDependsOn(":geode-protobuf-messages")
-
+// This project aggressively reaches into many other projects and must wait for those configurations
+// to be evaluated and resolved.  As a safeguard against this and to avoid having to explicitly 
+// re-list every geode-* here, we instead depend on every subproject of rootProject, excluding this
+// project itself.  Additionally, this project also aggressively inspects its own subprojects.
+// Evaluation depends on them all.
+evaluationDependsOnChildren()
+rootProject.subprojects.each { neighborProject ->
+  if (neighborProject != project) {
+    project.evaluationDependsOn(neighborProject.path)
+  }
+}
 apply plugin: 'distribution'
 apply from: "${rootDir}/${scriptDir}/publish.gradle"
 

diff --git a/geode-assembly/geode-assembly-test/build.gradle b/geode-assembly/geode-assembly-test/build.gradle
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
+
 
 
 

diff --git a/geode-common/build.gradle b/geode-common/build.gradle
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
+
 apply from: "${project.projectDir}/../gradle/publish.gradle"
 
 dependencies {

diff --git a/geode-concurrency-test/build.gradle b/geode-concurrency-test/build.gradle
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
+
 apply from: "${project.projectDir}/../gradle/publish.gradle"
 
 dependencies {

diff --git a/geode-connectors/build.gradle b/geode-connectors/build.gradle
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
+
 evaluationDependsOn(":geode-core")
 
 repositories {

diff --git a/geode-core/build.gradle b/geode-core/build.gradle
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
+
 apply plugin: 'antlr'
 apply plugin: 'me.champeau.gradle.jmh'
 apply from: "${project.projectDir}/../gradle/publish.gradle"

diff --git a/geode-cq/build.gradle b/geode-cq/build.gradle
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
+
 apply from: "${project.projectDir}/../gradle/publish.gradle"
 
 

diff --git a/geode-dunit/build.gradle b/geode-dunit/build.gradle
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
+
 apply from: "${project.projectDir}/../gradle/publish.gradle"
 
 

diff --git a/geode-experimental-driver/build.gradle b/geode-experimental-driver/build.gradle
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
+
 apply from: "${project.projectDir}/../gradle/publish.gradle"
 
 

diff --git a/geode-junit/build.gradle b/geode-junit/build.gradle
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
+
 apply from: "${project.projectDir}/../gradle/publish.gradle"
 
 

diff --git a/geode-lucene/build.gradle b/geode-lucene/build.gradle
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
+
 apply from: "${project.projectDir}/../gradle/publish.gradle"
 
 

diff --git a/geode-lucene/geode-lucene-test/build.gradle b/geode-lucene/geode-lucene-test/build.gradle
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
+
 
 
 

diff --git a/geode-management/build.gradle b/geode-management/build.gradle
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
+
 apply from: "${project.projectDir}/../gradle/publish.gradle"
 
 dependencies {

diff --git a/geode-memcached/build.gradle b/geode-memcached/build.gradle
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
+
 apply from: "${project.projectDir}/../gradle/publish.gradle"
 
 dependencies {

diff --git a/geode-old-client-support/build.gradle b/geode-old-client-support/build.gradle
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
+
 apply from: "${project.projectDir}/../gradle/publish.gradle"
 
 

diff --git a/geode-old-versions/build.gradle b/geode-old-versions/build.gradle
@@ -17,10 +17,14 @@ import java.nio.file.Paths
  * limitations under the License.
  */
 
+apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
+
 project.ext.installs = new Properties()
 project.ext.versions = new Properties()
 
 subprojects {
+  apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
+
   def oldGeodeVersion = project.name
 
   boolean useTgz = (oldGeodeVersion >= "1.7.0")
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,6 +17,8 @@ import org.apache.geode.gradle.plugins.DependencyConstraints @@
      * limitations under the License.
      */
+    apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
     dependencies {
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,6 +15,8 @@
		* limitations under the License.
		*/

		apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"




Expand Down