From 154e5ea1a52882dd9c38200bcfeb5dcfdd2c80a6 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 10 Sep 2018 18:38:34 +1000 Subject: [PATCH] align plugin version (#2893) Signed-off-by: olivier lamy --- .../src/it/jetty-cdi-run-forked/pom.xml | 2 +- .../src/it/jetty-deploy-war-mojo-it/pom.xml | 2 +- .../src/it/jetty-run-distro-mojo-it/pom.xml | 138 ++++++++-------- .../src/it/jetty-run-forked-mojo-it/pom.xml | 138 ++++++++-------- .../src/it/jetty-run-mojo-it/pom.xml | 148 +++++++++--------- .../it/jetty-run-war-exploded-mojo-it/pom.xml | 138 ++++++++-------- .../src/it/jetty-run-war-mojo-it/pom.xml | 138 ++++++++-------- .../src/it/jetty-start-mojo-it/pom.xml | 138 ++++++++-------- .../src/it/run-mojo-gwt-it/pom.xml | 5 +- 9 files changed, 424 insertions(+), 423 deletions(-) diff --git a/jetty-maven-plugin/src/it/jetty-cdi-run-forked/pom.xml b/jetty-maven-plugin/src/it/jetty-cdi-run-forked/pom.xml index 397663d132e..0229f3cf8ca 100644 --- a/jetty-maven-plugin/src/it/jetty-cdi-run-forked/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-cdi-run-forked/pom.xml @@ -54,7 +54,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.5.1 + 3.8.0 1.8 1.8 diff --git a/jetty-maven-plugin/src/it/jetty-deploy-war-mojo-it/pom.xml b/jetty-maven-plugin/src/it/jetty-deploy-war-mojo-it/pom.xml index 3f5bdeb270f..dc5ecc8d157 100644 --- a/jetty-maven-plugin/src/it/jetty-deploy-war-mojo-it/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-deploy-war-mojo-it/pom.xml @@ -37,7 +37,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.5.1 + 3.8.0 1.8 1.8 diff --git a/jetty-maven-plugin/src/it/jetty-run-distro-mojo-it/pom.xml b/jetty-maven-plugin/src/it/jetty-run-distro-mojo-it/pom.xml index 02601b40cc2..72f698ba84e 100644 --- a/jetty-maven-plugin/src/it/jetty-run-distro-mojo-it/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-run-distro-mojo-it/pom.xml @@ -1,84 +1,84 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - org.eclipse.jetty.its.jetty-run-distro-mojo-it - jetty-simple-project - 0.0.1-SNAPSHOT - pom + org.eclipse.jetty.its.jetty-run-distro-mojo-it + jetty-simple-project + 0.0.1-SNAPSHOT + pom - Jetty :: Simple + Jetty :: Simple - - UTF-8 - UTF-8 - 1.8 - 3.0.0 - @project.version@ - + + UTF-8 + UTF-8 + 1.8 + 3.0.0 + @project.version@ + - - jetty-simple-base - jetty-simple-webapp - + + jetty-simple-base + jetty-simple-webapp + - - - - org.eclipse.jetty.its.jetty-run-distro-mojo-it - jetty-simple-base - ${project.version} - + + + + org.eclipse.jetty.its.jetty-run-distro-mojo-it + jetty-simple-base + ${project.version} + - - javax.servlet - javax.servlet-api - 3.1.0 - jar - provided - + + javax.servlet + javax.servlet-api + 3.1.0 + jar + provided + - - org.slf4j - slf4j-api - 1.7.21 - + + org.slf4j + slf4j-api + 1.7.21 + - - commons-io - commons-io - 2.5 - + + commons-io + commons-io + 2.5 + - - org.eclipse.jetty - jetty-servlet - ${jetty.version} - + + org.eclipse.jetty + jetty-servlet + ${jetty.version} + - - + + - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.5.1 - - 1.8 - 1.8 - - - - org.eclipse.jetty - jetty-maven-plugin - ${jetty.version} - - - - + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.0 + + 1.8 + 1.8 + + + + org.eclipse.jetty + jetty-maven-plugin + ${jetty.version} + + + + diff --git a/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/pom.xml b/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/pom.xml index f67096ab1a8..03c697b9503 100644 --- a/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/pom.xml @@ -1,85 +1,85 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - org.eclipse.jetty.its.jetty-run-forked-mojo-it - jetty-simple-project - 0.0.1-SNAPSHOT - pom + org.eclipse.jetty.its.jetty-run-forked-mojo-it + jetty-simple-project + 0.0.1-SNAPSHOT + pom - Jetty :: Simple + Jetty :: Simple - - UTF-8 - UTF-8 - 1.8 - 3.0.0 - @project.version@ - + + UTF-8 + UTF-8 + 1.8 + 3.0.0 + @project.version@ + - - jetty-simple-base - jetty-simple-webapp - + + jetty-simple-base + jetty-simple-webapp + - - + + - - org.eclipse.jetty.its.jetty-run-forked-mojo-it - jetty-simple-base - ${project.version} - + + org.eclipse.jetty.its.jetty-run-forked-mojo-it + jetty-simple-base + ${project.version} + - - javax.servlet - javax.servlet-api - 3.1.0 - jar - provided - + + javax.servlet + javax.servlet-api + 3.1.0 + jar + provided + - - org.slf4j - slf4j-api - 1.7.21 - + + org.slf4j + slf4j-api + 1.7.21 + - - commons-io - commons-io - 2.5 - + + commons-io + commons-io + 2.5 + - - org.eclipse.jetty - jetty-servlet - ${jetty.version} - + + org.eclipse.jetty + jetty-servlet + ${jetty.version} + - - + + - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.5.1 - - 1.8 - 1.8 - - - - org.eclipse.jetty - jetty-maven-plugin - ${jetty.version} - - - - + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.0 + + 1.8 + 1.8 + + + + org.eclipse.jetty + jetty-maven-plugin + ${jetty.version} + + + + diff --git a/jetty-maven-plugin/src/it/jetty-run-mojo-it/pom.xml b/jetty-maven-plugin/src/it/jetty-run-mojo-it/pom.xml index 304b54dac53..575b7ef7431 100644 --- a/jetty-maven-plugin/src/it/jetty-run-mojo-it/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-run-mojo-it/pom.xml @@ -1,91 +1,91 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - org.eclipse.jetty.its.jetty-run-mojo-it - jetty-simple-project - 0.0.1-SNAPSHOT - pom + org.eclipse.jetty.its.jetty-run-mojo-it + jetty-simple-project + 0.0.1-SNAPSHOT + pom - Jetty :: Simple + Jetty :: Simple - - UTF-8 - UTF-8 - 1.8 - 3.0.0 - @project.version@ - + + UTF-8 + UTF-8 + 1.8 + 3.0.0 + @project.version@ + - - jetty-simple-base - jetty-simple-webapp - + + jetty-simple-base + jetty-simple-webapp + - - + + - - org.eclipse.jetty.its.jetty-run-mojo-it - jetty-simple-base - ${project.version} - + + org.eclipse.jetty.its.jetty-run-mojo-it + jetty-simple-base + ${project.version} + - - javax.servlet - javax.servlet-api - 3.1.0 - jar - provided - + + javax.servlet + javax.servlet-api + 3.1.0 + jar + provided + - - org.slf4j - slf4j-api - 1.7.21 - + + org.slf4j + slf4j-api + 1.7.21 + - - org.slf4j - slf4j-simple - 1.7.21 - + + org.slf4j + slf4j-simple + 1.7.21 + - - commons-io - commons-io - 2.5 - + + commons-io + commons-io + 2.5 + - - org.eclipse.jetty - jetty-servlet - ${jetty.version} - + + org.eclipse.jetty + jetty-servlet + ${jetty.version} + - - + + - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.5.1 - - 1.8 - 1.8 - - - - org.eclipse.jetty - jetty-maven-plugin - ${jetty.version} - - - - + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.0 + + 1.8 + 1.8 + + + + org.eclipse.jetty + jetty-maven-plugin + ${jetty.version} + + + + diff --git a/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/pom.xml b/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/pom.xml index ef8e9da91be..d68c9c3a11a 100644 --- a/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/pom.xml @@ -1,85 +1,85 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - org.eclipse.jetty.its.jetty-run-war-exploded-mojo-it - jetty-simple-project - 0.0.1-SNAPSHOT - pom + org.eclipse.jetty.its.jetty-run-war-exploded-mojo-it + jetty-simple-project + 0.0.1-SNAPSHOT + pom - Jetty :: Simple + Jetty :: Simple - - UTF-8 - UTF-8 - 1.8 - 3.0.0 - @project.version@ - + + UTF-8 + UTF-8 + 1.8 + 3.0.0 + @project.version@ + - - jetty-simple-base - jetty-simple-webapp - + + jetty-simple-base + jetty-simple-webapp + - - + + - - org.eclipse.jetty.its.jetty-run-war-exploded-mojo-it - jetty-simple-base - ${project.version} - + + org.eclipse.jetty.its.jetty-run-war-exploded-mojo-it + jetty-simple-base + ${project.version} + - - javax.servlet - javax.servlet-api - 3.1.0 - jar - provided - + + javax.servlet + javax.servlet-api + 3.1.0 + jar + provided + - - org.slf4j - slf4j-api - 1.7.21 - + + org.slf4j + slf4j-api + 1.7.21 + - - commons-io - commons-io - 2.5 - + + commons-io + commons-io + 2.5 + - - org.eclipse.jetty - jetty-servlet - ${jetty.version} - + + org.eclipse.jetty + jetty-servlet + ${jetty.version} + - - + + - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.5.1 - - 1.8 - 1.8 - - - - org.eclipse.jetty - jetty-maven-plugin - ${jetty.version} - - - - + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.0 + + 1.8 + 1.8 + + + + org.eclipse.jetty + jetty-maven-plugin + ${jetty.version} + + + + diff --git a/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/pom.xml b/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/pom.xml index 7907e80cb52..2a9e3d1acc2 100644 --- a/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/pom.xml @@ -1,85 +1,85 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - org.eclipse.jetty.its.jetty-run-war-mojo-it - jetty-simple-project - 0.0.1-SNAPSHOT - pom + org.eclipse.jetty.its.jetty-run-war-mojo-it + jetty-simple-project + 0.0.1-SNAPSHOT + pom - Jetty :: Simple + Jetty :: Simple - - UTF-8 - UTF-8 - 1.8 - 3.0.0 - @project.version@ - + + UTF-8 + UTF-8 + 1.8 + 3.0.0 + @project.version@ + - - jetty-simple-base - jetty-simple-webapp - + + jetty-simple-base + jetty-simple-webapp + - - + + - - org.eclipse.jetty.its.jetty-run-war-mojo-it - jetty-simple-base - ${project.version} - + + org.eclipse.jetty.its.jetty-run-war-mojo-it + jetty-simple-base + ${project.version} + - - javax.servlet - javax.servlet-api - 3.1.0 - jar - provided - + + javax.servlet + javax.servlet-api + 3.1.0 + jar + provided + - - org.slf4j - slf4j-api - 1.7.21 - + + org.slf4j + slf4j-api + 1.7.21 + - - commons-io - commons-io - 2.5 - + + commons-io + commons-io + 2.5 + - - org.eclipse.jetty - jetty-servlet - ${jetty.version} - + + org.eclipse.jetty + jetty-servlet + ${jetty.version} + - - + + - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.5.1 - - 1.8 - 1.8 - - - - org.eclipse.jetty - jetty-maven-plugin - ${jetty.version} - - - - + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.0 + + 1.8 + 1.8 + + + + org.eclipse.jetty + jetty-maven-plugin + ${jetty.version} + + + + diff --git a/jetty-maven-plugin/src/it/jetty-start-mojo-it/pom.xml b/jetty-maven-plugin/src/it/jetty-start-mojo-it/pom.xml index 0371ce2e327..e22078fc39d 100644 --- a/jetty-maven-plugin/src/it/jetty-start-mojo-it/pom.xml +++ b/jetty-maven-plugin/src/it/jetty-start-mojo-it/pom.xml @@ -1,85 +1,85 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - org.eclipse.jetty.its.jetty-start-mojo-it - jetty-simple-project - 0.0.1-SNAPSHOT - pom + org.eclipse.jetty.its.jetty-start-mojo-it + jetty-simple-project + 0.0.1-SNAPSHOT + pom - Jetty :: Simple + Jetty :: Simple - - UTF-8 - UTF-8 - 1.8 - 3.0.0 - @project.version@ - + + UTF-8 + UTF-8 + 1.8 + 3.0.0 + @project.version@ + - - jetty-simple-base - jetty-simple-webapp - + + jetty-simple-base + jetty-simple-webapp + - - + + - - org.eclipse.jetty.its.jetty-start-mojo-it - jetty-simple-base - ${project.version} - + + org.eclipse.jetty.its.jetty-start-mojo-it + jetty-simple-base + ${project.version} + - - javax.servlet - javax.servlet-api - 3.1.0 - jar - provided - + + javax.servlet + javax.servlet-api + 3.1.0 + jar + provided + - - org.slf4j - slf4j-api - 1.7.21 - + + org.slf4j + slf4j-api + 1.7.21 + - - commons-io - commons-io - 2.5 - + + commons-io + commons-io + 2.5 + - - org.eclipse.jetty - jetty-servlet - ${jetty.version} - + + org.eclipse.jetty + jetty-servlet + ${jetty.version} + - - + + - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.5.1 - - 1.8 - 1.8 - - - - org.eclipse.jetty - jetty-maven-plugin - ${jetty.version} - - - - + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.0 + + 1.8 + 1.8 + + + + org.eclipse.jetty + jetty-maven-plugin + ${jetty.version} + + + + diff --git a/jetty-maven-plugin/src/it/run-mojo-gwt-it/pom.xml b/jetty-maven-plugin/src/it/run-mojo-gwt-it/pom.xml index 2481085ced6..798e5050a34 100644 --- a/jetty-maven-plugin/src/it/run-mojo-gwt-it/pom.xml +++ b/jetty-maven-plugin/src/it/run-mojo-gwt-it/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 org.olamy @@ -44,7 +45,7 @@ maven-compiler-plugin - 3.1 + 3.8.0 1.8 1.8