GEODE-10490: Upgrade Gradle from 7.3.3 to 7.6.6

- Updated gradle-wrapper.properties to use Gradle 7.6.6
- Updated minimumGradleVersion from 6.8 to 7.6 in gradle.properties
- Migrated deprecated API usage for Gradle 7.6 compatibility
- Updated build scripts and configurations
- Updated expected POM files for dependency changes
- All existing functionality preserved

This upgrade is part of the Apache Geode 2.0 initiative and provides:
- Improved build performance and caching
- Enhanced dependency resolution
- Bug fixes and security updates
- Better Java toolchain support

Author: JinwooHwang

build-tools/geode-annotation-processor/build.gradle

@@ -18,12 +18,13 @@
 
 plugins {
   id 'java'
-  id 'java-gradle-plugin'
   id 'groovy-gradle-plugin'
-  id 'maven-publish'
-  id 'com.gradle.plugin-publish' version '0.18.0'
+  id 'maven-publish' // Gradle 7.6.6: Required to publish plugin to mavenLocal() for composite build replacement
 }
 
+group = 'org.apache.geode.gradle'
+version = 1.0
+
 repositories {
   mavenCentral()
 }
@@ -33,6 +34,8 @@ dependencies {
     transitive(false)
   }
   implementation(gradleApi())
+  // JUnit 4 needed for compatibility with existing Gradle plugin test infrastructure
+  implementation 'junit:junit:4.13.2'
 
   testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
   testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'

build-tools/geode-japicmp/build.gradle

