[Backport] [2.x] Update to Gradle 8.2.1 (#8018)

benchmarks/build.gradle

@@ -32,10 +32,16 @@ import org.opensearch.gradle.info.BuildParams
 
 apply plugin: 'opensearch.build'
 apply plugin: 'application'
-mainClassName = 'org.openjdk.jmh.Main'
 
 assemble.enabled = false
-archivesBaseName = 'opensearch-benchmarks'
+
+application {
+  mainClass = 'org.openjdk.jmh.Main'
+}
+
+base {
+  archivesBaseName = 'opensearch-benchmarks'
+}
 
 test.enabled = false
 

build.gradle

@@ -319,6 +319,7 @@ allprojects {
       javadoc.options.addStringOption('Xwerror', '-quiet')
     }
     javadoc.options.tags = ["opensearch.internal", "opensearch.api", "opensearch.experimental"]
+    javadoc.options.addStringOption("-release", java.targetCompatibility.majorVersion)
   }
 
   // support for reproducible builds
@@ -366,7 +367,7 @@ allprojects {
         } else {
           // Link to non-shadowed dependant projects
           project.javadoc.dependsOn "${upstreamProject.path}:javadoc"
-          String externalLinkName = upstreamProject.archivesBaseName
+          String externalLinkName = upstreamProject.base.archivesBaseName
           String artifactPath = dep.group.replaceAll('\\.', '/') + '/' + externalLinkName.replaceAll('\\.', '/') + '/' + dep.version
           String projectRelativePath = project.relativePath(upstreamProject.buildDir)
           project.javadoc.options.linksOffline artifactsHost + "/javadoc/" + artifactPath, "${projectRelativePath}/docs/javadoc/"
@@ -443,7 +444,7 @@ gradle.projectsEvaluated {
       testReportAggregation it
     }
     subprojects.findAll { it.pluginManager.hasPlugin('jacoco') }.forEach {
-     jacocoAggregation it
+      jacocoAggregation it
     }
   }
 }

buildSrc/build.gradle

