From c44ce8d3be1f325f9b3c586baec450756a7b725d Mon Sep 17 00:00:00 2001 From: Ryan Gardner Date: Wed, 9 Feb 2022 10:15:19 -0500 Subject: [PATCH 1/3] Upgrade to Gradle 7.4 Upgrade to Gradle 7.4 - Updated gradle wrapper - Updated usage of an internal TemporaryFileProvider to the correct location for Gradle 7 - Update the `main` -> `mainClass` for the geode assembly to match Gradle 7 syntax - Move some `compile` scope to `compileOnly` (required for Gradle 7) - Add explicit `dependsOn` relationship between tasks that have dependencies that Gradle 7 complains about - Add a `duplicatesStrategy` to the processIntegrationTestResources to avoid Gradle 7 failing on a duplicate resources in shiro.ini (this duplicate _seems_ to come from how the source set is configured) - Upgrade the RepeatTestExecutor to match the DefaultTestExecutor from Gradle 7.4 --- .../LauncherProxyWorkerProcessFactory.java | 2 +- .../testing/repeat/RepeatTestExecuter.java | 17 +- geode-assembly/build.gradle | 9 +- .../management/build.gradle | 2 +- geode-connectors/build.gradle | 5 + geode-core/build.gradle | 6 + gradle/java.gradle | 4 +- gradle/publish-artifacts.gradle | 6 +- gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 59536 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 257 +++++++++++------- 11 files changed, 186 insertions(+), 124 deletions(-) diff --git a/buildSrc/src/main/java/org/apache/geode/gradle/testing/process/LauncherProxyWorkerProcessFactory.java b/buildSrc/src/main/java/org/apache/geode/gradle/testing/process/LauncherProxyWorkerProcessFactory.java index fcee360ad19f..f1ea9e17917c 100644 --- a/buildSrc/src/main/java/org/apache/geode/gradle/testing/process/LauncherProxyWorkerProcessFactory.java +++ b/buildSrc/src/main/java/org/apache/geode/gradle/testing/process/LauncherProxyWorkerProcessFactory.java @@ -20,7 +20,7 @@ import org.gradle.api.Action; import org.gradle.api.internal.ClassPathRegistry; -import org.gradle.api.internal.file.TemporaryFileProvider; +import org.gradle.api.internal.file.temp.TemporaryFileProvider; import org.gradle.api.logging.LoggingManager; import org.gradle.internal.id.IdGenerator; import org.gradle.internal.jvm.inspection.JvmVersionDetector; diff --git a/buildSrc/src/main/java/org/apache/geode/gradle/testing/repeat/RepeatTestExecuter.java b/buildSrc/src/main/java/org/apache/geode/gradle/testing/repeat/RepeatTestExecuter.java index 58f068106d42..5ec495bebbb0 100644 --- a/buildSrc/src/main/java/org/apache/geode/gradle/testing/repeat/RepeatTestExecuter.java +++ b/buildSrc/src/main/java/org/apache/geode/gradle/testing/repeat/RepeatTestExecuter.java @@ -43,11 +43,11 @@ 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; /** - * A copy of {@link DefaultTestExecuter} from Gradle v6.8.3, modified to process each test class + * A copy of {@link DefaultTestExecuter} from Gradle v7.4, modified to process each test class * as many times as it was submitted. This is required by our {@link RepeatTest} task, because: *