Skip to content

Commit c4bf2c3

Browse files
committed
Merge branch 'master' into GHO-41-fix-codeowners-file
Sync with master
2 parents 82c2be5 + fca0bd3 commit c4bf2c3

File tree

3 files changed

+2
-36
lines changed

3 files changed

+2
-36
lines changed

Makefile

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ init-examples-submodule:
4040
install: | install-checkstyle
4141

4242
## lint - Lints the project
43-
lint: checkstyle scan
43+
lint: checkstyle
4444

4545
## publish - Publish a release of the project (will build the project via the `mvn deploy` command)
4646
# @parameters:
@@ -60,10 +60,6 @@ publish-dry:
6060
release:
6161
gh release create ${tag} target/*.jar target/*.asc target/*.pom --target ${target}
6262

63-
## scan - Scan the project for serious security issues
64-
scan:
65-
mvn verify -DskipTests=true -Dgpg.skip=true -Dcheckstyle.skip=true -Djavadoc.skip=true -Djacoco.skip=true -Ddependency-check.failBuildOnCVSS=0 -Ddependency-check.junitFailOnCVSS=0
66-
6763
## test - Test the project
6864
test:
6965
mvn test -Dgpg.skip=true -Dcheckstyle.skip=true -Ddependency-check.skip=true -Djavadoc.skip=true -Djacoco.skip=true
@@ -77,4 +73,4 @@ update-examples-submodule:
7773
git submodule init
7874
git submodule update --remote
7975

80-
.PHONY: help build clean coverage docs install-checkstyle install-styleguide install lint publish publish-dry release scan scan-strict test test-ci update-examples-submodule
76+
.PHONY: help build clean coverage docs install-checkstyle install-styleguide install lint publish publish-dry release test test-ci update-examples-submodule

dependency-check-suppressions.xml

Lines changed: 0 additions & 11 deletions
This file was deleted.

pom.xml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -335,25 +335,6 @@
335335
</execution>
336336
</executions>
337337
</plugin>
338-
<plugin>
339-
<groupId>org.owasp</groupId>
340-
<artifactId>dependency-check-maven</artifactId>
341-
<!-- Can't upgrade to `v11` or newer versions as it requires Java 11 -->
342-
<!-- TODO: API key now recommended (we must upgrade to v10) to avoid rate limiting: https://github.com/dependency-check/DependencyCheck?tab=readme-ov-file#nvd-api-key-highly-recommended -->
343-
<version>8.4.0</version>
344-
<configuration>
345-
<suppressionFile>dependency-check-suppressions.xml</suppressionFile>
346-
<failBuildOnCVSS>7</failBuildOnCVSS>
347-
<junitFailOnCVSS>7</junitFailOnCVSS>
348-
</configuration>
349-
<executions>
350-
<execution>
351-
<goals>
352-
<goal>check</goal>
353-
</goals>
354-
</execution>
355-
</executions>
356-
</plugin>
357338
</plugins>
358339
</build>
359340
</project>

0 commit comments

Comments
 (0)