Skip to content

Commit

Permalink
[Backport 2.x] Force newer version of transitive (spotless) eclipse d…
Browse files Browse the repository at this point in the history
…ependency (#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 2dcfc9c)

Signed-off-by: Daniel Widdis <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
  • Loading branch information
1 parent d9ce7c5 commit 5f1764e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
7 changes: 6 additions & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
}
Expand Down

0 comments on commit 5f1764e

Please sign in to comment.