Revert "GEODE-10490: Fix Gradle build system compatibility and test task resolution"

This reverts commit 7b279b1.

Author: JinwooHwang

build-tools/scripts/src/main/groovy/geode-test.gradle

@@ -75,25 +75,6 @@ facets {
   }
 }
 
-// Ensure test tasks exist immediately after facets configuration
-['integrationTest', 'distributedTest', 'performanceTest', 'acceptanceTest', 'uiTest', 'upgradeTest'].each { taskName ->
-  if (!tasks.findByName(taskName)) {
-    tasks.create(taskName, Test) {
-      description = "Stub ${taskName} tests (created for CI compatibility)"
-      group = 'verification'
-      useJUnitPlatform()
-      testClassesDirs = files()
-      classpath = configurations.testRuntimeClasspath
-      
-      // Skip if no tests to run
-      onlyIf {
-        !testClassesDirs.isEmpty()
-      }
-    }
-    logger.info("Created stub test task '${taskName}' for project ${project.name}")
-  }
-}
-
 dependencies {
   // Do not add dependencies here that are not part of a custom configuration.
   // Dependencies should be explicit in the relevant build.gradle files to keep our modules

build-tools/scripts/src/main/groovy/standard-subproject-configuration.gradle

@@ -18,7 +18,6 @@
 plugins {
   id 'geode-java'
   id 'dependency-resolution'
-  id 'nebula.facet'
   id 'geode-test'
   id 'code-analysis'
   id 'multi-process-test'

build.gradle

@@ -125,31 +125,6 @@ tasks.register('test') {
   description "An all-project target for unit tests"
 }
 
-tasks.register('integrationTest') {
-  description "An all-project target for integration tests"
-  group 'verification'
-}
-
-tasks.register('distributedTest') {
-  description "An all-project target for distributed tests"
-  group 'verification'
-}
-
-tasks.register('performanceTest') {
-  description "An all-project target for performance tests"
-  group 'verification'
-}
-
-tasks.register('uiTest') {
-  description "An all-project target for UI tests"
-  group 'verification'
-}
-
-tasks.register('upgradeTest') {
-  description "An all-project target for upgrade tests"
-  group 'verification'
-}
-
 tasks.register('acceptanceTest') {
   description "An all-project target for acceptance tests"
   group 'verification'
@@ -161,15 +136,12 @@ tasks.register('acceptanceTest') {
 
 // Configure dependencies after evaluation when tasks are fully configured
 gradle.projectsEvaluated {
-  def testTaskNames = ['integrationTest', 'distributedTest', 'performanceTest', 'uiTest', 'upgradeTest', 'acceptanceTest']
-  testTaskNames.each { testTaskName ->
-    def rootTestTask = tasks.getByName(testTaskName)
-    subprojects.each { subproject ->
-      def subprojectTestTask = subproject.tasks.findByName(testTaskName)
-      if (subprojectTestTask) {
-        rootTestTask.dependsOn subprojectTestTask
-        println "Adding dependency on ${subproject.path}:${testTaskName}"
-      }
+  def rootAcceptanceTest = tasks.getByName('acceptanceTest')
+  subprojects.each { subproject ->
+    def acceptanceTestTask = subproject.tasks.findByName('acceptanceTest')
+    if (acceptanceTestTask) {
+      rootAcceptanceTest.dependsOn acceptanceTestTask
+      println "Adding dependency on ${subproject.path}:acceptanceTest"
     }
   }
 }

dependency_classpath.txt

@@ -44,37 +44,6 @@ project.ext.set('constrainVersionInBom', false)
 
 project.ext {artifactName = 'apache-geode'}
 
-// Create missing test tasks that CI workflows reference
-if (!tasks.findByName('distributedTest')) {
-  tasks.create('distributedTest', Test) {
-    description = "Runs distributedTest tests (created for CI compatibility)"
-    group = 'verification'
-    useJUnitPlatform()
-    testClassesDirs = files()
-    classpath = configurations.testRuntimeClasspath
-
-    // Skip if no tests to run
-    onlyIf {
-      !testClassesDirs.isEmpty()
-    }
-  }
-}
-
-if (!tasks.findByName('integrationTest')) {
-  tasks.create('integrationTest', Test) {
-    description = "Runs integrationTest tests (created for CI compatibility)"
-    group = 'verification'
-    useJUnitPlatform()
-    testClassesDirs = files()
-    classpath = configurations.testRuntimeClasspath
-
-    // Skip if no tests to run
-    onlyIf {
-      !testClassesDirs.isEmpty()
-    }
-  }
-}
-
 configurations {
   compositeTarget {
     setDescription("Composite builds wishing to consume this apache-geode@tgz artifact must specify \"targetConfiguration = 'compositeTarget'\" for correct composite task dependency detection.")
@@ -147,14 +116,11 @@ repositories {
 def webServersDir = "$buildDir/generated-resources/webservers"
 
 sourceSets {
-  // Configure distributedTest source set if it exists
-  if (findByName('distributedTest')) {
-    distributedTest {
-      resources {
-        srcDirs webServersDir
-      }
-      output.dir(webServersDir, builtBy: 'downloadWebServers')
+  tasks.matching { it.name == 'distributedTest' }.configureEach {
+    resources {
+      srcDirs webServersDir
     }
+    output.dir(webServersDir, builtBy: 'downloadWebServers')
   }
 }
 

geode-assembly/build.gradle

@@ -32,14 +32,11 @@ configurations {
 }
 def jdbcJarsDir = "$buildDir/generated-resources/jdbcJars"
 sourceSets {
-  // Configure distributedTest source set if it exists
-  if (findByName('distributedTest')) {
-    distributedTest {
-      resources {
-        srcDirs jdbcJarsDir
-      }
-      output.dir(jdbcJarsDir, builtBy: 'downloadJdbcJars')
+  tasks.matching { it.name == 'distributedTest' }.configureEach {
+    resources {
+      srcDirs jdbcJarsDir
     }
+    output.dir(jdbcJarsDir, builtBy: 'downloadJdbcJars')
   }
 }
 task downloadJdbcJars(type:Copy) {

geode-connectors/build.gradle

@@ -65,9 +65,9 @@ sourceSets {
   // This works around resource-look up between integrationTest and test source-sets.
   // See GEODE-5803 / GEODE-5882
   test.resources.srcDirs.each { testResourceSrc ->
-    // Check if integrationTest source set exists, not task
-    if (sourceSets.findByName('integrationTest')) {
-      integrationTest.resources.srcDir {
+    def integrationTestTask = tasks.findByName('integrationTest')
+    if (integrationTestTask) {
+      integrationTestTask.resources.srcDir {
         testResourceSrc
       }
     }