From c8d8e6b96b0d7d802636508e28c5ed488af12cbc Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 9 Mar 2021 17:17:10 -0700 Subject: [PATCH] Update owasp dependency check to 6.1.2 and run only once. The download for this seems to have a high chance of failure, so lets split it out and only run it once. --- .github/workflows/jpos-dependency-check.yml | 22 +++++++++++++++++++++ .github/workflows/jpos.yml | 4 ---- jpos/build.gradle | 2 +- 3 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/jpos-dependency-check.yml diff --git a/.github/workflows/jpos-dependency-check.yml b/.github/workflows/jpos-dependency-check.yml new file mode 100644 index 0000000000..ab658a9f41 --- /dev/null +++ b/.github/workflows/jpos-dependency-check.yml @@ -0,0 +1,22 @@ +name: "Run jPOS Dependency Check Analyze" +on: [push, pull_request] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up JDK + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Cache Gradle packages + uses: actions/cache@v2 + with: + path: ~/.gradle/caches + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} + restore-keys: ${{ runner.os }}-gradle + - name: Dependency Check Analyze + run: ./gradlew jpos:dependencyCheckAnalyze --info + env: + TERM: dumb diff --git a/.github/workflows/jpos.yml b/.github/workflows/jpos.yml index 7c996b9bac..708e9e36af 100644 --- a/.github/workflows/jpos.yml +++ b/.github/workflows/jpos.yml @@ -29,7 +29,3 @@ jobs: run: ./gradlew jpos:check --info env: TERM: dumb - - name: Dependency Check Analyze - run: ./gradlew jpos:dependencyCheckAnalyze --info - env: - TERM: dumb diff --git a/jpos/build.gradle b/jpos/build.gradle index dc3a04244d..3c5e349ddc 100644 --- a/jpos/build.gradle +++ b/jpos/build.gradle @@ -4,7 +4,7 @@ buildscript { } dependencies { classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:5.2.0' - classpath 'org.owasp:dependency-check-gradle:6.1.1' + classpath 'org.owasp:dependency-check-gradle:6.1.2' } } apply plugin: 'biz.aQute.bnd.builder'