From 4011f1e71e9efd30a2ccde8302c21252fb9995c9 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 30 Sep 2021 20:41:49 +1000 Subject: [PATCH] merge jetty-10.0.x (#6945) --- apache-jsp/pom.xml | 3 - .../demo-async-rest-jar/pom.xml | 2 - .../demo-async-rest-server/pom.xml | 1 - .../demo-async-rest-webapp/pom.xml | 1 - demos/demo-jetty-webapp/pom.xml | 6 - demos/demo-jndi-webapp/pom.xml | 6 +- demos/demo-mock-resources/pom.xml | 1 - demos/demo-proxy-webapp/pom.xml | 7 - demos/demo-spec/demo-spec-webapp/pom.xml | 2 - demos/embedded/pom.xml | 21 - .../jetty-asciidoctor-extensions/pom.xml | 1 - documentation/jetty-documentation/pom.xml | 17 - glassfish-jstl/pom.xml | 3 - javadoc/pom.xml | 39 -- .../jetty-alpn-conscrypt-client/pom.xml | 4 - .../jetty-alpn-conscrypt-server/pom.xml | 7 - jetty-alpn/jetty-alpn-java-client/pom.xml | 2 - jetty-alpn/jetty-alpn-java-server/pom.xml | 2 - jetty-annotations/pom.xml | 2 - jetty-ant/pom.xml | 3 - jetty-cdi/pom.xml | 22 +- jetty-client/pom.xml | 3 - jetty-deploy/pom.xml | 3 - jetty-fcgi/fcgi-client/pom.xml | 2 - jetty-fcgi/fcgi-server/pom.xml | 7 - .../jetty-gcloud-session-manager/pom.xml | 11 +- jetty-gcloud/pom.xml | 2 +- jetty-hazelcast/pom.xml | 2 - jetty-home/pom.xml | 34 +- jetty-http-spi/pom.xml | 2 - jetty-http/pom.xml | 1 - jetty-http2/http2-client/pom.xml | 6 - jetty-http2/http2-common/pom.xml | 10 +- jetty-http2/http2-hpack/pom.xml | 3 - .../http2-http-client-transport/pom.xml | 5 - jetty-http2/http2-server/pom.xml | 4 - jetty-infinispan/infinispan-common/pom.xml | 1 - .../infinispan-embedded-query/pom.xml | 1 - jetty-infinispan/infinispan-embedded/pom.xml | 20 +- .../src/main/assembly/config.xml | 4 +- .../infinispan/infinispan-embedded.xml | 0 .../modules/infinispan-embedded.mod | 0 .../session-store-infinispan-embedded.mod | 0 .../embedded/infinispan-embedded-libs.mod | 0 .../infinispan-embedded-serverclasses.mod | 0 .../infinispan/embedded/infinispan.xml | 0 .../infinispan-remote-query/pom.xml | 1 - jetty-infinispan/infinispan-remote/pom.xml | 2 - jetty-io/pom.xml | 2 - jetty-jaas/pom.xml | 1 - jetty-jaspi/pom.xml | 1 - jetty-jmx/pom.xml | 1 - jetty-jndi/pom.xml | 2 - jetty-jspc-maven-plugin/pom.xml | 1 - jetty-keystore/pom.xml | 1 - jetty-maven-plugin/pom.xml | 15 - .../jetty-memcached-sessions/pom.xml | 3 - jetty-nosql/pom.xml | 2 - jetty-openid/pom.xml | 4 - jetty-osgi/jetty-osgi-boot-jsp/pom.xml | 3 - jetty-osgi/jetty-osgi-boot-warurl/pom.xml | 1 - jetty-osgi/jetty-osgi-httpservice/pom.xml | 2 - jetty-osgi/test-jetty-osgi-server/pom.xml | 1 - jetty-osgi/test-jetty-osgi-webapp/pom.xml | 1 - jetty-osgi/test-jetty-osgi/pom.xml | 22 - jetty-plus/pom.xml | 2 - jetty-proxy/pom.xml | 6 - jetty-quickstart/pom.xml | 2 - jetty-rewrite/pom.xml | 1 - jetty-runner/pom.xml | 8 - jetty-security/pom.xml | 1 - jetty-server/pom.xml | 4 - jetty-servlet/pom.xml | 5 - jetty-servlets/pom.xml | 4 - jetty-start/pom.xml | 1 - .../start/fileinits/MavenMetadataTest.java | 2 +- jetty-unixdomain-server/pom.xml | 1 - .../jetty-unixsocket-client/pom.xml | 3 - .../jetty-unixsocket-common/pom.xml | 1 - .../jetty-unixsocket-server/pom.xml | 1 - jetty-util-ajax/pom.xml | 1 - .../org/eclipse/jetty/util/ajax/JSON.java | 11 +- jetty-webapp/pom.xml | 4 - jetty-websocket/websocket-core-client/pom.xml | 3 - jetty-websocket/websocket-core-server/pom.xml | 1 - jetty-websocket/websocket-core-tests/pom.xml | 4 - .../websocket-jakarta-client/pom.xml | 5 - .../websocket-jakarta-common/pom.xml | 1 - .../websocket-jakarta-server/pom.xml | 3 - .../websocket-jakarta-tests/pom.xml | 3 - .../websocket-jetty-client/pom.xml | 5 - .../websocket-jetty-common/pom.xml | 2 - .../websocket-jetty-server/pom.xml | 6 - jetty-websocket/websocket-jetty-tests/pom.xml | 9 - jetty-websocket/websocket-servlet/pom.xml | 2 - jetty-xml/pom.xml | 1 - pom.xml | 447 +++++++++++++++++- tests/jetty-jmh/pom.xml | 2 - tests/test-cdi/pom.xml | 9 +- tests/test-distribution/pom.xml | 11 - tests/test-http-client-transport/pom.xml | 10 - tests/test-integration/pom.xml | 14 - tests/test-jmx/jmx-webapp-it/pom.xml | 2 - tests/test-jmx/jmx-webapp/pom.xml | 1 - .../test-jpms-websocket-core/pom.xml | 2 - tests/test-loginservice/pom.xml | 4 - tests/test-quickstart/pom.xml | 13 - .../test-sessions/test-file-sessions/pom.xml | 3 - .../test-gcloud-sessions/pom.xml | 4 - .../test-hazelcast-sessions/pom.xml | 5 - .../test-infinispan-sessions/pom.xml | 11 - .../test-sessions/test-jdbc-sessions/pom.xml | 3 - .../test-memcached-sessions/pom.xml | 4 - .../test-mongodb-sessions/pom.xml | 5 - .../test-sessions-common/pom.xml | 2 - .../test-bad-websocket-webapp/pom.xml | 1 - tests/test-webapps/test-http2-webapp/pom.xml | 6 - .../test-webapps/test-webapp-rfc2616/pom.xml | 1 - .../pom.xml | 1 - .../test-websocket-client-webapp/pom.xml | 1 - .../test-websocket-webapp/pom.xml | 1 - .../test-webapps/test-weld-cdi-webapp/pom.xml | 6 + 122 files changed, 479 insertions(+), 532 deletions(-) rename jetty-infinispan/infinispan-embedded/src/main/{config-templates => config-template}/etc/sessions/infinispan/infinispan-embedded.xml (100%) rename jetty-infinispan/infinispan-embedded/src/main/{config-templates => config-template}/modules/infinispan-embedded.mod (100%) rename jetty-infinispan/infinispan-embedded/src/main/{config-templates => config-template}/modules/session-store-infinispan-embedded.mod (100%) rename jetty-infinispan/infinispan-embedded/src/main/{config-templates => config-template}/modules/sessions/infinispan/embedded/infinispan-embedded-libs.mod (100%) rename jetty-infinispan/infinispan-embedded/src/main/{config-templates => config-template}/modules/sessions/infinispan/embedded/infinispan-embedded-serverclasses.mod (100%) rename jetty-infinispan/infinispan-embedded/src/main/{config-templates => config-template}/modules/sessions/infinispan/embedded/infinispan.xml (100%) diff --git a/apache-jsp/pom.xml b/apache-jsp/pom.xml index d12b8f181fd..d83cd9fd4f1 100644 --- a/apache-jsp/pom.xml +++ b/apache-jsp/pom.xml @@ -70,7 +70,6 @@ org.eclipse.jetty jetty-util - ${project.version} org.mortbay.jasper @@ -79,7 +78,6 @@ org.eclipse.jetty jetty-servlet - ${project.version} test @@ -89,7 +87,6 @@ org.eclipse.jetty.tests jetty-http-tools - ${project.version} test diff --git a/demos/demo-async-rest/demo-async-rest-jar/pom.xml b/demos/demo-async-rest/demo-async-rest-jar/pom.xml index df7ea3b2d63..487f6e9cabd 100644 --- a/demos/demo-async-rest/demo-async-rest-jar/pom.xml +++ b/demos/demo-async-rest/demo-async-rest-jar/pom.xml @@ -18,12 +18,10 @@ org.eclipse.jetty jetty-client - ${project.version} org.eclipse.jetty jetty-util-ajax - ${project.version} org.eclipse.jetty.toolchain diff --git a/demos/demo-async-rest/demo-async-rest-server/pom.xml b/demos/demo-async-rest/demo-async-rest-server/pom.xml index 8a277fdc7a0..e47adef588f 100644 --- a/demos/demo-async-rest/demo-async-rest-server/pom.xml +++ b/demos/demo-async-rest/demo-async-rest-server/pom.xml @@ -18,7 +18,6 @@ org.eclipse.jetty jetty-webapp - ${project.version} diff --git a/demos/demo-async-rest/demo-async-rest-webapp/pom.xml b/demos/demo-async-rest/demo-async-rest-webapp/pom.xml index b65b4c31838..12a9c51a987 100644 --- a/demos/demo-async-rest/demo-async-rest-webapp/pom.xml +++ b/demos/demo-async-rest/demo-async-rest-webapp/pom.xml @@ -23,7 +23,6 @@ org.eclipse.jetty.demos demo-async-rest-jar - ${project.version} org.eclipse.jetty.toolchain diff --git a/demos/demo-jetty-webapp/pom.xml b/demos/demo-jetty-webapp/pom.xml index 8b5fd81ff8d..fe54d152849 100644 --- a/demos/demo-jetty-webapp/pom.xml +++ b/demos/demo-jetty-webapp/pom.xml @@ -129,7 +129,6 @@ org.eclipse.jetty jetty-servlets - ${project.version} provided @@ -146,13 +145,11 @@ org.eclipse.jetty jetty-webapp - ${project.version} test org.eclipse.jetty jetty-jmx - ${project.version} test @@ -188,19 +185,16 @@ org.eclipse.jetty.websocket websocket-jetty-api - ${project.version} provided org.eclipse.jetty.websocket websocket-jetty-server - ${project.version} provided org.eclipse.jetty.websocket websocket-jakarta-server - ${project.version} test diff --git a/demos/demo-jndi-webapp/pom.xml b/demos/demo-jndi-webapp/pom.xml index 3498cad9172..fc4f16fcdaa 100644 --- a/demos/demo-jndi-webapp/pom.xml +++ b/demos/demo-jndi-webapp/pom.xml @@ -82,7 +82,6 @@ org.eclipse.jetty.demos demo-mock-resources - ${project.version} provided @@ -95,5 +94,10 @@ jetty-jakarta-servlet-api provided + + org.eclipse.jetty.orbit + javax.mail.glassfish + provided + diff --git a/demos/demo-mock-resources/pom.xml b/demos/demo-mock-resources/pom.xml index b9f85447081..6835c1c0f26 100644 --- a/demos/demo-mock-resources/pom.xml +++ b/demos/demo-mock-resources/pom.xml @@ -56,6 +56,5 @@ jakarta.mail-api provided - diff --git a/demos/demo-proxy-webapp/pom.xml b/demos/demo-proxy-webapp/pom.xml index cb143f8b9a6..56fb23e96b9 100644 --- a/demos/demo-proxy-webapp/pom.xml +++ b/demos/demo-proxy-webapp/pom.xml @@ -37,7 +37,6 @@ org.eclipse.jetty jetty-proxy - ${project.version} org.eclipse.jetty.toolchain @@ -47,18 +46,15 @@ org.eclipse.jetty jetty-webapp - ${project.version} test org.eclipse.jetty jetty-client - ${project.version} org.eclipse.jetty jetty-jmx - ${project.version} test @@ -69,19 +65,16 @@ org.eclipse.jetty.http2 http2-server - ${project.version} test org.eclipse.jetty jetty-alpn-java-server - ${project.version} test org.eclipse.jetty jetty-annotations - ${project.version} test diff --git a/demos/demo-spec/demo-spec-webapp/pom.xml b/demos/demo-spec/demo-spec-webapp/pom.xml index 086c967d146..d695ade46f7 100644 --- a/demos/demo-spec/demo-spec-webapp/pom.xml +++ b/demos/demo-spec/demo-spec-webapp/pom.xml @@ -202,12 +202,10 @@ org.eclipse.jetty.demos demo-web-fragment - ${project.version} org.eclipse.jetty.demos demo-container-initializer - ${project.version} diff --git a/demos/embedded/pom.xml b/demos/embedded/pom.xml index 21fac9ab4db..940e7e6b119 100644 --- a/demos/embedded/pom.xml +++ b/demos/embedded/pom.xml @@ -24,57 +24,46 @@ org.eclipse.jetty jetty-util-ajax - ${project.version} org.eclipse.jetty jetty-webapp - ${project.version} org.eclipse.jetty jetty-security - ${project.version} org.eclipse.jetty jetty-servlets - ${project.version} org.eclipse.jetty jetty-deploy - ${project.version} org.eclipse.jetty jetty-rewrite - ${project.version} org.eclipse.jetty jetty-jmx - ${project.version} org.eclipse.jetty.websocket websocket-jakarta-server - ${project.version} org.eclipse.jetty.websocket websocket-servlet - ${project.version} org.eclipse.jetty.websocket websocket-jetty-server - ${project.version} org.eclipse.jetty.http2 http2-server - ${project.version} org.eclipse.jetty @@ -84,32 +73,26 @@ org.eclipse.jetty jetty-alpn-java-server - ${project.version} org.eclipse.jetty jetty-alpn-conscrypt-server - ${project.version} org.eclipse.jetty jetty-annotations - ${project.version} org.eclipse.jetty.demos demo-mock-resources - ${project.version} org.eclipse.jetty jetty-proxy - ${project.version} org.eclipse.jetty jetty-jaas - ${project.version} org.eclipse.jetty @@ -118,12 +101,10 @@ org.eclipse.jetty apache-jsp - ${project.version} org.eclipse.jetty glassfish-jstl - ${project.version} jakarta.transaction @@ -138,13 +119,11 @@ org.eclipse.jetty.websocket websocket-jetty-client - ${project.version} test org.eclipse.jetty jetty-home - ${project.version} zip test diff --git a/documentation/jetty-asciidoctor-extensions/pom.xml b/documentation/jetty-asciidoctor-extensions/pom.xml index 4bf11513b2f..410217000d2 100644 --- a/documentation/jetty-asciidoctor-extensions/pom.xml +++ b/documentation/jetty-asciidoctor-extensions/pom.xml @@ -34,7 +34,6 @@ org.eclipse.jetty.tests test-distribution - ${project.version} diff --git a/documentation/jetty-documentation/pom.xml b/documentation/jetty-documentation/pom.xml index 59664b5d4b3..a9b1e593bb3 100644 --- a/documentation/jetty-documentation/pom.xml +++ b/documentation/jetty-documentation/pom.xml @@ -144,22 +144,18 @@ org.eclipse.jetty jetty-alpn-server - ${project.version} org.eclipse.jetty jetty-client - ${project.version} org.eclipse.jetty jetty-jmx - ${project.version} org.eclipse.jetty jetty-rewrite - ${project.version} org.eclipse.jetty @@ -168,7 +164,6 @@ org.eclipse.jetty jetty-servlet - ${project.version} org.eclipse.jetty @@ -178,63 +173,51 @@ org.eclipse.jetty jetty-util-ajax - ${project.version} org.eclipse.jetty jetty-webapp - ${project.version} org.eclipse.jetty.fcgi fcgi-client - ${project.version} org.eclipse.jetty.http2 http2-server - ${project.version} org.eclipse.jetty.http2 http2-http-client-transport - ${project.version} org.eclipse.jetty jetty-unixdomain-server - ${project.version} org.eclipse.jetty jetty-slf4j-impl - ${project.version} runtime org.eclipse.jetty.memcached jetty-memcached-sessions - ${project.version} org.eclipse.jetty jetty-nosql - ${project.version} org.eclipse.jetty.websocket websocket-jetty-client - ${project.version} org.eclipse.jetty.websocket websocket-jakarta-server - ${project.version} org.eclipse.jetty.websocket websocket-jetty-server - ${project.version} diff --git a/glassfish-jstl/pom.xml b/glassfish-jstl/pom.xml index bb7532a5cdf..7f2d6b76e43 100644 --- a/glassfish-jstl/pom.xml +++ b/glassfish-jstl/pom.xml @@ -53,21 +53,18 @@ org.eclipse.jetty apache-jsp - ${project.version} test org.eclipse.jetty jetty-annotations - ${project.version} test org.eclipse.jetty jetty-webapp - ${project.version} test diff --git a/javadoc/pom.xml b/javadoc/pom.xml index 25e9ade4940..718a02749f6 100644 --- a/javadoc/pom.xml +++ b/javadoc/pom.xml @@ -154,224 +154,187 @@ org.eclipse.jetty jetty-annotations - ${project.version} provided org.eclipse.jetty jetty-ant - ${project.version} provided org.eclipse.jetty jetty-alpn-client - ${project.version} provided org.eclipse.jetty jetty-alpn-conscrypt-client - ${project.version} provided org.eclipse.jetty jetty-alpn-conscrypt-server - ${project.version} provided org.eclipse.jetty jetty-alpn-java-client - ${project.version} provided org.eclipse.jetty jetty-alpn-java-server - ${project.version} provided org.eclipse.jetty apache-jsp - ${project.version} provided org.eclipse.jetty glassfish-jstl - ${project.version} provided org.eclipse.jetty jetty-cdi - ${project.version} provided org.eclipse.jetty jetty-client - ${project.version} provided org.eclipse.jetty jetty-deploy - ${project.version} provided org.eclipse.jetty.fcgi fcgi-client - ${project.version} provided org.eclipse.jetty.fcgi fcgi-server - ${project.version} provided org.eclipse.jetty.gcloud jetty-gcloud-session-manager - ${project.version} provided org.eclipse.jetty jetty-http-spi - ${project.version} provided org.eclipse.jetty.http2 http2-server - ${project.version} provided org.eclipse.jetty.http2 http2-client - ${project.version} provided org.eclipse.jetty jetty-jaas - ${project.version} provided org.eclipse.jetty jetty-jaspi - ${project.version} provided org.eclipse.jetty.memcached jetty-memcached-sessions - ${project.version} provided org.eclipse.jetty jetty-nosql - ${project.version} provided org.eclipse.jetty.osgi jetty-osgi-boot - ${project.version} provided org.eclipse.jetty jetty-proxy - ${project.version} provided org.eclipse.jetty jetty-quickstart - ${project.version} provided org.eclipse.jetty jetty-rewrite ${project.version} - provided org.eclipse.jetty jetty-runner - ${project.version} provided org.eclipse.jetty jetty-openid - ${project.version} provided org.eclipse.jetty jetty-start - ${project.version} provided org.eclipse.jetty jetty-unixsocket-client - ${project.version} provided org.eclipse.jetty jetty-unixsocket-server - ${project.version} provided org.eclipse.jetty.websocket websocket-jakarta-server - ${project.version} provided org.eclipse.jetty.websocket websocket-jakarta-client - ${project.version} provided org.eclipse.jetty.websocket websocket-jetty-client - ${project.version} provided org.eclipse.jetty.websocket websocket-jetty-server - ${project.version} provided org.eclipse.jetty jetty-jmx - ${project.version} provided org.eclipse.jetty jetty-jndi - ${project.version} provided @@ -390,13 +353,11 @@ org.eclipse.jetty jetty-jspc-maven-plugin - ${project.version} provided org.eclipse.jetty jetty-maven-plugin - ${project.version} provided diff --git a/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml b/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml index 864808c3cc1..68569d88103 100644 --- a/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml +++ b/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml @@ -19,22 +19,18 @@ org.conscrypt conscrypt-openjdk-uber - ${conscrypt.version} org.eclipse.jetty jetty-alpn-client - ${project.version} org.slf4j slf4j-api - org.eclipse.jetty.http2 http2-client - ${project.version} test diff --git a/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml b/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml index 7b37a274456..3970a40d7c0 100644 --- a/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml +++ b/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml @@ -18,12 +18,10 @@ org.conscrypt conscrypt-openjdk-uber - ${conscrypt.version} org.eclipse.jetty jetty-alpn-server - ${project.version} org.eclipse.jetty @@ -41,31 +39,26 @@ org.eclipse.jetty.http2 http2-server - ${project.version} test org.eclipse.jetty jetty-alpn-conscrypt-client - ${project.version} test org.eclipse.jetty jetty-client - ${project.version} test org.eclipse.jetty.http2 http2-client - ${project.version} test org.eclipse.jetty.http2 http2-http-client-transport - ${project.version} test diff --git a/jetty-alpn/jetty-alpn-java-client/pom.xml b/jetty-alpn/jetty-alpn-java-client/pom.xml index 1c364a9f21a..dbe945be487 100644 --- a/jetty-alpn/jetty-alpn-java-client/pom.xml +++ b/jetty-alpn/jetty-alpn-java-client/pom.xml @@ -38,7 +38,6 @@ org.eclipse.jetty jetty-alpn-client - ${project.version} org.slf4j @@ -48,7 +47,6 @@ org.eclipse.jetty.http2 http2-client - ${project.version} test diff --git a/jetty-alpn/jetty-alpn-java-server/pom.xml b/jetty-alpn/jetty-alpn-java-server/pom.xml index 5e11e087ffb..5530cf9d2a1 100644 --- a/jetty-alpn/jetty-alpn-java-server/pom.xml +++ b/jetty-alpn/jetty-alpn-java-server/pom.xml @@ -48,7 +48,6 @@ org.eclipse.jetty jetty-alpn-server - ${project.version} org.slf4j @@ -62,7 +61,6 @@ org.eclipse.jetty.http2 http2-server - ${project.version} test diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index 5df73bb2f0a..aeb4d2ca7bd 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -50,7 +50,6 @@ org.eclipse.jetty jetty-webapp - ${project.version} jakarta.annotation @@ -85,7 +84,6 @@ org.eclipse.jetty jetty-jndi - ${project.version} test diff --git a/jetty-ant/pom.xml b/jetty-ant/pom.xml index 718c76abb2d..240045be335 100644 --- a/jetty-ant/pom.xml +++ b/jetty-ant/pom.xml @@ -74,7 +74,6 @@ org.eclipse.jetty jetty-security - ${project.version} org.eclipse.jetty @@ -83,12 +82,10 @@ org.eclipse.jetty jetty-webapp - ${project.version} org.eclipse.jetty jetty-annotations - ${project.version} org.slf4j diff --git a/jetty-cdi/pom.xml b/jetty-cdi/pom.xml index ed5c9e51bf9..ba8a8bd5094 100644 --- a/jetty-cdi/pom.xml +++ b/jetty-cdi/pom.xml @@ -16,19 +16,16 @@ org.eclipse.jetty jetty-util - ${project.version} compile org.eclipse.jetty jetty-webapp - ${project.version} compile org.eclipse.jetty jetty-annotations - ${project.version} compile @@ -57,7 +54,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M5 + ${maven.surefire.plugin.version} diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml index 2f3896b3e7e..e5476e2923f 100644 --- a/jetty-http-spi/pom.xml +++ b/jetty-http-spi/pom.xml @@ -20,7 +20,6 @@ org.eclipse.jetty jetty-client - ${project.version} test @@ -36,7 +35,6 @@ org.slf4j jul-to-slf4j - ${slf4j.version} test diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index 3a807adce71..2ea0304aec8 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -19,7 +19,6 @@ org.eclipse.jetty jetty-util - ${project.version} org.eclipse.jetty diff --git a/jetty-http2/http2-client/pom.xml b/jetty-http2/http2-client/pom.xml index aaf425be903..90d012be379 100644 --- a/jetty-http2/http2-client/pom.xml +++ b/jetty-http2/http2-client/pom.xml @@ -32,12 +32,10 @@ org.eclipse.jetty.http2 http2-common - ${project.version} org.eclipse.jetty jetty-alpn-client - ${project.version} org.slf4j @@ -62,25 +60,21 @@ org.eclipse.jetty jetty-servlet - ${project.version} test org.eclipse.jetty jetty-servlets - ${project.version} test org.eclipse.jetty jetty-proxy - ${project.version} test org.eclipse.jetty.http2 http2-server - ${project.version} test diff --git a/jetty-http2/http2-common/pom.xml b/jetty-http2/http2-common/pom.xml index 372badce429..f815edc643c 100644 --- a/jetty-http2/http2-common/pom.xml +++ b/jetty-http2/http2-common/pom.xml @@ -10,11 +10,14 @@ http2-common Jetty :: HTTP2 :: Common + + ${project.groupId}.common + + org.eclipse.jetty.http2 http2-hpack - ${project.version} org.slf4j @@ -24,7 +27,6 @@ org.eclipse.jetty jetty-jmx - ${project.version} true @@ -39,8 +41,4 @@ - - ${project.groupId}.common - - diff --git a/jetty-http2/http2-hpack/pom.xml b/jetty-http2/http2-hpack/pom.xml index 9d0071144ca..9fccab46191 100644 --- a/jetty-http2/http2-hpack/pom.xml +++ b/jetty-http2/http2-hpack/pom.xml @@ -36,7 +36,6 @@ org.eclipse.jetty jetty-util - ${project.version} org.eclipse.jetty @@ -54,7 +53,6 @@ org.eclipse.jetty.tests jetty-http-tools - ${project.version} test @@ -70,7 +68,6 @@ org.eclipse.jetty jetty-util-ajax - ${project.version} test diff --git a/jetty-http2/http2-http-client-transport/pom.xml b/jetty-http2/http2-http-client-transport/pom.xml index 7b699072773..0a384c405bc 100644 --- a/jetty-http2/http2-http-client-transport/pom.xml +++ b/jetty-http2/http2-http-client-transport/pom.xml @@ -18,17 +18,14 @@ org.eclipse.jetty jetty-client - ${project.version} org.eclipse.jetty.http2 http2-client - ${project.version} org.eclipse.jetty jetty-alpn-java-client - ${project.version} org.slf4j @@ -38,7 +35,6 @@ org.eclipse.jetty jetty-alpn-java-server - ${project.version} test @@ -59,7 +55,6 @@ org.eclipse.jetty.http2 http2-server - ${project.version} test diff --git a/jetty-http2/http2-server/pom.xml b/jetty-http2/http2-server/pom.xml index b7fed7cd905..5f1ce9069cd 100644 --- a/jetty-http2/http2-server/pom.xml +++ b/jetty-http2/http2-server/pom.xml @@ -56,7 +56,6 @@ org.eclipse.jetty.http2 http2-common - ${project.version} org.eclipse.jetty @@ -69,19 +68,16 @@ org.eclipse.jetty jetty-servlet - ${project.version} test org.eclipse.jetty jetty-servlets - ${project.version} test org.eclipse.jetty jetty-alpn-server - ${project.version} test diff --git a/jetty-infinispan/infinispan-common/pom.xml b/jetty-infinispan/infinispan-common/pom.xml index 466498b7c0f..59595bc41f7 100644 --- a/jetty-infinispan/infinispan-common/pom.xml +++ b/jetty-infinispan/infinispan-common/pom.xml @@ -48,7 +48,6 @@ org.infinispan.protostream protostream - ${infinispan.protostream.version} true provided diff --git a/jetty-infinispan/infinispan-embedded-query/pom.xml b/jetty-infinispan/infinispan-embedded-query/pom.xml index ccb078ae2f4..3e0724e4c75 100644 --- a/jetty-infinispan/infinispan-embedded-query/pom.xml +++ b/jetty-infinispan/infinispan-embedded-query/pom.xml @@ -74,7 +74,6 @@ org.eclipse.jetty infinispan-common - ${project.version} org.infinispan diff --git a/jetty-infinispan/infinispan-embedded/pom.xml b/jetty-infinispan/infinispan-embedded/pom.xml index 4f0483d2678..0e2d8af5d7b 100644 --- a/jetty-infinispan/infinispan-embedded/pom.xml +++ b/jetty-infinispan/infinispan-embedded/pom.xml @@ -61,7 +61,7 @@ - + @@ -70,30 +70,12 @@ - - org.apache.maven.plugins - maven-assembly-plugin - - - package - - single - - - - src/main/assembly/config.xml - - - - - org.eclipse.jetty infinispan-common - ${project.version} org.infinispan diff --git a/jetty-infinispan/infinispan-embedded/src/main/assembly/config.xml b/jetty-infinispan/infinispan-embedded/src/main/assembly/config.xml index 491f84e6116..93917acb50e 100644 --- a/jetty-infinispan/infinispan-embedded/src/main/assembly/config.xml +++ b/jetty-infinispan/infinispan-embedded/src/main/assembly/config.xml @@ -7,7 +7,7 @@ - src/main/config-templates + ${project.build.directory}/jetty-config-files ** @@ -17,7 +17,7 @@ - target + ${project.build.directory} modules/sessions/infinispan/embedded infinispan-embedded-libs.mod diff --git a/jetty-infinispan/infinispan-embedded/src/main/config-templates/etc/sessions/infinispan/infinispan-embedded.xml b/jetty-infinispan/infinispan-embedded/src/main/config-template/etc/sessions/infinispan/infinispan-embedded.xml similarity index 100% rename from jetty-infinispan/infinispan-embedded/src/main/config-templates/etc/sessions/infinispan/infinispan-embedded.xml rename to jetty-infinispan/infinispan-embedded/src/main/config-template/etc/sessions/infinispan/infinispan-embedded.xml diff --git a/jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/infinispan-embedded.mod b/jetty-infinispan/infinispan-embedded/src/main/config-template/modules/infinispan-embedded.mod similarity index 100% rename from jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/infinispan-embedded.mod rename to jetty-infinispan/infinispan-embedded/src/main/config-template/modules/infinispan-embedded.mod diff --git a/jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/session-store-infinispan-embedded.mod b/jetty-infinispan/infinispan-embedded/src/main/config-template/modules/session-store-infinispan-embedded.mod similarity index 100% rename from jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/session-store-infinispan-embedded.mod rename to jetty-infinispan/infinispan-embedded/src/main/config-template/modules/session-store-infinispan-embedded.mod diff --git a/jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/sessions/infinispan/embedded/infinispan-embedded-libs.mod b/jetty-infinispan/infinispan-embedded/src/main/config-template/modules/sessions/infinispan/embedded/infinispan-embedded-libs.mod similarity index 100% rename from jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/sessions/infinispan/embedded/infinispan-embedded-libs.mod rename to jetty-infinispan/infinispan-embedded/src/main/config-template/modules/sessions/infinispan/embedded/infinispan-embedded-libs.mod diff --git a/jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/sessions/infinispan/embedded/infinispan-embedded-serverclasses.mod b/jetty-infinispan/infinispan-embedded/src/main/config-template/modules/sessions/infinispan/embedded/infinispan-embedded-serverclasses.mod similarity index 100% rename from jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/sessions/infinispan/embedded/infinispan-embedded-serverclasses.mod rename to jetty-infinispan/infinispan-embedded/src/main/config-template/modules/sessions/infinispan/embedded/infinispan-embedded-serverclasses.mod diff --git a/jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/sessions/infinispan/embedded/infinispan.xml b/jetty-infinispan/infinispan-embedded/src/main/config-template/modules/sessions/infinispan/embedded/infinispan.xml similarity index 100% rename from jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/sessions/infinispan/embedded/infinispan.xml rename to jetty-infinispan/infinispan-embedded/src/main/config-template/modules/sessions/infinispan/embedded/infinispan.xml diff --git a/jetty-infinispan/infinispan-remote-query/pom.xml b/jetty-infinispan/infinispan-remote-query/pom.xml index 7aade2d2df6..813d20b04ad 100644 --- a/jetty-infinispan/infinispan-remote-query/pom.xml +++ b/jetty-infinispan/infinispan-remote-query/pom.xml @@ -84,7 +84,6 @@ org.eclipse.jetty infinispan-common - ${project.version} org.infinispan diff --git a/jetty-infinispan/infinispan-remote/pom.xml b/jetty-infinispan/infinispan-remote/pom.xml index 0fd79d79bb2..3fa491a6fc4 100644 --- a/jetty-infinispan/infinispan-remote/pom.xml +++ b/jetty-infinispan/infinispan-remote/pom.xml @@ -76,7 +76,6 @@ org.eclipse.jetty infinispan-common - ${project.version} org.infinispan @@ -91,7 +90,6 @@ org.infinispan.protostream protostream - ${infinispan.protostream.version} provided diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml index 70fecd0737d..52922f886e6 100644 --- a/jetty-io/pom.xml +++ b/jetty-io/pom.xml @@ -20,12 +20,10 @@ org.eclipse.jetty jetty-util - ${project.version} org.eclipse.jetty jetty-jmx - ${project.version} true diff --git a/jetty-jaas/pom.xml b/jetty-jaas/pom.xml index 9664d5e551f..0a7a5cbf921 100644 --- a/jetty-jaas/pom.xml +++ b/jetty-jaas/pom.xml @@ -41,7 +41,6 @@ org.eclipse.jetty jetty-security - ${project.version} diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index 16bb0f4e1a4..b65e8fd5469 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -46,7 +46,6 @@ org.eclipse.jetty jetty-security - ${project.version} org.slf4j diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml index 18b5b45d525..f2e1b1b0f1f 100644 --- a/jetty-jmx/pom.xml +++ b/jetty-jmx/pom.xml @@ -28,7 +28,6 @@ org.eclipse.jetty jetty-util - ${project.version} org.slf4j diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml index 89e48183775..7b46601b4c9 100644 --- a/jetty-jndi/pom.xml +++ b/jetty-jndi/pom.xml @@ -34,7 +34,6 @@ org.eclipse.jetty jetty-util - ${project.version} org.slf4j @@ -58,7 +57,6 @@ org.eclipse.jetty jetty-security - ${project.version} provided diff --git a/jetty-jspc-maven-plugin/pom.xml b/jetty-jspc-maven-plugin/pom.xml index 0b3b8deaece..e286aa54252 100644 --- a/jetty-jspc-maven-plugin/pom.xml +++ b/jetty-jspc-maven-plugin/pom.xml @@ -71,7 +71,6 @@ org.eclipse.jetty jetty-util - ${project.version} org.apache.maven diff --git a/jetty-keystore/pom.xml b/jetty-keystore/pom.xml index 6001e3a4250..3b333329b83 100644 --- a/jetty-keystore/pom.xml +++ b/jetty-keystore/pom.xml @@ -30,7 +30,6 @@ org.eclipse.jetty jetty-util - ${project.version} diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml index feb06b7f919..7e3c5a7ef53 100644 --- a/jetty-maven-plugin/pom.xml +++ b/jetty-maven-plugin/pom.xml @@ -158,12 +158,10 @@ org.eclipse.jetty jetty-util - ${project.version} org.eclipse.jetty jetty-webapp - ${project.version} jakarta.servlet @@ -174,12 +172,10 @@ org.eclipse.jetty jetty-quickstart - ${project.version} org.eclipse.jetty jetty-jaas - ${project.version} org.eclipse.jetty @@ -188,7 +184,6 @@ org.eclipse.jetty jetty-jndi - ${project.version} org.eclipse.jetty @@ -197,12 +192,10 @@ org.eclipse.jetty jetty-servlet - ${project.version} org.eclipse.jetty jetty-client - ${project.version} org.eclipse.jetty @@ -215,37 +208,30 @@ org.eclipse.jetty jetty-jmx - ${project.version} org.eclipse.jetty jetty-annotations - ${project.version} org.eclipse.jetty.websocket websocket-jakarta-server - ${project.version} org.eclipse.jetty.websocket websocket-jetty-server - ${project.version} org.eclipse.jetty apache-jsp - ${project.version} org.eclipse.jetty glassfish-jstl - ${project.version} org.slf4j slf4j-api - ${slf4j.version} jakarta.transaction @@ -260,7 +246,6 @@ org.eclipse.jetty jetty-home - ${project.version} test zip diff --git a/jetty-memcached/jetty-memcached-sessions/pom.xml b/jetty-memcached/jetty-memcached-sessions/pom.xml index 4f692a3e25b..f40d0961964 100644 --- a/jetty-memcached/jetty-memcached-sessions/pom.xml +++ b/jetty-memcached/jetty-memcached-sessions/pom.xml @@ -23,19 +23,16 @@ org.slf4j slf4j-simple - ${slf4j.version} test org.eclipse.jetty jetty-webapp - ${project.version} test org.eclipse.jetty jetty-client - ${project.version} test diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml index 8dfd65c9dca..c4948b756c3 100644 --- a/jetty-nosql/pom.xml +++ b/jetty-nosql/pom.xml @@ -22,7 +22,6 @@ org.eclipse.jetty jetty-jmx - ${project.version} true @@ -48,7 +47,6 @@ org.eclipse.jetty.tests test-sessions-common - ${project.version} test diff --git a/jetty-openid/pom.xml b/jetty-openid/pom.xml index 49a760d8ba4..f6dee42787b 100644 --- a/jetty-openid/pom.xml +++ b/jetty-openid/pom.xml @@ -46,17 +46,14 @@ org.eclipse.jetty jetty-client - ${project.version} org.eclipse.jetty jetty-security - ${project.version} org.eclipse.jetty jetty-util-ajax - ${project.version} org.slf4j @@ -70,7 +67,6 @@ org.eclipse.jetty jetty-servlet - ${project.version} test diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml index 5bf1e86627d..6e64ac2698f 100644 --- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml @@ -16,12 +16,10 @@ org.eclipse.jetty jetty-deploy - ${project.version} org.eclipse.jetty.osgi jetty-osgi-boot - ${project.version} provided @@ -41,7 +39,6 @@ org.eclipse.jetty apache-jsp - ${project.version} diff --git a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml index 5fac02ffdbd..612d0d843ab 100644 --- a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml @@ -17,7 +17,6 @@ org.eclipse.jetty jetty-util - ${project.version} org.eclipse.platform diff --git a/jetty-osgi/jetty-osgi-httpservice/pom.xml b/jetty-osgi/jetty-osgi-httpservice/pom.xml index c3f2031d29c..9db738bea14 100644 --- a/jetty-osgi/jetty-osgi-httpservice/pom.xml +++ b/jetty-osgi/jetty-osgi-httpservice/pom.xml @@ -16,12 +16,10 @@ org.eclipse.jetty jetty-util - ${project.version} org.eclipse.jetty jetty-servlet - ${project.version} org.eclipse.equinox.http diff --git a/jetty-osgi/test-jetty-osgi-server/pom.xml b/jetty-osgi/test-jetty-osgi-server/pom.xml index f9474ad1542..3180430125e 100644 --- a/jetty-osgi/test-jetty-osgi-server/pom.xml +++ b/jetty-osgi/test-jetty-osgi-server/pom.xml @@ -15,7 +15,6 @@ org.eclipse.jetty jetty-webapp - ${project.version} org.eclipse.platform diff --git a/jetty-osgi/test-jetty-osgi-webapp/pom.xml b/jetty-osgi/test-jetty-osgi-webapp/pom.xml index a0e883c182b..58082603b37 100644 --- a/jetty-osgi/test-jetty-osgi-webapp/pom.xml +++ b/jetty-osgi/test-jetty-osgi-webapp/pom.xml @@ -16,7 +16,6 @@ org.eclipse.jetty jetty-webapp - ${project.version} org.eclipse.platform diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index 4c1d901eb51..13e291e9645 100644 --- a/jetty-osgi/test-jetty-osgi/pom.xml +++ b/jetty-osgi/test-jetty-osgi/pom.xml @@ -116,13 +116,11 @@ org.eclipse.platform org.eclipse.osgi - ${osgi-version} test org.eclipse.platform org.eclipse.osgi.services - ${osgi-services-version} test @@ -152,7 +150,6 @@ org.eclipse.jetty jetty-slf4j-impl - ${project.version} test @@ -251,19 +248,16 @@ org.eclipse.jetty jetty-annotations - ${project.version} runtime org.eclipse.jetty jetty-webapp - ${project.version} runtime org.eclipse.jetty jetty-deploy - ${project.version} runtime @@ -274,79 +268,66 @@ org.eclipse.jetty jetty-servlet - ${project.version} runtime org.eclipse.jetty jetty-servlets - ${project.version} runtime org.eclipse.jetty jetty-security - ${project.version} runtime org.eclipse.jetty jetty-xml - ${project.version} runtime org.eclipse.jetty jetty-jmx - ${project.version} runtime org.eclipse.jetty jetty-util - ${project.version} runtime org.eclipse.jetty jetty-client - ${project.version} runtime org.eclipse.jetty.websocket websocket-jetty-api - ${project.version} runtime org.eclipse.jetty.websocket websocket-jetty-common - ${project.version} runtime org.eclipse.jetty.websocket websocket-jetty-client - ${project.version} runtime org.eclipse.jetty.websocket websocket-jakarta-client - ${project.version} runtime org.eclipse.jetty.websocket websocket-servlet - ${project.version} runtime org.eclipse.jetty.websocket websocket-jetty-server - ${project.version} runtime @@ -357,18 +338,15 @@ org.eclipse.jetty.websocket websocket-jakarta-server - ${project.version} runtime org.eclipse.jetty.http2 http2-server - ${project.version} org.eclipse.jetty.http2 http2-hpack - ${project.version} org.eclipse.jetty.osgi diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml index 751728a109b..a1d9b8cfd47 100644 --- a/jetty-plus/pom.xml +++ b/jetty-plus/pom.xml @@ -44,12 +44,10 @@ org.eclipse.jetty jetty-jndi - ${project.version} org.eclipse.jetty jetty-webapp - ${project.version} org.slf4j diff --git a/jetty-proxy/pom.xml b/jetty-proxy/pom.xml index 642d870c966..4a36c4ff19a 100644 --- a/jetty-proxy/pom.xml +++ b/jetty-proxy/pom.xml @@ -28,29 +28,24 @@ org.eclipse.jetty jetty-servlet - ${project.version} provided org.eclipse.jetty jetty-util - ${project.version} org.eclipse.jetty jetty-client - ${project.version} org.eclipse.jetty jetty-util-ajax - ${project.version} test org.eclipse.jetty.tests jetty-http-tools - ${project.version} test @@ -61,7 +56,6 @@ org.eclipse.jetty jetty-rewrite - ${project.version} test diff --git a/jetty-quickstart/pom.xml b/jetty-quickstart/pom.xml index 06661ac6790..2f300a07fb8 100644 --- a/jetty-quickstart/pom.xml +++ b/jetty-quickstart/pom.xml @@ -38,7 +38,6 @@ org.eclipse.jetty jetty-webapp - ${project.version} org.eclipse.jetty @@ -47,7 +46,6 @@ org.eclipse.jetty jetty-annotations - ${project.version} org.slf4j diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml index 04df42001ea..6d105e6d28b 100644 --- a/jetty-rewrite/pom.xml +++ b/jetty-rewrite/pom.xml @@ -36,7 +36,6 @@ org.eclipse.jetty.tests jetty-http-tools - ${project.version} test diff --git a/jetty-runner/pom.xml b/jetty-runner/pom.xml index 29ae0946d80..ce22c315abf 100644 --- a/jetty-runner/pom.xml +++ b/jetty-runner/pom.xml @@ -126,32 +126,26 @@ org.eclipse.jetty jetty-annotations - ${project.version} org.eclipse.jetty jetty-jaas - ${project.version} org.eclipse.jetty.websocket websocket-jetty-server - ${project.version} org.eclipse.jetty jetty-jndi - ${project.version} org.eclipse.jetty apache-jsp - ${project.version} org.eclipse.jetty glassfish-jstl - ${project.version} org.slf4j @@ -165,14 +159,12 @@ org.eclipse.jetty.demos demo-simple-webapp - ${project.version} war test org.eclipse.jetty jetty-client - ${project.version} test diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml index 2d9da829aad..937cbcd8475 100644 --- a/jetty-security/pom.xml +++ b/jetty-security/pom.xml @@ -55,7 +55,6 @@ org.eclipse.jetty.tests jetty-http-tools - ${project.version} test diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index ce9032273ec..151cc1a7fa8 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -44,7 +44,6 @@ org.eclipse.jetty jetty-jmx - ${project.version} true @@ -55,7 +54,6 @@ org.eclipse.jetty jetty-xml - ${project.version} test @@ -66,13 +64,11 @@ org.eclipse.jetty.tests jetty-http-tools - ${project.version} test org.eclipse.jetty jetty-util-ajax - ${project.version} test diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml index 3b106ad8666..f7f7faf6da6 100644 --- a/jetty-servlet/pom.xml +++ b/jetty-servlet/pom.xml @@ -34,7 +34,6 @@ org.eclipse.jetty jetty-security - ${project.version} org.slf4j @@ -43,13 +42,11 @@ org.eclipse.jetty jetty-util-ajax - ${project.version} true org.eclipse.jetty jetty-jmx - ${project.version} true @@ -66,13 +63,11 @@ org.eclipse.jetty.tests jetty-http-tools - ${project.version} test org.eclipse.jetty jetty-client - ${project.version} test diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index 2e10af9742f..64614da5a5d 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -37,13 +37,11 @@ org.eclipse.jetty jetty-webapp - ${project.version} provided org.eclipse.jetty jetty-util - ${project.version} org.eclipse.jetty.toolchain @@ -67,13 +65,11 @@ org.eclipse.jetty jetty-jmx - ${project.version} test org.eclipse.jetty.tests jetty-http-tools - ${project.version} test diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml index 5518ccdf33e..caa400348d4 100644 --- a/jetty-start/pom.xml +++ b/jetty-start/pom.xml @@ -87,7 +87,6 @@ org.eclipse.jetty jetty-util - ${project.version} org.slf4j diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenMetadataTest.java b/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenMetadataTest.java index 9c6fd0c9201..4477099b3ac 100644 --- a/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenMetadataTest.java +++ b/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenMetadataTest.java @@ -79,7 +79,7 @@ public void testIsExpiredTimestampNow() @Test public void testIsExpiredTimestampYesterday() { - LocalDateTime yesterday = LocalDateTime.now().minusDays(1); + LocalDateTime yesterday = LocalDateTime.now(ZoneId.of("UTC")).minusDays(1); String timestamp = getTimestampFormatter().format(yesterday); assertTrue(MavenMetadata.isExpiredTimestamp(timestamp), "Timestamp should be stale: " + timestamp); } diff --git a/jetty-unixdomain-server/pom.xml b/jetty-unixdomain-server/pom.xml index e137a2f518f..3343c06463d 100644 --- a/jetty-unixdomain-server/pom.xml +++ b/jetty-unixdomain-server/pom.xml @@ -29,7 +29,6 @@ org.eclipse.jetty jetty-client - ${project.version} test diff --git a/jetty-unixsocket/jetty-unixsocket-client/pom.xml b/jetty-unixsocket/jetty-unixsocket-client/pom.xml index 61e8ee0b139..f902d2c0b22 100644 --- a/jetty-unixsocket/jetty-unixsocket-client/pom.xml +++ b/jetty-unixsocket/jetty-unixsocket-client/pom.xml @@ -18,12 +18,10 @@ org.eclipse.jetty jetty-unixsocket-common - ${project.version} org.eclipse.jetty jetty-client - ${project.version} org.slf4j @@ -33,7 +31,6 @@ org.eclipse.jetty jetty-unixsocket-server - ${project.version} test diff --git a/jetty-unixsocket/jetty-unixsocket-common/pom.xml b/jetty-unixsocket/jetty-unixsocket-common/pom.xml index 62494edf701..7a0084ebe3e 100644 --- a/jetty-unixsocket/jetty-unixsocket-common/pom.xml +++ b/jetty-unixsocket/jetty-unixsocket-common/pom.xml @@ -22,7 +22,6 @@ org.eclipse.jetty jetty-util - ${project.version} org.slf4j diff --git a/jetty-unixsocket/jetty-unixsocket-server/pom.xml b/jetty-unixsocket/jetty-unixsocket-server/pom.xml index 89c37a419ea..fa46eb23a0d 100644 --- a/jetty-unixsocket/jetty-unixsocket-server/pom.xml +++ b/jetty-unixsocket/jetty-unixsocket-server/pom.xml @@ -18,7 +18,6 @@ org.eclipse.jetty jetty-unixsocket-common - ${project.version} org.eclipse.jetty diff --git a/jetty-util-ajax/pom.xml b/jetty-util-ajax/pom.xml index 3eb5c26020e..86ab0872679 100644 --- a/jetty-util-ajax/pom.xml +++ b/jetty-util-ajax/pom.xml @@ -16,7 +16,6 @@ org.eclipse.jetty jetty-util - ${project.version} org.eclipse.jetty.toolchain diff --git a/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSON.java b/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSON.java index 719745c2736..42368a9218d 100644 --- a/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSON.java +++ b/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSON.java @@ -27,6 +27,7 @@ import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; +import java.util.stream.IntStream; import org.eclipse.jetty.util.Loader; import org.eclipse.jetty.util.TypeUtil; @@ -84,7 +85,7 @@ public class JSON private final Map _convertors = new ConcurrentHashMap<>(); private int _stringBufferSize = 1024; - private Function, Object> _arrayConverter = List::toArray; + private Function, Object> _arrayConverter = this::defaultArrayConverter; /** * @return the initial stringBuffer size to use when creating JSON strings @@ -937,6 +938,14 @@ protected Object parseObject(Source source) return map; } + private Object defaultArrayConverter(List list) + { + // Call newArray() to keep backward compatibility. + Object[] objects = newArray(list.size()); + IntStream.range(0, list.size()).forEach(i -> objects[i] = list.get(i)); + return objects; + } + protected Object parseArray(Source source) { if (source.next() != '[') diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index 264459d93ab..bfef2281230 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -69,12 +69,10 @@ org.eclipse.jetty jetty-servlet - ${project.version} org.eclipse.jetty jetty-xml - ${project.version} org.slf4j @@ -88,7 +86,6 @@ org.eclipse.jetty.tests jetty-http-tools - ${project.version} test @@ -99,7 +96,6 @@ org.eclipse.jetty jetty-client - ${project.version} test diff --git a/jetty-websocket/websocket-core-client/pom.xml b/jetty-websocket/websocket-core-client/pom.xml index fc691b3aef7..607d0a95d3d 100644 --- a/jetty-websocket/websocket-core-client/pom.xml +++ b/jetty-websocket/websocket-core-client/pom.xml @@ -18,17 +18,14 @@ org.eclipse.jetty.websocket websocket-core-common - ${project.version} org.eclipse.jetty jetty-client - ${project.version} org.eclipse.jetty jetty-xml - ${project.version} true diff --git a/jetty-websocket/websocket-core-server/pom.xml b/jetty-websocket/websocket-core-server/pom.xml index 3d010f8a730..f85eacd1d14 100644 --- a/jetty-websocket/websocket-core-server/pom.xml +++ b/jetty-websocket/websocket-core-server/pom.xml @@ -18,7 +18,6 @@ org.eclipse.jetty.websocket websocket-core-common - ${project.version} org.eclipse.jetty diff --git a/jetty-websocket/websocket-core-tests/pom.xml b/jetty-websocket/websocket-core-tests/pom.xml index 9d349f958e5..d37bcc0c923 100644 --- a/jetty-websocket/websocket-core-tests/pom.xml +++ b/jetty-websocket/websocket-core-tests/pom.xml @@ -18,22 +18,18 @@ org.eclipse.jetty.websocket websocket-core-client - ${project.version} org.eclipse.jetty.websocket websocket-core-server - ${project.version} org.eclipse.jetty.websocket websocket-core-common - ${project.version} org.eclipse.jetty jetty-servlet - ${project.version} test diff --git a/jetty-websocket/websocket-jakarta-client/pom.xml b/jetty-websocket/websocket-jakarta-client/pom.xml index 496a7b92966..174c22a4e45 100644 --- a/jetty-websocket/websocket-jakarta-client/pom.xml +++ b/jetty-websocket/websocket-jakarta-client/pom.xml @@ -22,17 +22,14 @@ org.eclipse.jetty.websocket websocket-jakarta-common - ${project.version} org.eclipse.jetty.websocket websocket-core-client - ${project.version} org.eclipse.jetty jetty-client - ${project.version} org.eclipse.jetty.toolchain @@ -42,13 +39,11 @@ org.eclipse.jetty jetty-xml - ${project.version} test org.eclipse.jetty jetty-jmx - ${project.version} test diff --git a/jetty-websocket/websocket-jakarta-common/pom.xml b/jetty-websocket/websocket-jakarta-common/pom.xml index 6fb3206f13e..bd7a20567a5 100644 --- a/jetty-websocket/websocket-jakarta-common/pom.xml +++ b/jetty-websocket/websocket-jakarta-common/pom.xml @@ -47,7 +47,6 @@ org.eclipse.jetty.websocket websocket-core-client - ${project.version} org.slf4j diff --git a/jetty-websocket/websocket-jakarta-server/pom.xml b/jetty-websocket/websocket-jakarta-server/pom.xml index 0ea7ea80bbd..2b8b46fd06c 100644 --- a/jetty-websocket/websocket-jakarta-server/pom.xml +++ b/jetty-websocket/websocket-jakarta-server/pom.xml @@ -18,17 +18,14 @@ org.eclipse.jetty.websocket websocket-jakarta-client - ${project.version} org.eclipse.jetty.websocket websocket-servlet - ${project.version} org.eclipse.jetty jetty-annotations - ${project.version} org.eclipse.jetty.toolchain diff --git a/jetty-websocket/websocket-jakarta-tests/pom.xml b/jetty-websocket/websocket-jakarta-tests/pom.xml index 91851b9f48e..778b9d6aae7 100644 --- a/jetty-websocket/websocket-jakarta-tests/pom.xml +++ b/jetty-websocket/websocket-jakarta-tests/pom.xml @@ -22,17 +22,14 @@ org.eclipse.jetty.websocket websocket-jakarta-client - ${project.version} org.eclipse.jetty.websocket websocket-jakarta-server - ${project.version} org.eclipse.jetty.tests jetty-http-tools - ${project.version} org.eclipse.jetty.toolchain diff --git a/jetty-websocket/websocket-jetty-client/pom.xml b/jetty-websocket/websocket-jetty-client/pom.xml index 5974a5f9a0a..6a7c4386b93 100644 --- a/jetty-websocket/websocket-jetty-client/pom.xml +++ b/jetty-websocket/websocket-jetty-client/pom.xml @@ -38,27 +38,22 @@ org.eclipse.jetty.websocket websocket-jetty-api - ${project.version} org.eclipse.jetty.websocket websocket-jetty-common - ${project.version} org.eclipse.jetty.websocket websocket-core-client - ${project.version} org.eclipse.jetty jetty-client - ${project.version} org.eclipse.jetty jetty-webapp - ${project.version} true diff --git a/jetty-websocket/websocket-jetty-common/pom.xml b/jetty-websocket/websocket-jetty-common/pom.xml index 0eb73227738..6ceb5ed98b4 100644 --- a/jetty-websocket/websocket-jetty-common/pom.xml +++ b/jetty-websocket/websocket-jetty-common/pom.xml @@ -45,12 +45,10 @@ org.eclipse.jetty.websocket websocket-jetty-api - ${project.version} org.eclipse.jetty.websocket websocket-core-common - ${project.version} org.eclipse.jetty diff --git a/jetty-websocket/websocket-jetty-server/pom.xml b/jetty-websocket/websocket-jetty-server/pom.xml index 75ab117fbec..400fb5c4478 100644 --- a/jetty-websocket/websocket-jetty-server/pom.xml +++ b/jetty-websocket/websocket-jetty-server/pom.xml @@ -18,17 +18,14 @@ org.eclipse.jetty.websocket websocket-jetty-api - ${project.version} org.eclipse.jetty.websocket websocket-jetty-common - ${project.version} org.eclipse.jetty.websocket websocket-servlet - ${project.version} org.eclipse.jetty.toolchain @@ -37,17 +34,14 @@ org.eclipse.jetty jetty-servlet - ${project.version} org.eclipse.jetty jetty-annotations - ${project.version} org.eclipse.jetty jetty-jmx - ${project.version} true diff --git a/jetty-websocket/websocket-jetty-tests/pom.xml b/jetty-websocket/websocket-jetty-tests/pom.xml index b69288e3ec3..07386507b08 100644 --- a/jetty-websocket/websocket-jetty-tests/pom.xml +++ b/jetty-websocket/websocket-jetty-tests/pom.xml @@ -23,49 +23,41 @@ org.eclipse.jetty.websocket websocket-jetty-api - ${project.version} test org.eclipse.jetty.websocket websocket-jetty-client - ${project.version} test org.eclipse.jetty.websocket websocket-jetty-server - ${project.version} test org.eclipse.jetty.tests jetty-http-tools - ${project.version} test org.eclipse.jetty.http2 http2-server - ${project.version} test org.eclipse.jetty jetty-alpn-server - ${project.version} test org.eclipse.jetty jetty-alpn-java-server - ${project.version} test org.eclipse.jetty.http2 http2-http-client-transport - ${project.version} test @@ -76,7 +68,6 @@ org.eclipse.jetty jetty-jmx - ${project.version} test diff --git a/jetty-websocket/websocket-servlet/pom.xml b/jetty-websocket/websocket-servlet/pom.xml index f1ce45b9702..5daec7342e1 100644 --- a/jetty-websocket/websocket-servlet/pom.xml +++ b/jetty-websocket/websocket-servlet/pom.xml @@ -18,12 +18,10 @@ org.eclipse.jetty.websocket websocket-core-server - ${project.version} org.eclipse.jetty jetty-servlet - ${project.version} org.slf4j diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index 5210a502c87..3ae7c8108aa 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -31,7 +31,6 @@ org.eclipse.jetty jetty-util - ${project.version} org.slf4j diff --git a/pom.xml b/pom.xml index 58e3a4d02db..a05dce909a7 100644 --- a/pom.xml +++ b/pom.xml @@ -45,12 +45,12 @@ 1.3 1.1.1 2.9.0 - 1.40.1 + 1.41.0 2.8.8 - 30.1.1-jre + 31.0.1-jre 5.0.1 2.2 - 2.13.5 + 2.14.0 4.2.2 11.0.11.Final 4.3.4.Final @@ -87,7 +87,7 @@ 1.0.7 5.0.2 1.2 - 5.8 + 5.9 1.33 5.9.0 0.10.2 @@ -102,8 +102,8 @@ 5.8.0 2.0.1 1.2.17 - 2.14.0 - 1.3.0-alpha9 + 2.14.1 + 1.3.0-alpha10 2.7.4 10.3.6 3.8.2 @@ -1065,6 +1065,11 @@ ${hawtio.version} war + + jakarta.el + jakarta.el-api + ${jakarta.el.api.version} + jakarta.enterprise jakarta.enterprise.cdi-api @@ -1313,6 +1318,11 @@ asciidoctor-maven-plugin ${asciidoctor.maven.plugin.version} + + org.conscrypt + conscrypt-openjdk-uber + ${conscrypt.version} + org.codehaus.plexus plexus-component-annotations @@ -1323,31 +1333,448 @@ plexus-utils ${plexus-utils.version} + + org.eclipse.jetty + apache-jsp + ${project.version} + + + org.eclipse.jetty + glassfish-jstl + ${project.version} + + + org.eclipse.jetty + jetty-alpn-client + ${project.version} + + + org.eclipse.jetty + jetty-alpn-conscrypt-client + ${project.version} + + + org.eclipse.jetty + jetty-alpn-conscrypt-server + ${project.version} + + + org.eclipse.jetty + jetty-alpn-java-server + ${project.version} + + + org.eclipse.jetty + jetty-alpn-java-client + ${project.version} + + + org.eclipse.jetty + jetty-alpn-server + ${project.version} + + + org.eclipse.jetty + jetty-annotations + ${project.version} + + + org.eclipse.jetty + jetty-ant + ${project.version} + + + org.eclipse.jetty + jetty-cdi + ${project.version} + + + org.eclipse.jetty + jetty-client + ${project.version} + + + org.eclipse.jetty + jetty-deploy + ${project.version} + + + org.eclipse.jetty + jetty-hazelcast + ${project.version} + + + org.eclipse.jetty + jetty-home + ${project.version} + zip + org.eclipse.jetty jetty-http ${project.version} + + org.eclipse.jetty + jetty-http-spi + ${project.version} + + + org.eclipse.jetty + infinispan-common + ${project.version} + + + org.eclipse.jetty + infinispan-embedded + ${project.version} + + + org.eclipse.jetty + infinispan-embedded-query + ${project.version} + + + org.eclipse.jetty + infinispan-remote + ${project.version} + + + org.eclipse.jetty + infinispan-remote-query + ${project.version} + org.eclipse.jetty jetty-io ${project.version} + + org.eclipse.jetty + jetty-nosql + ${project.version} + + + org.eclipse.jetty + jetty-jaas + ${project.version} + + + org.eclipse.jetty + jetty-jaspi + ${project.version} + + + org.eclipse.jetty + jetty-jmx + ${project.version} + + + org.eclipse.jetty + jetty-jndi + ${project.version} + + + org.eclipse.jetty + jetty-jspc-maven-plugin + ${project.version} + + + org.eclipse.jetty + jetty-keystore + ${project.version} + + + org.eclipse.jetty + jetty-maven-plugin + ${project.version} + + + org.eclipse.jetty + jetty-openid + ${project.version} + org.eclipse.jetty jetty-plus ${project.version} + + org.eclipse.jetty + jetty-proxy + ${project.version} + + + org.eclipse.jetty + jetty-quickstart + ${project.version} + + + org.eclipse.jetty + jetty-rewrite + ${project.version} + + + org.eclipse.jetty + jetty-runner + ${project.version} + + + org.eclipse.jetty + jetty-security + ${project.version} + org.eclipse.jetty jetty-server ${project.version} + + org.eclipse.jetty + jetty-servlet + ${project.version} + + + org.eclipse.jetty + jetty-servlets + ${project.version} + org.eclipse.jetty jetty-slf4j-impl ${project.version} - test + + + org.eclipse.jetty + jetty-start + ${project.version} + + + org.eclipse.jetty + jetty-unixdomain-server + ${project.version} + + + org.eclipse.jetty + jetty-unixsocket-client + ${project.version} + + + org.eclipse.jetty + jetty-unixsocket-common + ${project.version} + + + org.eclipse.jetty + jetty-unixsocket-server + ${project.version} + + + org.eclipse.jetty + jetty-util + ${project.version} + + + org.eclipse.jetty + jetty-util-ajax + ${project.version} + + + org.eclipse.jetty + jetty-webapp + ${project.version} + + + org.eclipse.jetty + jetty-xml + ${project.version} + + + org.eclipse.jetty.demos + demo-async-rest-jar + ${project.version} + + + org.eclipse.jetty.demos + demo-async-rest-webapp + ${project.version} + war + + + org.eclipse.jetty.demos + demo-container-initializer + ${project.version} + + + org.eclipse.jetty.demos + demo-jaas-webapp + ${project.version} + war + + + org.eclipse.jetty.demos + demo-jetty-webapp + ${project.version} + war + + + org.eclipse.jetty.demos + demo-jndi-webapp + ${project.version} + war + + + org.eclipse.jetty.demos + demo-jsp-webapp + ${project.version} + war + + + org.eclipse.jetty.demos + demo-mock-resources + ${project.version} + + + org.eclipse.jetty.demos + demo-proxy-webapp + ${project.version} + + + org.eclipse.jetty.demos + demo-spec-webapp + ${project.version} + war + + + org.eclipse.jetty.demos + demo-simple-webapp + ${project.version} + war + + + org.eclipse.jetty.demos + demo-web-fragment + ${project.version} + + + org.eclipse.jetty.fcgi + fcgi-client + ${project.version} + + + org.eclipse.jetty.fcgi + fcgi-server + ${project.version} + + + org.eclipse.jetty.gcloud + jetty-gcloud-session-manager + ${project.version} + + + org.eclipse.jetty.http2 + http2-client + ${project.version} + + + org.eclipse.jetty.http2 + http2-common + ${project.version} + + + org.eclipse.jetty.http2 + http2-hpack + ${project.version} + + + org.eclipse.jetty.http2 + http2-http-client-transport + ${project.version} + + + org.eclipse.jetty.http2 + http2-server + ${project.version} + + + org.eclipse.jetty.memcached + jetty-memcached-sessions + ${project.version} + + + org.eclipse.jetty.osgi + jetty-osgi-boot + ${project.version} + + + org.eclipse.jetty.tests + jetty-http-tools + ${project.version} + + + org.eclipse.jetty.tests + test-distribution + ${project.version} + + + org.eclipse.jetty.tests + test-sessions-common + ${project.version} + + + org.eclipse.jetty.websocket + websocket-core-client + ${project.version} + + + org.eclipse.jetty.websocket + websocket-core-common + ${project.version} + + + org.eclipse.jetty.websocket + websocket-core-server + ${project.version} + + + org.eclipse.jetty.websocket + websocket-jakarta-server + ${project.version} + + + org.eclipse.jetty.websocket + websocket-jakarta-client + ${project.version} + + + org.eclipse.jetty.websocket + websocket-jakarta-common + ${project.version} + + + org.eclipse.jetty.websocket + websocket-jetty-api + ${project.version} + + + org.eclipse.jetty.websocket + websocket-jetty-client + ${project.version} + + + org.eclipse.jetty.websocket + websocket-jetty-common + ${project.version} + + + org.eclipse.jetty.websocket + websocket-jetty-server + ${project.version} + + + org.eclipse.jetty.websocket + websocket-servlet + ${project.version} org.eclipse.jetty.orbit @@ -1421,6 +1848,11 @@ pom import + + org.infinispan.protostream + protostream + ${infinispan.protostream.version} + org.jboss.logging jboss-logging @@ -1507,7 +1939,6 @@ org.slf4j jul-to-slf4j ${slf4j.version} - test org.slf4j diff --git a/tests/jetty-jmh/pom.xml b/tests/jetty-jmh/pom.xml index a9d3a1dc72f..23375a7e887 100644 --- a/tests/jetty-jmh/pom.xml +++ b/tests/jetty-jmh/pom.xml @@ -75,7 +75,6 @@ org.eclipse.jetty jetty-util - ${project.version} org.eclipse.jetty @@ -101,7 +100,6 @@ org.eclipse.jetty jetty-client - ${project.version} org.eclipse.jetty.toolchain diff --git a/tests/test-cdi/pom.xml b/tests/test-cdi/pom.xml index 060aab86fe9..0e81fa001d8 100644 --- a/tests/test-cdi/pom.xml +++ b/tests/test-cdi/pom.xml @@ -19,12 +19,10 @@ org.eclipse.jetty jetty-cdi - ${project.version} org.eclipse.jetty jetty-webapp - ${project.version} compile @@ -47,6 +45,10 @@ io.undertow * + + javax.enterprise + cdi-api + @@ -63,19 +65,16 @@ org.eclipse.jetty.websocket websocket-jakarta-server - ${project.version} test org.eclipse.jetty.websocket websocket-jetty-server - ${project.version} test org.eclipse.jetty.websocket websocket-jetty-client - ${project.version} test diff --git a/tests/test-distribution/pom.xml b/tests/test-distribution/pom.xml index 34433ad9317..c4699d07a52 100644 --- a/tests/test-distribution/pom.xml +++ b/tests/test-distribution/pom.xml @@ -19,7 +19,6 @@ org.eclipse.jetty jetty-util - ${project.version} org.slf4j @@ -72,26 +71,22 @@ org.eclipse.jetty jetty-home - ${project.version} zip test org.eclipse.jetty jetty-client - ${project.version} test org.eclipse.jetty.http2 http2-http-client-transport - ${project.version} test org.eclipse.jetty.demos demo-simple-webapp - ${project.version} war test @@ -112,7 +107,6 @@ org.eclipse.jetty.demos demo-jetty-webapp - ${project.version} war test @@ -127,31 +121,26 @@ org.eclipse.jetty jetty-unixsocket-server - ${project.version} test org.eclipse.jetty jetty-unixsocket-client - ${project.version} test org.eclipse.jetty.websocket websocket-jetty-client - ${project.version} test org.eclipse.jetty jetty-util-ajax - ${project.version} test org.eclipse.jetty.websocket websocket-jetty-api - ${project.version} test diff --git a/tests/test-http-client-transport/pom.xml b/tests/test-http-client-transport/pom.xml index 6f07c38ebd2..9bbda1283f4 100644 --- a/tests/test-http-client-transport/pom.xml +++ b/tests/test-http-client-transport/pom.xml @@ -54,61 +54,51 @@ org.eclipse.jetty jetty-alpn-java-client - ${project.version} test org.eclipse.jetty jetty-alpn-java-server - ${project.version} test org.eclipse.jetty jetty-jmx - ${project.version} test org.eclipse.jetty jetty-servlet - ${project.version} test org.eclipse.jetty jetty-client - ${project.version} test org.eclipse.jetty.http2 http2-server - ${project.version} test org.eclipse.jetty.http2 http2-http-client-transport - ${project.version} test org.eclipse.jetty jetty-unixsocket-client - ${project.version} test org.eclipse.jetty jetty-unixsocket-server - ${project.version} test org.eclipse.jetty.fcgi fcgi-server - ${project.version} test diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml index c6d24760dd5..f50db3f6fc1 100644 --- a/tests/test-integration/pom.xml +++ b/tests/test-integration/pom.xml @@ -74,22 +74,18 @@ org.eclipse.jetty jetty-webapp - ${project.version} org.eclipse.jetty jetty-deploy - ${project.version} org.eclipse.jetty jetty-rewrite - ${project.version} org.eclipse.jetty jetty-client - ${project.version} org.slf4j @@ -104,7 +100,6 @@ org.eclipse.jetty.tests jetty-http-tools - ${project.version} test @@ -120,41 +115,34 @@ org.eclipse.jetty apache-jsp - ${project.version} org.eclipse.jetty.http2 http2-server - ${project.version} org.eclipse.jetty jetty-annotations - ${project.version} test org.eclipse.jetty jetty-servlets - ${project.version} test org.eclipse.jetty.websocket websocket-jetty-server - ${project.version} test org.eclipse.jetty.websocket websocket-jetty-client - ${project.version} test org.eclipse.jetty.websocket websocket-jakarta-server - ${project.version} test @@ -167,14 +155,12 @@ org.eclipse.jetty.demos demo-jetty-webapp - ${project.version} war test org.eclipse.jetty jetty-alpn-server - ${project.version} test diff --git a/tests/test-jmx/jmx-webapp-it/pom.xml b/tests/test-jmx/jmx-webapp-it/pom.xml index e5d039bc33a..fd643cf5746 100644 --- a/tests/test-jmx/jmx-webapp-it/pom.xml +++ b/tests/test-jmx/jmx-webapp-it/pom.xml @@ -19,12 +19,10 @@ org.eclipse.jetty jetty-annotations - ${project.version} org.eclipse.jetty jetty-jmx - ${project.version} org.eclipse.jetty.tests diff --git a/tests/test-jmx/jmx-webapp/pom.xml b/tests/test-jmx/jmx-webapp/pom.xml index 55810301cd7..d39f5be00fb 100644 --- a/tests/test-jmx/jmx-webapp/pom.xml +++ b/tests/test-jmx/jmx-webapp/pom.xml @@ -22,7 +22,6 @@ org.eclipse.jetty jetty-jmx - ${project.version} org.slf4j diff --git a/tests/test-jpms/test-jpms-websocket-core/pom.xml b/tests/test-jpms/test-jpms-websocket-core/pom.xml index f08c439c33a..f55611adf78 100644 --- a/tests/test-jpms/test-jpms-websocket-core/pom.xml +++ b/tests/test-jpms/test-jpms-websocket-core/pom.xml @@ -14,12 +14,10 @@ org.eclipse.jetty.websocket websocket-core-server - ${project.version} org.eclipse.jetty.websocket websocket-core-client - ${project.version} diff --git a/tests/test-loginservice/pom.xml b/tests/test-loginservice/pom.xml index 9d70e9a6efe..237f3869ff9 100644 --- a/tests/test-loginservice/pom.xml +++ b/tests/test-loginservice/pom.xml @@ -19,17 +19,14 @@ org.eclipse.jetty jetty-webapp - ${project.version} org.eclipse.jetty jetty-client - ${project.version} org.eclipse.jetty jetty-security - ${project.version} org.eclipse.jetty @@ -38,7 +35,6 @@ org.eclipse.jetty jetty-jndi - ${project.version} org.testcontainers diff --git a/tests/test-quickstart/pom.xml b/tests/test-quickstart/pom.xml index dcedea5c48f..c9fc71b405a 100644 --- a/tests/test-quickstart/pom.xml +++ b/tests/test-quickstart/pom.xml @@ -18,19 +18,16 @@ org.eclipse.jetty jetty-quickstart - ${project.version} test org.eclipse.jetty jetty-webapp - ${project.version} test org.eclipse.jetty jetty-jmx - ${project.version} test @@ -41,7 +38,6 @@ org.eclipse.jetty jetty-annotations - ${project.version} test @@ -52,58 +48,49 @@ org.eclipse.jetty.demos demo-mock-resources - ${project.version} test org.eclipse.jetty jetty-servlets - ${project.version} test org.eclipse.jetty.demos demo-jndi-webapp - ${project.version} war test org.eclipse.jetty.demos demo-spec-webapp - ${project.version} war test org.eclipse.jetty.demos demo-jetty-webapp - ${project.version} war test org.eclipse.jetty.websocket websocket-jakarta-server - ${project.version} test org.eclipse.jetty.websocket websocket-jetty-server - ${project.version} test org.eclipse.jetty apache-jsp - ${project.version} test org.eclipse.jetty glassfish-jstl - ${project.version} test diff --git a/tests/test-sessions/test-file-sessions/pom.xml b/tests/test-sessions/test-file-sessions/pom.xml index 95536dd6ace..3422853b490 100644 --- a/tests/test-sessions/test-file-sessions/pom.xml +++ b/tests/test-sessions/test-file-sessions/pom.xml @@ -32,19 +32,16 @@ org.eclipse.jetty jetty-webapp - ${project.version} test org.eclipse.jetty jetty-client - ${project.version} test org.eclipse.jetty.tests test-sessions-common - ${project.version} test diff --git a/tests/test-sessions/test-gcloud-sessions/pom.xml b/tests/test-sessions/test-gcloud-sessions/pom.xml index 85757e55d25..99ecce106a5 100644 --- a/tests/test-sessions/test-gcloud-sessions/pom.xml +++ b/tests/test-sessions/test-gcloud-sessions/pom.xml @@ -32,25 +32,21 @@ org.eclipse.jetty jetty-webapp - ${project.version} test org.eclipse.jetty jetty-client - ${project.version} test org.eclipse.jetty.tests test-sessions-common - ${project.version} test org.eclipse.jetty.gcloud jetty-gcloud-session-manager - ${project.version} test diff --git a/tests/test-sessions/test-hazelcast-sessions/pom.xml b/tests/test-sessions/test-hazelcast-sessions/pom.xml index 606e38913b4..02367355004 100644 --- a/tests/test-sessions/test-hazelcast-sessions/pom.xml +++ b/tests/test-sessions/test-hazelcast-sessions/pom.xml @@ -68,25 +68,21 @@ org.eclipse.jetty jetty-webapp - ${project.version} test org.eclipse.jetty jetty-client - ${project.version} test org.eclipse.jetty.tests test-sessions-common - ${project.version} test org.eclipse.jetty jetty-hazelcast - ${project.version} test @@ -103,7 +99,6 @@ org.eclipse.jetty jetty-jmx - ${project.version} true test diff --git a/tests/test-sessions/test-infinispan-sessions/pom.xml b/tests/test-sessions/test-infinispan-sessions/pom.xml index 55d9cfea528..6f49d0b43db 100644 --- a/tests/test-sessions/test-infinispan-sessions/pom.xml +++ b/tests/test-sessions/test-infinispan-sessions/pom.xml @@ -76,37 +76,31 @@ org.eclipse.jetty jetty-webapp - ${project.version} test org.eclipse.jetty jetty-client - ${project.version} test org.eclipse.jetty.tests test-sessions-common - ${project.version} test org.eclipse.jetty infinispan-remote-query - ${project.version} test org.eclipse.jetty infinispan-embedded-query - ${project.version} test org.eclipse.jetty jetty-jmx - ${project.version} true test @@ -118,7 +112,6 @@ org.infinispan infinispan-core - ${infinispan.version} test @@ -130,25 +123,21 @@ org.infinispan infinispan-query - ${infinispan.version} test org.infinispan infinispan-client-hotrod - ${infinispan.version} test org.infinispan infinispan-remote-query-client - ${infinispan.version} test org.infinispan.protostream protostream - ${infinispan.protostream.version} test diff --git a/tests/test-sessions/test-jdbc-sessions/pom.xml b/tests/test-sessions/test-jdbc-sessions/pom.xml index 969d68f2f20..36c900a31f3 100644 --- a/tests/test-sessions/test-jdbc-sessions/pom.xml +++ b/tests/test-sessions/test-jdbc-sessions/pom.xml @@ -41,19 +41,16 @@ org.eclipse.jetty jetty-webapp - ${project.version} test org.eclipse.jetty jetty-client - ${project.version} test org.eclipse.jetty.tests test-sessions-common - ${project.version} test diff --git a/tests/test-sessions/test-memcached-sessions/pom.xml b/tests/test-sessions/test-memcached-sessions/pom.xml index bf44937dfa3..76e17d4c8ed 100644 --- a/tests/test-sessions/test-memcached-sessions/pom.xml +++ b/tests/test-sessions/test-memcached-sessions/pom.xml @@ -32,25 +32,21 @@ org.eclipse.jetty jetty-webapp - ${project.version} test org.eclipse.jetty jetty-client - ${project.version} test org.eclipse.jetty.tests test-sessions-common - ${project.version} test org.eclipse.jetty.memcached jetty-memcached-sessions - ${project.version} test diff --git a/tests/test-sessions/test-mongodb-sessions/pom.xml b/tests/test-sessions/test-mongodb-sessions/pom.xml index ba8011fbe0d..7f01c466257 100644 --- a/tests/test-sessions/test-mongodb-sessions/pom.xml +++ b/tests/test-sessions/test-mongodb-sessions/pom.xml @@ -70,31 +70,26 @@ org.eclipse.jetty jetty-webapp - ${project.version} test org.eclipse.jetty jetty-client - ${project.version} test org.eclipse.jetty.tests test-sessions-common - ${project.version} test org.eclipse.jetty jetty-nosql - ${project.version} test org.eclipse.jetty jetty-jmx - ${project.version} true test diff --git a/tests/test-sessions/test-sessions-common/pom.xml b/tests/test-sessions/test-sessions-common/pom.xml index 77c9d68f3bf..d060090bf76 100644 --- a/tests/test-sessions/test-sessions-common/pom.xml +++ b/tests/test-sessions/test-sessions-common/pom.xml @@ -20,12 +20,10 @@ org.eclipse.jetty jetty-webapp - ${project.version} org.eclipse.jetty jetty-client - ${project.version} org.slf4j diff --git a/tests/test-webapps/test-bad-websocket-webapp/pom.xml b/tests/test-webapps/test-bad-websocket-webapp/pom.xml index c231fe3b039..64856e96aa8 100644 --- a/tests/test-webapps/test-bad-websocket-webapp/pom.xml +++ b/tests/test-webapps/test-bad-websocket-webapp/pom.xml @@ -22,7 +22,6 @@ org.eclipse.jetty.websocket websocket-jakarta-common - ${project.version} provided diff --git a/tests/test-webapps/test-http2-webapp/pom.xml b/tests/test-webapps/test-http2-webapp/pom.xml index 5a3a5485bf7..0d390c49c26 100644 --- a/tests/test-webapps/test-http2-webapp/pom.xml +++ b/tests/test-webapps/test-http2-webapp/pom.xml @@ -60,7 +60,6 @@ org.eclipse.jetty.http2 http2-client - ${project.version} org.eclipse.jetty.toolchain @@ -70,31 +69,26 @@ org.eclipse.jetty jetty-alpn-java-client - ${project.version} org.eclipse.jetty jetty-alpn-java-server - ${project.version} test org.eclipse.jetty jetty-client - ${project.version} test org.eclipse.jetty jetty-webapp - ${project.version} test org.eclipse.jetty.http2 http2-server - ${project.version} test diff --git a/tests/test-webapps/test-webapp-rfc2616/pom.xml b/tests/test-webapps/test-webapp-rfc2616/pom.xml index 353b9f1503b..448e50e577b 100644 --- a/tests/test-webapps/test-webapp-rfc2616/pom.xml +++ b/tests/test-webapps/test-webapp-rfc2616/pom.xml @@ -41,7 +41,6 @@ org.eclipse.jetty jetty-servlets - ${project.version} org.eclipse.jetty.toolchain diff --git a/tests/test-webapps/test-websocket-client-provided-webapp/pom.xml b/tests/test-webapps/test-websocket-client-provided-webapp/pom.xml index 9fe5778b837..cfb69792fab 100644 --- a/tests/test-webapps/test-websocket-client-provided-webapp/pom.xml +++ b/tests/test-webapps/test-websocket-client-provided-webapp/pom.xml @@ -35,7 +35,6 @@ org.eclipse.jetty.websocket websocket-jetty-client - ${project.version} provided diff --git a/tests/test-webapps/test-websocket-client-webapp/pom.xml b/tests/test-webapps/test-websocket-client-webapp/pom.xml index a8b8a8747ce..9475f0b1d93 100644 --- a/tests/test-webapps/test-websocket-client-webapp/pom.xml +++ b/tests/test-webapps/test-websocket-client-webapp/pom.xml @@ -35,7 +35,6 @@ org.eclipse.jetty.websocket websocket-jetty-client - ${project.version} diff --git a/tests/test-webapps/test-websocket-webapp/pom.xml b/tests/test-webapps/test-websocket-webapp/pom.xml index 7c4fe193e04..2acd11e2072 100644 --- a/tests/test-webapps/test-websocket-webapp/pom.xml +++ b/tests/test-webapps/test-websocket-webapp/pom.xml @@ -30,7 +30,6 @@ org.eclipse.jetty.websocket websocket-jakarta-common - ${project.version} provided diff --git a/tests/test-webapps/test-weld-cdi-webapp/pom.xml b/tests/test-webapps/test-weld-cdi-webapp/pom.xml index 92bf6a00997..d14d2e55c64 100644 --- a/tests/test-webapps/test-weld-cdi-webapp/pom.xml +++ b/tests/test-webapps/test-weld-cdi-webapp/pom.xml @@ -34,6 +34,12 @@ org.jboss.weld.servlet weld-servlet-core ${weld.version} + + + javax.enterprise + cdi-api + + org.jboss.logging