diff --git a/.github/workflows/ci-config.yml b/.github/workflows/ci-config.yml index 3f0a498b660..be1a18bd42e 100644 --- a/.github/workflows/ci-config.yml +++ b/.github/workflows/ci-config.yml @@ -97,37 +97,6 @@ jobs: - name: Build the code with Maven run: mvn -B -ntp verify -Pwebsite javadoc:javadoc - dependencies: - name: Dependency Check - runs-on: ubuntu-latest - strategy: - matrix: - java: [ 17 ] - - steps: - - uses: actions/checkout@v6 - - - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v5 - with: - distribution: 'temurin' - java-version: ${{ matrix.java }} - cache: 'maven' - - - name: Generate Cache Name - shell: bash - run: echo "CACHE_NAME=$(date '+%y.%j')" >> $GITHUB_ENV - - - name: Restore NVD data cache - uses: actions/cache@v5 - with: - key: nvd-data-${{ env.CACHE_NAME }} - restore-keys: nvd-data- - path: ./data/cache - - - name: Verify dependencies - run: mvn -B -ntp verify -Pdependencies -Dnvd.api.datafeed="file:${GITHUB_WORKSPACE}/data/cache/nvdcve-{0}.json.gz" - sonar: name: Sonar Scan runs-on: ubuntu-latest diff --git a/.github/workflows/nvd-cache.yml b/.github/workflows/nvd-cache.yml deleted file mode 100644 index 2b0168a22ec..00000000000 --- a/.github/workflows/nvd-cache.yml +++ /dev/null @@ -1,55 +0,0 @@ -name: NVD Data Workflow Schedule - -on: - schedule: - - cron: '0 5 * * 1,2,3,4,5' - workflow_dispatch: { } - -jobs: - build: - name: Build and collect data - runs-on: ubuntu-latest - if: ${{ github.actor != 'dependabot[bot]' }} - - steps: - - name: Checkout OVP repository - uses: actions/checkout@v6 - with: - repository: jeremylong/Open-Vulnerability-Project - path: ovp - ref: v7.2.2 - - - name: Set up JDK 17 - uses: actions/setup-java@v5 - with: - distribution: 'temurin' - java-version: 17 - cache: 'gradle' - - - name: Build the OVP code with Gradle - working-directory: ./ovp - run: ./gradlew build -x test -x spotlessJavaCheck - - - uses: actions/checkout@v6 - with: - path: data - - - name: Generate Cache Name - shell: bash - run: echo "CACHE_NAME=$(date '+%y.%j')" >> $GITHUB_ENV - - - name: Rename artifact - run: find ./ovp/vulnz/build/libs -type f -regex './ovp/vulnz/build/libs/vulnz-[0-9].[0-9].[0-9].jar' -exec mv {} ./data/vulnz.jar ';' - - - name: Generate data - working-directory: ./data - run: ./vulnz.jar cve --cache --directory ./cache --delay=10000 --maxRetry=20 - env: - NVD_API_KEY: ${{ secrets.NVD_API_KEY }} - JAVA_OPTS: "-Xmx4g" - - - name: Cache NVD data - uses: actions/cache@v5 - with: - key: nvd-data-${{ env.CACHE_NAME }} - path: ./data/cache diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 14d9a09050a..f007a615a3f 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -17,16 +17,4 @@ java - - - - - org.owasp - dependency-check-maven - - true - - - - diff --git a/build-tools/owasp/suppressions.xml b/build-tools/owasp/suppressions.xml deleted file mode 100644 index 8a9ab688208..00000000000 --- a/build-tools/owasp/suppressions.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - ^pkg:maven/com\.inrupt\.client/inrupt\-client\-openid@.*$ - cpe:/a:openid:openid - - - - ^pkg:maven/org\.roaringbitmap/RoaringBitmap@.*$ - cpe:/a:bitmap_project:bitmap - - - - ^pkg:maven/com\.inrupt\.client/inrupt-client-webid@.*$ - CVE-2021-4236 - - - - ^pkg:maven/(com\.inrupt\.client/inrupt\-client\-jsonb|com\.github\.jsonld\-java/jsonld\-java|net\.javacrumbs\.json\-unit/json\-unit\-core)@.*$ - CVE-2023-5072 - - - - ^pkg:maven/(com\.inrupt\.client/inrupt\-client\-jsonb|com\.github\.jsonld\-java/jsonld\-java|net\.javacrumbs\.json\-unit/json\-unit\-core)@.*$ - CVE-2022-45688 - - - - diff --git a/examples/cli/pom.xml b/examples/cli/pom.xml index fbbd15f82fd..84ba113e5ac 100644 --- a/examples/cli/pom.xml +++ b/examples/cli/pom.xml @@ -16,7 +16,7 @@ - 3.34.1 + 3.34.2 diff --git a/examples/pom.xml b/examples/pom.xml index d3872316832..dd2afae85cc 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -23,14 +23,6 @@ - - org.owasp - dependency-check-maven - ${owasp.plugin.version} - - true - - org.apache.maven.plugins maven-deploy-plugin diff --git a/examples/webapp/pom.xml b/examples/webapp/pom.xml index b98fc5987a7..f2f66aed3c0 100644 --- a/examples/webapp/pom.xml +++ b/examples/webapp/pom.xml @@ -16,7 +16,7 @@ - 3.34.1 + 3.34.2 diff --git a/pom.xml b/pom.xml index 9fb6d0a9e79..39e96eff00b 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ 0.9.6 3.0.1 5.3.2 - 3.34.1 + 3.34.2 5.2.2 2.0.17 7.0.4 @@ -56,7 +56,6 @@ 3.5.0 3.12.0 5.0.0 - 12.2.0 3.9.0 3.28.0 3.21.0 @@ -82,10 +81,7 @@ 3.0 - true true - - ${maven.multiModuleProjectDirectory}/reports/target/site/jacoco-merged/jacoco.xml @@ -494,11 +490,6 @@ - - org.owasp - dependency-check-maven - ${owasp.plugin.version} - @@ -599,31 +590,6 @@ - - org.owasp - dependency-check-maven - - - - check - - - - - 7 - false - - HTML - JSON - CSV - - - ./build-tools/owasp/suppressions.xml - - ${nvd.api.key} - ${nvd.api.datafeed} - - org.sonatype.central central-publishing-maven-plugin @@ -747,23 +713,6 @@ - - org.owasp - dependency-check-maven - ${owasp.plugin.version} - - - - aggregate - - - - - - ./build-tools/owasp/suppressions.xml - - - @@ -827,18 +776,6 @@ true - - dependencies - - true - true - true - false - true - true - true - -