Commit 147bf4f1 authored by Daniel Gerhardt's avatar Daniel Gerhardt

Merge branch '2.x'

parents ba21da0f f618ebe3
Pipeline #20306 canceled with stages
......@@ -400,7 +400,7 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>9.4.12.v2018083</version>
<version>9.4.12.v20180830</version>
<configuration>
<scanIntervalSeconds>0</scanIntervalSeconds>
<webApp>
......@@ -434,7 +434,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.0</version>
<version>2.22.1</version>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment