dubey/WebGoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to latest version and move the plugins out of the profile section.

Browse Source 
Move the configuration files from parent dir to config dir
This commit is contained in:
Nanne Baars 2021-03-15 16:59:02 +01:00 committed by Nanne Baars
parent 2e733f8594
commit 8e312204ee
4 changed files with 73 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
project-suppression.xml → config/dependency-check/project-suppression.xml
View File

@ -32,6 +32,8 @@
<cpe>cpe:/a:xstream_project:xstream</cpe> <cpe>cpe:/a:xstream_project:xstream</cpe>
<cve>CVE-2017-7957</cve> <cve>CVE-2017-7957</cve>
<cve>CVE-2016-3674</cve> <cve>CVE-2016-3674</cve>
<cve>CVE-2020-26217</cve>
<cve>CVE-2020-26258</cve>
</suppress> </suppress>
<suppress base="true"><!-- webgoat-server --> <suppress base="true"><!-- webgoat-server -->
<cpe>cpe:/a:postgresql:postgresql</cpe> <cpe>cpe:/a:postgresql:postgresql</cpe>

0
pmd-ruleset.xml → config/pmd/pmd-ruleset.xml
View File

49
pom.xml
View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.4.0</version> <version>2.4.3</version>
</parent> </parent>
<licenses> <licenses>
@ -126,7 +126,7 @@
<commons-collections.version>3.2.1</commons-collections.version> <commons-collections.version>3.2.1</commons-collections.version>
<commons-lang3.version>3.4</commons-lang3.version> <commons-lang3.version>3.4</commons-lang3.version>
<commons-io.version>2.6</commons-io.version> <commons-io.version>2.6</commons-io.version>
<guava.version>18.0</guava.version> <guava.version>30.1</guava.version>
<lombok.version>1.18.4</lombok.version> <lombok.version>1.18.4</lombok.version>
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version> <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
<maven-failsafe-plugin.version>2.22.0</maven-failsafe-plugin.version> <maven-failsafe-plugin.version>2.22.0</maven-failsafe-plugin.version>
@ -168,7 +168,7 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
@ -208,46 +208,16 @@
<suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression> <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
</configuration> </configuration>
</plugin> </plugin>
</plugins>
</build>
<profiles>
<profile>
<id>defaultProfile</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
</profile>
<profile>
<id>owasp</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<encoding>UTF-8</encoding>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
<configLocation>config/checkstyle/checkstyle.xml</configLocation>
<suppressionsLocation>config/checkstyle/suppressions.xml</suppressionsLocation>
<suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId> <artifactId>maven-pmd-plugin</artifactId>
<version>3.13.0</version> <version>3.14.0</version>
<configuration> <configuration>
<targetJdk>11</targetJdk> <targetJdk>11</targetJdk>
<failurePriority>1</failurePriority><!-- 5 means fail even on the lowest <failurePriority>1</failurePriority><!-- 5 means fail even on the lowest priority, 0 means never fail -->
priority, 0 means never fail -->
<rulesets> <rulesets>
<ruleset>${maven.multiModuleProjectDirectory}/pmd-ruleset.xml</ruleset> <!--suppress UnresolvedMavenProperty -->
<ruleset>${maven.multiModuleProjectDirectory}/config/pmd/pmd-ruleset.xml</ruleset>
</rulesets> </rulesets>
<failOnViolation>true</failOnViolation> <failOnViolation>true</failOnViolation>
<printFailingErrors>true</printFailingErrors> <printFailingErrors>true</printFailingErrors>
@ -269,7 +239,8 @@
<skipProvidedScope>true</skipProvidedScope> <skipProvidedScope>true</skipProvidedScope>
<skipRuntimeScope>true</skipRuntimeScope> <skipRuntimeScope>true</skipRuntimeScope>
<suppressionFiles> <suppressionFiles>
<suppressionFile>project-suppression.xml</suppressionFile> <!--suppress UnresolvedMavenProperty -->
<suppressionFile>${maven.multiModuleProjectDirectory}/config/dependency-check/project-suppression.xml</suppressionFile>
</suppressionFiles> </suppressionFiles>
</configuration> </configuration>
<executions> <executions>
@ -282,8 +253,6 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</profile>
</profiles>
<repositories> <repositories>
<repository> <repository>

1
webwolf/pom.xml
View File

@ -109,6 +109,7 @@
<dependency> <dependency>
<groupId>org.springframework.security</groupId> <groupId>org.springframework.security</groupId>
<artifactId>spring-security-test</artifactId> <artifactId>spring-security-test</artifactId>
<scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>