From 22db81f8f1da3925a93db2f39e53afa38bbe81f5 Mon Sep 17 00:00:00 2001
From: Joshua Li <joshuali925@gmail.com>
Date: Thu, 18 Jan 2024 00:13:41 +0000
Subject: [PATCH] upgrade gradle to 8.5

Signed-off-by: Joshua Li <joshuali925@gmail.com>
---
 build-tools/opensearchplugin-coverage.gradle |  4 ++--
 build-tools/pkgbuild.gradle                  | 18 +++++++++++++++---
 build.gradle                                 |  2 +-
 gradle/wrapper/gradle-wrapper.properties     |  2 +-
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/build-tools/opensearchplugin-coverage.gradle b/build-tools/opensearchplugin-coverage.gradle
index de94a5375..a0bdd156f 100644
--- a/build-tools/opensearchplugin-coverage.gradle
+++ b/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
     }
 }
 
diff --git a/build-tools/pkgbuild.gradle b/build-tools/pkgbuild.gradle
index 7507461b7..2c261ad60 100644
--- a/build-tools/pkgbuild.gradle
+++ b/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") }
+        }
     }
 }
diff --git a/build.gradle b/build.gradle
index 8c4b0d32e..dde0ae938 100644
--- a/build.gradle
+++ b/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'
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 508322917..3499ded5c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/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