diff --git a/.github/workflows/build-dev-release.yml b/.github/workflows/build-dev-release.yml index f8c9d3a..afaf8e0 100644 --- a/.github/workflows/build-dev-release.yml +++ b/.github/workflows/build-dev-release.yml @@ -14,4 +14,7 @@ jobs: sonatypePassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} sonatypeSigningKey: ${{ secrets.SONATYPE_GPG_ARMORED_KEY }} sonatypeSigningPassword: ${{ secrets.SONATYPE_SIGNING_PASSWORD }} - nvd-api-key: ${{ secrets.NVD_APIKEY }} \ No newline at end of file + nvd-api-key: ${{ secrets.NVD_APIKEY }} + cisa-domain: ${{ secrets.CISA_DOMAIN }} + cisa-user: ${{ secrets.CISA_USER }} + cisa-password: ${{ secrets.CISA_PWD }} \ No newline at end of file diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 9c50f2e..a3f6481 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -14,4 +14,7 @@ jobs: sonatypePassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} sonatypeSigningKey: ${{ secrets.SONATYPE_GPG_ARMORED_KEY }} sonatypeSigningPassword: ${{ secrets.SONATYPE_SIGNING_PASSWORD }} - nvd-api-key: ${{ secrets.NVD_APIKEY }} \ No newline at end of file + nvd-api-key: ${{ secrets.NVD_APIKEY }} + cisa-domain: ${{ secrets.CISA_DOMAIN }} + cisa-user: ${{ secrets.CISA_USER }} + cisa-password: ${{ secrets.CISA_PWD }} \ No newline at end of file diff --git a/.github/workflows/build-sanpshot.yml b/.github/workflows/build-sanpshot.yml index 52250b4..e934dc7 100644 --- a/.github/workflows/build-sanpshot.yml +++ b/.github/workflows/build-sanpshot.yml @@ -5,7 +5,6 @@ on: branches-ignore: - master - version-* - - dependabot* paths-ignore: - README.md @@ -19,4 +18,7 @@ jobs: sonatypePassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} sonatypeSigningKey: ${{ secrets.SONATYPE_GPG_ARMORED_KEY }} sonatypeSigningPassword: ${{ secrets.SONATYPE_SIGNING_PASSWORD }} - nvd-api-key: ${{ secrets.NVD_APIKEY }} \ No newline at end of file + nvd-api-key: ${{ secrets.NVD_APIKEY }} + cisa-domain: ${{ secrets.CISA_DOMAIN }} + cisa-user: ${{ secrets.CISA_USER }} + cisa-password: ${{ secrets.CISA_PWD }} \ No newline at end of file diff --git a/.github/workflows/dependabot-java-build.yml b/.github/workflows/dependabot-java-build.yml deleted file mode 100644 index 53ad8a9..0000000 --- a/.github/workflows/dependabot-java-build.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: Dependabot build check - -on: - push: - branches: - - dependabot* - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - # Build package - - name: Set up JDK 11 - uses: actions/setup-java@v4 - with: - java-version: '11' - - name: Build with Gradle - run: ./gradlew --info clean build diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml new file mode 100644 index 0000000..0197710 --- /dev/null +++ b/.github/workflows/scan.yml @@ -0,0 +1,15 @@ +name: Scan licenses and vulnerabilities in java project + +on: + workflow_dispatch: + schedule: + - cron: '0 0 * * 1' + +jobs: + build: + uses: th2-net/.github/.github/workflows/compound-java-scan.yml@main + secrets: + nvd-api-key: ${{ secrets.NVD_APIKEY }} + cisa-domain: ${{ secrets.CISA_DOMAIN }} + cisa-user: ${{ secrets.CISA_USER }} + cisa-password: ${{ secrets.CISA_PWD }} \ No newline at end of file diff --git a/README.md b/README.md index 89a7607..4c7781b 100644 --- a/README.md +++ b/README.md @@ -77,10 +77,7 @@ protobuf { ### 3.8.0 * Updated libs: - * bom: `4.10.0` - * Added suppressions: - * CVE-2025-25193 - This vulnerability does not affect us because this library don’t use netty for reading environment files. - * CVE-2025-24970 - this library doesn’t use SSL. + * bom: `4.11.0` * Updated plugins: * org.owasp.dependencycheck: `12.1.0` diff --git a/suppressions.xml b/suppressions.xml index 2ce21c3..cbc052c 100644 --- a/suppressions.xml +++ b/suppressions.xml @@ -1,14 +1,3 @@ - - - - ^pkg:maven/io\.netty/netty-common@.*$ - CVE-2025-25193 - - - - ^pkg:maven/io\.netty/netty-handler@.*$ - CVE-2025-24970 - \ No newline at end of file