build: fix owasp check is broken (#4371)

Signed-off-by: ZhangJian He <[email protected]>
apache · May 20, 2024 · b20c48a · b20c48a
1 parent f8eb7a0
commit b20c48a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/.github/changes-filter.yaml b/.github/changes-filter.yaml
@@ -9,6 +9,7 @@ docs:
   - '**/*.md'
   - '.github/changes-filter.yaml'
   - '.github/ISSUE_TEMPLATE/**'
+  - 'src/owasp-dependency-check-suppressions.xml'
 need_owasp:
   - 'pom.xml'
   - '**/pom.xml'

diff --git a/.github/workflows/bk-ci.yml b/.github/workflows/bk-ci.yml
@@ -60,6 +60,7 @@ jobs:
         id: check_changes
         run: |
           echo "docs_only=${{ fromJSON(steps.changes.outputs.all_count) == fromJSON(steps.changes.outputs.docs_count) && fromJSON(steps.changes.outputs.docs_count) > 0 }}" >> $GITHUB_OUTPUT
+          echo "need_owasp=${{ fromJSON(steps.changes.outputs.need_owasp) }}" >> $GITHUB_OUTPUT
 
       - name: Cache local Maven repository
         if: steps.check_changes.outputs.docs_only != 'true'
@@ -92,6 +93,9 @@ jobs:
       - name:  Generate Javadoc
         if: steps.check_changes.outputs.docs_only != 'true'
         run: mvn -B -nsu -am -pl bookkeeper-common,bookkeeper-server,:bookkeeper-stats-api,:bookkeeper-stats-providers,:codahale-metrics-provider,:prometheus-metrics-provider javadoc:aggregate -DskipTests -Pdelombok -Dchesktyle.skip -Dspotbugs.skip
+    outputs:
+      docs_only: ${{ steps.check_changes.outputs.docs_only }}
+      need_owasp: ${{ steps.check_changes.outputs.need_owasp }}
 
   unit-tests:
     name: ${{ matrix.step_name }}
@@ -505,7 +509,8 @@ jobs:
       - name: Set up JDK 11
         uses: actions/setup-java@v4
         with:
-          java-version: 11
+          distribution: 'temurin'
+          java-version: 21
 
       - name: run "clean install verify" to trigger dependency check
         # excluding dlfs because it includes hadoop lib with

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -63,7 +63,7 @@ jobs:
     - name: Cache local Maven repository
       if: steps.check_changes.outputs.docs_only != 'true'
       id: cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: |
           ~/.m2/repository/*/*/*

diff --git a/.github/workflows/java21-daily-build.yml b/.github/workflows/java21-daily-build.yml
@@ -30,8 +30,8 @@ jobs:
       - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '21'
           distribution: 'temurin'
+          java-version: 21
       - name: Build with Maven
         run: mvn -B clean install
       - name: Aggregates all test reports to ./test-reports and ./surefire-reports directories If failure

diff --git a/.github/workflows/windows-daily-build.yml b/.github/workflows/windows-daily-build.yml
@@ -30,8 +30,8 @@ jobs:
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
           distribution: 'temurin'
+          java-version: 21
       - name: Build with Maven
         run: mvn -B clean install
       - name: Aggregates all test reports to ./test-reports and ./surefire-reports directories If failure