From b1f801986072ed3e6a6c0f10b7870e37d42d4498 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 10 Oct 2022 12:52:40 +1000 Subject: [PATCH] simplify poms, add back missing changes from #7850 and #7687 (#8697) * simplify poms, add back missing changes from #7850 * remove non used plugin, missing from #7687 Signed-off-by: Olivier Lamy --- build/build-resources/pom.xml | 12 +---------- jetty-core/jetty-http-spi/pom.xml | 8 +------- .../pom.xml | 9 +-------- .../jetty-quic-quiche-jna/pom.xml | 14 +------------ .../jetty-websocket-core-tests/pom.xml | 18 ++--------------- jetty-ee10/jetty-ee10-ant/pom.xml | 8 +------- jetty-ee10/jetty-ee10-apache-jsp/pom.xml | 8 +------- jetty-ee10/jetty-ee10-glassfish-jstl/pom.xml | 8 +------- .../jetty-ee10-jspc-maven-plugin/pom.xml | 16 ++------------- .../jetty-simple-webapp/pom.xml | 14 ++++++------- .../jetty-simple-webapp/pom.xml | 14 ++++++------- jetty-ee10/jetty-ee10-osgi/pom.xml | 8 +------- .../test-jetty-ee10-osgi-context/pom.xml | 13 +----------- .../test-jetty-ee10-osgi-fragment/pom.xml | 13 +----------- .../test-jetty-ee10-osgi-server/pom.xml | 13 +----------- .../pom.xml | 13 +----------- .../test-jetty-ee10-osgi-webapp/pom.xml | 13 +----------- .../test-jetty-ee10-osgi/pom.xml | 9 +-------- jetty-ee10/jetty-ee10-tests/pom.xml | 12 ----------- .../pom.xml | 9 +-------- .../jetty-ee10-websocket-jetty-tests/pom.xml | 13 +----------- jetty-ee8/jetty-ee8-apache-jsp/pom.xml | 8 +------- jetty-ee8/jetty-ee8-glassfish-jstl/pom.xml | 8 +------- jetty-ee8/jetty-ee8-jspc-maven-plugin/pom.xml | 16 ++------------- .../jetty-simple-webapp/pom.xml | 14 ++++++------- .../jetty-simple-webapp/pom.xml | 20 +++++++++---------- .../jetty-ee8-websocket-javax-tests/pom.xml | 9 +-------- .../jetty-ee8-websocket-jetty-tests/pom.xml | 13 +----------- jetty-ee9/jetty-ee9-ant/pom.xml | 8 +------- jetty-ee9/jetty-ee9-apache-jsp/pom.xml | 8 +------- jetty-ee9/jetty-ee9-glassfish-jstl/pom.xml | 8 +------- jetty-ee9/jetty-ee9-jspc-maven-plugin/pom.xml | 16 ++------------- .../jetty-simple-webapp/pom.xml | 14 ++++++------- .../jetty-simple-webapp/pom.xml | 20 +++++++++---------- jetty-ee9/jetty-ee9-osgi/pom.xml | 8 +------- jetty-ee9/jetty-ee9-tests/pom.xml | 12 +---------- pom.xml | 6 ------ 37 files changed, 81 insertions(+), 352 deletions(-) diff --git a/build/build-resources/pom.xml b/build/build-resources/pom.xml index 4977849fc31..ec1e40a30ed 100644 --- a/build/build-resources/pom.xml +++ b/build/build-resources/pom.xml @@ -14,12 +14,10 @@ UTF-8 - 3.0.0-M2 - 3.4.0 3.0.0 - 3.0.0-M5 true true + true @@ -58,14 +56,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - ${maven.surefire.plugin.version} - - true - - diff --git a/jetty-core/jetty-http-spi/pom.xml b/jetty-core/jetty-http-spi/pom.xml index 62ea54691ba..6d6c45a1ccd 100644 --- a/jetty-core/jetty-http-spi/pom.xml +++ b/jetty-core/jetty-http-spi/pom.xml @@ -10,6 +10,7 @@ ${project.groupId}.http.spi org.eclipse.jetty.http.spi.* + true @@ -65,13 +66,6 @@ - - org.jacoco - jacoco-maven-plugin - - true - - diff --git a/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/pom.xml b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/pom.xml index c628cf3f617..ff68c941cc0 100644 --- a/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/pom.xml +++ b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/pom.xml @@ -12,18 +12,11 @@ ${project.groupId}.quic-quiche-foreign-incubator + true - - org.apache.maven.plugins - maven-checkstyle-plugin - ${maven.checkstyle.plugin.version} - - true - - maven-compiler-plugin diff --git a/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/pom.xml b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/pom.xml index 07e3ae3b15a..5fa835ddf4d 100644 --- a/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/pom.xml +++ b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/pom.xml @@ -12,21 +12,9 @@ ${project.groupId}.quic-quiche-jna + true - - - - org.apache.maven.plugins - maven-checkstyle-plugin - ${maven.checkstyle.plugin.version} - - true - - - - - org.slf4j diff --git a/jetty-core/jetty-websocket/jetty-websocket-core-tests/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-core-tests/pom.xml index ebd4d420d74..fd176f08f0f 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-core-tests/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-core-tests/pom.xml @@ -12,6 +12,8 @@ ${project.groupId}.core.tests + true + true @@ -69,22 +71,6 @@ - - org.apache.maven.plugins - maven-deploy-plugin - - - true - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - true - - org.apache.felix maven-bundle-plugin diff --git a/jetty-ee10/jetty-ee10-ant/pom.xml b/jetty-ee10/jetty-ee10-ant/pom.xml index 76248ae8dc6..a9c56df9c98 100644 --- a/jetty-ee10/jetty-ee10-ant/pom.xml +++ b/jetty-ee10/jetty-ee10-ant/pom.xml @@ -11,6 +11,7 @@ ${project.groupId}.ant + true @@ -48,13 +49,6 @@ - - org.jacoco - jacoco-maven-plugin - - true - - diff --git a/jetty-ee10/jetty-ee10-apache-jsp/pom.xml b/jetty-ee10/jetty-ee10-apache-jsp/pom.xml index ea4de3372cc..8defa366e04 100644 --- a/jetty-ee10/jetty-ee10-apache-jsp/pom.xml +++ b/jetty-ee10/jetty-ee10-apache-jsp/pom.xml @@ -11,6 +11,7 @@ ${project.groupId}.apache-jsp + true @@ -52,13 +53,6 @@ - - org.jacoco - jacoco-maven-plugin - - true - - diff --git a/jetty-ee10/jetty-ee10-glassfish-jstl/pom.xml b/jetty-ee10/jetty-ee10-glassfish-jstl/pom.xml index 72f9edfb3a9..95ff5ee7b6b 100644 --- a/jetty-ee10/jetty-ee10-glassfish-jstl/pom.xml +++ b/jetty-ee10/jetty-ee10-glassfish-jstl/pom.xml @@ -11,6 +11,7 @@ jar ${project.groupId}.glassfish.jstl + true @@ -22,13 +23,6 @@ false - - org.jacoco - jacoco-maven-plugin - - true - - diff --git a/jetty-ee10/jetty-ee10-jspc-maven-plugin/pom.xml b/jetty-ee10/jetty-ee10-jspc-maven-plugin/pom.xml index b39d8641cce..cdf1cd0bfaa 100644 --- a/jetty-ee10/jetty-ee10-jspc-maven-plugin/pom.xml +++ b/jetty-ee10/jetty-ee10-jspc-maven-plugin/pom.xml @@ -11,16 +11,11 @@ EE10 :: Jetty :: Jetty JSPC Maven Plugin ${project.groupId}.jspc.plugin + true + true - - org.apache.maven.plugins - maven-surefire-plugin - - true - - org.apache.maven.plugins maven-plugin-plugin @@ -35,13 +30,6 @@ - - org.jacoco - jacoco-maven-plugin - - true - - org.apache.maven.plugins maven-invoker-plugin diff --git a/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/pom.xml b/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/pom.xml index d96eb20cff0..fa47f76bbc4 100644 --- a/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/pom.xml @@ -64,16 +64,16 @@ false + + org.apache.maven.plugins + maven-surefire-plugin + + true + + - - org.apache.maven.plugins - maven-surefire-plugin - - true - - org.apache.maven.plugins maven-failsafe-plugin diff --git a/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-war-forked-mojo-it/jetty-simple-webapp/pom.xml b/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-war-forked-mojo-it/jetty-simple-webapp/pom.xml index ab898d38695..67571012332 100644 --- a/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-war-forked-mojo-it/jetty-simple-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-war-forked-mojo-it/jetty-simple-webapp/pom.xml @@ -64,16 +64,16 @@ false + + org.apache.maven.plugins + maven-surefire-plugin + + true + + - - org.apache.maven.plugins - maven-surefire-plugin - - true - - org.eclipse.jetty.ee10 jetty-ee10-maven-plugin diff --git a/jetty-ee10/jetty-ee10-osgi/pom.xml b/jetty-ee10/jetty-ee10-osgi/pom.xml index b2a3edd7aad..090b763bf92 100644 --- a/jetty-ee10/jetty-ee10-osgi/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/pom.xml @@ -16,6 +16,7 @@ 3.10.200 3.6.100 1.0.0-v20070606 + true @@ -89,13 +90,6 @@ - - org.jacoco - jacoco-maven-plugin - - true - - diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-context/pom.xml b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-context/pom.xml index 4c825a51f7d..1e29f84ff9f 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-context/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-context/pom.xml @@ -11,6 +11,7 @@ ${project.groupId}.testcontext true + true @@ -42,18 +43,6 @@ src/main/context - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - true - - - - org.apache.felix diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-fragment/pom.xml b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-fragment/pom.xml index d1c1ecbad5c..7f0c32c06fa 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-fragment/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-fragment/pom.xml @@ -12,6 +12,7 @@ ${project.groupId}.webapp.fragment true + true @@ -19,18 +20,6 @@ src/main/resources - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - true - - - - org.apache.felix diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-server/pom.xml b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-server/pom.xml index 7f13bb5a6f5..c956c0573b6 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-server/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-server/pom.xml @@ -11,6 +11,7 @@ ${project.groupId}.testserver true + true @@ -30,18 +31,6 @@ - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - true - - - - org.apache.felix diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-webapp-resources/pom.xml b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-webapp-resources/pom.xml index 0880bf5e940..756467225c5 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-webapp-resources/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-webapp-resources/pom.xml @@ -12,20 +12,9 @@ ${project.groupId}.webapp.resources true + true - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - true - - - - org.apache.maven.plugins diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-webapp/pom.xml b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-webapp/pom.xml index 080454b246d..9e536073353 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-webapp/pom.xml @@ -12,6 +12,7 @@ ${project.groupId}.webapp true + true @@ -36,18 +37,6 @@ src/main/resources - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - true - - - - org.apache.felix diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/pom.xml b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/pom.xml index a11f9c04b04..ef3818991bc 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/pom.xml @@ -20,6 +20,7 @@ 1.3.4 true + true @@ -515,14 +516,6 @@ - - org.apache.maven.plugins - maven-javadoc-plugin - - - true - - maven-surefire-plugin diff --git a/jetty-ee10/jetty-ee10-tests/pom.xml b/jetty-ee10/jetty-ee10-tests/pom.xml index da0af1b50b6..477789eb762 100644 --- a/jetty-ee10/jetty-ee10-tests/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/pom.xml @@ -39,16 +39,4 @@ jetty-ee10-test-weld-cdi-webapp jetty-ee10-test-badinit-webapp - - - - - org.jacoco - jacoco-maven-plugin - - true - - - - diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/pom.xml index 922fce608f5..1826fd3e673 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/pom.xml @@ -13,6 +13,7 @@ ${project.groupId}.jakarta.tests true + true @@ -58,14 +59,6 @@ - - org.apache.maven.plugins - maven-javadoc-plugin - - - true - - org.apache.felix maven-bundle-plugin diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/pom.xml index 47e3fdbbc7e..a04b6ccb736 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/pom.xml @@ -13,6 +13,7 @@ ${project.groupId}.tests true + true @@ -74,18 +75,6 @@ - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - true - - - - org.apache.felix diff --git a/jetty-ee8/jetty-ee8-apache-jsp/pom.xml b/jetty-ee8/jetty-ee8-apache-jsp/pom.xml index 1525a551876..7fd8159071b 100644 --- a/jetty-ee8/jetty-ee8-apache-jsp/pom.xml +++ b/jetty-ee8/jetty-ee8-apache-jsp/pom.xml @@ -12,6 +12,7 @@ jetty-ee9-apache-jsp ${project.groupId}.apache-jsp + true @@ -53,13 +54,6 @@ - - org.jacoco - jacoco-maven-plugin - - true - - diff --git a/jetty-ee8/jetty-ee8-glassfish-jstl/pom.xml b/jetty-ee8/jetty-ee8-glassfish-jstl/pom.xml index ea7301d041b..5420339cf44 100644 --- a/jetty-ee8/jetty-ee8-glassfish-jstl/pom.xml +++ b/jetty-ee8/jetty-ee8-glassfish-jstl/pom.xml @@ -12,6 +12,7 @@ jetty-ee9-glassfish-jstl ${project.groupId}.glassfish.jstl + true @@ -26,13 +27,6 @@ - - org.jacoco - jacoco-maven-plugin - - true - - diff --git a/jetty-ee8/jetty-ee8-jspc-maven-plugin/pom.xml b/jetty-ee8/jetty-ee8-jspc-maven-plugin/pom.xml index 5c7bdc49122..4ffdd268eaa 100644 --- a/jetty-ee8/jetty-ee8-jspc-maven-plugin/pom.xml +++ b/jetty-ee8/jetty-ee8-jspc-maven-plugin/pom.xml @@ -12,16 +12,11 @@ ${project.groupId}.jspc.plugin jetty-ee9-jspc-maven-plugin + true + true - - org.apache.maven.plugins - maven-surefire-plugin - - true - - org.apache.maven.plugins maven-plugin-plugin @@ -36,13 +31,6 @@ - - org.jacoco - jacoco-maven-plugin - - true - - org.apache.maven.plugins maven-invoker-plugin diff --git a/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/pom.xml b/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/pom.xml index 778c8effed2..1702c0cf857 100644 --- a/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/pom.xml @@ -64,16 +64,16 @@ false + + org.apache.maven.plugins + maven-surefire-plugin + + true + + - - org.apache.maven.plugins - maven-surefire-plugin - - true - - org.apache.maven.plugins maven-failsafe-plugin diff --git a/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-start-war-forked-mojo-it/jetty-simple-webapp/pom.xml b/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-start-war-forked-mojo-it/jetty-simple-webapp/pom.xml index 314c49b42f8..44a206facd0 100644 --- a/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-start-war-forked-mojo-it/jetty-simple-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-start-war-forked-mojo-it/jetty-simple-webapp/pom.xml @@ -64,24 +64,24 @@ false + + org.apache.maven.plugins + maven-surefire-plugin + + true + + - - org.apache.maven.plugins - maven-surefire-plugin - - true - - org.eclipse.jetty.ee8 jetty-ee8-maven-plugin - org.eclipse.jetty - jetty-slf4j-impl - ${jetty.version} + org.eclipse.jetty + jetty-slf4j-impl + ${jetty.version} diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-tests/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-tests/pom.xml index e0019b80eb3..f3a2c4419d0 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-tests/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-tests/pom.xml @@ -14,6 +14,7 @@ jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests ${project.groupId}.javax.tests true + true @@ -59,14 +60,6 @@ - - org.apache.maven.plugins - maven-javadoc-plugin - - - true - - org.apache.felix maven-bundle-plugin diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-tests/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-tests/pom.xml index df7bd7db198..fea25c7afa1 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-tests/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-tests/pom.xml @@ -14,6 +14,7 @@ jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests ${project.groupId}.tests true + true @@ -75,18 +76,6 @@ - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - true - - - - org.apache.felix diff --git a/jetty-ee9/jetty-ee9-ant/pom.xml b/jetty-ee9/jetty-ee9-ant/pom.xml index 474b71989c7..48d240f50fd 100644 --- a/jetty-ee9/jetty-ee9-ant/pom.xml +++ b/jetty-ee9/jetty-ee9-ant/pom.xml @@ -11,6 +11,7 @@ ${project.groupId}.ant + true @@ -48,13 +49,6 @@ - - org.jacoco - jacoco-maven-plugin - - true - - diff --git a/jetty-ee9/jetty-ee9-apache-jsp/pom.xml b/jetty-ee9/jetty-ee9-apache-jsp/pom.xml index c25b4fbc1bb..bd1d6e1c817 100644 --- a/jetty-ee9/jetty-ee9-apache-jsp/pom.xml +++ b/jetty-ee9/jetty-ee9-apache-jsp/pom.xml @@ -11,6 +11,7 @@ ${project.groupId}.apache-jsp + true @@ -52,13 +53,6 @@ - - org.jacoco - jacoco-maven-plugin - - true - - diff --git a/jetty-ee9/jetty-ee9-glassfish-jstl/pom.xml b/jetty-ee9/jetty-ee9-glassfish-jstl/pom.xml index a5984e12216..7b04f062e00 100644 --- a/jetty-ee9/jetty-ee9-glassfish-jstl/pom.xml +++ b/jetty-ee9/jetty-ee9-glassfish-jstl/pom.xml @@ -11,6 +11,7 @@ jar ${project.groupId}.glassfish.jstl + true @@ -25,13 +26,6 @@ - - org.jacoco - jacoco-maven-plugin - - true - - diff --git a/jetty-ee9/jetty-ee9-jspc-maven-plugin/pom.xml b/jetty-ee9/jetty-ee9-jspc-maven-plugin/pom.xml index 58c26a58efd..c294c4689f9 100644 --- a/jetty-ee9/jetty-ee9-jspc-maven-plugin/pom.xml +++ b/jetty-ee9/jetty-ee9-jspc-maven-plugin/pom.xml @@ -11,16 +11,11 @@ EE9 :: Jetty :: Jetty JSPC Maven Plugin ${project.groupId}.jspc.plugin + true + true - - org.apache.maven.plugins - maven-surefire-plugin - - true - - org.apache.maven.plugins maven-plugin-plugin @@ -35,13 +30,6 @@ - - org.jacoco - jacoco-maven-plugin - - true - - org.apache.maven.plugins maven-invoker-plugin diff --git a/jetty-ee9/jetty-ee9-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/pom.xml b/jetty-ee9/jetty-ee9-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/pom.xml index 7044dcde45b..cc47b7578eb 100644 --- a/jetty-ee9/jetty-ee9-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/pom.xml @@ -64,16 +64,16 @@ false + + org.apache.maven.plugins + maven-surefire-plugin + + true + + - - org.apache.maven.plugins - maven-surefire-plugin - - true - - org.apache.maven.plugins maven-failsafe-plugin diff --git a/jetty-ee9/jetty-ee9-maven-plugin/src/it/jetty-start-war-forked-mojo-it/jetty-simple-webapp/pom.xml b/jetty-ee9/jetty-ee9-maven-plugin/src/it/jetty-start-war-forked-mojo-it/jetty-simple-webapp/pom.xml index 46cd957552e..ca8887041d8 100644 --- a/jetty-ee9/jetty-ee9-maven-plugin/src/it/jetty-start-war-forked-mojo-it/jetty-simple-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-maven-plugin/src/it/jetty-start-war-forked-mojo-it/jetty-simple-webapp/pom.xml @@ -64,24 +64,24 @@ false + + org.apache.maven.plugins + maven-surefire-plugin + + true + + - - org.apache.maven.plugins - maven-surefire-plugin - - true - - org.eclipse.jetty.ee9 jetty-ee9-maven-plugin - org.eclipse.jetty - jetty-slf4j-impl - ${jetty.version} + org.eclipse.jetty + jetty-slf4j-impl + ${jetty.version} diff --git a/jetty-ee9/jetty-ee9-osgi/pom.xml b/jetty-ee9/jetty-ee9-osgi/pom.xml index 07064a9e223..4fc9b16e372 100644 --- a/jetty-ee9/jetty-ee9-osgi/pom.xml +++ b/jetty-ee9/jetty-ee9-osgi/pom.xml @@ -25,6 +25,7 @@ 1.5.4 1.0.2 1.0.0-v20070606 + true @@ -81,13 +82,6 @@ - - org.jacoco - jacoco-maven-plugin - - true - - diff --git a/jetty-ee9/jetty-ee9-tests/pom.xml b/jetty-ee9/jetty-ee9-tests/pom.xml index df821156cbb..d17c5acb808 100644 --- a/jetty-ee9/jetty-ee9-tests/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/pom.xml @@ -14,6 +14,7 @@ true true + true @@ -39,15 +40,4 @@ jetty-ee9-test-badinit-webapp - - - - org.jacoco - jacoco-maven-plugin - - true - - - - diff --git a/pom.xml b/pom.xml index e3f1c80251a..0d035a141e0 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,6 @@ 3.4.1 3.6.4 3.6.2 - 3.1.2 2.5.3 3.0.0 3.3.0 @@ -654,11 +653,6 @@ maven-plugin-plugin ${maven-plugin.plugin.version} - - org.apache.maven.plugins - maven-project-info-reports-plugin - ${maven.project-info-reports.plugin.version} - org.apache.maven.plugins maven-release-plugin