@@ -111,7 +111,7 @@ dependencies {
   api 'org.apache.rat:apache-rat:0.15'
   api 'commons-io:commons-io:2.11.0'
   api "net.java.dev.jna:jna:5.13.0"
-  api 'gradle.plugin.com.github.johnrengelman:shadow:8.0.0'
+  api 'com.github.johnrengelman:shadow:8.1.1'
   api 'org.jdom:jdom2:2.0.6.1'
   api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${props.getProperty('kotlin')}"
   api 'de.thetaphi:forbiddenapis:3.5.1'
@@ -164,8 +164,10 @@ if (project != rootProject) {
   apply plugin: 'opensearch.publish'
 
   allprojects {
-    targetCompatibility = JavaVersion.VERSION_11
-    sourceCompatibility = JavaVersion.VERSION_11
+    java {
+        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_11
+    }
   }
 
   // groovydoc succeeds, but has some weird internal exception...

buildSrc/reaper/build.gradle

@@ -11,8 +11,10 @@
 
 apply plugin: 'java'
 
-targetCompatibility = JavaVersion.VERSION_11
-sourceCompatibility = JavaVersion.VERSION_11
+java {
+  targetCompatibility = JavaVersion.VERSION_11
+  sourceCompatibility = JavaVersion.VERSION_11
+}
 
 jar {
   archiveFileName = "${project.name}.jar"

buildSrc/src/main/groovy/org/opensearch/gradle/plugin/PluginBuildPlugin.groovy

@@ -44,6 +44,8 @@ import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.Task
 import org.gradle.api.plugins.BasePlugin
+import org.gradle.api.plugins.BasePluginExtension
+import org.gradle.api.plugins.JavaPluginExtension
 import org.gradle.api.publish.maven.MavenPublication
 import org.gradle.api.publish.maven.plugins.MavenPublishPlugin
 import org.gradle.api.publish.maven.tasks.GenerateMavenPom
@@ -85,7 +87,9 @@ class PluginBuildPlugin implements Plugin<Project> {
             PluginPropertiesExtension extension1 = project.getExtensions().getByType(PluginPropertiesExtension.class)
             configurePublishing(project, extension1)
             String name = extension1.name
-            project.archivesBaseName = name
+
+            BasePluginExtension base = project.getExtensions().findByType(BasePluginExtension.class)
+            base.archivesBaseName = name
             project.description = extension1.description
 
             if (extension1.name == null) {
@@ -98,12 +102,13 @@ class PluginBuildPlugin implements Plugin<Project> {
                 throw new InvalidUserDataException('classname is a required setting for opensearchplugin')
             }
 
+            JavaPluginExtension java = project.getExtensions().findByType(JavaPluginExtension.class)
             Map<String, String> properties = [
                     'name'                : extension1.name,
                     'description'         : extension1.description,
                     'version'             : extension1.version,
                     'opensearchVersion'   : Version.fromString(VersionProperties.getOpenSearch()).toString(),
-                    'javaVersion'         : project.targetCompatibility as String,
+                    'javaVersion'         : java.targetCompatibility as String,
                     'classname'           : extension1.classname,
                     'customFolderName'    : extension1.customFolderName,
                     'extendedPlugins'     : extension1.extendedPlugins.join(','),
@@ -156,8 +161,9 @@ class PluginBuildPlugin implements Plugin<Project> {
             }
             // always configure publishing for client jars
             project.publishing.publications.nebula(MavenPublication).artifactId(extension.name + "-client")
+            final BasePluginExtension base = project.getExtensions().findByType(BasePluginExtension.class)
             project.tasks.withType(GenerateMavenPom.class).configureEach { GenerateMavenPom generatePOMTask ->
-                generatePOMTask.destination = "${project.buildDir}/distributions/${project.archivesBaseName}-client-${project.versions.opensearch}.pom"
+                generatePOMTask.destination = "${project.buildDir}/distributions/${base.archivesBaseName}-client-${project.versions.opensearch}.pom"
             }
         } else {
             if (project.plugins.hasPlugin(MavenPublishPlugin)) {

buildSrc/src/main/java/org/opensearch/gradle/PublishPlugin.java

@@ -46,7 +46,7 @@
 import org.gradle.api.XmlProvider;
 import org.gradle.api.artifacts.ProjectDependency;
 import org.gradle.api.plugins.BasePlugin;
-import org.gradle.api.plugins.BasePluginConvention;
+import org.gradle.api.plugins.BasePluginExtension;
 import org.gradle.api.plugins.JavaPlugin;
 import org.gradle.api.publish.PublishingExtension;
 import org.gradle.api.publish.maven.MavenPublication;
@@ -77,7 +77,7 @@ public void apply(Project project) {
     }
 
     private static String getArchivesBaseName(Project project) {
-        return project.getConvention().getPlugin(BasePluginConvention.class).getArchivesBaseName();
+        return project.getExtensions().getByType(BasePluginExtension.class).getArchivesBaseName();
     }
 
     /**Configuration generation of maven poms. */

buildSrc/src/main/java/org/opensearch/gradle/precommit/ForbiddenPatternsTask.java

@@ -36,7 +36,7 @@
 import org.gradle.api.InvalidUserDataException;
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.file.FileTree;
-import org.gradle.api.plugins.JavaPluginConvention;
+import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.tasks.IgnoreEmptyDirectories;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.InputFiles;
@@ -106,8 +106,8 @@ public ForbiddenPatternsTask() {
     @IgnoreEmptyDirectories
     @PathSensitive(PathSensitivity.RELATIVE)
     public FileCollection getFiles() {
-        return getProject().getConvention()
-            .getPlugin(JavaPluginConvention.class)
+        return getProject().getExtensions()
+            .getByType(JavaPluginExtension.class)
             .getSourceSets()
             .stream()
             .map(sourceSet -> sourceSet.getAllSource().matching(filesFilter))

buildSrc/src/main/java/org/opensearch/gradle/precommit/LoggerUsageTask.java

@@ -34,7 +34,7 @@
 
 import org.opensearch.gradle.LoggedExec;
 import org.gradle.api.file.FileCollection;
-import org.gradle.api.plugins.JavaPluginConvention;
+import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.tasks.CacheableTask;
 import org.gradle.api.tasks.Classpath;
 import org.gradle.api.tasks.IgnoreEmptyDirectories;
@@ -82,8 +82,8 @@ public void setClasspath(FileCollection classpath) {
     @SkipWhenEmpty
     @IgnoreEmptyDirectories
     public FileCollection getClassDirectories() {
-        return getProject().getConvention()
-            .getPlugin(JavaPluginConvention.class)
+        return getProject().getExtensions()
+            .getByType(JavaPluginExtension.class)
             .getSourceSets()
             .stream()
             // Don't pick up all source sets like the java9 ones as logger-check doesn't support the class format

buildSrc/src/main/java/org/opensearch/gradle/test/rest/CopyRestApiTask.java

@@ -41,7 +41,7 @@
 import org.gradle.api.file.ConfigurableFileCollection;
 import org.gradle.api.file.FileSystemOperations;
 import org.gradle.api.file.FileTree;
-import org.gradle.api.plugins.JavaPluginConvention;
+import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.provider.ListProperty;
 import org.gradle.api.tasks.IgnoreEmptyDirectories;
 import org.gradle.api.tasks.Input;
@@ -240,7 +240,7 @@ private File getTestOutputResourceDir() {
 
     private Optional<SourceSet> getSourceSet() {
         Project project = getProject();
-        return project.getConvention().findPlugin(JavaPluginConvention.class) == null
+        return project.getExtensions().findByType(JavaPluginExtension.class) == null
             ? Optional.empty()
             : Optional.ofNullable(GradleUtils.getJavaSourceSets(project).findByName(getSourceSetName()));
     }

buildSrc/src/main/java/org/opensearch/gradle/test/rest/CopyRestTestsTask.java

@@ -41,7 +41,7 @@
 import org.gradle.api.file.ConfigurableFileCollection;
 import org.gradle.api.file.FileSystemOperations;
 import org.gradle.api.file.FileTree;
-import org.gradle.api.plugins.JavaPluginConvention;
+import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.provider.ListProperty;
 import org.gradle.api.tasks.IgnoreEmptyDirectories;
 import org.gradle.api.tasks.Input;
@@ -178,7 +178,7 @@ void copy() {
 
     private Optional<SourceSet> getSourceSet() {
         Project project = getProject();
-        return project.getConvention().findPlugin(JavaPluginConvention.class) == null
+        return project.getExtensions().findByType(JavaPluginExtension.class) == null
             ? Optional.empty()
             : Optional.ofNullable(GradleUtils.getJavaSourceSets(project).findByName(getSourceSetName()));
     }

buildSrc/src/main/java/org/opensearch/gradle/util/GradleUtils.java

@@ -40,7 +40,7 @@
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.artifacts.Dependency;
 import org.gradle.api.plugins.JavaBasePlugin;
-import org.gradle.api.plugins.JavaPluginConvention;
+import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.provider.Provider;
 import org.gradle.api.services.BuildService;
 import org.gradle.api.services.BuildServiceRegistration;
@@ -68,7 +68,7 @@ public static <T> Action<T> noop() {
     }
 
     public static SourceSetContainer getJavaSourceSets(Project project) {
-        return project.getConvention().getPlugin(JavaPluginConvention.class).getSourceSets();
+        return project.getExtensions().getByType(JavaPluginExtension.class).getSourceSets();
     }
 
     public static <T extends Task> TaskProvider<T> maybeRegister(TaskContainer tasks, String name, Class<T> clazz, Action<T> action) {

buildSrc/src/main/java/org/opensearch/gradle/util/Util.java

@@ -37,7 +37,7 @@
 import org.gradle.api.GradleException;
 import org.gradle.api.Project;
 import org.gradle.api.file.FileTree;
-import org.gradle.api.plugins.JavaPluginConvention;
+import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.tasks.SourceSet;
 import org.gradle.api.tasks.util.PatternFilterable;
 
@@ -149,7 +149,7 @@ public static FileTree getJavaTestAndMainSourceResources(Project project, Action
      * @return An Optional that contains the Java test SourceSet if it exists.
      */
     public static Optional<SourceSet> getJavaTestSourceSet(Project project) {
-        return project.getConvention().findPlugin(JavaPluginConvention.class) == null
+        return project.getExtensions().findByType(JavaPluginExtension.class) == null
             ? Optional.empty()
             : Optional.ofNullable(GradleUtils.getJavaSourceSets(project).findByName(SourceSet.TEST_SOURCE_SET_NAME));
     }
@@ -159,7 +159,7 @@ public static Optional<SourceSet> getJavaTestSourceSet(Project project) {
      * @return An Optional that contains the Java main SourceSet if it exists.
      */
     public static Optional<SourceSet> getJavaMainSourceSet(Project project) {
-        return project.getConvention().findPlugin(JavaPluginConvention.class) == null
+        return project.getExtensions().findByType(JavaPluginExtension.class) == null
             ? Optional.empty()
             : Optional.ofNullable(GradleUtils.getJavaSourceSets(project).findByName(SourceSet.MAIN_SOURCE_SET_NAME));
     }

client/benchmark/build.gradle

@@ -31,13 +31,17 @@
 apply plugin: 'opensearch.build'
 apply plugin: 'application'
 
-group = 'org.opensearch.client'
+base {
+  group = 'org.opensearch.client'
+  archivesBaseName = 'client-benchmarks'
+}
 
 // Not published so no need to assemble
 assemble.enabled = true
 
-archivesBaseName = 'client-benchmarks'
-mainClassName = 'org.opensearch.client.benchmark.BenchmarkMain'
+application {
+  mainClass = 'org.opensearch.client.benchmark.BenchmarkMain'
+}
 
 // never try to invoke tests on the benchmark project - there aren't any
 test.enabled = false

client/rest-high-level/build.gradle

@@ -37,8 +37,10 @@ apply plugin: 'opensearch.rest-test'
 apply plugin: 'opensearch.publish'
 apply plugin: 'opensearch.rest-resources'
 
-group = 'org.opensearch.client'
-archivesBaseName = 'opensearch-rest-high-level-client'
+base {
+  group = 'org.opensearch.client'
+  archivesBaseName = 'opensearch-rest-high-level-client'
+}
 
 restResources {
   //we need to copy the yaml spec so we can check naming (see RestHighlevelClientTests#testApiNamingConventions)

client/rest/build.gradle

@@ -33,11 +33,15 @@ import de.thetaphi.forbiddenapis.gradle.CheckForbiddenApis
 apply plugin: 'opensearch.build'
 apply plugin: 'opensearch.publish'
 
-targetCompatibility = JavaVersion.VERSION_11
-sourceCompatibility = JavaVersion.VERSION_11
+java {
+  targetCompatibility = JavaVersion.VERSION_11
+  sourceCompatibility = JavaVersion.VERSION_11
+}
 
-group = 'org.opensearch.client'
-archivesBaseName = 'opensearch-rest-client'
+base {
+  group = 'org.opensearch.client'
+  archivesBaseName = 'opensearch-rest-client'
+}
 
 dependencies {
   api "org.apache.httpcomponents:httpclient:${versions.httpclient}"

client/sniffer/build.gradle

@@ -30,11 +30,15 @@
 apply plugin: 'opensearch.build'
 apply plugin: 'opensearch.publish'
 
-targetCompatibility = JavaVersion.VERSION_11
-sourceCompatibility = JavaVersion.VERSION_11
+java {
+  targetCompatibility = JavaVersion.VERSION_11
+  sourceCompatibility = JavaVersion.VERSION_11
+}
 
-group = 'org.opensearch.client'
-archivesBaseName = 'opensearch-rest-client-sniffer'
+base {
+  group = 'org.opensearch.client'
+  archivesBaseName = 'opensearch-rest-client-sniffer'
+}
 
 dependencies {
   api project(":client:rest")

client/test/build.gradle

@@ -29,10 +29,14 @@
  */
 apply plugin: 'opensearch.build'
 
-targetCompatibility = JavaVersion.VERSION_11
-sourceCompatibility = JavaVersion.VERSION_11
+java {
+  targetCompatibility = JavaVersion.VERSION_11
+  sourceCompatibility = JavaVersion.VERSION_11
+}
 
-group = "${group}.client.test"
+base {
+  group = "${group}.client.test"
+}
 
 dependencies {
   api "org.apache.httpcomponents:httpcore:${versions.httpcore}"

distribution/archives/integ-test-zip/build.gradle

@@ -36,7 +36,10 @@ apply plugin: 'opensearch.rest-test'
 apply plugin: 'opensearch.publish'
 apply plugin: 'com.netflix.nebula.maven-publish'
 
-group = "org.opensearch.distribution.integ-test-zip"
+base {
+  group = "org.opensearch.distribution.integ-test-zip"
+  archivesBaseName = "opensearch"
+}
 
 integTest {
   dependsOn assemble
@@ -48,7 +51,6 @@ processTestResources {
 }
 
 // make the pom file name use opensearch instead of the project name
-archivesBaseName = "opensearch"
 ext.buildDist = parent.tasks.named("buildIntegTestZip")
 
 publishing {

distribution/tools/java-version-checker/build.gradle

@@ -11,8 +11,10 @@
 
 apply plugin: 'opensearch.build'
 
-sourceCompatibility = JavaVersion.VERSION_11
-targetCompatibility = JavaVersion.VERSION_11
+java {
+  sourceCompatibility = JavaVersion.VERSION_11
+  targetCompatibility = JavaVersion.VERSION_11
+}
 
 // targetting very old java versions enables a warning by default on newer JDK: disable it.
 compileJava.options.compilerArgs += '-Xlint:-options'