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 @@ Jetty :: Jetty JSPC Maven Plugin ${project.groupId}.jspc.plugin - true 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 @@ ${project.groupId}.maven.plugin FREEBEER - true diff --git a/pom.xml b/pom.xml index e1fe911a70a..4c5ebfe1e6f 100644 --- a/pom.xml +++ b/pom.xml @@ -327,8 +327,6 @@ **/org/eclipse/jetty/ant/** - **/org/eclipse/jetty/maven/** - **/org/eclipse/jetty/jspc/** **/org/eclipse/jetty/embedded/** **/org/eclipse/jetty/asyncrest/** @@ -352,6 +350,17 @@ prepare-agent + + jacoco-setup-m-invoker-p + initialize + + + invoker.mavenOpts + + + prepare-agent + + jacoco-site package