Merge branch 'master' of

https://github.com/SafeExamBrowser/seb-server.git

Conflicts:
	pom.xml
This commit is contained in:
anhefti 2018-11-19 12:44:50 +01:00
commit 5a4f95a78e

View file

@ -80,9 +80,9 @@
<failOnViolation>false</failOnViolation> <failOnViolation>false</failOnViolation>
<targetJdk>${java.version}</targetJdk> <targetJdk>${java.version}</targetJdk>
<linkXRef>false</linkXRef> <linkXRef>false</linkXRef>
<excludes> <excludes>
<exclude>.*/batis.mapper/*.*</exclude> <exclude>.*/batis.mapper/*.*</exclude>
<exclude>.*/batis.model/*.*</exclude> <exclude>.*/batis.model/*.*</exclude>
</excludes> </excludes>
</configuration> </configuration>
<executions> <executions>
@ -102,8 +102,8 @@
<effort>Max</effort> <effort>Max</effort>
<failOnError>false</failOnError> <failOnError>false</failOnError>
<threshold>Low</threshold> <threshold>Low</threshold>
<xmlOutput>true</xmlOutput> <xmlOutput>true</xmlOutput>
<excludeFilterFile>findbugs-excludes.xml</excludeFilterFile> <excludeFilterFile>findbugs-excludes.xml</excludeFilterFile>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>