Update to Gradle 8.5 (#617)

opensearch-project · Feb 6, 2024 · bfab315 · bfab315
1 parent 857a157
commit bfab315
Show file tree

Hide file tree

Showing 39 changed files with 29 additions and 30 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -15,6 +15,7 @@ jobs:
         java:
           - 11
           - 17
+          - 21
       fail-fast: false
     runs-on: [ubuntu-latest]
     name: Building PA package

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.74'
-    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/commons-lang3-3.12.0.jar.sha1 b/licenses/commons-lang3-3.12.0.jar.sha1
diff --git a/licenses/commons-lang3-3.13.0.jar.sha1 b/licenses/commons-lang3-3.13.0.jar.sha1
@@ -0,0 +1 @@
+b7263237aa89c1f99b327197c41d0669707a462e
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.106.Final.jar.sha1 b/licenses/netty-buffer-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+c5495ba59a627641b3a7c23f6bcb801874c7f7b0
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.106.Final.jar.sha1 b/licenses/netty-codec-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+025171b63aa1e7a5fd8a7e4e660d6d3110241ea7
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.106.Final.jar.sha1 b/licenses/netty-codec-http-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+21a07cdf0fc46b313fe2248f1275cdbdac0ba87b
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.106.Final.jar.sha1 b/licenses/netty-codec-http2-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+41515e8c51eeaaddceabdb4f86fbc5dbfc25b70e
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.106.Final.jar.sha1 b/licenses/netty-codec-socks-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+129f9bd6aa0cf28bfd7d45a8b6a598eed9c67702
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.106.Final.jar.sha1 b/licenses/netty-common-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+132defb4689f41b51b483b7202b22b6e89fe35fd
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.106.Final.jar.sha1 b/licenses/netty-handler-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+874c970c4ff958b1140dde52bc17e6a9e7cde662
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.106.Final.jar.sha1 b/licenses/netty-handler-proxy-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+bffc88b7c56d7b553453e4244247a1b0ba1fdc8a
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.106.Final.jar.sha1 b/licenses/netty-resolver-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+e185ae573db04939215f94d6ba869758dcecbde9
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.106.Final.jar.sha1 b/licenses/netty-transport-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+8fcca44ae16b98e15965093e7696832019fd6f27
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.106.Final.jar.sha1 b/licenses/netty-transport-native-unix-common-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+2da179bd95903f0fa73218b8f0d02690c0cfbc94
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
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,6 +15,7 @@ jobs: @@
             java:
               - 11
               - 17
+              - 21
           fail-fast: false
         runs-on: [ubuntu-latest]
         name: Building PA package
@@ Expand Down @@