Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 1 addition & 26 deletions .github/workflows/code-quality-check-sonar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,29 +42,4 @@ jobs:
# note that we deliberately turn off the OWASP dependency checker here, it will run in a separate job,
# such that its results can be viewed independently of what Sonar has to say
run: |
mvn -B verify sonar:sonar -Dsonar.projectKey=siemens_cmp-ra-component -Ddependency-check.skip=true -Dgpg.skip

# analyze_dependencies_owasp:
# name: Check dependencies with OWASP
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v4
# with:
# fetch-depth: 0
# - name: Set up JDK 17
# uses: actions/setup-java@v4
# with:
# java-version: 17
# distribution: 'temurin'
# - name: Cache Maven packages
# uses: actions/cache@v4
# with:
# path: ~/.m2
# key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
# restore-keys: ${{ runner.os }}-m2
# - name: Analyze dependencies
# env:
# SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
# OSS_INDEX_PASSWORD: ${{ secrets.OSS_INDEX_PASSWORD }}
# OSS_INDEX_USERNAME: ${{ secrets.OSS_INDEX_USERNAME }}
# run: mvn dependency-check:check -DnvdApiKey=${{ secrets.NVD_TOKEN }}
mvn -B verify sonar:sonar -Dsonar.projectKey=siemens_cmp-ra-component -Dgpg.skip
139 changes: 0 additions & 139 deletions .github/workflows/dependency-check-develop.yml

This file was deleted.

55 changes: 0 additions & 55 deletions .github/workflows/dependency-check.yml

This file was deleted.

24 changes: 3 additions & 21 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<groupId>com.siemens.pki</groupId>
<artifactId>CmpRaComponent</artifactId>
<packaging>jar</packaging>
<version>4.3.0</version>
<version>4.4.0</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<parent.basedir>.</parent.basedir>
Expand Down Expand Up @@ -131,24 +131,6 @@
</java>
</configuration>
</plugin>
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
<version>12.2.2</version>
<executions>
<execution>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
<configuration>
<failBuildOnCVSS>0</failBuildOnCVSS>
<suppressionFiles>resources/dependency-check-suppress.xml</suppressionFiles>
<ossIndexUsername>${env.OSS_INDEX_USERNAME}</ossIndexUsername>
<ossIndexPassword>${env.OSS_INDEX_PASSWORD}</ossIndexPassword>
</configuration>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
Expand Down Expand Up @@ -262,7 +244,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.20.0</version>
<version>2.22.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
Expand All @@ -273,7 +255,7 @@
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<version>2.20.1</version>
<version>2.22.0</version>
</dependency>
</dependencies>
<scm>
Expand Down
Loading