This is an automated email from the ASF dual-hosted git repository.
shoothzj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new b20c48a782 build: fix owasp check is broken (#4371)
b20c48a782 is described below
commit b20c48a7827c295cceb2aab9e1dfd72aae64abd3
Author: ZhangJian He <[email protected]>
AuthorDate: Mon May 20 09:27:19 2024 +0800
build: fix owasp check is broken (#4371)
Signed-off-by: ZhangJian He <[email protected]>
---
.github/changes-filter.yaml | 1 +
.github/workflows/bk-ci.yml | 7 ++++++-
.github/workflows/codeql.yml | 2 +-
.github/workflows/java21-daily-build.yml | 2 +-
.github/workflows/windows-daily-build.yml | 2 +-
5 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/.github/changes-filter.yaml b/.github/changes-filter.yaml
index 676ba76724..03507b7a59 100644
--- 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
index 22cde4ec10..0dc2c7c5b3 100644
--- 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
index c0ffe00a35..c9ca73e533 100644
--- 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
index aa9c834da6..fa599a32a3 100644
--- 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
index 5862ca1a71..ff130de29a 100644
--- 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
