From 791f7c4314f10d0f7ab5598ed1f877dffd8039c1 Mon Sep 17 00:00:00 2001
From: tobias <thinkdifferent055@gmail.com>
Date: Sat, 30 Jul 2022 22:35:09 +0200
Subject: [PATCH] Fix dependency-check plugin
---
BudgetMasterServer/pom.xml | 26 ---------------------
dependency-check-maven-suppression.xml | 4 ++++
pom.xml | 32 ++++++++++++++++++++++++++
3 files changed, 36 insertions(+), 26 deletions(-)
create mode 100644 dependency-check-maven-suppression.xml
diff --git a/BudgetMasterServer/pom.xml b/BudgetMasterServer/pom.xml
index 1e27e780f..39a7af9e3 100644
--- a/BudgetMasterServer/pom.xml
+++ b/BudgetMasterServer/pom.xml
@@ -40,7 +40,6 @@
<itextpdf.version>5.5.13.3</itextpdf.version>
<vanilla-picker.version>2.12.1</vanilla-picker.version>
<jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
- <dependency-check-maven.version>7.1.0</dependency-check-maven.version>
<project.outputDirectory>${project.build.directory}/../build/${project.version}</project.outputDirectory>
<project.artifactName>${project.artifactId}-v${project.version}</project.artifactName>
@@ -284,31 +283,6 @@
</execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>org.owasp</groupId>
- <artifactId>dependency-check-maven</artifactId>
- <version>${dependency-check-maven.version}</version>
- <inherited>false</inherited>
- <configuration>
- <skip>false</skip>
- <cveValidForHours>48</cveValidForHours>
- <assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
- <failOnError>false</failOnError>
- <formats>
- <format>HTML</format>
- <format>XML</format>
- </formats>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>aggregate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
</plugins>
</build>
</project>
\ No newline at end of file
diff --git a/dependency-check-maven-suppression.xml b/dependency-check-maven-suppression.xml
new file mode 100644
index 000000000..442d77a96
--- /dev/null
+++ b/dependency-check-maven-suppression.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
+
+</suppressions>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index b58c028c8..3ecd84e28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,6 +57,8 @@
<testcontainer.version>1.17.2</testcontainer.version>
<assertj-core.version>3.22.0</assertj-core.version>
+
+ <dependency-check-maven.version>7.1.0</dependency-check-maven.version>
</properties>
<dependencies>
@@ -88,6 +90,36 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.owasp</groupId>
+ <artifactId>dependency-check-maven</artifactId>
+ <version>${dependency-check-maven.version}</version>
+ <inherited>false</inherited>
+ <configuration>
+ <skip>false</skip>
+ <cveValidForHours>48</cveValidForHours>
+ <assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
+ <failOnError>false</failOnError>
+ <formats>
+ <format>HTML</format>
+ <format>XML</format>
+ </formats>
+ <suppressionFile>dependency-check-maven-suppression.xml</suppressionFile>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>aggregate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+
<distributionManagement>
<repository>
<id>release</id>
--
GitLab