From c41c73b8de90bbf12b29451b9a620548a6371f73 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <oliver.lamy@gmail.com>
Date: Thu, 14 Jul 2022 07:19:45 +1000
Subject: [PATCH] Add jetty maven plugin ITs as part of code coverage as we do
 it :) (#7962)

* enable of jacoco coverage for maven its plugin

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
---
 Jenkinsfile                     | 14 +++++++++-----
 jetty-jspc-maven-plugin/pom.xml |  1 -
 jetty-maven-plugin/pom.xml      |  1 -
 pom.xml                         | 13 +++++++++++--
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index f91e72730d6..7d0aa6c56e6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,17 +21,21 @@ pipeline {
                 jacoco inclusionPattern: '**/org/eclipse/jetty/**/*.class',
                        exclusionPattern: '' +
                                // build tools
-                               '**/org/eclipse/jetty/ant/**' + ',**/org/eclipse/jetty/maven/**' +
-                               ',**/org/eclipse/jetty/jspc/**' +
+                               '**/org/eclipse/jetty/ant/**' +
+                               ',*/org/eclipse/jetty/maven/its/**' +
+                               ',**/org/eclipse/jetty/its/**' +
                                // example code / documentation
-                               ',**/org/eclipse/jetty/embedded/**' + ',**/org/eclipse/jetty/asyncrest/**' +
+                               ',**/org/eclipse/jetty/embedded/**' +
+                               ',**/org/eclipse/jetty/asyncrest/**' +
                                ',**/org/eclipse/jetty/demo/**' +
                                // special environments / late integrations
-                               ',**/org/eclipse/jetty/gcloud/**' + ',**/org/eclipse/jetty/infinispan/**' +
+                               ',**/org/eclipse/jetty/gcloud/**' +
+                               ',**/org/eclipse/jetty/infinispan/**' +
                                ',**/org/eclipse/jetty/osgi/**' +
                                ',**/org/eclipse/jetty/http/spi/**' +
                                // test classes
-                               ',**/org/eclipse/jetty/tests/**' + ',**/org/eclipse/jetty/test/**',
+                               ',**/org/eclipse/jetty/tests/**' +
+                               ',**/org/eclipse/jetty/test/**',
                        execPattern: '**/target/jacoco.exec',
                        classPattern: '**/target/classes',
                        sourcePattern: '**/src/main/java'
diff --git a/jetty-jspc-maven-plugin/pom.xml b/jetty-jspc-maven-plugin/pom.xml
index c4e3b13c58b..66b8bf42e22 100644
--- a/jetty-jspc-maven-plugin/pom.xml
+++ b/jetty-jspc-maven-plugin/pom.xml
@@ -11,7 +11,6 @@
   <name>Jetty :: Jetty JSPC Maven Plugin</name>
   <properties>
     <bundle-symbolic-name>${project.groupId}.jspc.plugin</bundle-symbolic-name>
-    <jacoco.skip>true</jacoco.skip>
   </properties>
   <build>
     <plugins>
diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml
index 7c1fc57d140..8030848f128 100644
--- a/jetty-maven-plugin/pom.xml
+++ b/jetty-maven-plugin/pom.xml
@@ -13,7 +13,6 @@
     <bundle-symbolic-name>${project.groupId}.maven.plugin</bundle-symbolic-name>
     <jetty.stopKey>FREEBEER</jetty.stopKey>
     <jetty.jvmArgs></jetty.jvmArgs>
-    <jacoco.skip>true</jacoco.skip>
   </properties>
   <build>
     <plugins>
diff --git a/pom.xml b/pom.xml
index e1fe911a70a..4c5ebfe1e6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -327,8 +327,6 @@
           <excludes>
             <!-- build tools -->
             <exclude>**/org/eclipse/jetty/ant/**</exclude>
-            <exclude>**/org/eclipse/jetty/maven/**</exclude>
-            <exclude>**/org/eclipse/jetty/jspc/**</exclude>
             <!-- example code / documentation -->
             <exclude>**/org/eclipse/jetty/embedded/**</exclude>
             <exclude>**/org/eclipse/jetty/asyncrest/**</exclude>
@@ -352,6 +350,17 @@
               <goal>prepare-agent</goal>
             </goals>
           </execution>
+          <execution>
+            <id>jacoco-setup-m-invoker-p</id>
+            <phase>initialize</phase>
+            <configuration>
+              <!-- Enable recording of coverage during execution of maven-invoker-plugin -->
+              <propertyName>invoker.mavenOpts</propertyName>
+            </configuration>
+            <goals>
+              <goal>prepare-agent</goal>
+            </goals>
+          </execution>
           <execution>
             <id>jacoco-site</id>
             <phase>package</phase>