Update to Gradle 8.5 (#617) (#619)

Signed-off-by: Andriy Redko <[email protected]> Co-authored-by: Dharmesh <[email protected]> (cherry picked from commit f8666da)
opensearch-project · Feb 7, 2024 · c342006 · c342006
1 parent 1d6e66e
commit c342006
Show file tree

Hide file tree

Showing 36 changed files with 27 additions and 29 deletions.
diff --git a/build.gradle b/build.gradle
@@ -47,7 +47,7 @@ buildscript {
 
 plugins {
     id 'java'
-    id 'nebula.ospackage' version "8.3.0"
+    id 'com.netflix.nebula.ospackage' version "11.6.0"
     id 'com.github.spotbugs' version '5.0.13'
     id 'jacoco'
     id 'com.diffplug.spotless' version '5.11.0'
@@ -217,9 +217,9 @@ jacoco {
 
 jacocoTestReport {
     reports {
-        xml.enabled true
-        html.enabled true
-        csv.enabled false
+        xml.required = true
+        html.required = true
+        csv.required = false
     }
     afterEvaluate {
         classDirectories.from = files(classDirectories.files.collect {
@@ -301,7 +301,7 @@ dependencies {
     implementation 'org.jooq:jooq:3.10.8'
     implementation 'org.apache.commons:commons-lang3:3.9'
     implementation 'org.bouncycastle:bcprov-jdk15to18:1.75'
-    implementation 'org.bouncycastle:bcpkix-jdk15on:1.70'
+    implementation 'org.bouncycastle:bcpkix-jdk18on:1.74'
     implementation "org.opensearch:performance-analyzer-commons:${paCommonsVersion}"
     implementation "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"
     implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonDataBindVersion}"
@@ -872,10 +872,9 @@ afterEvaluate {
         task renameRpm(type: Copy) {
             from("$buildDir/distributions")
             into("$buildDir/distributions")
-            include archiveName
-            rename archiveName, "${packageName}-${version}.rpm"
+            rename "$archiveFileName", "${packageName}-${version}.rpm"
             doLast {
-                delete file("$buildDir/distributions/$archiveName")
+                delete file("$buildDir/distributions/$archiveFileName")
             }
         }
     }
@@ -889,10 +888,9 @@ afterEvaluate {
         task renameDeb(type: Copy) {
             from("$buildDir/distributions")
             into("$buildDir/distributions")
-            include archiveName
-            rename archiveName, "${packageName}-${version}.deb"
+            rename "$archiveFileName", "${packageName}-${version}.deb"
             doLast {
-                delete file("$buildDir/distributions/$archiveName")
+                delete file("$buildDir/distributions/$archiveFileName")
             }
         }
     }

diff --git 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
diff --git a/licenses/bcpkix-jdk15on-1.70.jar.sha1 b/licenses/bcpkix-jdk15on-1.70.jar.sha1
diff --git a/licenses/bcpkix-jdk18on-1.74.jar.sha1 b/licenses/bcpkix-jdk18on-1.74.jar.sha1
@@ -0,0 +1 @@
+a197fb87f0697c1925e7248865ee84516fdb6d9c
diff --git a/licenses/bcpkix-jdk15on-LICENSE.txt → licenses/bcpkix-jdk18on-LICENSE.txt b/licenses/bcpkix-jdk15on-LICENSE.txt → licenses/bcpkix-jdk18on-LICENSE.txt
@@ -1,5 +1,5 @@
 LICENSE
-Copyright (c) 2000 - 2019 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org)
+Copyright (c) 2000 - 2024 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

diff --git a/licenses/bcpkix-jdk15on-NOTICE.txt → licenses/bcpkix-jdk18on-NOTICE.txt b/licenses/bcpkix-jdk15on-NOTICE.txt → licenses/bcpkix-jdk18on-NOTICE.txt
diff --git a/licenses/jackson-annotations-2.15.2.jar.sha1 b/licenses/jackson-annotations-2.15.2.jar.sha1
diff --git a/licenses/jackson-annotations-2.16.1.jar.sha1 b/licenses/jackson-annotations-2.16.1.jar.sha1
@@ -0,0 +1 @@
+fd441d574a71e7d10a4f73de6609f881d8cdfeec
diff --git a/licenses/jackson-databind-2.15.2.jar.sha1 b/licenses/jackson-databind-2.15.2.jar.sha1
diff --git a/licenses/jackson-databind-2.16.1.jar.sha1 b/licenses/jackson-databind-2.16.1.jar.sha1
@@ -0,0 +1 @@
+02a16efeb840c45af1e2f31753dfe76795278b73
diff --git a/licenses/jackson-module-paranamer-2.15.2.jar.sha1 b/licenses/jackson-module-paranamer-2.15.2.jar.sha1
diff --git a/licenses/jackson-module-paranamer-2.16.1.jar.sha1 b/licenses/jackson-module-paranamer-2.16.1.jar.sha1
@@ -0,0 +1 @@
+8ccd968bf3c07b7a67f099ca8709b3fed5ffedae
diff --git a/licenses/netty-buffer-4.1.104.Final.jar.sha1 b/licenses/netty-buffer-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+756797174b94a3aee11ce83522473f3c18287a43
diff --git a/licenses/netty-buffer-4.1.97.Final.jar.sha1 b/licenses/netty-buffer-4.1.97.Final.jar.sha1
diff --git a/licenses/netty-codec-4.1.104.Final.jar.sha1 b/licenses/netty-codec-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+f51fcfd3baac88b2c0b8dc715932ad5622d17429
diff --git a/licenses/netty-codec-4.1.97.Final.jar.sha1 b/licenses/netty-codec-4.1.97.Final.jar.sha1
diff --git a/licenses/netty-codec-http-4.1.104.Final.jar.sha1 b/licenses/netty-codec-http-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+2db1556de1b8dc07695604bf51a0a133263ad63f
diff --git a/licenses/netty-codec-http-4.1.97.Final.jar.sha1 b/licenses/netty-codec-http-4.1.97.Final.jar.sha1
diff --git a/licenses/netty-codec-http2-4.1.104.Final.jar.sha1 b/licenses/netty-codec-http2-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+5bb757929f7c4d1bf12740a378a99643caaad1ac
diff --git a/licenses/netty-codec-http2-4.1.97.Final.jar.sha1 b/licenses/netty-codec-http2-4.1.97.Final.jar.sha1
diff --git a/licenses/netty-codec-socks-4.1.104.Final.jar.sha1 b/licenses/netty-codec-socks-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+5b126ceba61275f38297cacd5ea0cd6d3addee04
diff --git a/licenses/netty-codec-socks-4.1.97.Final.jar.sha1 b/licenses/netty-codec-socks-4.1.97.Final.jar.sha1
diff --git a/licenses/netty-common-4.1.104.Final.jar.sha1 b/licenses/netty-common-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+ec5fc4a7c5475eb20805e14f7274aa28872b5ba1
diff --git a/licenses/netty-common-4.1.97.Final.jar.sha1 b/licenses/netty-common-4.1.97.Final.jar.sha1
diff --git a/licenses/netty-handler-4.1.104.Final.jar.sha1 b/licenses/netty-handler-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+18c0e659950cdef5f12c36eccfa14cbd2ad2049d
diff --git a/licenses/netty-handler-4.1.97.Final.jar.sha1 b/licenses/netty-handler-4.1.97.Final.jar.sha1
diff --git a/licenses/netty-handler-proxy-4.1.104.Final.jar.sha1 b/licenses/netty-handler-proxy-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+50a2d899a8f8a68daed1a9b6d7750184310cc45f
diff --git a/licenses/netty-handler-proxy-4.1.97.Final.jar.sha1 b/licenses/netty-handler-proxy-4.1.97.Final.jar.sha1
diff --git a/licenses/netty-resolver-4.1.104.Final.jar.sha1 b/licenses/netty-resolver-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+dfa4fe5c3a6eabb7af09902eb63266829876d8a2
diff --git a/licenses/netty-resolver-4.1.97.Final.jar.sha1 b/licenses/netty-resolver-4.1.97.Final.jar.sha1
diff --git a/licenses/netty-transport-4.1.104.Final.jar.sha1 b/licenses/netty-transport-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+da7b263b6fedc5add70e78ee8927c8bd2b9bb589
diff --git a/licenses/netty-transport-4.1.97.Final.jar.sha1 b/licenses/netty-transport-4.1.97.Final.jar.sha1
diff --git a/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1 b/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+d4da9f7237ac3ac292891e0b2d5364acbce128cf
diff --git a/licenses/netty-transport-native-unix-common-4.1.97.Final.jar.sha1 b/licenses/netty-transport-native-unix-common-4.1.97.Final.jar.sha1
diff --git a/licenses/performance-analyzer-commons-1.0.0-SNAPSHOT.jar.sha1 b/licenses/performance-analyzer-commons-1.0.0-SNAPSHOT.jar.sha1
diff --git a/licenses/performance-analyzer-commons-1.3.0-SNAPSHOT.jar.sha1 b/licenses/performance-analyzer-commons-1.3.0-SNAPSHOT.jar.sha1
@@ -0,0 +1 @@
+a7390b56028ff0ec41c0114036cec55a511bfe91