From b70eb755094088c6c7483caec822eec6962d161c Mon Sep 17 00:00:00 2001 From: Simon Liu Date: Tue, 21 Jan 2025 12:52:12 -0800 Subject: [PATCH] update dependency --- .github/workflows/build.yml | 47 ++++++++++++++----------------------- build.gradle | 12 ++++++++-- 2 files changed, 28 insertions(+), 31 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e20e8d1..f3a56fb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -264,37 +264,26 @@ jobs: # # This step will fail the build if snyk fails - # - name: Run Snyk as a blocking step - # uses: snyk/actions/gradle@master - # env: - # SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} - # JAVA_HOME: /usr/lib/jvm/default-java/ - # with: - # command: test - # args: > - # --org=${{ secrets.SNYK_ORG_ID }} - # --project-name=${{ github.repository }} - # --severity-threshold=high - # --fail-on=all - - # # This step will send the results of snyk to the snyk servers - # - name: Run Snyk on Python - # uses: snyk/actions/python-3.8@master - # env: - # SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} - # with: - # command: monitor - # args: > - # --org=${{ secrets.SNYK_ORG_ID }} - # --project-name=${{ github.repository }} + - name: Run Snyk as a blocking step + uses: snyk/actions/gradle@master + env: + SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} + JAVA_HOME: /usr/lib/jvm/default-java/ + with: + command: test + args: > + --org=${{ secrets.SNYK_ORG_ID }} + --project-name=${{ github.repository }} + --severity-threshold=high + --fail-on=all # Lastly run the tests bundled with the repo - # - name: Test and coverage - # run: | - # gradle wrapper --gradle-version 6.3 - # ./gradlew test - # ./gradlew mergeJUnitReports - # junit 'build/test-results/test/TESTS-TestSuites.xml' + - name: Test and coverage + run: | + gradle wrapper --gradle-version 6.3 + ./gradlew test + ./gradlew mergeJUnitReports + junit 'build/test-results/test/TESTS-TestSuites.xml' ######################################################################### # Publish release to releases diff --git a/build.gradle b/build.gradle index f6f99a3..f84cfb9 100644 --- a/build.gradle +++ b/build.gradle @@ -42,6 +42,12 @@ configurations { } } +configurations.all { + resolutionStrategy { + force 'junit:junit:4.13.2' // Force the fixed version + } +} + dependencies { compile group: 'com.vividsolutions', name: 'jts', version: '1.13' compile group: 'gov.nasa.earthdata', name: 'cumulus-message-adapter', version: '2.0.0' @@ -55,11 +61,13 @@ dependencies { compile group: 'com.google.code.gson', name: 'gson', version: '2.9.0' compile group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1' + testCompile group: 'junit', name: 'junit', version: '4.13.2' + compile group: 'org.json', name: 'json', version: '20231013' compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0' - compile group: 'commons-io', name: 'commons-io', version: '2.8.0' - compile group: 'edu.ucar', name: 'cdm', version: '4.6.20' + compile group: 'commons-io', name: 'commons-io', version: '2.18.0' + compile group: 'edu.ucar', name: 'cdm-core', version: '5.7.0' compile group: 'org.geotools', name: 'gt-shapefile', version: '29.2' compile group: 'commons-cli', name: 'commons-cli', version: '1.4'