@@ -18,6 +18,7 @@
 
 plugins {
   id 'groovy-gradle-plugin'
+  id 'maven-publish' // Gradle 7.6.6: Required to publish plugin to mavenLocal() for composite build replacement
 }
 
 repositories {

build-tools/geode-repeat-test/build.gradle

@@ -33,11 +33,15 @@ dependencies {
   implementation(gradleApi())
   implementation('com.google.guava:guava:31.1-jre')
 
+  // Gradle 7.6.6: Dual JUnit support needed because Gradle API internals use JUnit 5 while our tests use JUnit 4
+  testImplementation 'junit:junit:4.13.2'
   testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
   testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
 }
 
 test {
+  // Gradle 7.6.6: Both platforms required to prevent ClassNotFoundException with mixed JUnit versions
+  useJUnit()
   useJUnitPlatform()
 }
 

build-tools/geode-repeat-test/src/main/groovy/org/apache/geode/gradle/testing/repeat/RepeatTest.groovy

@@ -23,7 +23,7 @@ import org.gradle.api.internal.tasks.testing.filter.DefaultTestFilter
 import org.gradle.api.tasks.testing.Test
 import org.gradle.api.tasks.Input
 import org.gradle.internal.time.Clock
-import org.gradle.internal.work.WorkerLeaseRegistry
+import org.gradle.internal.work.WorkerLeaseService
 
 public class RepeatTest extends Test {
 
@@ -46,14 +46,17 @@ public class RepeatTest extends Test {
 
   /**
    * Use a custom {@link TestExecuter} that processes each test class as many times as submitted.
+   * GRADLE MIGRATION: Updated to use WorkerLeaseService instead of WorkerLeaseRegistry for Gradle 7.6.6
    */
   @Override
   protected TestExecuter<JvmTestExecutionSpec> createTestExecuter() {
     return new RepeatTestExecuter(
             super.createTestExecuter().workerFactory,
             getActorFactory(),
             getModuleRegistry(),
-            getServices().get(WorkerLeaseRegistry.class),
+            // GRADLE MIGRATION: Changed from WorkerLeaseRegistry to WorkerLeaseService
+            // This is the new API pattern in Gradle 7.6.6 for managing worker threads
+            getServices().get(WorkerLeaseService.class),
             getServices().get(StartParameter.class).getMaxWorkerCount(),
             getServices().get(Clock.class),
             getServices().get(DocumentationRegistry.class),

build-tools/geode-repeat-test/src/main/java/org/apache/geode/gradle/testing/repeat/ExecutionTrackingTestResultProcessor.java

@@ -26,6 +26,7 @@
 import org.gradle.api.internal.tasks.testing.TestStartEvent;
 import org.gradle.api.internal.tasks.testing.worker.WorkerTestClassProcessor;
 import org.gradle.api.tasks.testing.TestOutputEvent;
+import org.gradle.api.tasks.testing.TestFailure;
 
 /**
  * A test result processor that associates each test event with the test class execution that
@@ -67,8 +68,9 @@ public void output(Object testId, TestOutputEvent event) {
     processor.output(testId, event);
   }
 
+  // Gradle 7.6.6 changed from failure(Object testId, Throwable result) to failure(Object testId, TestFailure result)
   @Override
-  public void failure(Object testId, Throwable result) {
+  public void failure(Object testId, TestFailure result) {
     processor.failure(testId, result);
   }
 

build-tools/geode-repeat-test/src/main/java/org/apache/geode/gradle/testing/repeat/RepeatTestExecuter.java

@@ -40,10 +40,11 @@
 import org.gradle.api.internal.tasks.testing.worker.ForkingTestClassProcessor;
 import org.gradle.api.logging.Logger;
 import org.gradle.api.logging.Logging;
+import org.gradle.api.internal.tasks.testing.worker.WorkerTestClassProcessor;
 import org.gradle.internal.Factory;
 import org.gradle.internal.actor.ActorFactory;
 import org.gradle.internal.time.Clock;
-import org.gradle.internal.work.WorkerLeaseRegistry;
+import org.gradle.internal.work.WorkerLeaseService;
 import org.gradle.process.internal.worker.WorkerProcessFactory;
 
 /**
@@ -71,22 +72,23 @@ public class RepeatTestExecuter implements TestExecuter<JvmTestExecutionSpec> {
   private final WorkerProcessFactory workerFactory;
   private final ActorFactory actorFactory;
   private final ModuleRegistry moduleRegistry;
-  private final WorkerLeaseRegistry workerLeaseRegistry;
+  private final WorkerLeaseService workerLeaseService;
   private final int maxWorkerCount;
   private final Clock clock;
   private final DocumentationRegistry documentationRegistry;
   private final DefaultTestFilter testFilter;
   private final int iterationCount;
   private TestClassProcessor processor;
 
+  // Gradle 7.6.6: WorkerLeaseRegistry became private, use WorkerLeaseService instead
   public RepeatTestExecuter(WorkerProcessFactory workerFactory, ActorFactory actorFactory,
-      ModuleRegistry moduleRegistry, WorkerLeaseRegistry workerLeaseRegistry, int maxWorkerCount,
+      ModuleRegistry moduleRegistry, WorkerLeaseService workerLeaseService, int maxWorkerCount,
       Clock clock, DocumentationRegistry documentationRegistry, DefaultTestFilter testFilter,
       int iterationCount) {
     this.workerFactory = workerFactory;
     this.actorFactory = actorFactory;
     this.moduleRegistry = moduleRegistry;
-    this.workerLeaseRegistry = workerLeaseRegistry;
+    this.workerLeaseService = workerLeaseService;
     this.maxWorkerCount = maxWorkerCount;
     this.clock = clock;
     this.documentationRegistry = documentationRegistry;
@@ -99,17 +101,15 @@ public void execute(final JvmTestExecutionSpec testExecutionSpec,
       TestResultProcessor testResultProcessor) {
     final TestFramework testFramework = testExecutionSpec.getTestFramework();
     final WorkerTestClassProcessorFactory testInstanceFactory = testFramework.getProcessorFactory();
-    final WorkerLeaseRegistry.WorkerLease
-        currentWorkerLease =
-        workerLeaseRegistry.getCurrentWorkerLease();
     final Set<File> classpath = ImmutableSet.copyOf(testExecutionSpec.getClasspath());
     final Set<File> modulePath = ImmutableSet.copyOf(testExecutionSpec.getModulePath());
     final List<String>
         testWorkerImplementationModules =
         testFramework.getTestWorkerImplementationModules();
     final Factory<TestClassProcessor> forkingProcessorFactory = () -> {
+      // Gradle 7.6.6: Worker API changed to require WorkerLeaseService for thread management
       TestClassProcessor forkingTestClassProcessor =
-          new ForkingTestClassProcessor(currentWorkerLease, workerFactory, testInstanceFactory,
+          new ForkingTestClassProcessor(workerLeaseService, workerFactory, testInstanceFactory,
               testExecutionSpec.getJavaForkOptions(), classpath, modulePath,
               testWorkerImplementationModules, testFramework.getWorkerConfigurationAction(),
               moduleRegistry, documentationRegistry);
@@ -139,7 +139,8 @@ public void execute(final JvmTestExecutionSpec testExecutionSpec,
       detector = new DefaultTestClassScanner(testClassFiles, null, processor);
     }
 
-    new TestMainAction(detector, processor, testResultProcessor, clock, testExecutionSpec.getPath(),
+    // Gradle 7.6.6: TestMainAction constructor changed to accept WorkerLeaseService for resource management
+    new TestMainAction(detector, processor, testResultProcessor, workerLeaseService, clock, testExecutionSpec.getPath(),
         "Gradle Test Run " + testExecutionSpec.getIdentityPath()).run();
   }
 

build-tools/geode-testing-isolation/src/main/groovy/org/apache/geode/gradle/testing/Executers.groovy

@@ -23,7 +23,7 @@ import org.gradle.api.internal.tasks.testing.JvmTestExecutionSpec
 import org.gradle.api.internal.tasks.testing.TestExecuter
 import org.gradle.api.internal.tasks.testing.detection.DefaultTestExecuter
 import org.gradle.internal.time.Clock
-import org.gradle.internal.work.WorkerLeaseRegistry
+import org.gradle.internal.work.WorkerLeaseService
 
 class Executers {
     /**
@@ -48,7 +48,8 @@ class Executers {
                 workerProcessFactory,
                 testTask.actorFactory,
                 testTask.moduleRegistry,
-                services.get(WorkerLeaseRegistry),
+                // Gradle 7.6.6: WorkerLeaseRegistry renamed to WorkerLeaseService
+                services.get(WorkerLeaseService),
                 services.get(StartParameter).getMaxWorkerCount(),
                 services.get(Clock),
                 services.get(DocumentationRegistry),

build-tools/geode-testing-isolation/src/main/groovy/org/apache/geode/gradle/testing/Workers.groovy

@@ -32,6 +32,8 @@ class Workers {
             ProcessLauncher processLauncher,
             MessagingServer messagingServer) {
         def workerImplementationFactory = donor.workerImplementationFactory
+        // Gradle 7.6.6: jvmVersionDetector moved from workerImplementationFactory to donor
+        def jvmVersionDetector = donor.jvmVersionDetector
         return new LauncherProxyWorkerProcessFactory(
                 donor.loggingManager,
                 messagingServer,
@@ -40,7 +42,7 @@ class Workers {
                 workerImplementationFactory.gradleUserHomeDir,
                 workerImplementationFactory.temporaryFileProvider,
                 donor.execHandleFactory,
-                workerImplementationFactory.jvmVersionDetector,
+                jvmVersionDetector,
                 donor.outputEventListener,
                 donor.memoryManager,
                 processLauncher)

build-tools/geode-testing-isolation/src/main/java/org/apache/geode/gradle/testing/process/LauncherProxyWorkerProcessBuilder.java

@@ -157,4 +157,9 @@ private synchronized Object assignableProcessLauncher(Class<?> requiredType) {
     }
     return processLauncherProxy;
   }
+  // Gradle 7.6.6: setUseLegacyAddOpens required by WorkerProcessBuilder
+  @Override
+  public WorkerProcessBuilder setUseLegacyAddOpens(boolean useLegacyAddOpens) {
+    return delegate.setUseLegacyAddOpens(useLegacyAddOpens);
+  }
 }

build-tools/scripts/build.gradle

@@ -20,6 +20,8 @@ plugins {
 }
 
 repositories {
+  // mavenLocal() first for Gradle 7.6.6 strict resolution - custom Geode plugins published here
+  mavenLocal()
   mavenCentral()
   gradlePluginPortal()
 }
@@ -32,8 +34,9 @@ dependencies {
   implementation("org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.3")
   implementation('me.champeau.gradle:japicmp-gradle-plugin:0.3.0')
 
-  implementation('org.apache.geode.gradle:org.apache.geode.gradle.geode-repeat-test:1.0')
+  // Custom Geode plugins with Gradle 7.6.6 compatibility fixes and corrected coordinates
+  implementation('org.apache.geode.gradle:geode-build-tools:1.0')
   implementation('org.apache.geode.gradle:geode-japicmp:1.0')
-  implementation('org.apache.geode.gradle:org.apache.geode.gradle.geode-build-tools:1.0')
-  implementation('org.apache.geode.gradle:org.apache.geode.gradle.geode-testing-isolation:1.0')
+  implementation('org.apache.geode.gradle:geode-repeat-test:1.0')
+  implementation('org.apache.geode.gradle:geode-testing-isolation:1.0')
 }