diff --git a/.github/workflows/ci-owasp-dependency-check.yaml b/.github/workflows/ci-owasp-dependency-check.yaml
index a273e902c88d2..a70f4a82ff1af 100644
--- a/.github/workflows/ci-owasp-dependency-check.yaml
+++ b/.github/workflows/ci-owasp-dependency-check.yaml
@@ -24,8 +24,9 @@ on:
workflow_dispatch:
env:
- MAVEN_OPTS: -Xss1500k -Xmx1024m -Daether.connector.http.reuseConnections=false -Daether.connector.requestTimeout=60000 -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 -Dmaven.wagon.http.retryHandler.requestSentEnabled=true -Dmaven.wagon.http.serviceUnavailableRetryStrategy.class=standard -Dmaven.wagon.rto=60000
+ MAVEN_OPTS: -Xss1500k -Xmx1500m -Daether.connector.http.reuseConnections=false -Daether.connector.requestTimeout=60000 -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 -Dmaven.wagon.http.retryHandler.requestSentEnabled=true -Dmaven.wagon.http.serviceUnavailableRetryStrategy.class=standard -Dmaven.wagon.rto=60000
JDK_DISTRIBUTION: corretto
+ NIST_NVD_API_KEY: ${{ secrets.NIST_NVD_API_KEY }}
jobs:
run-owasp-dependency-check:
@@ -42,12 +43,9 @@ jobs:
matrix:
include:
- branch: master
+ - branch: branch-3.3
- branch: branch-3.2
- - branch: branch-3.1
- branch: branch-3.0
- - branch: branch-2.11
- - branch: branch-2.10
- jdk: 11
steps:
- name: checkout
@@ -58,16 +56,14 @@ jobs:
- name: Tune Runner VM
uses: ./.github/actions/tune-runner-vm
- - name: Cache local Maven repository
- uses: actions/cache@v4
+ - name: Restore Maven repository cache
+ uses: actions/cache/restore@v4
timeout-minutes: 5
with:
path: |
~/.m2/repository/*/*/*
!~/.m2/repository/org/apache/pulsar
- !~/.m2/repository/org/owasp/dependency-check-data
key: ${{ runner.os }}-m2-dependencies-all-${{ hashFiles('**/pom.xml') }}
- lookup-only: true
restore-keys: |
${{ runner.os }}-m2-dependencies-core-modules-${{ hashFiles('**/pom.xml') }}
${{ runner.os }}-m2-dependencies-core-modules-
@@ -79,7 +75,7 @@ jobs:
java-version: ${{ matrix.jdk || '17' }}
- name: run install by skip tests
- run: mvn -B -ntp clean install -DskipTests -Dspotbugs.skip=true -Dlicense.skip=true -Dcheckstyle.skip=true -Drat.skip=true -DskipDocker=true
+ run: mvn -B -ntp clean install -DskipTests -Dspotbugs.skip=true -Dlicense.skip=true -Dcheckstyle.skip=true -Drat.skip=true -DskipDocker=true -DnarPluginPhase=none -pl '!distribution/io,!distribution/offloaders'
- name: OWASP cache key weeknum
id: get-weeknum
@@ -89,7 +85,7 @@ jobs:
- name: Restore OWASP Dependency Check data
id: restore-owasp-dependency-check-data
- uses: actions/cache/restore@v3
+ uses: actions/cache/restore@v4
timeout-minutes: 5
with:
path: ~/.m2/repository/org/owasp/dependency-check-data
@@ -105,7 +101,7 @@ jobs:
- name: Save OWASP Dependency Check data
if: ${{ steps.update-owasp-dependency-check-data.outcome == 'success' }}
- uses: actions/cache/save@v3
+ uses: actions/cache/save@v4
timeout-minutes: 5
with:
path: ~/.m2/repository/org/owasp/dependency-check-data
diff --git a/.github/workflows/pulsar-ci.yaml b/.github/workflows/pulsar-ci.yaml
index 8decde1c999ca..828f876f13194 100644
--- a/.github/workflows/pulsar-ci.yaml
+++ b/.github/workflows/pulsar-ci.yaml
@@ -1427,6 +1427,7 @@ jobs:
env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
CI_JDK_MAJOR_VERSION: ${{ needs.preconditions.outputs.jdk_major_version }}
+ NIST_NVD_API_KEY: ${{ secrets.NIST_NVD_API_KEY }}
steps:
- name: checkout
uses: actions/checkout@v4
@@ -1442,16 +1443,14 @@ jobs:
with:
limit-access-to-actor: true
- - name: Cache Maven dependencies
- uses: actions/cache@v4
+ - name: Restore Maven repository cache
+ uses: actions/cache/restore@v4
timeout-minutes: 5
with:
path: |
~/.m2/repository/*/*/*
!~/.m2/repository/org/apache/pulsar
- !~/.m2/repository/org/owasp/dependency-check-data
key: ${{ runner.os }}-m2-dependencies-core-modules-${{ hashFiles('**/pom.xml') }}
- lookup-only: true
restore-keys: |
${{ runner.os }}-m2-dependencies-core-modules-
@@ -1480,7 +1479,7 @@ jobs:
- name: Restore OWASP Dependency Check data
id: restore-owasp-dependency-check-data
- uses: actions/cache/restore@v3
+ uses: actions/cache/restore@v4
timeout-minutes: 5
with:
path: ~/.m2/repository/org/owasp/dependency-check-data
diff --git a/distribution/io/pom.xml b/distribution/io/pom.xml
index bd65d5a81232b..96dd8b071106b 100644
--- a/distribution/io/pom.xml
+++ b/distribution/io/pom.xml
@@ -136,7 +136,6 @@
org.owasp
dependency-check-maven
- ${dependency-check-maven.version}
diff --git a/pom.xml b/pom.xml
index 7c556fa127786..d42eac2d5af59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -316,7 +316,7 @@ flexible messaging model and an intuitive client API.
0.1.21
1.3
0.4
- 9.1.0
+ 10.0.1
1.0.6
1.6.1
6.4.0
@@ -2192,6 +2192,16 @@ flexible messaging model and an intuitive client API.
build-helper-maven-plugin
${build-helper-maven-plugin.version}
+
+ org.owasp
+ dependency-check-maven
+ ${dependency-check-maven.version}
+
+ NIST_NVD_API_KEY
+
+
+
+
@@ -2639,7 +2649,6 @@ flexible messaging model and an intuitive client API.
org.owasp
dependency-check-maven
- ${dependency-check-maven.version}
${pulsar.basedir}/src/owasp-dependency-check-false-positives.xml
@@ -2674,7 +2683,6 @@ flexible messaging model and an intuitive client API.
org.owasp
dependency-check-maven
- ${dependency-check-maven.version}
diff --git a/pulsar-io/docs/pom.xml b/pulsar-io/docs/pom.xml
index 82c8f0bb6f96a..1e21656305b6c 100644
--- a/pulsar-io/docs/pom.xml
+++ b/pulsar-io/docs/pom.xml
@@ -258,7 +258,6 @@
org.owasp
dependency-check-maven
- ${dependency-check-maven.version}
diff --git a/pulsar-io/flume/pom.xml b/pulsar-io/flume/pom.xml
index 9b2839970ab79..86cec763cbe4a 100644
--- a/pulsar-io/flume/pom.xml
+++ b/pulsar-io/flume/pom.xml
@@ -141,7 +141,6 @@
org.owasp
dependency-check-maven
- ${dependency-check-maven.version}
diff --git a/pulsar-io/hbase/pom.xml b/pulsar-io/hbase/pom.xml
index 0c38d4f06d029..9fb98069a8ceb 100644
--- a/pulsar-io/hbase/pom.xml
+++ b/pulsar-io/hbase/pom.xml
@@ -108,7 +108,6 @@
org.owasp
dependency-check-maven
- ${dependency-check-maven.version}
diff --git a/pulsar-io/hdfs2/pom.xml b/pulsar-io/hdfs2/pom.xml
index 81b67f8e095fa..3b73adae46caa 100644
--- a/pulsar-io/hdfs2/pom.xml
+++ b/pulsar-io/hdfs2/pom.xml
@@ -27,14 +27,14 @@
pulsar-io-hdfs2
Pulsar IO :: Hdfs2
-
+
${project.groupId}
pulsar-io-core
${project.version}
-
+
com.fasterxml.jackson.core
jackson-databind
@@ -74,7 +74,7 @@
commons-lang3
-
+
@@ -113,7 +113,6 @@
org.owasp
dependency-check-maven
- ${dependency-check-maven.version}
diff --git a/pulsar-io/hdfs3/pom.xml b/pulsar-io/hdfs3/pom.xml
index 3d9f185e37582..29a1c248c756f 100644
--- a/pulsar-io/hdfs3/pom.xml
+++ b/pulsar-io/hdfs3/pom.xml
@@ -27,14 +27,14 @@
pulsar-io-hdfs3
Pulsar IO :: Hdfs3
-
+
${project.groupId}
pulsar-io-core
${project.version}
-
+
com.fasterxml.jackson.core
jackson-databind
@@ -49,7 +49,7 @@
org.apache.commons
commons-collections4
-
+
org.apache.hadoop
hadoop-client
@@ -80,7 +80,7 @@
-
+
@@ -119,7 +119,6 @@
org.owasp
dependency-check-maven
- ${dependency-check-maven.version}
diff --git a/tiered-storage/file-system/pom.xml b/tiered-storage/file-system/pom.xml
index d20b92692fc58..03dc5371ef7f6 100644
--- a/tiered-storage/file-system/pom.xml
+++ b/tiered-storage/file-system/pom.xml
@@ -208,7 +208,6 @@
org.owasp
dependency-check-maven
- ${dependency-check-maven.version}