pull latest merge from master
This commit is contained in:
commit
e9ef517b38
|
@ -32,5 +32,5 @@ target/
|
||||||
# vim
|
# vim
|
||||||
.*.sw[a-p]
|
.*.sw[a-p]
|
||||||
|
|
||||||
# kdiff merge
|
# merge tooling
|
||||||
*.orig
|
*.orig
|
||||||
|
|
2
pom.xml
2
pom.xml
|
@ -187,7 +187,7 @@
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||||
<artifactId>jetty-version-maven-plugin</artifactId>
|
<artifactId>jetty-version-maven-plugin</artifactId>
|
||||||
<version>1.0.6</version>
|
<version>1.0.7</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
|
Loading…
Reference in New Issue