From 154298af643a898601e374f1d7078bb33c5b40e4 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Wed, 30 May 2018 08:33:25 +1000
Subject: [PATCH] run maven it tests as default #2576

* run maven its test per default #2576

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
---
 Jenkinsfile                     |   2 +-
 jetty-jspc-maven-plugin/pom.xml |  74 +++++++++-----------
 jetty-maven-plugin/pom.xml      | 119 +++++++++++++++-----------------
 pom.xml                         |   2 +-
 4 files changed, 90 insertions(+), 107 deletions(-)

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 @@
           <skip>true</skip>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-invoker-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>integration-test</id>
+            <goals>
+              <goal>install</goal>
+              <goal>integration-test</goal>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <debug>${it.debug}</debug>
+          <addTestClassPath>true</addTestClassPath>
+          <timeoutInSeconds>60</timeoutInSeconds>
+          <projectsDirectory>src/it</projectsDirectory>
+          <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+          <pomIncludes>
+            <pomInclude>*/pom.xml</pomInclude>
+          </pomIncludes>
+          <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+          <settingsFile>src/it/settings.xml</settingsFile>
+          <scriptVariables>
+            <surefireVersion>${surefireVersion}</surefireVersion>
+          </scriptVariables>
+          <skipInvocation>${skipTests}</skipInvocation>
+          <goals>
+            <goal>clean</goal>
+          </goals>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
   <dependencies>
@@ -107,45 +140,4 @@
       </plugin>
     </plugins>
   </reporting>
-  <profiles>
-    <profile>
-      <id>run-its</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-invoker-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>integration-test</id>
-                <goals>
-                  <goal>install</goal>
-                  <goal>integration-test</goal>
-                  <goal>verify</goal>
-                </goals>
-              </execution>
-            </executions>
-            <configuration>
-              <debug>${it.debug}</debug>
-              <addTestClassPath>true</addTestClassPath>
-              <timeoutInSeconds>60</timeoutInSeconds>
-              <projectsDirectory>src/it</projectsDirectory>
-              <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
-              <pomIncludes>
-                <pomInclude>*/pom.xml</pomInclude>
-              </pomIncludes>
-              <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
-              <settingsFile>src/it/settings.xml</settingsFile>
-              <scriptVariables>
-                <surefireVersion>${surefireVersion}</surefireVersion>
-              </scriptVariables>
-              <goals>
-                <goal>clean</goal>
-              </goals>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
 </project>
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 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-invoker-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>integration-test</id>
+            <goals>
+              <goal>install</goal>
+              <goal>integration-test</goal>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <debug>${it.debug}</debug>
+          <addTestClassPath>true</addTestClassPath>
+          <projectsDirectory>src/it</projectsDirectory>
+          <timeoutInSeconds>60</timeoutInSeconds>
+          <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+          <pomIncludes>
+            <pomInclude>*/pom.xml</pomInclude>
+          </pomIncludes>
+          <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+          <settingsFile>src/it/settings.xml</settingsFile>
+          <scriptVariables>
+            <jettyStopKey>${jetty.stopKey}</jettyStopKey>
+            <jettyStopPort>${jetty.stopPort}</jettyStopPort>
+            <jettyRunPort>${jetty.runPort}</jettyRunPort>
+            <surefireVersion>${surefireVersion}</surefireVersion>
+          </scriptVariables>
+          <skipInvocation>${skipTests}</skipInvocation>
+          <goals>
+            <goal>clean</goal>
+          </goals>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>reserve-ports</id>
+            <phase>pre-integration-test</phase>
+            <goals>
+              <goal>reserve-network-port</goal>
+            </goals>
+            <configuration>
+              <portNames>
+                <portName>jetty.stopPort</portName>
+                <portName>jetty.runPort</portName>
+              </portNames>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
@@ -179,68 +234,4 @@
       </plugin>
     </plugins>
   </reporting>
-  <profiles>
-    <profile>
-      <id>run-its</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-invoker-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>integration-test</id>
-                <goals>
-                  <goal>install</goal>
-                  <goal>integration-test</goal>
-                  <goal>verify</goal>
-                </goals>
-              </execution>
-            </executions>
-            <configuration>
-              <debug>${it.debug}</debug>
-              <addTestClassPath>true</addTestClassPath>
-              <projectsDirectory>src/it</projectsDirectory>
-              <timeoutInSeconds>60</timeoutInSeconds>
-              <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
-              <pomIncludes>
-                <pomInclude>*/pom.xml</pomInclude>
-              </pomIncludes>
-              <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
-              <settingsFile>src/it/settings.xml</settingsFile>
-              <scriptVariables>
-                <jettyStopKey>${jetty.stopKey}</jettyStopKey>
-                <jettyStopPort>${jetty.stopPort}</jettyStopPort>
-                <jettyRunPort>${jetty.runPort}</jettyRunPort>
-                <surefireVersion>${surefireVersion}</surefireVersion>
-              </scriptVariables>
-              <goals>
-                <goal>clean</goal>
-              </goals>
-            </configuration>
-          </plugin>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>build-helper-maven-plugin</artifactId>
-            <version>3.0.0</version>
-            <executions>
-              <execution>
-                <id>reserve-ports</id>
-                <phase>pre-integration-test</phase>
-                <goals>
-                  <goal>reserve-network-port</goal>
-                </goals>
-                <configuration>
-                  <portNames>
-                    <portName>jetty.stopPort</portName>
-                    <portName>jetty.runPort</portName>
-                  </portNames>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
 </project>
diff --git a/pom.xml b/pom.xml
index 601304336d4..fd896d7b038 100644
--- a/pom.xml
+++ b/pom.xml
@@ -452,7 +452,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-invoker-plugin</artifactId>
-          <version>3.0.2-SNAPSHOT</version>
+          <version>3.1.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>