upgrade gradle to 8.5

Signed-off-by: Joshua Li <[email protected]>

build-tools/opensearchplugin-coverage.gradle

@@ -54,8 +54,8 @@ jacocoTestReport {
  sourceDirectories.from = "src/main/kotlin"
  classDirectories.from = sourceSets.main.output
  reports {
- html.enabled = true // human readable
- xml.enabled = true // for coverlay
+ html.required = true // human readable
+ xml.required = true // for coverlay
  }
 }
 

build-tools/pkgbuild.gradle

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-apply plugin: 'nebula.ospackage'
+apply plugin: 'com.netflix.nebula.ospackage'
 
 // This is afterEvaluate because the bundlePlugin ZIP task is updated afterEvaluate and changes the ZIP name to match the plugin name
 afterEvaluate {
@@ -39,13 +39,25 @@ afterEvaluate {
 
  buildRpm {
  arch = 'NOARCH'
- archiveName "${packageName}-${version}.rpm"
  dependsOn 'assemble'
+ finalizedBy 'renameRpm'
+ task renameRpm(type: Copy) {
+ from("$buildDir/distributions")
+ into("$buildDir/distributions")
+ rename "$archiveFileName", "${packageName}-${version}.rpm"
+ doLast { delete file("$buildDir/distributions/$archiveFileName") }
+ }
  }
 
  buildDeb {
  arch = 'amd64'
- archiveName "${packageName}-${version}.deb"
  dependsOn 'assemble'
+ finalizedBy 'renameDeb'
+ task renameDeb(type: Copy) {
+ from("$buildDir/distributions")
+ into("$buildDir/distributions")
+ rename "$archiveFileName", "${packageName}-${version}.deb"
+ doLast { delete file("$buildDir/distributions/$archiveFileName") }
+ }
  }
 }

build.gradle

@@ -41,7 +41,7 @@ buildscript {
 }
 
 plugins {
- id 'nebula.ospackage' version "8.3.0"
+ id "com.netflix.nebula.ospackage" version "11.6.0"
  id "com.dorongold.task-tree" version "1.5"
  id 'java-library'
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists