From 5f1764ebf28fcdc8efaba9e4781d4263b5009e87 Mon Sep 17 00:00:00 2001 From: "opensearch-trigger-bot[bot]" <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Date: Fri, 17 Nov 2023 14:52:34 -0800 Subject: [PATCH] [Backport 2.x] Force newer version of transitive (spotless) eclipse dependency (#176) Force newer version of transitive (spotless) eclipse dependency (#175) * Force newer version of transitive (spotless) eclipse dependency * Non-impacted Eclipse Core dependency requires JDK17+ for spotless * Don't do spotless check during build as its already done --------- (cherry picked from commit 2dcfc9c82095771e560e2de2495e1c8a95ad4fe2) Signed-off-by: Daniel Widdis Signed-off-by: github-actions[bot] Co-authored-by: github-actions[bot] --- .github/workflows/CI.yml | 7 ++++++- build.gradle | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 2b9c5286b..65d654197 100644 --- 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 index 961408a7f..cf75db3fd 100644 --- 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 } } }