diff --git a/Jenkinsfile b/Jenkinsfile index 5685afe6fad..a3917bf696e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -90,7 +90,7 @@ def getFullBuild(jdk, os) { publisherStrategy: 'EXPLICIT', globalMavenSettingsConfig: settingsName, mavenLocalRepo: localRepo) { - sh "mvn -V -B install -Dmaven.test.failure.ignore=true -Prun-its -e -Pmongodb -T3" + sh "mvn -V -B install -Dmaven.test.failure.ignore=true -e -Pmongodb -T3" } // withMaven doesn't label.. // Report failures in the jenkins UI diff --git a/jetty-jspc-maven-plugin/pom.xml b/jetty-jspc-maven-plugin/pom.xml index 375baee1776..d3f9b535aeb 100644 --- a/jetty-jspc-maven-plugin/pom.xml +++ b/jetty-jspc-maven-plugin/pom.xml @@ -42,6 +42,39 @@ true + + org.apache.maven.plugins + maven-invoker-plugin + + + integration-test + + install + integration-test + verify + + + + + ${it.debug} + true + 60 + src/it + ${project.build.directory}/it + + */pom.xml + + ${project.build.directory}/local-repo + src/it/settings.xml + + ${surefireVersion} + + ${skipTests} + + clean + + + @@ -107,45 +140,4 @@ - - - run-its - - - - org.apache.maven.plugins - maven-invoker-plugin - - - integration-test - - install - integration-test - verify - - - - - ${it.debug} - true - 60 - src/it - ${project.build.directory}/it - - */pom.xml - - ${project.build.directory}/local-repo - src/it/settings.xml - - ${surefireVersion} - - - clean - - - - - - - diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml index e288c366bfc..eebe394a38a 100644 --- a/jetty-maven-plugin/pom.xml +++ b/jetty-maven-plugin/pom.xml @@ -36,6 +36,61 @@ + + org.apache.maven.plugins + maven-invoker-plugin + + + integration-test + + install + integration-test + verify + + + + + ${it.debug} + true + src/it + 60 + ${project.build.directory}/it + + */pom.xml + + ${project.build.directory}/local-repo + src/it/settings.xml + + ${jetty.stopKey} + ${jetty.stopPort} + ${jetty.runPort} + ${surefireVersion} + + ${skipTests} + + clean + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + reserve-ports + pre-integration-test + + reserve-network-port + + + + jetty.stopPort + jetty.runPort + + + + + org.jacoco jacoco-maven-plugin @@ -179,68 +234,4 @@ - - - run-its - - - - org.apache.maven.plugins - maven-invoker-plugin - - - integration-test - - install - integration-test - verify - - - - - ${it.debug} - true - src/it - 60 - ${project.build.directory}/it - - */pom.xml - - ${project.build.directory}/local-repo - src/it/settings.xml - - ${jetty.stopKey} - ${jetty.stopPort} - ${jetty.runPort} - ${surefireVersion} - - - clean - - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.0.0 - - - reserve-ports - pre-integration-test - - reserve-network-port - - - - jetty.stopPort - jetty.runPort - - - - - - - - - diff --git a/pom.xml b/pom.xml index 601304336d4..fd896d7b038 100644 --- a/pom.xml +++ b/pom.xml @@ -452,7 +452,7 @@ org.apache.maven.plugins maven-invoker-plugin - 3.0.2-SNAPSHOT + 3.1.0 org.apache.maven.plugins