From 95a136f791241dec1f870aea870467f0bf09cd85 Mon Sep 17 00:00:00 2001
From: Arpit Bandejiya <abandeji@amazon.com>
Date: Thu, 7 Sep 2023 14:56:02 +0530
Subject: [PATCH] Revert "Incrementing guava version and increasing heap size
 (#340)"

This reverts commit e015089824785feae82ad37a24ce6443d2c7d252.
---
 .github/workflows/build.yml                    | 2 --
 .github/workflows/multi-node-test-workflow.yml | 2 --
 build.gradle                                   | 3 +--
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9e3a132d..60cf75d1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,8 +30,6 @@ jobs:
         uses: actions/checkout@v2
       - name: Build with Gradle
         run: ./gradlew build
-        env:
-          _JAVA_OPTIONS: -Xmx600M
       - name: Pull and Run Docker for security tests
         run: |
           version=`./gradlew properties -q | grep "opensearch_version:" | awk '{print $2}'`
diff --git a/.github/workflows/multi-node-test-workflow.yml b/.github/workflows/multi-node-test-workflow.yml
index 07136a4d..60bfa30b 100644
--- a/.github/workflows/multi-node-test-workflow.yml
+++ b/.github/workflows/multi-node-test-workflow.yml
@@ -28,8 +28,6 @@ jobs:
         uses: actions/checkout@v2
       - name: Run integration tests with multi node config
         run: ./gradlew integTest -PnumNodes=5
-        env:
-          _JAVA_OPTIONS: -Xmx600M
       - name: Run Backwards Compatibility Tests
         run: |
           echo "Running backwards compatibility tests ..."
diff --git a/build.gradle b/build.gradle
index 5ce91172..02747955 100644
--- a/build.gradle
+++ b/build.gradle
@@ -62,7 +62,7 @@ apply plugin: 'opensearch.pluginzip'
 
 
 checkstyle {
-    toolVersion = '10.12.1'
+    toolVersion = '8.29'
     configFile file("checkstyle/checkstyle.xml")
 }
 
@@ -134,7 +134,6 @@ dependencies {
     implementation "org.opensearch:common-utils:${common_utils_version}"
     configurations.all {
         resolutionStrategy {
-            force "com.google.guava:guava:32.0.1-jre"
             force "com.puppycrawl.tools:checkstyle:${project.checkstyle.toolVersion}"
         }
     }