diff --git a/.gitignore b/.gitignore index 26a4890bb85..e39c5e13af8 100644 --- a/.gitignore +++ b/.gitignore @@ -32,5 +32,5 @@ target/ # vim .*.sw[a-p] -# kdiff merge +# merge tooling *.orig diff --git a/pom.xml b/pom.xml index 41c57e0f011..7cf7fd19127 100644 --- a/pom.xml +++ b/pom.xml @@ -187,7 +187,7 @@ org.eclipse.jetty.toolchain jetty-version-maven-plugin - 1.0.6 + 1.0.7 org.apache.maven.plugins