Update Gradle to 8.5

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
opensearch-project · Nov 29, 2023 · 01ca364 · 01ca364
1 parent 6bc0cd6
commit 01ca364
Show file tree

Hide file tree

Showing 17 changed files with 20 additions and 20 deletions.
diff --git a/benchmarks/build.gradle b/benchmarks/build.gradle
@@ -40,7 +40,7 @@ application {
 }
 
 base {
-  archivesBaseName = 'opensearch-benchmarks'
+  archivesName = 'opensearch-benchmarks'
 }
 
 test.enabled = false

diff --git a/build.gradle b/build.gradle
@@ -375,7 +375,7 @@ allprojects {
         } else {
           // Link to non-shadowed dependant projects
           project.javadoc.dependsOn "${upstreamProject.path}:javadoc"
-          String externalLinkName = upstreamProject.base.archivesBaseName
+          String externalLinkName = upstreamProject.base.archivesName
           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/"

diff --git a/buildSrc/src/main/groovy/org/opensearch/gradle/plugin/PluginBuildPlugin.groovy b/buildSrc/src/main/groovy/org/opensearch/gradle/plugin/PluginBuildPlugin.groovy
@@ -89,7 +89,7 @@ class PluginBuildPlugin implements Plugin<Project> {
             String name = extension1.name
 
             BasePluginExtension base = project.getExtensions().findByType(BasePluginExtension.class)
-            base.archivesBaseName = name
+            base.archivesName = name
             project.description = extension1.description
 
             if (extension1.name == null) {
@@ -155,15 +155,15 @@ class PluginBuildPlugin implements Plugin<Project> {
         // Only configure publishing if applied externally
         if (extension.hasClientJar) {
             project.pluginManager.apply('com.netflix.nebula.maven-base-publish')
-            // Only change Jar tasks, we don't want a -client zip so we can't change archivesBaseName
+            // Only change Jar tasks, we don't want a -client zip so we can't change archivesName
             project.tasks.withType(Jar) {
                 archiveBaseName = archiveBaseName.get() +  "-client"
             }
             // 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/${base.archivesBaseName}-client-${project.versions.opensearch}.pom"
+                generatePOMTask.destination = "${project.buildDir}/distributions/${base.archivesName}-client-${project.versions.opensearch}.pom"
             }
         } else {
             if (project.plugins.hasPlugin(MavenPublishPlugin)) {

diff --git a/buildSrc/src/main/java/org/opensearch/gradle/PublishPlugin.java b/buildSrc/src/main/java/org/opensearch/gradle/PublishPlugin.java
@@ -77,7 +77,7 @@ public void apply(Project project) {
     }
 
     private static String getArchivesBaseName(Project project) {
-        return project.getExtensions().getByType(BasePluginExtension.class).getArchivesBaseName();
+        return project.getExtensions().getByType(BasePluginExtension.class).getArchivesName().get();
     }
 
     /**Configuration generation of maven poms. */

diff --git a/client/benchmark/build.gradle b/client/benchmark/build.gradle
@@ -33,7 +33,7 @@ apply plugin: 'application'
 
 base {
   group = 'org.opensearch.client'
-  archivesBaseName = 'client-benchmarks'
+  archivesName = 'client-benchmarks'
 }
 
 // Not published so no need to assemble

diff --git a/client/rest-high-level/build.gradle b/client/rest-high-level/build.gradle
@@ -39,7 +39,7 @@ apply plugin: 'opensearch.rest-resources'
 
 base {
   group = 'org.opensearch.client'
-  archivesBaseName = 'opensearch-rest-high-level-client'
+  archivesName = 'opensearch-rest-high-level-client'
 }
 
 restResources {

diff --git a/client/rest/build.gradle b/client/rest/build.gradle
@@ -40,7 +40,7 @@ java {
 
 base {
   group = 'org.opensearch.client'
-  archivesBaseName = 'opensearch-rest-client'
+  archivesName = 'opensearch-rest-client'
 }
 
 dependencies {

diff --git a/client/sniffer/build.gradle b/client/sniffer/build.gradle
@@ -37,7 +37,7 @@ java {
 
 base {
   group = 'org.opensearch.client'
-  archivesBaseName = 'opensearch-rest-client-sniffer'
+  archivesName = 'opensearch-rest-client-sniffer'
 }
 
 dependencies {

diff --git a/distribution/archives/integ-test-zip/build.gradle b/distribution/archives/integ-test-zip/build.gradle
@@ -38,7 +38,7 @@ apply plugin: 'com.netflix.nebula.maven-publish'
 
 base {
   group = "org.opensearch.distribution.integ-test-zip"
-  archivesBaseName = "opensearch"
+  archivesName = "opensearch"
 }
 
 integTest {

diff --git a/distribution/tools/launchers/build.gradle b/distribution/tools/launchers/build.gradle
@@ -39,7 +39,7 @@ dependencies {
 }
 
 base {
-  archivesBaseName = 'opensearch-launchers'
+  archivesName = 'opensearch-launchers'
 }
 
 tasks.withType(CheckForbiddenApis).configureEach {

diff --git a/distribution/tools/plugin-cli/build.gradle b/distribution/tools/plugin-cli/build.gradle
@@ -31,7 +31,7 @@
 apply plugin: 'opensearch.build'
 
 base {
-  archivesBaseName = 'opensearch-plugin-cli'
+  archivesName = 'opensearch-plugin-cli'
 }
 
 dependencies {

diff --git a/distribution/tools/upgrade-cli/build.gradle b/distribution/tools/upgrade-cli/build.gradle
@@ -10,7 +10,7 @@
 apply plugin: 'opensearch.build'
 
 base {
-  archivesBaseName = 'opensearch-upgrade-cli'
+  archivesName = 'opensearch-upgrade-cli'
 }
 
 dependencies {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -11,7 +11,7 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-rc-1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionSha256Sum=f2b9ed0faf8472cbe469255ae6c86eddb77076c75191741b4a462f33128dd419
+distributionSha256Sum=758ec07710ac706e7296b98fe34ea9a52cf68c223e6a3d8749a7383f268de89e
diff --git a/libs/common/build.gradle b/libs/common/build.gradle
@@ -14,7 +14,7 @@ import org.opensearch.gradle.info.BuildParams
 apply plugin: 'opensearch.publish'
 
 base {
-  archivesBaseName = 'opensearch-common'
+  archivesName = 'opensearch-common'
 }
 
 dependencies {

diff --git a/libs/core/build.gradle b/libs/core/build.gradle
@@ -33,7 +33,7 @@ import org.opensearch.gradle.info.BuildParams
 apply plugin: 'opensearch.publish'
 
 base {
-  archivesBaseName = 'opensearch-core'
+  archivesName = 'opensearch-core'
 }
 
 // we want to keep the JDKs in our IDEs set to JDK 8 until minimum JDK is bumped to 11 so we do not include this source set in our IDEs

diff --git a/modules/lang-painless/spi/build.gradle b/modules/lang-painless/spi/build.gradle
@@ -33,7 +33,7 @@ apply plugin: 'opensearch.publish'
 
 base {
   group = 'org.opensearch.plugin'
-  archivesBaseName = 'opensearch-scripting-painless-spi'
+  archivesName = 'opensearch-scripting-painless-spi'
 }
 
 dependencies {

diff --git a/server/build.gradle b/server/build.gradle
@@ -47,7 +47,7 @@ publishing {
 }
 
 base {
-  archivesBaseName = 'opensearch'
+  archivesName = 'opensearch'
 }
 
 sourceSets {
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,7 +40,7 @@ application { @@
     }
     base {
-      archivesBaseName = 'opensearch-benchmarks'
+      archivesName = 'opensearch-benchmarks'
     }
     test.enabled = false
@@ Expand Down @@