From d0f617cd24a690bd3a04dd11fd9993ed59f2d1ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dharmesh=20=F0=9F=92=A4?= <sdharms@amazon.com>
Date: Tue, 6 Feb 2024 16:50:36 +0530
Subject: [PATCH] Update to Gradle 8.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Dharmesh 💤 <sdharms@amazon.com>
---
 .github/workflows/gauntlet-tests-workflow.yml |  7 ++++++-
 .github/workflows/gradle.yml                  |  1 +
 build.gradle                                  | 20 +++++++++++--------
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/gauntlet-tests-workflow.yml b/.github/workflows/gauntlet-tests-workflow.yml
index 552b0ae85..2b760dadf 100644
--- a/.github/workflows/gauntlet-tests-workflow.yml
+++ b/.github/workflows/gauntlet-tests-workflow.yml
@@ -13,11 +13,16 @@ jobs:
   build_rca_pkg:
     runs-on: [ubuntu-latest]
     name: Build and Run Gauntlet tests
+    strategy:
+      matrix:
+        java:
+          - 17
+          - 21
     steps:
     - name: Set up JDK
       uses: actions/setup-java@v1
       with:
-        java-version: 14
+        java-version: ${{matrix.java}}
     # RCA in ./tmp/performance-analyzer-rca
     - name: Checkout RCA
       uses: actions/checkout@v2
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 6c432e923..cb7024798 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -16,6 +16,7 @@ jobs:
         java:
           - 11
           - 17
+          - 21
       fail-fast: false
     runs-on: [ubuntu-latest]
     name: Building RCA package
diff --git a/build.gradle b/build.gradle
index 9673c0a96..7f9c73e94 100644
--- a/build.gradle
+++ b/build.gradle
@@ -150,9 +150,9 @@ jacoco {
 
 jacocoTestReport {
     reports {
-        xml.enabled true
-        html.enabled true
-        csv.enabled false
+        xml.required = true
+        html.required = true
+        csv.required = false
     }
 
     afterEvaluate {
@@ -208,7 +208,7 @@ check.dependsOn jacocoTestCoverageVerification
 version = opensearch_build
 
 distZip {
-    archiveName "performance-analyzer-rca-${version}.zip"
+    archiveFileName = "performance-analyzer-rca-${version}.zip"
 }
 
 publishing {
@@ -367,11 +367,15 @@ dependencies {
     implementation group: 'com.google.protobuf', name: 'protobuf-java', version: "${protobufVersion}"
     implementation 'io.grpc:grpc-netty:1.56.1'
     implementation 'io.grpc:grpc-protobuf:1.56.1'
-    implementation("io.netty:netty-codec-http2:${nettyVersion}") {
-        force = 'true'
+    implementation("io.netty:netty-codec-http2") {
+        version {
+            strictly "${nettyVersion}"
+        }
     }
-    implementation("io.netty:netty-handler-proxy:${nettyVersion}") {
-        force = 'true'
+    implementation("io.netty:netty-handler-proxy") {
+        version {
+            strictly "${nettyVersion}"
+        }
     }
     implementation 'io.grpc:grpc-stub:1.52.1'
     implementation "jakarta.annotation:jakarta.annotation-api:${jakartaVersion}"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 508322917..744c64d12 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.4-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists