Skip to content

Commit 09ce36c

Browse files
committed
chore(release): Merged back the changes related to removing the owasp dependency plugin
1 parent af3f749 commit 09ce36c

File tree

10 files changed

+0
-215
lines changed

10 files changed

+0
-215
lines changed

plc4j/drivers/mock/false-positives.xml

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

plc4j/drivers/mock/pom.xml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,6 @@
3131
<name>PLC4J: Driver: Mock</name>
3232
<description>Implementation of a PLC4X driver Mock usable in Unit-Tests.</description>
3333

34-
<build>
35-
<plugins>
36-
<plugin>
37-
<groupId>org.owasp</groupId>
38-
<artifactId>dependency-check-maven</artifactId>
39-
<configuration>
40-
<suppressionFiles>${project.basedir}/false-positives.xml</suppressionFiles>
41-
</configuration>
42-
</plugin>
43-
</plugins>
44-
</build>
45-
4634
<dependencies>
4735
<dependency>
4836
<groupId>org.apache.plc4x</groupId>

plc4j/drivers/opcua/false-positives.xml

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

plc4j/drivers/opcua/pom.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -122,14 +122,6 @@
122122
</usedDependencies>
123123
</configuration>
124124
</plugin>
125-
<plugin>
126-
<groupId>org.owasp</groupId>
127-
<artifactId>dependency-check-maven</artifactId>
128-
<configuration>
129-
<skip>true</skip>
130-
<suppressionFiles>${project.basedir}/false-positives.xml</suppressionFiles>
131-
</configuration>
132-
</plugin>
133125
</plugins>
134126
</build>
135127

plc4j/examples/pom.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,6 @@
6868
<skip>true</skip>
6969
</configuration>
7070
</plugin>
71-
<plugin>
72-
<groupId>org.owasp</groupId>
73-
<artifactId>dependency-check-maven</artifactId>
74-
<configuration>
75-
<!-- Don't fail the examples on CVSS errors -->
76-
<failBuildOnCVSS>11</failBuildOnCVSS>
77-
</configuration>
78-
</plugin>
7971
<!-- Build a fat jar containing all dependencies -->
8072
<plugin>
8173
<groupId>org.apache.maven.plugins</groupId>

plc4j/integrations/apache-nifi/nifi-plc4x-nar/false-positives.xml

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

plc4j/integrations/apache-nifi/nifi-plc4x-nar/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,6 @@
3939
<build>
4040
<pluginManagement>
4141
<plugins>
42-
<plugin>
43-
<groupId>org.owasp</groupId>
44-
<artifactId>dependency-check-maven</artifactId>
45-
<configuration>
46-
<suppressionFiles>${project.basedir}/false-positives.xml</suppressionFiles>
47-
</configuration>
48-
</plugin>
4942
<plugin>
5043
<groupId>org.apache.maven.plugins</groupId>
5144
<artifactId>maven-dependency-plugin</artifactId>

plc4j/utils/test-utils/false-positives.xml

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

plc4j/utils/test-utils/pom.xml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,6 @@
3232
<name>PLC4J: Utils: Test Utils</name>
3333
<description>A set of test utils. Especially defining the test-categories used to categorize tests.</description>
3434

35-
<build>
36-
<plugins>
37-
<plugin>
38-
<groupId>org.owasp</groupId>
39-
<artifactId>dependency-check-maven</artifactId>
40-
<configuration>
41-
<suppressionFiles>${project.basedir}/false-positives.xml</suppressionFiles>
42-
</configuration>
43-
</plugin>
44-
</plugins>
45-
</build>
46-
4735
<dependencies>
4836
<dependency>
4937
<groupId>org.apache.plc4x</groupId>

pom.xml

Lines changed: 0 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@
152152
<milo.version>0.6.8</milo.version>
153153
<mockito.version>4.8.0</mockito.version>
154154
<netty.version>4.1.82.Final</netty.version>
155-
<owasp-dependency-check.version>7.2.1</owasp-dependency-check.version>
156155
<pcap4j.version>1.8.2</pcap4j.version>
157156
<slf4j.version>2.0.3</slf4j.version>
158157
<vavr.version>0.10.4</vavr.version>
@@ -867,45 +866,6 @@
867866
</execution>
868867
</executions>
869868
</plugin>
870-
871-
<!--
872-
Check the referenced dependencies for known vulnerabilities
873-
and fail the build if there are critical ones in our classpath
874-
-->
875-
<plugin>
876-
<groupId>org.owasp</groupId>
877-
<artifactId>dependency-check-maven</artifactId>
878-
<executions>
879-
<execution>
880-
<goals>
881-
<goal>check</goal>
882-
</goals>
883-
</execution>
884-
</executions>
885-
<configuration>
886-
<skip>${skip-dependency-cve-scan}</skip>
887-
<!-- Fail the build on any CVE, which is not considered minor -->
888-
<failBuildOnCVSS>4</failBuildOnCVSS>
889-
<assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
890-
<!-- On some systems some analysis seems to randomly fail ... don't let this fail the build -->
891-
<failOnError>false</failOnError>
892-
<excludes>
893-
<!-- For some reason the plugin detects our ADS driver as TwinCAT for which CVEs exist. -->
894-
<exclude>org.apache.plc4x:plc4j-driver-ads</exclude>
895-
<!--
896-
CVE-2020-13955 affects Apache Calcite till version 1.26 (excluding)
897-
We're using at least 1.28, so this is a false positive.
898-
-->
899-
<exclude>org.apache.calcite.avatica:avatica-core</exclude>
900-
<exclude>javax.ws.rs:javax.ws.rs-api</exclude>
901-
<!--
902-
With 4.7.0 this gets falsely detected as junit 4.7.0 which the produces a unrelated CVE-2020-15250
903-
-->
904-
<exclude>org.mockito:mockito-junit-jupiter</exclude>
905-
</excludes>
906-
</configuration>
907-
</plugin>
908-
909869
<plugin>
910870
<groupId>org.apache.maven.plugins</groupId>
911871
<artifactId>maven-enforcer-plugin</artifactId>
@@ -1324,12 +1284,6 @@
13241284
<version>2.3</version>
13251285
</plugin>
13261286

1327-
<plugin>
1328-
<groupId>org.owasp</groupId>
1329-
<artifactId>dependency-check-maven</artifactId>
1330-
<version>${owasp-dependency-check.version}</version>
1331-
</plugin>
1332-
13331287
<plugin>
13341288
<groupId>org.codehaus.mojo</groupId>
13351289
<artifactId>exec-maven-plugin</artifactId>
@@ -1460,19 +1414,6 @@
14601414
<issueLinkUrl>https://issues.apache.org/jira/browse/%ISSUE%</issueLinkUrl>
14611415
</configuration>
14621416
</plugin-->
1463-
1464-
<!-- Generates a dependency vulnerability -->
1465-
<!--plugin>
1466-
<groupId>org.owasp</groupId>
1467-
<artifactId>dependency-check-maven</artifactId>
1468-
<reportSets>
1469-
<reportSet>
1470-
<reports>
1471-
<report>aggregate</report>
1472-
</reports>
1473-
</reportSet>
1474-
</reportSets>
1475-
</plugin-->
14761417
</plugins>
14771418
</reporting>
14781419

0 commit comments

Comments
 (0)