From dac9a1a253848ba03cefea2a86942b863c0ed53d Mon Sep 17 00:00:00 2001 From: Bharathwaj G Date: Wed, 6 Sep 2023 20:33:16 +0530 Subject: [PATCH 1/2] fixing guava version Signed-off-by: Bharathwaj G --- build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 02747955..5ce91172 100644 --- a/build.gradle +++ b/build.gradle @@ -62,7 +62,7 @@ apply plugin: 'opensearch.pluginzip' checkstyle { - toolVersion = '8.29' + toolVersion = '10.12.1' configFile file("checkstyle/checkstyle.xml") } @@ -134,6 +134,7 @@ 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}" } } From e015089824785feae82ad37a24ce6443d2c7d252 Mon Sep 17 00:00:00 2001 From: Bharathwaj G Date: Thu, 7 Sep 2023 00:47:30 +0530 Subject: [PATCH 2/2] Incrementing guava version and increasing heap size (#340) * fixing guava version Signed-off-by: Bharathwaj G * setting heap to 600M Signed-off-by: Bharathwaj G --------- Signed-off-by: Bharathwaj G --- .github/workflows/build.yml | 2 ++ .github/workflows/multi-node-test-workflow.yml | 2 ++ build.gradle | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 60cf75d1..9e3a132d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,6 +30,8 @@ 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 60bfa30b..07136a4d 100644 --- a/.github/workflows/multi-node-test-workflow.yml +++ b/.github/workflows/multi-node-test-workflow.yml @@ -28,6 +28,8 @@ 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 02747955..5ce91172 100644 --- a/build.gradle +++ b/build.gradle @@ -62,7 +62,7 @@ apply plugin: 'opensearch.pluginzip' checkstyle { - toolVersion = '8.29' + toolVersion = '10.12.1' configFile file("checkstyle/checkstyle.xml") } @@ -134,6 +134,7 @@ 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}" } }