Force newer version of transitive (spotless) eclipse dependency (#175)

* Force newer version of transitive (spotless) eclipse dependency Signed-off-by: Daniel Widdis <[email protected]> * Non-impacted Eclipse Core dependency requires JDK17+ for spotless Signed-off-by: Daniel Widdis <[email protected]> * Don't do spotless check during build as its already done Signed-off-by: Daniel Widdis <[email protected]> --------- Signed-off-by: Daniel Widdis <[email protected]>
opensearch-project · Nov 17, 2023 · 2dcfc9c · 2dcfc9c
1 parent e3bbfcb
commit 2dcfc9c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -14,6 +14,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      # Spotless requires JDK 17+
+      - uses: actions/setup-java@v3
+        with:
+          java-version: 17
+          distribution: temurin
       - name: Spotless Check
         run: ./gradlew spotlessCheck
   javadoc:
@@ -46,7 +51,7 @@ jobs:
         distribution: temurin
     - name: Build and Run Tests
       run: |
-          ./gradlew check -x integTest -x yamlRestTest
+          ./gradlew check -x integTest -x yamlRestTest -x spotlessJava
     - name: Upload Coverage Report
       if: ${{ matrix.codecov }}
       uses: codecov/codecov-action@v3

diff --git a/build.gradle b/build.gradle
@@ -142,6 +142,7 @@ dependencies {
     configurations.all {
         resolutionStrategy {
             force("com.google.guava:guava:32.1.3-jre") // CVE for 31.1
+            force("org.eclipse.platform:org.eclipse.core.runtime:3.29.0") // CVE for 3.26.100
         }
     }
 }