Skip to content
Snippets Groups Projects
Commit 0bbf11c0 authored by Jesper Zedlitz's avatar Jesper Zedlitz
Browse files

new Maven Plugins: maven-enforcer-plugin, dependency-check-maven, spotbugs-maven-plugin 

update to Junit 5
parent 7b8b1e3d
Branches
No related tags found
No related merge requests found
Pipeline #250 passed
Stage: build
Show whitespace changes
Inline Side-by-side
owasp-suppressions.xml 0 → 100644
+ 7
− 0
View file @ 0bbf11c0
<?xml version="1.0" encoding="utf-8"?>
<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.2.xsd">
<suppress>
<notes>The GeneralHandler is not used. de.landsh.opendata.dataproxy.App handles GET requests directly.</notes>
<cve>CVE-2020-13697</cve>
</suppress>
</suppressions>
pom.xml
+ 79
− 4
View file @ 0bbf11c0
...@@ -36,6 +36,14 @@ ...@@ -36,6 +36,14 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.2</version>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.22.2</version>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
...@@ -58,6 +66,74 @@ ...@@ -58,6 +66,74 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.7</version>
<executions>
<execution>
<id>coverage-initialize</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>coverage-report</id>
<phase>post-integration-test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0</version>
<configuration>
<rules>
<bannedDependencies>
<excludes>
<exclude>junit:junit</exclude>
<exclude>junit:junit-dep</exclude>
</excludes>
</bannedDependencies>
<dependencyConvergence/>
</rules>
</configuration>
<executions>
<execution>
<goals>
<goal>enforce</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
<version>6.5.3</version>
<configuration>
<suppressionFiles>
<suppressionFile>owasp-suppressions.xml</suppressionFile>
</suppressionFiles>
<failBuildOnCVSS>8</failBuildOnCVSS>
<assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
<failOnError>true</failOnError>
</configuration>
<executions>
<execution>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>4.5.3.0</version>
</plugin>
</plugins> </plugins>
</build> </build>
<dependencies> <dependencies>
...@@ -88,11 +164,10 @@ ...@@ -88,11 +164,10 @@
<artifactId>antlr4-runtime</artifactId> <artifactId>antlr4-runtime</artifactId>
<version>4.9.3</version> <version>4.9.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>org.junit.jupiter</groupId>
<artifactId>junit</artifactId> <artifactId>junit-jupiter</artifactId>
<version>4.13.2</version> <version>5.8.2</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
......
src/test/java/de/landsh/opendata/dataproxy/CoronaDataTest.java
+ 2
− 3
View file @ 0bbf11c0
...@@ -3,13 +3,12 @@ package de.landsh.opendata.dataproxy; ...@@ -3,13 +3,12 @@ package de.landsh.opendata.dataproxy;
import de.landsh.opendata.coronardeck.CoronaDataLexer; import de.landsh.opendata.coronardeck.CoronaDataLexer;
import de.landsh.opendata.coronardeck.CoronaDataParser; import de.landsh.opendata.coronardeck.CoronaDataParser;
import org.antlr.v4.runtime.*; import org.antlr.v4.runtime.*;
import org.junit.Test; import org.junit.jupiter.api.Test;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import static org.junit.jupiter.api.Assertions.*;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
/** /**
* Unit test for simple CoronaData. * Unit test for simple CoronaData.
......
src/test/java/de/landsh/opendata/dataproxy/StrassenSH2GeojsonTest.java
+ 4
− 3
View file @ 0bbf11c0
...@@ -2,9 +2,10 @@ package de.landsh.opendata.dataproxy; ...@@ -2,9 +2,10 @@ package de.landsh.opendata.dataproxy;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONObject; import org.json.JSONObject;
import org.junit.Test; import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
import static org.junit.Assert.*;
public class StrassenSH2GeojsonTest { public class StrassenSH2GeojsonTest {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Impressum - Datenschutz - Barrierefreiheit