diff --git a/build-resources/pom.xml b/build-resources/pom.xml
index a3676a7fc55..8f5c396ceec 100644
--- a/build-resources/pom.xml
+++ b/build-resources/pom.xml
@@ -18,6 +18,8 @@
3.4.0
1.6.0
3.0.0-M5
+ true
+ true
@@ -34,19 +36,6 @@
META-INF
-
-
-
- org.apache.maven.plugins
- maven-javadoc-plugin
- ${maven.javadoc.plugin.version}
-
-
- true
-
-
-
-
org.apache.maven.plugins
@@ -77,15 +66,6 @@
true
-
- org.apache.maven.plugins
- maven-deploy-plugin
- ${maven.deploy.plugin.version}
-
-
- true
-
-
diff --git a/demos/demo-jaas-webapp/pom.xml b/demos/demo-jaas-webapp/pom.xml
index f57e8692efd..7afc22919f0 100644
--- a/demos/demo-jaas-webapp/pom.xml
+++ b/demos/demo-jaas-webapp/pom.xml
@@ -11,18 +11,9 @@
war
${project.groupId}.jaas
+ false
-
-
- org.apache.maven.plugins
- maven-deploy-plugin
-
-
- false
-
-
-
diff --git a/javadoc/pom.xml b/javadoc/pom.xml
index ca49325b9d5..30d3619108c 100644
--- a/javadoc/pom.xml
+++ b/javadoc/pom.xml
@@ -16,22 +16,11 @@
true
true
true
+ true
${sources-directory}
-
-
-
-
- org.apache.maven.plugins
- maven-deploy-plugin
-
- true
-
-
-
-
org.apache.maven.plugins
diff --git a/jetty-http3/http3-tests/pom.xml b/jetty-http3/http3-tests/pom.xml
index 6f78bf1adc2..500e31bb6d0 100644
--- a/jetty-http3/http3-tests/pom.xml
+++ b/jetty-http3/http3-tests/pom.xml
@@ -10,6 +10,11 @@
http3-tests
Jetty :: HTTP3 :: Tests
+
+ true
+ true
+
+
org.eclipse.jetty.http3
diff --git a/jetty-osgi/test-jetty-osgi-context/pom.xml b/jetty-osgi/test-jetty-osgi-context/pom.xml
index d650493d4e3..9457851e99e 100644
--- a/jetty-osgi/test-jetty-osgi-context/pom.xml
+++ b/jetty-osgi/test-jetty-osgi-context/pom.xml
@@ -10,6 +10,8 @@
Test Jetty OSGi bundle with a ContextHandler
${project.groupId}.testcontext
+ true
+ true
@@ -37,27 +39,7 @@
src/main/context
-
-
-
- org.apache.maven.plugins
- maven-javadoc-plugin
-
-
- true
-
-
-
-
-
- org.apache.maven.plugins
- maven-deploy-plugin
-
-
- true
-
-
org.apache.felix
maven-bundle-plugin
diff --git a/jetty-osgi/test-jetty-osgi-fragment/pom.xml b/jetty-osgi/test-jetty-osgi-fragment/pom.xml
index 5e73e362117..8919721d2c5 100644
--- a/jetty-osgi/test-jetty-osgi-fragment/pom.xml
+++ b/jetty-osgi/test-jetty-osgi-fragment/pom.xml
@@ -11,6 +11,8 @@
Test Jetty OSGi Webapp Fragment bundle
${project.groupId}.webapp.fragment
+ true
+ true
@@ -18,27 +20,7 @@
src/main/resources
-
-
-
- org.apache.maven.plugins
- maven-javadoc-plugin
-
-
- true
-
-
-
-
-
- org.apache.maven.plugins
- maven-deploy-plugin
-
-
- true
-
-
org.apache.felix
maven-bundle-plugin
diff --git a/jetty-osgi/test-jetty-osgi-server/pom.xml b/jetty-osgi/test-jetty-osgi-server/pom.xml
index a88869bbd5b..a8435bc1b67 100644
--- a/jetty-osgi/test-jetty-osgi-server/pom.xml
+++ b/jetty-osgi/test-jetty-osgi-server/pom.xml
@@ -10,6 +10,8 @@
Test Jetty OSGi bundle with a Server
${project.groupId}.testserver
+ true
+ true
@@ -29,27 +31,7 @@
-
-
-
- org.apache.maven.plugins
- maven-javadoc-plugin
-
-
- true
-
-
-
-
-
- org.apache.maven.plugins
- maven-deploy-plugin
-
-
- true
-
-
org.apache.felix
maven-bundle-plugin
diff --git a/jetty-osgi/test-jetty-osgi-webapp-resources/pom.xml b/jetty-osgi/test-jetty-osgi-webapp-resources/pom.xml
index 3d5a95dc134..fa53076c19a 100644
--- a/jetty-osgi/test-jetty-osgi-webapp-resources/pom.xml
+++ b/jetty-osgi/test-jetty-osgi-webapp-resources/pom.xml
@@ -11,41 +11,31 @@
war
${project.groupId}.webapp.resources
+ true
+ true
-
-
-
- org.apache.maven.plugins
- maven-javadoc-plugin
-
-
- true
-
-
-
-
-
- org.apache.maven.plugins
- maven-resources-plugin
-
-
- copy-resources
- validate
-
- copy-resources
-
-
- ${basedir}/target/classes
-
-
- src/main/resources
-
-
-
-
-
+
+ org.apache.maven.plugins
+ maven-resources-plugin
+
+
+ copy-resources
+ validate
+
+ copy-resources
+
+
+ ${basedir}/target/classes
+
+
+ src/main/resources
+
+
+
+
+
org.apache.felix
@@ -70,14 +60,6 @@
-
- org.apache.maven.plugins
- maven-deploy-plugin
-
-
- false
-
-
diff --git a/jetty-osgi/test-jetty-osgi-webapp/pom.xml b/jetty-osgi/test-jetty-osgi-webapp/pom.xml
index 5c1dbba520c..404e7efe2a8 100644
--- a/jetty-osgi/test-jetty-osgi-webapp/pom.xml
+++ b/jetty-osgi/test-jetty-osgi-webapp/pom.xml
@@ -11,6 +11,8 @@
Test Jetty OSGi Webapp bundle
${project.groupId}.webapp
+ true
+ true
@@ -35,27 +37,7 @@
src/main/resources
-
-
-
- org.apache.maven.plugins
- maven-javadoc-plugin
-
-
- true
-
-
-
-
-
- org.apache.maven.plugins
- maven-deploy-plugin
-
-
- true
-
-
org.apache.felix
maven-bundle-plugin
diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml
index de642d78faf..1dc74f9fa8b 100644
--- a/jetty-osgi/test-jetty-osgi/pom.xml
+++ b/jetty-osgi/test-jetty-osgi/pom.xml
@@ -18,6 +18,7 @@
1.8.3
3.0.0
1.2
+ true
@@ -532,14 +533,6 @@
-
- org.apache.maven.plugins
- maven-javadoc-plugin
-
-
- true
-
-
maven-surefire-plugin
diff --git a/jetty-websocket/websocket-core-tests/pom.xml b/jetty-websocket/websocket-core-tests/pom.xml
index 30dde6d2595..5ea23dda566 100644
--- a/jetty-websocket/websocket-core-tests/pom.xml
+++ b/jetty-websocket/websocket-core-tests/pom.xml
@@ -12,6 +12,8 @@
${project.groupId}.core.tests
+ true
+ true
@@ -39,24 +41,4 @@
-
-
-
- org.apache.maven.plugins
- maven-deploy-plugin
-
-
- true
-
-
-
- org.apache.maven.plugins
- maven-javadoc-plugin
-
-
- true
-
-
-
-
diff --git a/jetty-websocket/websocket-javax-tests/pom.xml b/jetty-websocket/websocket-javax-tests/pom.xml
index d03015342f7..062b1680e39 100644
--- a/jetty-websocket/websocket-javax-tests/pom.xml
+++ b/jetty-websocket/websocket-javax-tests/pom.xml
@@ -12,6 +12,8 @@
${project.groupId}.javax.tests
+ true
+ true
@@ -57,22 +59,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-websocket/websocket-jetty-tests/pom.xml b/jetty-websocket/websocket-jetty-tests/pom.xml
index 46d3b642a5c..33844234002 100644
--- a/jetty-websocket/websocket-jetty-tests/pom.xml
+++ b/jetty-websocket/websocket-jetty-tests/pom.xml
@@ -12,6 +12,8 @@
${project.groupId}.tests
+ true
+ true
@@ -73,26 +75,6 @@
-
-
-
- org.apache.maven.plugins
- maven-deploy-plugin
-
-
- true
-
-
-
- org.apache.maven.plugins
- maven-javadoc-plugin
-
-
- true
-
-
-
-
org.apache.felix
@@ -107,13 +89,6 @@
-
- org.apache.maven.plugins
- maven-deploy-plugin
-
- true
-
-
diff --git a/tests/jetty-jmh/pom.xml b/tests/jetty-jmh/pom.xml
index a3a1269bdcf..796b402d9bc 100644
--- a/tests/jetty-jmh/pom.xml
+++ b/tests/jetty-jmh/pom.xml
@@ -57,18 +57,6 @@
-
-
-
- org.apache.maven.plugins
- maven-deploy-plugin
-
-
- true
-
-
-
-
diff --git a/tests/pom.xml b/tests/pom.xml
index 56f82426419..672feb0228a 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -13,37 +13,10 @@
pom
true
+ true
+ true
+ true
-
-
-
-
- org.apache.maven.plugins
- maven-deploy-plugin
-
-
- true
-
-
-
- org.apache.maven.plugins
- maven-source-plugin
-
-
- true
-
-
-
- org.apache.maven.plugins
- maven-javadoc-plugin
-
-
- true
-
-
-
-
-
jetty-jmh
jetty-http-tools
diff --git a/tests/test-http-client-transport/pom.xml b/tests/test-http-client-transport/pom.xml
index f9bf1e83d50..a95887aaa2f 100644
--- a/tests/test-http-client-transport/pom.xml
+++ b/tests/test-http-client-transport/pom.xml
@@ -14,6 +14,7 @@
${project.groupId}.client.http
false
+ true
@@ -30,16 +31,6 @@
-
-
- org.apache.maven.plugins
- maven-deploy-plugin
-
-
- true
-
-
-
diff --git a/tests/test-jmx/jmx-webapp/pom.xml b/tests/test-jmx/jmx-webapp/pom.xml
index 468aae221f5..1d823673f76 100644
--- a/tests/test-jmx/jmx-webapp/pom.xml
+++ b/tests/test-jmx/jmx-webapp/pom.xml
@@ -35,15 +35,5 @@
jmx-webapp
-
-
- org.apache.maven.plugins
- maven-deploy-plugin
-
-
- true
-
-
-
diff --git a/tests/test-sessions/test-file-sessions/pom.xml b/tests/test-sessions/test-file-sessions/pom.xml
index a6ddd33fdb4..30fdd091873 100644
--- a/tests/test-sessions/test-file-sessions/pom.xml
+++ b/tests/test-sessions/test-file-sessions/pom.xml
@@ -11,18 +11,6 @@
${project.groupId}.sessions.file
-
-
-
- org.apache.maven.plugins
- maven-deploy-plugin
-
-
- true
-
-
-
-
org.eclipse.jetty
diff --git a/tests/test-sessions/test-gcloud-sessions/pom.xml b/tests/test-sessions/test-gcloud-sessions/pom.xml
index fd07e51faad..6b171fdb978 100644
--- a/tests/test-sessions/test-gcloud-sessions/pom.xml
+++ b/tests/test-sessions/test-gcloud-sessions/pom.xml
@@ -11,18 +11,6 @@
${project.groupId}.sessions.gcloud
-
-
-
- org.apache.maven.plugins
- maven-deploy-plugin
-
-
- true
-
-
-
-
org.eclipse.jetty
diff --git a/tests/test-sessions/test-hazelcast-sessions/pom.xml b/tests/test-sessions/test-hazelcast-sessions/pom.xml
index dd502877cbd..49ba7db1e3c 100644
--- a/tests/test-sessions/test-hazelcast-sessions/pom.xml
+++ b/tests/test-sessions/test-hazelcast-sessions/pom.xml
@@ -13,14 +13,6 @@
-
- org.apache.maven.plugins
- maven-deploy-plugin
-
-
- true
-
-
org.apache.maven.plugins
maven-dependency-plugin
diff --git a/tests/test-sessions/test-infinispan-sessions/pom.xml b/tests/test-sessions/test-infinispan-sessions/pom.xml
index b3663045591..6b825af96a0 100644
--- a/tests/test-sessions/test-infinispan-sessions/pom.xml
+++ b/tests/test-sessions/test-infinispan-sessions/pom.xml
@@ -17,14 +17,6 @@
-
- org.apache.maven.plugins
- maven-deploy-plugin
-
-
- true
-
-
org.apache.maven.plugins
maven-surefire-plugin
diff --git a/tests/test-sessions/test-jdbc-sessions/pom.xml b/tests/test-sessions/test-jdbc-sessions/pom.xml
index f8b0b19979e..9322d37b5f1 100644
--- a/tests/test-sessions/test-jdbc-sessions/pom.xml
+++ b/tests/test-sessions/test-jdbc-sessions/pom.xml
@@ -13,14 +13,6 @@
-
- org.apache.maven.plugins
- maven-deploy-plugin
-
-
- true
-
-
org.apache.maven.plugins
maven-surefire-plugin
diff --git a/tests/test-sessions/test-memcached-sessions/pom.xml b/tests/test-sessions/test-memcached-sessions/pom.xml
index fd90d464fcf..5cf9edc9799 100644
--- a/tests/test-sessions/test-memcached-sessions/pom.xml
+++ b/tests/test-sessions/test-memcached-sessions/pom.xml
@@ -11,18 +11,6 @@
${project.groupId}.sessions.memcached
-
-
-
- org.apache.maven.plugins
- maven-deploy-plugin
-
-
- true
-
-
-
-
org.eclipse.jetty
diff --git a/tests/test-sessions/test-mongodb-sessions/pom.xml b/tests/test-sessions/test-mongodb-sessions/pom.xml
index f67633bcb97..85e451d429a 100644
--- a/tests/test-sessions/test-mongodb-sessions/pom.xml
+++ b/tests/test-sessions/test-mongodb-sessions/pom.xml
@@ -14,14 +14,6 @@
-
- org.apache.maven.plugins
- maven-deploy-plugin
-
-
- true
-
-
org.apache.maven.plugins
maven-surefire-plugin
diff --git a/tests/test-webapps/pom.xml b/tests/test-webapps/pom.xml
index 523bc40bc95..045a0b20d7a 100644
--- a/tests/test-webapps/pom.xml
+++ b/tests/test-webapps/pom.xml
@@ -10,10 +10,12 @@
test-webapps-parent
Jetty Tests :: WebApps :: Parent
pom
+
true
true
+
test-webapp-rfc2616
test-http2-webapp
diff --git a/tests/test-webapps/test-webapp-rfc2616/pom.xml b/tests/test-webapps/test-webapp-rfc2616/pom.xml
index 56fbafd9da6..8b73c67d7ba 100644
--- a/tests/test-webapps/test-webapp-rfc2616/pom.xml
+++ b/tests/test-webapps/test-webapp-rfc2616/pom.xml
@@ -14,14 +14,6 @@
-
- org.apache.maven.plugins
- maven-deploy-plugin
-
-
- true
-
-
org.eclipse.jetty
jetty-maven-plugin