From 9a18dc8722b88c80cb47df3c30d08d9ac6dc3983 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 3 Jan 2024 03:12:56 -0600 Subject: [PATCH] Results of: mvn spotless:apply --- apache-jsp/pom.xml | 94 +- apache-jstl/pom.xml | 47 +- build-resources/pom.xml | 13 +- .../demo-async-rest-jar/pom.xml | 5 +- .../demo-async-rest-server/pom.xml | 5 +- .../demo-async-rest-webapp/pom.xml | 13 +- demos/demo-async-rest/pom.xml | 5 +- demos/demo-jaas-webapp/pom.xml | 6 +- demos/demo-jetty-webapp/pom.xml | 300 +- demos/demo-jndi-webapp/pom.xml | 138 +- demos/demo-jsp-webapp/pom.xml | 76 +- demos/demo-mock-resources/pom.xml | 45 +- demos/demo-proxy-webapp/pom.xml | 86 +- demos/demo-simple-webapp/pom.xml | 6 +- .../demo-container-initializer/pom.xml | 15 +- demos/demo-spec/demo-spec-webapp/pom.xml | 244 +- demos/demo-spec/demo-web-fragment/pom.xml | 5 +- demos/demo-spec/pom.xml | 2 +- demos/embedded/pom.xml | 135 +- demos/pom.xml | 32 +- .../jetty-asciidoctor-extensions/pom.xml | 6 +- documentation/jetty-documentation/pom.xml | 394 +-- documentation/pom.xml | 6 +- javadoc/pom.xml | 538 ++-- jetty-alpn/jetty-alpn-client/pom.xml | 43 +- .../jetty-alpn-conscrypt-client/pom.xml | 12 +- .../jetty-alpn-conscrypt-server/pom.xml | 28 +- jetty-alpn/jetty-alpn-java-client/pom.xml | 48 +- jetty-alpn/jetty-alpn-java-server/pom.xml | 58 +- jetty-alpn/jetty-alpn-server/pom.xml | 45 +- jetty-alpn/pom.xml | 3 +- jetty-annotations/pom.xml | 78 +- jetty-ant/pom.xml | 93 +- jetty-bom/pom.xml | 443 +-- jetty-cdi/pom.xml | 29 +- jetty-client/pom.xml | 161 +- jetty-deploy/pom.xml | 51 +- jetty-fcgi/fcgi-client/pom.xml | 16 +- jetty-fcgi/fcgi-server/pom.xml | 76 +- jetty-fcgi/pom.xml | 4 +- .../jetty-gcloud-session-manager/pom.xml | 102 +- jetty-gcloud/pom.xml | 18 +- jetty-hazelcast/pom.xml | 14 +- jetty-home/pom.xml | 1434 +++++---- jetty-http-spi/pom.xml | 69 +- jetty-http/pom.xml | 26 +- jetty-http2/http2-client/pom.xml | 56 +- jetty-http2/http2-common/pom.xml | 16 +- jetty-http2/http2-hpack/pom.xml | 84 +- .../http2-http-client-transport/pom.xml | 30 +- jetty-http2/http2-server/pom.xml | 98 +- jetty-http2/pom.xml | 10 +- jetty-http3/http3-client/pom.xml | 20 +- jetty-http3/http3-common/pom.xml | 20 +- .../http3-http-client-transport/pom.xml | 12 +- jetty-http3/http3-qpack/pom.xml | 84 +- jetty-http3/http3-server/pom.xml | 4 +- jetty-http3/http3-tests/pom.xml | 54 +- jetty-http3/pom.xml | 10 +- jetty-infinispan/infinispan-common/pom.xml | 33 +- .../infinispan-embedded-query/pom.xml | 133 +- jetty-infinispan/infinispan-embedded/pom.xml | 125 +- .../infinispan-remote-query/pom.xml | 169 +- jetty-infinispan/infinispan-remote/pom.xml | 125 +- jetty-infinispan/pom.xml | 12 +- jetty-io/pom.xml | 18 +- jetty-jaas/pom.xml | 170 +- jetty-jaspi/pom.xml | 85 +- jetty-jmx/pom.xml | 35 +- jetty-jndi/pom.xml | 73 +- jetty-jspc-maven-plugin/pom.xml | 164 +- jetty-keystore/pom.xml | 10 +- jetty-maven-plugin/pom.xml | 481 +-- .../jetty-memcached-sessions/pom.xml | 34 +- jetty-memcached/pom.xml | 10 +- jetty-nosql/pom.xml | 19 +- jetty-openid/pom.xml | 81 +- jetty-osgi/jetty-osgi-alpn/pom.xml | 11 +- jetty-osgi/jetty-osgi-boot-jsp/pom.xml | 72 +- jetty-osgi/jetty-osgi-boot-warurl/pom.xml | 3 +- jetty-osgi/jetty-osgi-boot/pom.xml | 69 +- jetty-osgi/jetty-osgi-httpservice/pom.xml | 61 +- jetty-osgi/pom.xml | 117 +- jetty-osgi/test-jetty-osgi-context/pom.xml | 9 +- jetty-osgi/test-jetty-osgi-fragment/pom.xml | 3 +- jetty-osgi/test-jetty-osgi-server/pom.xml | 9 +- .../test-jetty-osgi-webapp-resources/pom.xml | 60 +- jetty-osgi/test-jetty-osgi-webapp/pom.xml | 3 +- jetty-osgi/test-jetty-osgi/pom.xml | 825 +++--- jetty-p2/pom.xml | 65 +- jetty-plus/pom.xml | 43 +- jetty-proxy/pom.xml | 65 +- jetty-quic/pom.xml | 10 +- jetty-quic/quic-client/pom.xml | 32 +- jetty-quic/quic-common/pom.xml | 14 +- jetty-quic/quic-quiche/pom.xml | 4 +- .../quic-quiche/quic-quiche-common/pom.xml | 12 +- .../quic-quiche-foreign-incubator/pom.xml | 50 +- .../quic-quiche/quic-quiche-jna/pom.xml | 52 +- jetty-quic/quic-server/pom.xml | 12 +- jetty-quickstart/pom.xml | 45 +- jetty-rewrite/pom.xml | 5 +- jetty-runner/pom.xml | 259 +- jetty-security/pom.xml | 35 +- jetty-server/pom.xml | 65 +- jetty-servlet/pom.xml | 62 +- jetty-servlets/pom.xml | 76 +- jetty-slf4j-impl/pom.xml | 71 +- jetty-start/pom.xml | 75 +- jetty-unixdomain-server/pom.xml | 4 +- .../jetty-unixsocket-client/pom.xml | 24 +- .../jetty-unixsocket-common/pom.xml | 26 +- .../jetty-unixsocket-server/pom.xml | 72 +- jetty-unixsocket/pom.xml | 5 +- jetty-util-ajax/pom.xml | 11 +- jetty-util/pom.xml | 117 +- jetty-webapp/pom.xml | 109 +- jetty-websocket/pom.xml | 12 +- jetty-websocket/websocket-core-client/pom.xml | 12 +- jetty-websocket/websocket-core-common/pom.xml | 16 +- jetty-websocket/websocket-core-server/pom.xml | 12 +- jetty-websocket/websocket-core-tests/pom.xml | 8 +- .../websocket-javax-client/pom.xml | 48 +- .../websocket-javax-common/pom.xml | 38 +- .../websocket-javax-server/pom.xml | 42 +- jetty-websocket/websocket-javax-tests/pom.xml | 42 +- jetty-websocket/websocket-jetty-api/pom.xml | 4 +- .../websocket-jetty-client/pom.xml | 64 +- .../websocket-jetty-common/pom.xml | 44 +- .../websocket-jetty-server/pom.xml | 48 +- jetty-websocket/websocket-jetty-tests/pom.xml | 87 +- jetty-websocket/websocket-servlet/pom.xml | 12 +- jetty-xml/pom.xml | 48 +- pom.xml | 2573 ++++++++--------- tests/jetty-home-tester/pom.xml | 47 +- tests/jetty-http-tools/pom.xml | 4 +- tests/jetty-jmh/pom.xml | 135 +- tests/pom.xml | 14 +- tests/test-cdi/pom.xml | 50 +- tests/test-distribution/pom.xml | 159 +- tests/test-http-client-transport/pom.xml | 170 +- tests/test-integration/pom.xml | 200 +- tests/test-jmx/jmx-webapp-it/pom.xml | 6 +- tests/test-jmx/jmx-webapp/pom.xml | 12 +- tests/test-jmx/pom.xml | 2 +- tests/test-jpms/pom.xml | 10 +- .../test-jpms-websocket-core/pom.xml | 8 +- tests/test-loginservice/pom.xml | 50 +- tests/test-quickstart/pom.xml | 88 +- tests/test-sessions/pom.xml | 2 +- .../test-sessions/test-file-sessions/pom.xml | 34 +- .../test-gcloud-sessions/pom.xml | 28 +- .../test-hazelcast-sessions/pom.xml | 124 +- .../test-infinispan-sessions/pom.xml | 244 +- .../test-sessions/test-jdbc-sessions/pom.xml | 114 +- .../test-memcached-sessions/pom.xml | 48 +- .../test-mongodb-sessions/pom.xml | 156 +- .../test-sessions-common/pom.xml | 28 +- tests/test-webapps/pom.xml | 12 +- .../test-bad-websocket-webapp/pom.xml | 12 +- .../test-cdi-common-webapp/pom.xml | 19 +- tests/test-webapps/test-felix-webapp/pom.xml | 30 +- tests/test-webapps/test-http2-webapp/pom.xml | 100 +- tests/test-webapps/test-openid-webapp/pom.xml | 4 +- .../test-webapps/test-owb-cdi-webapp/pom.xml | 46 +- .../test-webapps/test-webapp-rfc2616/pom.xml | 36 +- .../pom.xml | 8 +- .../test-websocket-client-webapp/pom.xml | 18 +- .../test-websocket-webapp/pom.xml | 12 +- .../test-webapps/test-weld-cdi-webapp/pom.xml | 30 +- tests/test-websocket-autobahn/pom.xml | 74 +- 171 files changed, 7568 insertions(+), 7680 deletions(-) diff --git a/apache-jsp/pom.xml b/apache-jsp/pom.xml index 859585696a1..fb49fbaaea1 100644 --- a/apache-jsp/pom.xml +++ b/apache-jsp/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty jetty-project 10.0.20-SNAPSHOT - - 4.0.0 apache-jsp Jetty :: Apache JSP Implementation @@ -14,6 +15,45 @@ true + + + org.eclipse.jetty + jetty-util + + + org.eclipse.jetty.toolchain + jetty-servlet-api + + + org.mortbay.jasper + apache-jsp + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-servlet + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.tests + jetty-http-tools + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + @@ -23,14 +63,9 @@ Jetty-specific ServletContainerInitializer for Jasper - - org.eclipse.jetty.apache.jsp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}", org.eclipse.jetty.jsp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - - - osgi.serviceloader;osgi.serviceloader=javax.servlet.ServletContainerInitializer,osgi.serviceloader;osgi.serviceloader=org.apache.juli.logging.Log - + org.eclipse.jetty.apache.jsp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}", org.eclipse.jetty.jsp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional + osgi.serviceloader;osgi.serviceloader=javax.servlet.ServletContainerInitializer,osgi.serviceloader;osgi.serviceloader=org.apache.juli.logging.Log <_nouses>true @@ -56,43 +91,4 @@ - - - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-util - - - org.eclipse.jetty.toolchain - jetty-servlet-api - - - org.mortbay.jasper - apache-jsp - - - org.eclipse.jetty - jetty-servlet - test - - - org.eclipse.jetty.tests - jetty-http-tools - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - diff --git a/apache-jstl/pom.xml b/apache-jstl/pom.xml index ee8b9f9d92f..35cbc060ce0 100644 --- a/apache-jstl/pom.xml +++ b/apache-jstl/pom.xml @@ -1,48 +1,31 @@ + + 4.0.0 org.eclipse.jetty jetty-project 10.0.20-SNAPSHOT - 4.0.0 apache-jstl + jar Apache :: JSTL module http://tomcat.apache.org/taglibs/standard/ - jar ${project.groupId}.apache.jstl true - - - - org.apache.maven.plugins - maven-surefire-plugin - - false - - - - - - - - org.apache.taglibs - taglibs-standard-spec - org.apache.taglibs taglibs-standard-impl - + - org.eclipse.jetty.toolchain - jetty-test-helper - test + org.apache.taglibs + taglibs-standard-spec @@ -63,6 +46,12 @@ test + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + org.slf4j slf4j-simple @@ -71,4 +60,16 @@ + + + + org.apache.maven.plugins + maven-surefire-plugin + + false + + + + + diff --git a/build-resources/pom.xml b/build-resources/pom.xml index 244ce5066f3..3224db89cf0 100644 --- a/build-resources/pom.xml +++ b/build-resources/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 3.0.0-M2 + true 3.4.0 + true 3.1.0 3.2.3 - true - true + UTF-8 @@ -28,12 +29,12 @@ ${project.basedir}/src/main/resources + META-INF ${project.basedir}/../ LICENSE NOTICE.txt - META-INF @@ -84,10 +85,10 @@ create-shared-resources - process-resources bundle + process-resources ${project.build.outputDirectory} 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 24a3293405d..0413321d49b 100644 --- a/demos/demo-async-rest/demo-async-rest-jar/pom.xml +++ b/demos/demo-async-rest/demo-async-rest-jar/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.demos demo-async-rest-parent 10.0.20-SNAPSHOT - - 4.0.0 demo-async-rest-jar jar Demo :: Async Rest :: Jar 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 6574c68342e..a79544589ff 100644 --- a/demos/demo-async-rest/demo-async-rest-server/pom.xml +++ b/demos/demo-async-rest/demo-async-rest-server/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.demos demo-async-rest-parent 10.0.20-SNAPSHOT - - 4.0.0 demo-async-rest-server jar Demo :: Async Rest :: Server 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 620ecc84018..dacd5f5a156 100644 --- a/demos/demo-async-rest/demo-async-rest-webapp/pom.xml +++ b/demos/demo-async-rest/demo-async-rest-webapp/pom.xml @@ -1,20 +1,17 @@ + + + 4.0.0 org.eclipse.jetty.demos demo-async-rest-parent 10.0.20-SNAPSHOT - - 4.0.0 demo-async-rest-webapp war Demo :: Async Rest :: WebApp - - org.slf4j - slf4j-api - org.eclipse.jetty jetty-slf4j-impl @@ -24,6 +21,10 @@ org.eclipse.jetty.demos demo-async-rest-jar + + org.slf4j + slf4j-api + org.eclipse.jetty.toolchain jetty-servlet-api diff --git a/demos/demo-async-rest/pom.xml b/demos/demo-async-rest/pom.xml index 049a90f6a6b..d733f4aa54a 100644 --- a/demos/demo-async-rest/pom.xml +++ b/demos/demo-async-rest/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.demos demos-parent 10.0.20-SNAPSHOT - - 4.0.0 demo-async-rest-parent pom Demo :: Async Rest diff --git a/demos/demo-jaas-webapp/pom.xml b/demos/demo-jaas-webapp/pom.xml index 293a9303095..3b2145f3dd9 100644 --- a/demos/demo-jaas-webapp/pom.xml +++ b/demos/demo-jaas-webapp/pom.xml @@ -7,8 +7,8 @@ 10.0.20-SNAPSHOT demo-jaas-webapp - Demo :: JAAS :: WebApp war + Demo :: JAAS :: WebApp ${project.groupId}.jaas false @@ -24,9 +24,9 @@ 10 - ${basedir}/src/main/config/modules/demo.d + ${basedir}/src/main/config/modules/demo.d - ${basedir}/src/main/config/modules/demo.d/demo-login.conf + ${basedir}/src/main/config/modules/demo.d/demo-login.conf /test-jaas diff --git a/demos/demo-jetty-webapp/pom.xml b/demos/demo-jetty-webapp/pom.xml index 624636db7f3..69a80249ac3 100644 --- a/demos/demo-jetty-webapp/pom.xml +++ b/demos/demo-jetty-webapp/pom.xml @@ -1,57 +1,131 @@ + 4.0.0 org.eclipse.jetty.demos demos-parent 10.0.20-SNAPSHOT ../pom.xml - 4.0.0 demo-jetty-webapp - Demo :: Jetty :: WebApp war + Demo :: Jetty :: WebApp ${project.groupId}.webapp + + + jakarta.annotation + jakarta.annotation-api + provided + + + jakarta.servlet.jsp + jakarta.servlet.jsp-api + provided + + + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + provided + + + org.eclipse.jetty + jetty-server + provided + + + org.eclipse.jetty + jetty-servlets + provided + + + org.eclipse.jetty.toolchain + jetty-javax-websocket-api + provided + + + org.eclipse.jetty.toolchain + jetty-servlet-api + provided + + + org.eclipse.jetty.websocket + websocket-jetty-api + provided + + + org.eclipse.jetty.websocket + websocket-jetty-server + provided + + + org.eclipse.jetty + jetty-jmx + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty + jetty-webapp + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + org.eclipse.jetty.websocket + websocket-javax-server + test + + + + + + org.eclipse.jetty + jetty-maven-plugin + ${project.version} + + 8087 + foo + 1 + + 222 + + + /test + ${project.build.directory}/work + + + + Test Realm + src/test/resources/test-realm.properties + + + + + + org.eclipse.jetty + jetty-client + ${project.version} + + + org.eclipse.jetty + jetty-servlets + ${project.version} + + + + + - - org.apache.maven.plugins - maven-surefire-plugin - - - test - test - - - - - **/WebAppTest.java - **/Test*.java - - - - - org.apache.maven.plugins - maven-assembly-plugin - - - web-bundle-assembly - package - - single - - - - src/main/assembly/web-bundle.xml - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - org.apache.felix maven-bundle-plugin @@ -75,6 +149,43 @@ + + org.apache.maven.plugins + maven-assembly-plugin + + + web-bundle-assembly + + single + + package + + + src/main/assembly/web-bundle.xml + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/WebAppTest.java + **/Test*.java + + + + + test + test + + + maven-war-plugin @@ -85,116 +196,5 @@ - - - - org.eclipse.jetty - jetty-maven-plugin - ${project.version} - - - org.eclipse.jetty - jetty-client - ${project.version} - - - org.eclipse.jetty - jetty-servlets - ${project.version} - - - - 8087 - foo - 1 - - 222 - - - /test - ${project.build.directory}/work - - - - Test Realm - src/test/resources/test-realm.properties - - - - - - - - - org.eclipse.jetty - jetty-servlets - provided - - - org.eclipse.jetty.toolchain - jetty-servlet-api - provided - - - org.eclipse.jetty - jetty-webapp - test - - - org.eclipse.jetty - jetty-jmx - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - org.eclipse.jetty - jetty-server - provided - - - jakarta.servlet.jsp - jakarta.servlet.jsp-api - provided - - - jakarta.servlet.jsp.jstl - jakarta.servlet.jsp.jstl-api - provided - - - jakarta.annotation - jakarta.annotation-api - provided - - - org.eclipse.jetty.toolchain - jetty-javax-websocket-api - provided - - - org.eclipse.jetty.websocket - websocket-jetty-api - provided - - - org.eclipse.jetty.websocket - websocket-jetty-server - provided - - - org.eclipse.jetty.websocket - websocket-javax-server - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - - diff --git a/demos/demo-jndi-webapp/pom.xml b/demos/demo-jndi-webapp/pom.xml index 299777b6fc7..4f12a241440 100644 --- a/demos/demo-jndi-webapp/pom.xml +++ b/demos/demo-jndi-webapp/pom.xml @@ -7,52 +7,40 @@ 10.0.20-SNAPSHOT demo-jndi-webapp - Demo :: JNDI :: WebApp war + Demo :: JNDI :: WebApp ${project.groupId}.jndi + + + jakarta.transaction + jakarta.transaction-api + provided + + + org.eclipse.jetty.demos + demo-mock-resources + provided + + + org.eclipse.jetty.orbit + javax.mail.glassfish + provided + + + org.eclipse.jetty.orbit + javax.activation + + + + + org.eclipse.jetty.toolchain + jetty-servlet-api + provided + + - - - maven-antrun-plugin - - - generate-xml-files - process-resources - - - - - - - - - - - - run - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - package - - copy-dependencies - - - jakarta.transaction-api,javax.mail.glassfish,demo-mock-resources - ${project.build.directory}/lib/jndi - - - - - @@ -82,33 +70,45 @@ + + + maven-antrun-plugin + + + generate-xml-files + + run + + process-resources + + + + + + + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + + copy-dependencies + + package + + jakarta.transaction-api,javax.mail.glassfish,demo-mock-resources + ${project.build.directory}/lib/jndi + + + + + - - - org.eclipse.jetty.demos - demo-mock-resources - provided - - - jakarta.transaction - jakarta.transaction-api - provided - - - org.eclipse.jetty.toolchain - jetty-servlet-api - provided - - - org.eclipse.jetty.orbit - javax.mail.glassfish - provided - - - org.eclipse.jetty.orbit - javax.activation - - - - diff --git a/demos/demo-jsp-webapp/pom.xml b/demos/demo-jsp-webapp/pom.xml index 39dc9ad75f3..80767420727 100644 --- a/demos/demo-jsp-webapp/pom.xml +++ b/demos/demo-jsp-webapp/pom.xml @@ -1,20 +1,38 @@ + + 4.0.0 org.eclipse.jetty.demos demos-parent 10.0.20-SNAPSHOT - - 4.0.0 demo-jsp-webapp - Demo :: JSP :: Webapp war + Demo :: JSP :: Webapp ${project.groupId}.jsp + + + jakarta.servlet.jsp + jakarta.servlet.jsp-api + provided + + + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + provided + + + org.eclipse.jetty.toolchain + jetty-servlet-api + provided + + + @@ -33,24 +51,15 @@ - - - maven-war-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - maven-assembly-plugin web-bundle-assembly - package single + package src/main/assembly/web-bundle.xml @@ -62,32 +71,30 @@ + + + maven-war-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + - - - org.eclipse.jetty.toolchain - jetty-servlet-api - provided - - - jakarta.servlet.jsp - jakarta.servlet.jsp-api - provided - - - jakarta.servlet.jsp.jstl - jakarta.servlet.jsp.jstl-api - provided - - - precompile-jsp + + org.apache.maven.plugins + maven-war-plugin + + ${basedir}/target/web.xml + + org.eclipse.jetty jetty-jspc-maven-plugin @@ -109,13 +116,6 @@ - - org.apache.maven.plugins - maven-war-plugin - - ${basedir}/target/web.xml - - diff --git a/demos/demo-mock-resources/pom.xml b/demos/demo-mock-resources/pom.xml index de1ff020cbb..d36d6e46de6 100644 --- a/demos/demo-mock-resources/pom.xml +++ b/demos/demo-mock-resources/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 @@ -5,12 +6,29 @@ demos-parent 10.0.20-SNAPSHOT - Demo :: Mock Resources demo-mock-resources jar + Demo :: Mock Resources ${project.groupId}.mocks + + + jakarta.transaction + jakarta.transaction-api + provided + + + org.eclipse.jetty.orbit + javax.mail.glassfish + provided + + + org.eclipse.jetty.toolchain + jetty-servlet-api + provided + + @@ -21,33 +39,12 @@ org.eclipse.jetty.demos.demo-mock-resources Mock resources used for testing - - com.acme;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - - - javax.sql, javax.transaction;version="1.1", javax.mail;version="1.4.1" - + com.acme;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" + javax.sql, javax.transaction;version="1.1", javax.mail;version="1.4.1" <_nouses>true - - - jakarta.transaction - jakarta.transaction-api - provided - - - org.eclipse.jetty.toolchain - jetty-servlet-api - provided - - - org.eclipse.jetty.orbit - javax.mail.glassfish - provided - - diff --git a/demos/demo-proxy-webapp/pom.xml b/demos/demo-proxy-webapp/pom.xml index 2e3d7b5b2be..b5fbf11e5b2 100644 --- a/demos/demo-proxy-webapp/pom.xml +++ b/demos/demo-proxy-webapp/pom.xml @@ -1,56 +1,39 @@ + 4.0.0 org.eclipse.jetty.demos demos-parent 10.0.20-SNAPSHOT - 4.0.0 demo-proxy-webapp - Demo :: Proxy :: Webapp war + Demo :: Proxy :: Webapp ${project.groupId}.proxy - - - - maven-war-plugin - - - src/main/webapp/META-INF/MANIFEST.MF - - - - - - - org.slf4j - slf4j-simple - - - org.eclipse.jetty - jetty-proxy - - - org.eclipse.jetty.toolchain - jetty-servlet-api - provided - - - org.eclipse.jetty - jetty-webapp - test - org.eclipse.jetty jetty-client org.eclipse.jetty - jetty-jmx - test + jetty-proxy + + + org.slf4j + slf4j-simple + + + jakarta.servlet.jsp + jakarta.servlet.jsp-api + provided + + + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + provided org.eclipse.jetty @@ -58,9 +41,9 @@ provided - org.eclipse.jetty.http2 - http2-server - test + org.eclipse.jetty.toolchain + jetty-servlet-api + provided org.eclipse.jetty @@ -73,14 +56,31 @@ test - jakarta.servlet.jsp - jakarta.servlet.jsp-api - provided + org.eclipse.jetty + jetty-jmx + test - jakarta.servlet.jsp.jstl - jakarta.servlet.jsp.jstl-api - provided + org.eclipse.jetty + jetty-webapp + test + + + org.eclipse.jetty.http2 + http2-server + test + + + + maven-war-plugin + + + src/main/webapp/META-INF/MANIFEST.MF + + + + + diff --git a/demos/demo-simple-webapp/pom.xml b/demos/demo-simple-webapp/pom.xml index 251a2fab2fa..75a4903510c 100644 --- a/demos/demo-simple-webapp/pom.xml +++ b/demos/demo-simple-webapp/pom.xml @@ -1,15 +1,15 @@ + + 4.0.0 org.eclipse.jetty.demos demos-parent 10.0.20-SNAPSHOT - - 4.0.0 demo-simple-webapp - Demo :: Simple :: Webapp war + Demo :: Simple :: Webapp ${project.groupId}.simple diff --git a/demos/demo-spec/demo-container-initializer/pom.xml b/demos/demo-spec/demo-container-initializer/pom.xml index 67b1fbe7d57..722945164ae 100644 --- a/demos/demo-spec/demo-container-initializer/pom.xml +++ b/demos/demo-spec/demo-container-initializer/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 @@ -12,6 +13,13 @@ ${project.groupId}.sci + + + org.eclipse.jetty.toolchain + jetty-servlet-api + provided + + @@ -31,11 +39,4 @@ - - - org.eclipse.jetty.toolchain - jetty-servlet-api - provided - - diff --git a/demos/demo-spec/demo-spec-webapp/pom.xml b/demos/demo-spec/demo-spec-webapp/pom.xml index 26449a93f9c..b1f39b6d9d0 100644 --- a/demos/demo-spec/demo-spec-webapp/pom.xml +++ b/demos/demo-spec/demo-spec-webapp/pom.xml @@ -7,53 +7,89 @@ 10.0.20-SNAPSHOT ../../pom.xml - Demo :: Servlet Spec :: Webapp demo-spec-webapp war + Demo :: Servlet Spec :: Webapp ${project.groupId}.spec.webapp + + + + org.eclipse.jetty.demos + demo-container-initializer + + + org.eclipse.jetty.demos + demo-web-fragment + + + jakarta.annotation + jakarta.annotation-api + provided + + + jakarta.transaction + jakarta.transaction-api + provided + + + org.eclipse.jetty.toolchain + jetty-servlet-api + provided + + + + + + + + + org.eclipse.jetty + jetty-maven-plugin + ${project.version} + + 10 + ${project.build.directory}/plugin-context.xml + + src/main/webapp + src/main/webapp/WEB-INF/web.xml + /test-spec + .*/jetty-servlet-api-[^/]*\.jar$ + true + ${basedir}/src/main/webapp/WEB-INF/jetty-env.xml + + + + Test Realm + src/etc/realm.properties + + + + + + org.eclipse.jetty.demos + demo-mock-resources + ${project.version} + + + + + - - org.apache.maven.plugins - maven-assembly-plugin - - - web-bundle-assembly - package - - single - - - - src/main/assembly/web-bundle.xml - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - - - - maven-war-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - target - - plugin-context.xml - - META-INF - - - - org.apache.felix @@ -66,10 +102,8 @@ Test Webapp for Servlet 4.0 Features - - javax.transaction*;version="[1.1,2.0)", javax.servlet*;version="[2.6,4.1)", org.eclipse.jetty*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))", org.eclipse.jetty.webapp;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))";resolution:="optional", org.eclipse.jetty.plus.jndi;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))";resolution:="optional", com.acme;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}", * - - <_nouses /> + javax.transaction*;version="[1.1,2.0)", javax.servlet*;version="[2.6,4.1)", org.eclipse.jetty*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))", org.eclipse.jetty.webapp;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))";resolution:="optional", org.eclipse.jetty.plus.jndi;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))";resolution:="optional", com.acme;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}", * + <_nouses> com.acme.test;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}";-noimport:=true / .,WEB-INF/classes,WEB-INF/lib @@ -83,20 +117,41 @@ generate-xml-files + + run + process-resources - + - + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + web-bundle-assembly - run + single + package + + + src/main/assembly/web-bundle.xml + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + @@ -105,10 +160,10 @@ maven-dependency-plugin - package copy + package @@ -146,81 +201,24 @@ + + + maven-war-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + target + + plugin-context.xml + + META-INF + + + + - - - - org.eclipse.jetty - jetty-maven-plugin - ${project.version} - - 10 - ${project.build.directory}/plugin-context.xml - - src/main/webapp - src/main/webapp/WEB-INF/web.xml - /test-spec - .*/jetty-servlet-api-[^/]*\.jar$ - true - ${basedir}/src/main/webapp/WEB-INF/jetty-env.xml - - - - Test Realm - src/etc/realm.properties - - - - - - org.eclipse.jetty.demos - demo-mock-resources - ${project.version} - - - - - - - - - jakarta.transaction - jakarta.transaction-api - provided - - - org.eclipse.jetty.toolchain - jetty-servlet-api - provided - - - jakarta.annotation - jakarta.annotation-api - provided - - - org.eclipse.jetty.demos - demo-web-fragment - - - org.eclipse.jetty.demos - demo-container-initializer - - - - - diff --git a/demos/demo-spec/demo-web-fragment/pom.xml b/demos/demo-spec/demo-web-fragment/pom.xml index bd122fcfd89..111912018cc 100644 --- a/demos/demo-spec/demo-web-fragment/pom.xml +++ b/demos/demo-spec/demo-web-fragment/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 @@ -6,11 +7,11 @@ 10.0.20-SNAPSHOT ../../pom.xml - - Demo :: Servlet Spec :: Fragment Jar demo-web-fragment jar + Demo :: Servlet Spec :: Fragment Jar + ${project.groupId}.spec.fragment diff --git a/demos/demo-spec/pom.xml b/demos/demo-spec/pom.xml index aafa423caa8..3a2127c4842 100644 --- a/demos/demo-spec/pom.xml +++ b/demos/demo-spec/pom.xml @@ -6,9 +6,9 @@ demos-parent 10.0.20-SNAPSHOT - Demo :: Servlet Spec demo-spec pom + Demo :: Servlet Spec demo-spec-webapp diff --git a/demos/embedded/pom.xml b/demos/embedded/pom.xml index 71f26e4663b..eacf53863ca 100644 --- a/demos/embedded/pom.xml +++ b/demos/embedded/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty.demos demos-parent 10.0.20-SNAPSHOT - 4.0.0 demos-jetty-embedded Demo :: Embedded Jetty Embedded Jetty Demos @@ -13,21 +14,58 @@ - org.slf4j - slf4j-api + jakarta.transaction + jakarta.transaction-api + compile org.eclipse.jetty - jetty-slf4j-impl - runtime + apache-jsp org.eclipse.jetty - jetty-util-ajax + apache-jstl org.eclipse.jetty - jetty-webapp + jetty-alpn-conscrypt-server + + + org.eclipse.jetty + jetty-alpn-java-server + + + org.eclipse.jetty + jetty-alpn-server + ${project.version} + + + org.eclipse.jetty + jetty-annotations + + + org.eclipse.jetty + jetty-deploy + + + org.eclipse.jetty + jetty-jaas + + + org.eclipse.jetty + jetty-jmx + + + org.eclipse.jetty + jetty-plus + + + org.eclipse.jetty + jetty-proxy + + + org.eclipse.jetty + jetty-rewrite org.eclipse.jetty @@ -39,81 +77,50 @@ org.eclipse.jetty - jetty-deploy + jetty-util-ajax org.eclipse.jetty - jetty-rewrite + jetty-webapp - org.eclipse.jetty - jetty-jmx + org.eclipse.jetty.demos + demo-mock-resources + + + org.eclipse.jetty.http2 + http2-server + + + org.eclipse.jetty.orbit + javax.mail.glassfish org.eclipse.jetty.websocket websocket-javax-server - - org.eclipse.jetty.websocket - websocket-servlet - org.eclipse.jetty.websocket websocket-jetty-server - org.eclipse.jetty.http2 - http2-server + org.eclipse.jetty.websocket + websocket-servlet + + + org.slf4j + slf4j-api org.eclipse.jetty - jetty-alpn-server - ${project.version} + jetty-slf4j-impl + runtime org.eclipse.jetty - jetty-alpn-java-server - - - org.eclipse.jetty - jetty-alpn-conscrypt-server - - - org.eclipse.jetty - jetty-annotations - - - org.eclipse.jetty.demos - demo-mock-resources - - - org.eclipse.jetty - jetty-proxy - - - org.eclipse.jetty - jetty-jaas - - - org.eclipse.jetty - jetty-plus - - - org.eclipse.jetty - apache-jsp - - - org.eclipse.jetty - apache-jstl - - - org.eclipse.jetty.orbit - javax.mail.glassfish - - - jakarta.transaction - jakarta.transaction-api - compile + jetty-home + zip + test org.eclipse.jetty.toolchain @@ -125,12 +132,6 @@ websocket-jetty-client test - - org.eclipse.jetty - jetty-home - zip - test - diff --git a/demos/pom.xml b/demos/pom.xml index 959ad263ff3..5ff8f1f9e53 100644 --- a/demos/pom.xml +++ b/demos/pom.xml @@ -1,16 +1,29 @@ + + 4.0.0 org.eclipse.jetty jetty-project 10.0.20-SNAPSHOT - - 4.0.0 org.eclipse.jetty.demos demos-parent - Demos :: Parent pom + Demos :: Parent + + + demo-async-rest + demo-jaas-webapp + demo-jndi-webapp + demo-jetty-webapp + demo-proxy-webapp + demo-simple-webapp + demo-jsp-webapp + demo-mock-resources + demo-spec + embedded + true @@ -28,17 +41,4 @@ - - - demo-async-rest - demo-jaas-webapp - demo-jndi-webapp - demo-jetty-webapp - demo-proxy-webapp - demo-simple-webapp - demo-jsp-webapp - demo-mock-resources - demo-spec - embedded - diff --git a/documentation/jetty-asciidoctor-extensions/pom.xml b/documentation/jetty-asciidoctor-extensions/pom.xml index bb91b042dd3..f2be2e817a5 100644 --- a/documentation/jetty-asciidoctor-extensions/pom.xml +++ b/documentation/jetty-asciidoctor-extensions/pom.xml @@ -1,15 +1,15 @@ + + 4.0.0 org.eclipse.jetty.documentation documentation-parent 10.0.20-SNAPSHOT - - 4.0.0 jetty-asciidoctor-extensions - Jetty :: Documentation :: AsciiDoctor Extensions jar + Jetty :: Documentation :: AsciiDoctor Extensions ${project.groupId}.asciidoctor.extensions diff --git a/documentation/jetty-documentation/pom.xml b/documentation/jetty-documentation/pom.xml index 4e1f5ee6155..ea9a3d27066 100644 --- a/documentation/jetty-documentation/pom.xml +++ b/documentation/jetty-documentation/pom.xml @@ -1,192 +1,21 @@ + + 4.0.0 org.eclipse.jetty.documentation documentation-parent 10.0.20-SNAPSHOT - - 4.0.0 jetty-documentation - Jetty :: Documentation jar + Jetty :: Documentation ${project.groupId} - - - - maven-enforcer-plugin - - false - - - [17,) - [ERROR] OLD JDK [${java.version}] in use. Jetty documentation ${project.version} MUST use JDK 17 or newer - - - - - - org.asciidoctor - asciidoctor-maven-plugin - - - org.asciidoctor - asciidoctorj-diagram - ${asciidoctorj-diagram.version} - - - org.eclipse.jetty.documentation - jetty-asciidoctor-extensions - ${project.version} - - - jakarta.annotation - jakarta.annotation-api - - - - - org.apache.httpcomponents - httpcore - ${apache.httpcore.version} - - - org.apache.httpcomponents - httpclient - ${apache.httpclient.version} - - - - html5 - - asciidoctor-diagram - - - ${project.basedir} - ${project.version} - ${settings.localRepository} - ${project.version} - ../programming-guide/index.html - ../operations-guide/index.html - https://eclipse.dev/jetty/javadoc/jetty-10 - - - - - index - prepare-package - - process-asciidoc - - - src/main/asciidoc - index.adoc - ${project.build.directory}/html - - - - operations-guide - prepare-package - - process-asciidoc - - - src/main/asciidoc/operations-guide - index.adoc - ${project.build.directory}/html/operations-guide - - - - contribution-guide - prepare-package - - process-asciidoc - - - ${basedir}/src/main/asciidoc/contribution-guide - index.adoc - ${project.build.directory}/html/contribution-guide - - - - programming-guide - prepare-package - - process-asciidoc - - - ${basedir}/src/main/asciidoc/programming-guide - index.adoc - ${project.build.directory}/html/programming-guide - - - - old_docs - prepare-package - - process-asciidoc - - - ${basedir}/src/main/asciidoc/old_docs - index.adoc - ${project.build.directory}/html/old_docs - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack-jetty-home - generate-resources - - unpack - - - - - org.eclipse.jetty - jetty-home - ${project.version} - zip - - - ${project.build.directory}/ - - - - - - maven-assembly-plugin - - - src/main/assembly/html.xml - - - - - make-assembly - package - - single - - - - - - - - - org.eclipse.jetty.toolchain - jetty-servlet-api - org.eclipse.jetty jetty-alpn-server @@ -195,10 +24,21 @@ org.eclipse.jetty jetty-client + + org.eclipse.jetty + jetty-home + ${project.version} + zip + true + org.eclipse.jetty jetty-jmx + + org.eclipse.jetty + jetty-nosql + org.eclipse.jetty jetty-rewrite @@ -215,6 +55,10 @@ org.eclipse.jetty jetty-servlets + + org.eclipse.jetty + jetty-unixdomain-server + org.eclipse.jetty jetty-util-ajax @@ -227,57 +71,213 @@ org.eclipse.jetty.fcgi fcgi-client - - org.eclipse.jetty.http2 - http2-server - org.eclipse.jetty.http2 http2-http-client-transport - org.eclipse.jetty.http3 - http3-server + org.eclipse.jetty.http2 + http2-server org.eclipse.jetty.http3 http3-http-client-transport - org.eclipse.jetty - jetty-unixdomain-server - - - org.eclipse.jetty - jetty-slf4j-impl - runtime + org.eclipse.jetty.http3 + http3-server org.eclipse.jetty.memcached jetty-memcached-sessions - org.eclipse.jetty - jetty-nosql - - - org.eclipse.jetty.websocket - websocket-jetty-client + org.eclipse.jetty.toolchain + jetty-servlet-api org.eclipse.jetty.websocket websocket-javax-server + + org.eclipse.jetty.websocket + websocket-jetty-client + org.eclipse.jetty.websocket websocket-jetty-server org.eclipse.jetty - jetty-home - ${project.version} - zip - true + jetty-slf4j-impl + runtime + + + + + maven-assembly-plugin + + + src/main/assembly/html.xml + + + + + make-assembly + + single + + package + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack-jetty-home + + unpack + + generate-resources + + + + org.eclipse.jetty + jetty-home + ${project.version} + zip + + + ${project.build.directory}/ + + + + + + maven-enforcer-plugin + + false + + + [17,) + [ERROR] OLD JDK [${java.version}] in use. Jetty documentation ${project.version} MUST use JDK 17 or newer + + + + + + org.asciidoctor + asciidoctor-maven-plugin + + html5 + + asciidoctor-diagram + + + ${project.basedir} + ${project.version} + ${settings.localRepository} + ${project.version} + ../programming-guide/index.html + ../operations-guide/index.html + https://eclipse.dev/jetty/javadoc/jetty-10 + + + + + org.apache.httpcomponents + httpclient + ${apache.httpclient.version} + + + org.apache.httpcomponents + httpcore + ${apache.httpcore.version} + + + org.asciidoctor + asciidoctorj-diagram + ${asciidoctorj-diagram.version} + + + org.eclipse.jetty.documentation + jetty-asciidoctor-extensions + ${project.version} + + + jakarta.annotation + jakarta.annotation-api + + + + + + + contribution-guide + + process-asciidoc + + prepare-package + + ${basedir}/src/main/asciidoc/contribution-guide + index.adoc + ${project.build.directory}/html/contribution-guide + + + + index + + process-asciidoc + + prepare-package + + src/main/asciidoc + index.adoc + ${project.build.directory}/html + + + + old_docs + + process-asciidoc + + prepare-package + + ${basedir}/src/main/asciidoc/old_docs + index.adoc + ${project.build.directory}/html/old_docs + + + + operations-guide + + process-asciidoc + + prepare-package + + src/main/asciidoc/operations-guide + index.adoc + ${project.build.directory}/html/operations-guide + + + + programming-guide + + process-asciidoc + + prepare-package + + ${basedir}/src/main/asciidoc/programming-guide + index.adoc + ${project.build.directory}/html/programming-guide + + + + + + diff --git a/documentation/pom.xml b/documentation/pom.xml index b843672a964..f0a7f2fd302 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -1,16 +1,16 @@ + + 4.0.0 org.eclipse.jetty jetty-project 10.0.20-SNAPSHOT - - 4.0.0 org.eclipse.jetty.documentation documentation-parent - Jetty :: Documentation :: Parent pom + Jetty :: Documentation :: Parent jetty-asciidoctor-extensions diff --git a/javadoc/pom.xml b/javadoc/pom.xml index 826a2d60cd4..358b32c6797 100644 --- a/javadoc/pom.xml +++ b/javadoc/pom.xml @@ -1,177 +1,45 @@ + + 4.0.0 org.eclipse.jetty jetty-project 10.0.20-SNAPSHOT - - 4.0.0 javadoc - Jetty :: Javadoc Build jar + Jetty :: Javadoc Build - ${project.build.directory}/jetty-sources - true - true true true + true + ${project.build.directory}/jetty-sources + true - - ${sources-directory} - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-java - - enforce - - - - - - com.google.code.findbugs:jsr305 - com.google.code.gson:gson - com.google.guava:guava - com.google.protobuf:protobuf-java - org.codehaus.plexus:plexus-interpolation - org.codehaus.plexus:plexus-utils - - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - create-sources-dir - generate-sources - - run - - - - - - - - - delete-sources-dir - verify - - run - - - - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack-sources - prepare-package - - unpack-dependencies - - - - org.eclipse.jetty, - org.eclipse.jetty.fcgi, - org.eclipse.jetty.gcloud, - org.eclipse.jetty.http2, - org.eclipse.jetty.http3, - org.eclipse.jetty.memcached, - org.eclipse.jetty.osgi, - org.eclipse.jetty.quic, - org.eclipse.jetty.websocket - - - org.eclipse.jetty.toolchain, - org.eclipse.jetty.orbit - - - infinispan-embedded, - infinispan-remote, - jetty-test-helper, - jetty-maven-plugin, - jetty-jspc-maven-plugin, - alpn-api, - quic-quiche, - quic-quiche-common, - quic-quiche-foreign-incubator, - quic-quiche-jna, - javax.servlet, - javax.websocket, - jetty-servlet-api, - jetty-javax-websocket-api, - javax.mail.glassfish, - jakarta.security.auth.message-api, - plexus-utils, - plexus-interpolation - - sources - false - META-INF/**,module-info.java - ${sources-directory} - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - build-javadoc - prepare-package - - jar - - - Eclipse Jetty API Doc - v${project.version} - Eclipse Jetty API Doc - v${project.version} - - org.eclipse.jetty.http3.client.http.internal; - org.eclipse.jetty.http3.client.internal; - org.eclipse.jetty.http3.internal; - org.eclipse.jetty.http3.internal.*; - org.eclipse.jetty.http3.qpack.internal; - org.eclipse.jetty.http3.qpack.internal.*; - org.eclipse.jetty.http3.server.internal; - org.eclipse.jetty.quic.common.internal; - org.eclipse.jetty.quic.server.internal; - - - - - - - - org.eclipse.jetty - jetty-annotations + jetty-rewrite + ${project.version} + + + org.eclipse.jetty + apache-jsp provided org.eclipse.jetty - jetty-ant + apache-jstl + provided + + + + org.eclipse.jetty + infinispan-common + ${project.version} provided @@ -201,12 +69,12 @@ org.eclipse.jetty - apache-jsp + jetty-annotations provided org.eclipse.jetty - apache-jstl + jetty-ant provided @@ -224,6 +92,72 @@ jetty-deploy provided + + org.eclipse.jetty + jetty-http-spi + provided + + + org.eclipse.jetty + jetty-jaas + provided + + + org.eclipse.jetty + jetty-jaspi + provided + + + org.eclipse.jetty + jetty-jmx + provided + + + + org.eclipse.jetty + jetty-jndi + provided + + + org.eclipse.jetty + jetty-nosql + provided + + + org.eclipse.jetty + jetty-openid + provided + + + org.eclipse.jetty + jetty-proxy + provided + + + org.eclipse.jetty + jetty-quickstart + provided + + + org.eclipse.jetty + jetty-runner + provided + + + org.eclipse.jetty + jetty-start + provided + + + org.eclipse.jetty + jetty-unixsocket-client + provided + + + org.eclipse.jetty + jetty-unixsocket-server + provided + org.eclipse.jetty.fcgi fcgi-client @@ -239,11 +173,6 @@ jetty-gcloud-session-manager provided - - org.eclipse.jetty - jetty-http-spi - provided - org.eclipse.jetty.http2 http2-client @@ -274,112 +203,11 @@ http3-server provided - - org.eclipse.jetty - jetty-jaas - provided - - - org.eclipse.jetty - jetty-jaspi - provided - org.eclipse.jetty.memcached jetty-memcached-sessions provided - - org.eclipse.jetty - jetty-nosql - provided - - - org.eclipse.jetty.osgi - jetty-osgi-boot - provided - - - org.eclipse.jetty - jetty-proxy - provided - - - org.eclipse.jetty.quic - quic-client - provided - - - org.eclipse.jetty.quic - quic-server - provided - - - org.eclipse.jetty - jetty-quickstart - provided - - - org.eclipse.jetty - jetty-rewrite - ${project.version} - - - org.eclipse.jetty - jetty-runner - provided - - - org.eclipse.jetty - jetty-openid - provided - - - org.eclipse.jetty - jetty-start - provided - - - org.eclipse.jetty - jetty-unixsocket-client - provided - - - org.eclipse.jetty - jetty-unixsocket-server - provided - - - org.eclipse.jetty.websocket - websocket-javax-server - provided - - - org.eclipse.jetty.websocket - websocket-javax-client - provided - - - org.eclipse.jetty.websocket - websocket-jetty-client - provided - - - org.eclipse.jetty.websocket - websocket-jetty-server - provided - - - org.eclipse.jetty - jetty-jmx - provided - - - - org.eclipse.jetty - jetty-jndi - provided - @@ -393,24 +221,40 @@ - - org.eclipse.jetty - infinispan-common - ${project.version} + org.eclipse.jetty.osgi + jetty-osgi-boot provided - - org.infinispan - infinispan-core + org.eclipse.jetty.quic + quic-client + provided + + + org.eclipse.jetty.quic + quic-server + provided + + + org.eclipse.jetty.websocket + websocket-javax-client + provided + + + org.eclipse.jetty.websocket + websocket-javax-server + provided + + + org.eclipse.jetty.websocket + websocket-jetty-client + provided + + + org.eclipse.jetty.websocket + websocket-jetty-server provided - - - org.wildfly.common - wildfly-common - - @@ -419,10 +263,158 @@ provided + + org.infinispan + infinispan-core + provided + + + org.wildfly.common + wildfly-common + + + + org.infinispan.protostream protostream provided + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + create-sources-dir + + run + + generate-sources + + + + + + + + delete-sources-dir + + run + + verify + + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack-sources + + unpack-dependencies + + prepare-package + + org.eclipse.jetty, + org.eclipse.jetty.fcgi, + org.eclipse.jetty.gcloud, + org.eclipse.jetty.http2, + org.eclipse.jetty.http3, + org.eclipse.jetty.memcached, + org.eclipse.jetty.osgi, + org.eclipse.jetty.quic, + org.eclipse.jetty.websocket + org.eclipse.jetty.toolchain, + org.eclipse.jetty.orbit + infinispan-embedded, + infinispan-remote, + jetty-test-helper, + jetty-maven-plugin, + jetty-jspc-maven-plugin, + alpn-api, + quic-quiche, + quic-quiche-common, + quic-quiche-foreign-incubator, + quic-quiche-jna, + javax.servlet, + javax.websocket, + jetty-servlet-api, + jetty-javax-websocket-api, + javax.mail.glassfish, + jakarta.security.auth.message-api, + plexus-utils, + plexus-interpolation + sources + false + META-INF/**,module-info.java + ${sources-directory} + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-java + + enforce + + + + + + com.google.code.findbugs:jsr305 + com.google.code.gson:gson + com.google.guava:guava + com.google.protobuf:protobuf-java + org.codehaus.plexus:plexus-interpolation + org.codehaus.plexus:plexus-utils + + + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + build-javadoc + + jar + + prepare-package + + Eclipse Jetty API Doc - v${project.version} + Eclipse Jetty API Doc - v${project.version} + org.eclipse.jetty.http3.client.http.internal; + org.eclipse.jetty.http3.client.internal; + org.eclipse.jetty.http3.internal; + org.eclipse.jetty.http3.internal.*; + org.eclipse.jetty.http3.qpack.internal; + org.eclipse.jetty.http3.qpack.internal.*; + org.eclipse.jetty.http3.server.internal; + org.eclipse.jetty.quic.common.internal; + org.eclipse.jetty.quic.server.internal; + + + + + + ${sources-directory} + diff --git a/jetty-alpn/jetty-alpn-client/pom.xml b/jetty-alpn/jetty-alpn-client/pom.xml index fe9f0423cc8..d8fd42ff859 100644 --- a/jetty-alpn/jetty-alpn-client/pom.xml +++ b/jetty-alpn/jetty-alpn-client/pom.xml @@ -1,16 +1,37 @@ + + 4.0.0 org.eclipse.jetty jetty-alpn-parent 10.0.20-SNAPSHOT - 4.0.0 jetty-alpn-client Jetty :: ALPN :: Client ${project.groupId}.alpn.client org.eclipse.alpn.* + + + org.eclipse.jetty + jetty-io + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + @@ -32,24 +53,4 @@ - - - org.eclipse.jetty - jetty-io - - - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - diff --git a/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml b/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml index f5a73c53f6c..80c99132478 100644 --- a/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml +++ b/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml @@ -1,13 +1,13 @@ + 4.0.0 + org.eclipse.jetty jetty-alpn-parent 10.0.20-SNAPSHOT - - 4.0.0 jetty-alpn-conscrypt-client Jetty :: ALPN :: Conscrypt Client Implementation @@ -29,13 +29,13 @@ slf4j-api - org.eclipse.jetty.http2 - http2-client + org.eclipse.jetty + jetty-slf4j-impl test - org.eclipse.jetty - jetty-slf4j-impl + org.eclipse.jetty.http2 + http2-client test diff --git a/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml b/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml index 8ed2a3393ac..22f498dfa76 100644 --- a/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml +++ b/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty jetty-alpn-parent 10.0.20-SNAPSHOT - - 4.0.0 jetty-alpn-conscrypt-server Jetty :: ALPN :: Conscrypt Server Implementation @@ -31,16 +31,6 @@ org.slf4j slf4j-api - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.http2 - http2-server - test - org.eclipse.jetty jetty-alpn-conscrypt-client @@ -51,6 +41,11 @@ jetty-client test + + org.eclipse.jetty + jetty-slf4j-impl + test + org.eclipse.jetty.http2 http2-client @@ -61,6 +56,11 @@ http2-http-client-transport test + + org.eclipse.jetty.http2 + http2-server + test + @@ -82,9 +82,7 @@ maven-surefire-plugin - - @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.alpn.conscrypt.server=org.eclipse.jetty.server - + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.alpn.conscrypt.server=org.eclipse.jetty.server diff --git a/jetty-alpn/jetty-alpn-java-client/pom.xml b/jetty-alpn/jetty-alpn-java-client/pom.xml index 19561ed233d..57ca052eff2 100644 --- a/jetty-alpn/jetty-alpn-java-client/pom.xml +++ b/jetty-alpn/jetty-alpn-java-client/pom.xml @@ -1,13 +1,13 @@ + 4.0.0 + org.eclipse.jetty jetty-alpn-parent 10.0.20-SNAPSHOT - - 4.0.0 jetty-alpn-java-client Jetty :: ALPN :: JDK9 Client Implementation @@ -15,6 +15,28 @@ ${project.groupId}.alpn.java.client + + + org.eclipse.jetty + jetty-alpn-client + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + + org.eclipse.jetty.http2 + http2-client + test + + + @@ -34,26 +56,4 @@ - - - org.eclipse.jetty - jetty-alpn-client - - - org.slf4j - slf4j-api - - - - org.eclipse.jetty.http2 - http2-client - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - diff --git a/jetty-alpn/jetty-alpn-java-server/pom.xml b/jetty-alpn/jetty-alpn-java-server/pom.xml index a56c79d3e7a..5e439725aa3 100644 --- a/jetty-alpn/jetty-alpn-java-server/pom.xml +++ b/jetty-alpn/jetty-alpn-java-server/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty jetty-alpn-parent 10.0.20-SNAPSHOT - - 4.0.0 jetty-alpn-java-server Jetty :: ALPN :: JDK9 Server Implementation @@ -14,40 +14,14 @@ ${project.groupId}.alpn.java.server - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.alpn.java.server=org.eclipse.jetty.server - - - - - org.apache.felix - maven-bundle-plugin - true - - - JDK9 Server ALPN - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.io.ssl.ALPNProcessor$Server - <_nouses>true - - - - - - org.eclipse.jetty - jetty-io + jetty-alpn-server org.eclipse.jetty - jetty-alpn-server + jetty-io org.slf4j @@ -70,4 +44,28 @@ + + + + org.apache.felix + maven-bundle-plugin + true + + + JDK9 Server ALPN + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional + osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.io.ssl.ALPNProcessor$Server + <_nouses>true + + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.alpn.java.server=org.eclipse.jetty.server + + + + + diff --git a/jetty-alpn/jetty-alpn-server/pom.xml b/jetty-alpn/jetty-alpn-server/pom.xml index cc546a49662..ed1433a5e17 100644 --- a/jetty-alpn/jetty-alpn-server/pom.xml +++ b/jetty-alpn/jetty-alpn-server/pom.xml @@ -1,37 +1,17 @@ + + 4.0.0 org.eclipse.jetty jetty-alpn-parent 10.0.20-SNAPSHOT - 4.0.0 jetty-alpn-server Jetty :: ALPN :: Server ${project.groupId}.alpn.server org.eclipse.alpn.* - - - - - org.apache.maven.plugins - maven-source-plugin - - - org.apache.felix - maven-bundle-plugin - - - ${bundle-symbolic-name};singleton:=true - org.eclipse.jetty.alpn.server,* - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional, osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.io.ssl.ALPNProcessor$Server)";resolution:=optional;cardinality:=multiple - - - - - org.eclipse.jetty @@ -52,4 +32,25 @@ test + + + + org.apache.felix + maven-bundle-plugin + + + ${bundle-symbolic-name};singleton:=true + org.eclipse.jetty.alpn.server,* + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional, osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.io.ssl.ALPNProcessor$Server)";resolution:=optional;cardinality:=multiple + + + + + + org.apache.maven.plugins + maven-source-plugin + + + diff --git a/jetty-alpn/pom.xml b/jetty-alpn/pom.xml index 5e19cd70b27..30637a59d7f 100644 --- a/jetty-alpn/pom.xml +++ b/jetty-alpn/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty jetty-project 10.0.20-SNAPSHOT - 4.0.0 jetty-alpn-parent pom Jetty :: ALPN :: Parent diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index d31cf4b1d84..9f2e526c12a 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty jetty-project 10.0.20-SNAPSHOT - - 4.0.0 jetty-annotations Jetty :: Servlet Annotations Annotation support for deploying servlets in jetty. @@ -14,37 +15,11 @@ org.eclipse.annotations.* - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} - --add-opens org.eclipse.jetty.annotations/org.eclipse.jetty.annotations.resources=org.eclipse.jetty.plus - --add-reads org.eclipse.jetty.annotations=org.eclipse.jetty.logging - - - - - org.apache.felix - maven-bundle-plugin - true - - - ${osgi.slf4j.import.packages},org.objectweb.asm;version="[$(version;==;${asm.version}),$(version;+;${asm.version}))",* - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)", osgi.serviceloader; filter:="(osgi.serviceloader=javax.servlet.ServletContainerInitializer)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.webapp.Configuration - - - - - - - + + jakarta.annotation + jakarta.annotation-api + org.eclipse.jetty jetty-plus @@ -53,10 +28,6 @@ org.eclipse.jetty jetty-webapp - - jakarta.annotation - jakarta.annotation-api - org.ow2.asm asm @@ -75,11 +46,6 @@ jakarta.transaction-api test - - org.eclipse.jetty.toolchain - jetty-test-helper - test - org.eclipse.jetty jetty-jndi @@ -90,5 +56,35 @@ jetty-slf4j-impl test + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + + + + org.apache.felix + maven-bundle-plugin + true + + + ${osgi.slf4j.import.packages},org.objectweb.asm;version="[$(version;==;${asm.version}),$(version;+;${asm.version}))",* + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)", osgi.serviceloader; filter:="(osgi.serviceloader=javax.servlet.ServletContainerInitializer)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.webapp.Configuration + + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} + --add-opens org.eclipse.jetty.annotations/org.eclipse.jetty.annotations.resources=org.eclipse.jetty.plus + --add-reads org.eclipse.jetty.annotations=org.eclipse.jetty.logging + + + + diff --git a/jetty-ant/pom.xml b/jetty-ant/pom.xml index 39ec20c3217..3e707ad5a35 100644 --- a/jetty-ant/pom.xml +++ b/jetty-ant/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty jetty-project 10.0.20-SNAPSHOT - 4.0.0 jetty-ant jar Jetty :: Ant Plugin @@ -13,6 +14,46 @@ ${project.groupId}.ant true + + + org.apache.ant + ant + + + org.apache.ant + ant-launcher + + + org.eclipse.jetty + jetty-annotations + + + org.eclipse.jetty + jetty-plus + + + org.eclipse.jetty + jetty-security + + + org.eclipse.jetty + jetty-webapp + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + @@ -21,12 +62,8 @@ true - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.webapp.Configuration - + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.webapp.Configuration @@ -35,10 +72,10 @@ copy-lib-deps - process-test-resources copy-dependencies + process-test-resources org.eclipse.jetty org.eclipse.jetty.orbit,org.eclipse.jetty.websocket @@ -51,44 +88,4 @@ - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - org.apache.ant - ant - - - org.apache.ant - ant-launcher - - - org.eclipse.jetty - jetty-security - - - org.eclipse.jetty - jetty-plus - - - org.eclipse.jetty - jetty-webapp - - - org.eclipse.jetty - jetty-annotations - - - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-slf4j-impl - test - - diff --git a/jetty-bom/pom.xml b/jetty-bom/pom.xml index 19285baba6a..75e15bd4c05 100644 --- a/jetty-bom/pom.xml +++ b/jetty-bom/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 @@ -8,45 +9,9 @@ jetty-bom + pom Jetty :: BOM Jetty BOM artifact - pom - - - - - org.codehaus.mojo - flatten-maven-plugin - ${flatten.maven.plugin.version} - - ${project.build.directory} - flattened-pom.xml - bom - true - - remove - remove - - - - - flatten - - flatten - - process-resources - - - flatten-clean - - clean - - clean - - - - - @@ -60,21 +25,26 @@ apache-jstl 10.0.20-SNAPSHOT + + org.eclipse.jetty + infinispan-common + 10.0.20-SNAPSHOT + + + org.eclipse.jetty + infinispan-embedded-query + 10.0.20-SNAPSHOT + + + org.eclipse.jetty + infinispan-remote-query + 10.0.20-SNAPSHOT + org.eclipse.jetty jetty-alpn-client 10.0.20-SNAPSHOT - - org.eclipse.jetty - jetty-alpn-java-client - 10.0.20-SNAPSHOT - - - org.eclipse.jetty - jetty-alpn-java-server - 10.0.20-SNAPSHOT - org.eclipse.jetty jetty-alpn-conscrypt-client @@ -85,6 +55,16 @@ jetty-alpn-conscrypt-server 10.0.20-SNAPSHOT + + org.eclipse.jetty + jetty-alpn-java-client + 10.0.20-SNAPSHOT + + + org.eclipse.jetty + jetty-alpn-java-server + 10.0.20-SNAPSHOT + org.eclipse.jetty jetty-alpn-server @@ -102,12 +82,12 @@ org.eclipse.jetty - jetty-client + jetty-cdi 10.0.20-SNAPSHOT org.eclipse.jetty - jetty-cdi + jetty-client 10.0.20-SNAPSHOT @@ -116,18 +96,8 @@ 10.0.20-SNAPSHOT - org.eclipse.jetty.fcgi - fcgi-client - 10.0.20-SNAPSHOT - - - org.eclipse.jetty.fcgi - fcgi-server - 10.0.20-SNAPSHOT - - - org.eclipse.jetty.gcloud - jetty-gcloud-session-manager + org.eclipse.jetty + jetty-hazelcast 10.0.20-SNAPSHOT @@ -147,6 +117,151 @@ jetty-http 10.0.20-SNAPSHOT + + org.eclipse.jetty + jetty-http-spi + 10.0.20-SNAPSHOT + + + org.eclipse.jetty + jetty-io + 10.0.20-SNAPSHOT + + + org.eclipse.jetty + jetty-jaas + 10.0.20-SNAPSHOT + + + org.eclipse.jetty + jetty-jaspi + 10.0.20-SNAPSHOT + + + org.eclipse.jetty + jetty-jmx + 10.0.20-SNAPSHOT + + + org.eclipse.jetty + jetty-jndi + 10.0.20-SNAPSHOT + + + org.eclipse.jetty + jetty-keystore + 10.0.20-SNAPSHOT + + + org.eclipse.jetty + jetty-nosql + 10.0.20-SNAPSHOT + + + org.eclipse.jetty + jetty-openid + 10.0.20-SNAPSHOT + + + org.eclipse.jetty + jetty-plus + 10.0.20-SNAPSHOT + + + org.eclipse.jetty + jetty-proxy + 10.0.20-SNAPSHOT + + + org.eclipse.jetty + jetty-quickstart + 10.0.20-SNAPSHOT + + + org.eclipse.jetty + jetty-rewrite + 10.0.20-SNAPSHOT + + + org.eclipse.jetty + jetty-security + 10.0.20-SNAPSHOT + + + org.eclipse.jetty + jetty-server + 10.0.20-SNAPSHOT + + + org.eclipse.jetty + jetty-servlet + 10.0.20-SNAPSHOT + + + org.eclipse.jetty + jetty-servlets + 10.0.20-SNAPSHOT + + + org.eclipse.jetty + jetty-slf4j-impl + 10.0.20-SNAPSHOT + + + org.eclipse.jetty + jetty-unixdomain-server + 10.0.20-SNAPSHOT + + + org.eclipse.jetty + jetty-unixsocket-client + 10.0.20-SNAPSHOT + + + org.eclipse.jetty + jetty-unixsocket-common + 10.0.20-SNAPSHOT + + + org.eclipse.jetty + jetty-unixsocket-server + 10.0.20-SNAPSHOT + + + org.eclipse.jetty + jetty-util + 10.0.20-SNAPSHOT + + + org.eclipse.jetty + jetty-util-ajax + 10.0.20-SNAPSHOT + + + org.eclipse.jetty + jetty-webapp + 10.0.20-SNAPSHOT + + + org.eclipse.jetty + jetty-xml + 10.0.20-SNAPSHOT + + + org.eclipse.jetty.fcgi + fcgi-client + 10.0.20-SNAPSHOT + + + org.eclipse.jetty.fcgi + fcgi-server + 10.0.20-SNAPSHOT + + + org.eclipse.jetty.gcloud + jetty-gcloud-session-manager + 10.0.20-SNAPSHOT + org.eclipse.jetty.http2 http2-client @@ -197,69 +312,14 @@ http3-server 10.0.20-SNAPSHOT - - org.eclipse.jetty - jetty-http-spi - 10.0.20-SNAPSHOT - - - org.eclipse.jetty - infinispan-common - 10.0.20-SNAPSHOT - - - org.eclipse.jetty - infinispan-remote-query - 10.0.20-SNAPSHOT - - - org.eclipse.jetty - infinispan-embedded-query - 10.0.20-SNAPSHOT - - - org.eclipse.jetty - jetty-hazelcast - 10.0.20-SNAPSHOT - - - org.eclipse.jetty - jetty-io - 10.0.20-SNAPSHOT - - - org.eclipse.jetty - jetty-jaas - 10.0.20-SNAPSHOT - - - org.eclipse.jetty - jetty-jaspi - 10.0.20-SNAPSHOT - - - org.eclipse.jetty - jetty-jmx - 10.0.20-SNAPSHOT - - - org.eclipse.jetty - jetty-jndi - 10.0.20-SNAPSHOT - - - org.eclipse.jetty - jetty-keystore - 10.0.20-SNAPSHOT - org.eclipse.jetty.memcached jetty-memcached-sessions 10.0.20-SNAPSHOT - org.eclipse.jetty - jetty-nosql + org.eclipse.jetty.osgi + jetty-httpservice 10.0.20-SNAPSHOT @@ -308,93 +368,18 @@ 10.0.20-SNAPSHOT - org.eclipse.jetty.osgi - jetty-httpservice + org.eclipse.jetty.websocket + websocket-core-client 10.0.20-SNAPSHOT - org.eclipse.jetty - jetty-plus + org.eclipse.jetty.websocket + websocket-core-common 10.0.20-SNAPSHOT - org.eclipse.jetty - jetty-proxy - 10.0.20-SNAPSHOT - - - org.eclipse.jetty - jetty-quickstart - 10.0.20-SNAPSHOT - - - org.eclipse.jetty - jetty-rewrite - 10.0.20-SNAPSHOT - - - org.eclipse.jetty - jetty-security - 10.0.20-SNAPSHOT - - - org.eclipse.jetty - jetty-openid - 10.0.20-SNAPSHOT - - - org.eclipse.jetty - jetty-server - 10.0.20-SNAPSHOT - - - org.eclipse.jetty - jetty-servlet - 10.0.20-SNAPSHOT - - - org.eclipse.jetty - jetty-servlets - 10.0.20-SNAPSHOT - - - org.eclipse.jetty - jetty-slf4j-impl - 10.0.20-SNAPSHOT - - - org.eclipse.jetty - jetty-unixdomain-server - 10.0.20-SNAPSHOT - - - org.eclipse.jetty - jetty-unixsocket-common - 10.0.20-SNAPSHOT - - - org.eclipse.jetty - jetty-unixsocket-client - 10.0.20-SNAPSHOT - - - org.eclipse.jetty - jetty-unixsocket-server - 10.0.20-SNAPSHOT - - - org.eclipse.jetty - jetty-util - 10.0.20-SNAPSHOT - - - org.eclipse.jetty - jetty-util-ajax - 10.0.20-SNAPSHOT - - - org.eclipse.jetty - jetty-webapp + org.eclipse.jetty.websocket + websocket-core-server 10.0.20-SNAPSHOT @@ -404,12 +389,12 @@ org.eclipse.jetty.websocket - websocket-javax-server + websocket-javax-common 10.0.20-SNAPSHOT org.eclipse.jetty.websocket - websocket-javax-common + websocket-javax-server 10.0.20-SNAPSHOT @@ -437,29 +422,45 @@ websocket-servlet 10.0.20-SNAPSHOT - - org.eclipse.jetty.websocket - websocket-core-common - 10.0.20-SNAPSHOT - - - org.eclipse.jetty.websocket - websocket-core-client - 10.0.20-SNAPSHOT - - - org.eclipse.jetty.websocket - websocket-core-server - 10.0.20-SNAPSHOT - - - org.eclipse.jetty - jetty-xml - 10.0.20-SNAPSHOT - + + + + org.codehaus.mojo + flatten-maven-plugin + ${flatten.maven.plugin.version} + + ${project.build.directory} + flattened-pom.xml + bom + true + + remove + remove + + + + + flatten-clean + + clean + + clean + + + flatten + + flatten + + process-resources + + + + + + jdk17 diff --git a/jetty-cdi/pom.xml b/jetty-cdi/pom.xml index 4335af67fab..7648a3e2b51 100644 --- a/jetty-cdi/pom.xml +++ b/jetty-cdi/pom.xml @@ -1,18 +1,24 @@ + + 4.0.0 org.eclipse.jetty jetty-project 10.0.20-SNAPSHOT - 4.0.0 org.eclipse.jetty jetty-cdi - Jetty :: CDI jar + Jetty :: CDI ${project.groupId}.cdi + + org.eclipse.jetty + jetty-annotations + compile + org.eclipse.jetty jetty-util @@ -23,11 +29,6 @@ jetty-webapp compile - - org.eclipse.jetty - jetty-annotations - compile - org.slf4j slf4j-api @@ -35,19 +36,15 @@ - + org.apache.felix maven-bundle-plugin true - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.webapp.Configuration, - osgi.serviceloader; osgi.serviceloader=javax.servlet.ServletContainerInitializer - + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.webapp.Configuration, + osgi.serviceloader; osgi.serviceloader=javax.servlet.ServletContainerInitializer @@ -59,7 +56,7 @@ - + diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml index 3e9cf5ee933..d4b788b5d94 100644 --- a/jetty-client/pom.xml +++ b/jetty-client/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty jetty-project 10.0.20-SNAPSHOT - - 4.0.0 jetty-client Jetty :: Asynchronous HTTP Client @@ -14,29 +15,84 @@ org.eclipse.client.* + + + org.eclipse.jetty + jetty-alpn-client + + + org.eclipse.jetty + jetty-http + + + org.eclipse.jetty + jetty-io + + + org.eclipse.jetty + jetty-jmx + true + + + org.slf4j + slf4j-api + + + + net.minidev + json-smart + test + + + org.apache.kerby + kerb-simplekdc + test + + + org.awaitility + awaitility + test + + + org.eclipse.jetty + jetty-security + test + + + org.eclipse.jetty + jetty-server + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + + org.eclipse.jetty.toolchain + jetty-servlet-api + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} - --add-modules java.security.jgss - --add-modules org.eclipse.jetty.jmx - --add-reads org.eclipse.jetty.client=org.eclipse.jetty.logging - - - org.apache.maven.plugins maven-dependency-plugin unpack - generate-test-resources unpack + generate-test-resources @@ -58,10 +114,10 @@ maven-shade-plugin - package shade + package true hybrid @@ -90,72 +146,15 @@ + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} + --add-modules java.security.jgss + --add-modules org.eclipse.jetty.jmx + --add-reads org.eclipse.jetty.client=org.eclipse.jetty.logging + + - - - - org.eclipse.jetty - jetty-http - - - org.eclipse.jetty - jetty-io - - - org.eclipse.jetty - jetty-alpn-client - - - org.eclipse.jetty - jetty-jmx - true - - - - org.eclipse.jetty.toolchain - jetty-servlet-api - test - - - org.eclipse.jetty - jetty-server - test - - - org.eclipse.jetty - jetty-security - test - - - org.awaitility - awaitility - test - - - org.apache.kerby - kerb-simplekdc - test - - - - net.minidev - json-smart - test - - - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml index 65a6d23acfc..f685c2b87df 100644 --- a/jetty-deploy/pom.xml +++ b/jetty-deploy/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty jetty-project 10.0.20-SNAPSHOT - - 4.0.0 jetty-deploy Jetty :: Deployers Jetty deployers @@ -15,23 +16,12 @@ org.eclipse.deploy.* - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} - --add-modules org.eclipse.jetty.jmx - --add-reads org.eclipse.jetty.deploy=org.eclipse.jetty.http,jetty.servlet.api - --add-reads org.eclipse.jetty.deploy=org.eclipse.jetty.logging - - - - - - + + org.eclipse.jetty + jetty-jmx + true + org.eclipse.jetty jetty-webapp @@ -45,9 +35,9 @@ slf4j-api - org.eclipse.jetty - jetty-jmx - true + org.awaitility + awaitility + test org.eclipse.jetty @@ -59,10 +49,19 @@ jetty-test-helper test - - org.awaitility - awaitility - test - + + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} + --add-modules org.eclipse.jetty.jmx + --add-reads org.eclipse.jetty.deploy=org.eclipse.jetty.http,jetty.servlet.api + --add-reads org.eclipse.jetty.deploy=org.eclipse.jetty.logging + + + + diff --git a/jetty-fcgi/fcgi-client/pom.xml b/jetty-fcgi/fcgi-client/pom.xml index 9ef0eaf9255..e7dd62c07ae 100644 --- a/jetty-fcgi/fcgi-client/pom.xml +++ b/jetty-fcgi/fcgi-client/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.fcgi fcgi-parent 10.0.20-SNAPSHOT - - 4.0.0 fcgi-client Jetty :: FastCGI :: Client @@ -17,11 +17,7 @@ org.eclipse.jetty - jetty-util - - - org.eclipse.jetty - jetty-io + jetty-client org.eclipse.jetty @@ -29,7 +25,11 @@ org.eclipse.jetty - jetty-client + jetty-io + + + org.eclipse.jetty + jetty-util org.slf4j diff --git a/jetty-fcgi/fcgi-server/pom.xml b/jetty-fcgi/fcgi-server/pom.xml index 6c2cb7381d1..105c7ae926a 100644 --- a/jetty-fcgi/fcgi-server/pom.xml +++ b/jetty-fcgi/fcgi-server/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.fcgi fcgi-parent 10.0.20-SNAPSHOT - - 4.0.0 fcgi-server Jetty :: FastCGI :: Server @@ -14,34 +14,7 @@ ${project.groupId}.server - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} - --add-reads org.eclipse.jetty.fcgi.server=org.eclipse.jetty.logging - - - - - - - - org.slf4j - slf4j-api - - - org.eclipse.jetty.toolchain - jetty-servlet-api - true - - - org.eclipse.jetty.fcgi - fcgi-client - org.eclipse.jetty jetty-proxy @@ -50,21 +23,18 @@ org.eclipse.jetty jetty-server - - org.eclipse.jetty - jetty-slf4j-impl - test + org.eclipse.jetty.fcgi + fcgi-client - org.eclipse.jetty - jetty-servlet - test + org.eclipse.jetty.toolchain + jetty-servlet-api + true - org.eclipse.jetty.http2 - http2-server - test + org.slf4j + slf4j-api org.eclipse.jetty @@ -76,10 +46,38 @@ jetty-annotations test + + org.eclipse.jetty + jetty-servlet + test + + + + org.eclipse.jetty + jetty-slf4j-impl + test + org.eclipse.jetty jetty-unixdomain-server test + + org.eclipse.jetty.http2 + http2-server + test + + + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} + --add-reads org.eclipse.jetty.fcgi.server=org.eclipse.jetty.logging + + + + diff --git a/jetty-fcgi/pom.xml b/jetty-fcgi/pom.xml index cb068b4e235..b551c88747b 100644 --- a/jetty-fcgi/pom.xml +++ b/jetty-fcgi/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty jetty-project 10.0.20-SNAPSHOT - - 4.0.0 org.eclipse.jetty.fcgi fcgi-parent pom diff --git a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml index 857156f658d..60889607af3 100644 --- a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml +++ b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.gcloud gcloud-parent 10.0.20-SNAPSHOT - - 4.0.0 jetty-gcloud-session-manager Jetty :: GCloud :: Session Manager @@ -15,33 +15,33 @@ - - org.eclipse.jetty - jetty-server - - - org.slf4j - slf4j-api - com.google.cloud google-cloud-datastore ${gcloud.version} - javax.servlet - servlet-api + javax.annotation + javax.annotation-api javax.servlet javax.servlet-api - javax.annotation - javax.annotation-api + javax.servlet + servlet-api + + org.eclipse.jetty + jetty-server + + + org.slf4j + slf4j-api + @@ -52,22 +52,54 @@ true - - org.eclipse.jetty.gcloud.session.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - + org.eclipse.jetty.gcloud.session.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" + + org.apache.maven.plugins + maven-antrun-plugin + + + process-deps + + run + + process-resources + + + + + + + + + process-mod + + run + + process-resources + + + + + + + + + + + org.apache.maven.plugins maven-dependency-plugin build-deps-file - generate-resources list + generate-resources false ${project.build.directory}/deps.txt @@ -79,40 +111,6 @@ - - org.apache.maven.plugins - maven-antrun-plugin - - - process-deps - process-resources - - run - - - - - - - - - - process-mod - process-resources - - run - - - - - - - - - - - - diff --git a/jetty-gcloud/pom.xml b/jetty-gcloud/pom.xml index a34770c8f52..004df4699ad 100644 --- a/jetty-gcloud/pom.xml +++ b/jetty-gcloud/pom.xml @@ -1,23 +1,23 @@ - - jetty-project - org.eclipse.jetty - 10.0.20-SNAPSHOT - 4.0.0 + + org.eclipse.jetty + jetty-project + 10.0.20-SNAPSHOT + org.eclipse.jetty.gcloud gcloud-parent pom Jetty :: GCloud - - 2.17.6 - - jetty-gcloud-session-manager + + 2.17.6 + + diff --git a/jetty-hazelcast/pom.xml b/jetty-hazelcast/pom.xml index 635831fb6f6..482f4374ac4 100644 --- a/jetty-hazelcast/pom.xml +++ b/jetty-hazelcast/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty jetty-project 10.0.20-SNAPSHOT - - 4.0.0 jetty-hazelcast Jetty :: Hazelcast Session Manager @@ -28,6 +28,11 @@ org.slf4j slf4j-api + + org.eclipse.jetty + jetty-client + test + org.eclipse.jetty jetty-slf4j-impl @@ -38,11 +43,6 @@ jetty-webapp test - - org.eclipse.jetty - jetty-client - test - org.eclipse.jetty.toolchain jetty-test-helper diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml index 86cb7b10de3..f854d091891 100644 --- a/jetty-home/pom.xml +++ b/jetty-home/pom.xml @@ -1,653 +1,45 @@ + 4.0.0 - jetty-project org.eclipse.jetty + jetty-project 10.0.20-SNAPSHOT - 4.0.0 jetty-home - Jetty :: Home Assembly pom + Jetty :: Home Assembly ${basedir}/target/jetty-home - ${basedir}/target/jetty-home-sources 1.0.4 + ${basedir}/target/jetty-home-sources true - - - - org.apache.maven.plugins - maven-resources-plugin - - - copy-base-assembly-tree - generate-resources - - copy-resources - - - false - true - ${assembly-directory} - UTF-8 - false - - @ - - - - ${basedir}/src/main/resources - true - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy - generate-resources - - copy - - - - - org.eclipse.jetty - jetty-project - ${project.version} - version - txt - true - ${assembly-directory}/ - VERSION.txt - - - org.eclipse.jetty - jetty-start - ${project.version} - shaded - jar - true - ** - ${assembly-directory} - start.jar - - - - - - copy-setuid-deps - generate-resources - - copy - - - - - org.eclipse.jetty.toolchain.setuid - jetty-setuid-java - ${jetty-setuid-version} - jar - true - ${assembly-directory}/lib/setuid - - - org.eclipse.jetty.toolchain.setuid - libsetuid-linux - ${jetty-setuid-version} - so - true - ${assembly-directory}/lib/setuid - libsetuid-linux.so - - - org.eclipse.jetty.toolchain.setuid - libsetuid-osx - ${jetty-setuid-version} - so - true - ${assembly-directory}/lib/setuid - libsetuid-osx.so - - - - - - copy-lib-deps - generate-resources - - copy-dependencies - - - jakarta.transaction,org.eclipse.jetty - - org.eclipse.jetty.demo,org.eclipse.jetty.orbit,org.eclipse.jetty.http2,org.eclipse.jetty.http3,org.eclipse.jetty.quic,org.eclipse.jetty.websocket,org.eclipse.jetty.fcgi,org.eclipse.jetty.toolchain,org.apache.taglibs - - - apache-jsp,apache-jstl,jetty-start,jetty-slf4j-impl,javadoc - - jar - ${assembly-directory}/lib - - - - copy-lib-src-deps - generate-resources - - copy-dependencies - - - jakarta.transaction,org.eclipse.jetty - - org.eclipse.jetty.orbit,org.eclipse.jetty.http2,org.eclipse.jetty.http3,org.eclipse.jetty.quic,org.eclipse.jetty.websocket,org.eclipse.jetty.fcgi,org.eclipse.jetty.toolchain,org.apache.taglibs - - - apache-jsp,apache-jstl,jetty-start - - jar - sources - ${source-assembly-directory}/lib - - - - copy-lib-logging-deps - generate-resources - - copy-dependencies - - - org.eclipse.jetty,org.slf4j - jetty-slf4j-impl,slf4j-api - jar - ${assembly-directory}/lib/logging - - - - copy-lib-logging-src-deps - generate-resources - - copy-dependencies - - - org.eclipse.jetty,org.slf4j - jetty-slf4j-impl,slf4j-api - jar - sources - ${source-assembly-directory}/lib/logging - - - - copy-lib-websocket-deps - generate-resources - - copy-dependencies - - - org.eclipse.jetty.websocket - jar - ${assembly-directory}/lib/websocket - - - - copy-lib-websocket-src-deps - generate-resources - - copy-dependencies - - - org.eclipse.jetty.websocket - jar - sources - ${source-assembly-directory}/lib/websocket - - - - copy-lib-javax-websocket-deps - generate-resources - - copy-dependencies - - - org.eclipse.jetty.toolchain - jetty-javax-websocket-api - jar - ${assembly-directory}/lib/websocket - - - - copy-lib-javax-websocket-src-deps - generate-resources - - copy-dependencies - - - org.eclipse.jetty.toolchain - jetty-javax-websocket-api - jar - sources - ${source-assembly-directory}/lib/websocket - - - - copy-lib-http2-deps - generate-resources - - copy-dependencies - - - org.eclipse.jetty.http2 - http2-hpack,http2-common,http2-server - jar - ${assembly-directory}/lib/http2 - - - - copy-lib-http2-src-deps - generate-resources - - copy-dependencies - - - org.eclipse.jetty.http2 - http2-hpack,http2-common,http2-server - jar - sources - ${source-assembly-directory}/lib/http2 - - - - copy-lib-http3-deps - generate-resources - - copy-dependencies - - - org.eclipse.jetty.http3,org.eclipse.jetty.quic,org.eclipse.jetty.quiche - http3-server,http3-common,http3-qpack,quic-server,quic-common,quic-quiche-common,quic-quiche-jna,quic-quiche-foreign-incubator,jetty-quiche-native - jar - ${assembly-directory}/lib/http3 - - - - copy-lib-http3-src-deps - generate-resources - - copy-dependencies - - - org.eclipse.jetty.http3 - http3-server - jar - sources - ${source-assembly-directory}/lib/http3 - - - - copy-lib-fcgi-deps - generate-resources - - copy-dependencies - - - org.eclipse.jetty.fcgi - jar - ${assembly-directory}/lib/fcgi - - - - copy-lib-fcgi-src-deps - generate-resources - - copy-dependencies - - - org.eclipse.jetty.fcgi - jar - sources - ${source-assembly-directory}/lib/fcgi - - - - copy-servlet-api-deps - generate-resources - - copy - - - - - org.eclipse.jetty.toolchain - jetty-servlet-api - ${jetty.servlet.api.version} - true - ${assembly-directory}/lib - jetty-servlet-api-${jetty.servlet.api.version}.jar - - - - - - copy-servlet-src-deps - generate-resources - - copy-dependencies - - - org.eclipse.jetty.toolchain - jar - sources - ${source-assembly-directory}/lib/servlet-api - - - - copy-annotations-deps - generate-resources - - copy-dependencies - - - jakarta.annotation,org.eclipse.jetty.orbit,org.ow2.asm - jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis - jar - ${assembly-directory}/lib/annotations - - - - copy-annotations-src-deps - generate-resources - - copy-dependencies - - - jakarta.annotation,org.eclipse.jetty.orbit,org.ow2.asm - jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis - jar - sources - ${source-assembly-directory}/lib/annotations - - - - copy-apache-jsp-deps - generate-resources - - copy-dependencies - - - - org.eclipse.jetty,org.eclipse.jetty.toolchain,org.mortbay.jasper,org.eclipse.jdt - - apache-jsp,apache-el,ecj - jar - true - ${assembly-directory}/lib/apache-jsp - - - - copy-apache-jsp-src-deps - generate-resources - - copy-dependencies - - - - org.eclipse.jetty,org.eclipse.jetty.toolchain,org.mortbay.jasper,org.eclipse.jdt - - apache-jsp,apache-el,ecj - jar - sources - true - ${source-assembly-directory}/lib/apache-jsp - - - - copy-apache-jstl-deps - generate-resources - - copy-dependencies - - - org.glassfish.web - taglibs-standard-spec,taglibs-standard-impl - true - jar - ${assembly-directory}/lib/apache-jstl - - - - copy-apache-jstl-src-deps - generate-resources - - copy-dependencies - - - org.glassfish.web - taglibs-standard-spec,taglibs-standard-impl - true - jar - sources - ${source-assembly-directory}/lib/apache-jstl - - - - copy-jaspi-deps - generate-resources - - copy-dependencies - - - jakarta.security.auth.message - jakarta.security.auth.message-api - jar - ${assembly-directory}/lib/jaspi - - - - copy-jaspi-src-deps - generate-resources - - copy-dependencies - - - jakarta.security.auth.message - jakarta.security.auth.message-api - jar - sources - ${source-assembly-directory}/lib/jaspi - - - - unpack-config-deps - generate-resources - - unpack-dependencies - - - - org.eclipse.jetty, org.eclipse.jetty.websocket, org.eclipse.jetty.demos - - infinispan-embedded,infinispan-remote,jetty-test-helper,alpn-api,jakarta.security.auth.message-api,javax.activation - config - false - META-INF/**,webapps/**,start.d/**,start.ini - ${assembly-directory} - - - - unpack-infinispan-config - generate-resources - - unpack - - - - - org.eclipse.jetty - infinispan-embedded - ${project.version} - config - jar - - - org.eclipse.jetty - infinispan-remote - ${project.version} - config - jar - - - META-INF/** - ${assembly-directory} - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - set jetty.sh - process-resources - - run - - - - - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - - posix - false - - - - binary - package - - single - - - 0 - 0 - - src/main/assembly/jetty-assembly.xml - - - - - sources - package - - single - - - - src/main/assembly/jetty-source-assembly.xml - - true - - - - - - - - - org.eclipse.jetty.orbit - javax.mail.glassfish - - - jakarta.security.auth.message - jakarta.security.auth.message-api + ch.qos.logback + logback-core + true jakarta.annotation jakarta.annotation-api + + jakarta.security.auth.message + jakarta.security.auth.message-api + jakarta.transaction jakarta.transaction-api - - org.ow2.asm - asm - - - org.ow2.asm - asm-commons - - - org.ow2.asm - asm-tree - - - org.ow2.asm - asm-analysis - - - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty - jetty-deploy - - - org.eclipse.jetty - jetty-jmx - - - org.eclipse.jetty - jetty-quickstart - - - org.eclipse.jetty - jetty-start - shaded - ${project.version} - - - org.eclipse.jetty - jetty-servlets - - - org.eclipse.jetty.websocket - websocket-servlet - - - org.eclipse.jetty.websocket - websocket-jetty-server - - - org.eclipse.jetty.websocket - websocket-jetty-client - - - org.eclipse.jetty.websocket - websocket-javax-server + org.apache.logging.log4j + log4j-api + true org.eclipse.jetty @@ -663,86 +55,6 @@ - - org.eclipse.jetty - jetty-plus - - - org.eclipse.jetty - jetty-client - - - org.eclipse.jetty - jetty-proxy - - - org.eclipse.jetty - jetty-unixdomain-server - true - - - org.eclipse.jetty - jetty-unixsocket-server - true - - - org.eclipse.jetty.fcgi - fcgi-server - true - - - org.jboss.logging - jboss-logging - true - - - org.eclipse.jetty - jetty-cdi - true - - - org.eclipse.jetty - jetty-jaas - true - - - org.eclipse.jetty - jetty-annotations - - - org.eclipse.jetty - jetty-rewrite - - - org.eclipse.jetty.http2 - http2-server - - - org.eclipse.jetty.http3 - http3-server - - - org.eclipse.jetty - jetty-alpn-server - - - org.eclipse.jetty - jetty-alpn-java-server - - - org.eclipse.jetty - jetty-openid - true - - - org.eclipse.jetty - jetty-alpn-conscrypt-server - - - org.eclipse.jetty - jetty-jaspi - true - org.eclipse.jetty infinispan-embedded @@ -772,19 +84,57 @@ org.eclipse.jetty infinispan-remote-query + + org.eclipse.jetty + jetty-alpn-conscrypt-server + + + org.eclipse.jetty + jetty-alpn-java-server + + + org.eclipse.jetty + jetty-alpn-server + + + org.eclipse.jetty + jetty-annotations + + + org.eclipse.jetty + jetty-cdi + true + + + org.eclipse.jetty + jetty-client + + + org.eclipse.jetty + jetty-deploy + org.eclipse.jetty jetty-hazelcast true - org.eclipse.jetty.gcloud - jetty-gcloud-session-manager + org.eclipse.jetty + jetty-jaas true - org.eclipse.jetty.memcached - jetty-memcached-sessions + org.eclipse.jetty + jetty-jaspi + true + + + org.eclipse.jetty + jetty-jmx + + + org.eclipse.jetty + jetty-keystore true @@ -794,13 +144,56 @@ org.eclipse.jetty - jetty-keystore + jetty-openid + true + + + org.eclipse.jetty + jetty-plus + + + org.eclipse.jetty + jetty-proxy + + + org.eclipse.jetty + jetty-quickstart + + + org.eclipse.jetty + jetty-rewrite + + + org.eclipse.jetty + jetty-servlets + + + org.eclipse.jetty + jetty-start + ${project.version} + shaded + + + org.eclipse.jetty + jetty-unixdomain-server + true + + + org.eclipse.jetty + jetty-unixsocket-server true - org.eclipse.jetty.demos - demo-mock-resources + demo-async-rest-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.demos + demo-jaas-webapp ${project.version} config jar @@ -820,14 +213,6 @@ - - org.eclipse.jetty.demos - demo-jaas-webapp - ${project.version} - config - jar - true - org.eclipse.jetty.demos demo-jndi-webapp @@ -838,15 +223,16 @@ org.eclipse.jetty.demos - demo-spec-webapp + demo-jsp-webapp ${project.version} config jar true + org.eclipse.jetty.demos - demo-async-rest-webapp + demo-mock-resources ${project.version} config jar @@ -870,22 +256,622 @@ org.eclipse.jetty.demos - demo-jsp-webapp + demo-spec-webapp ${project.version} config jar true - org.apache.logging.log4j - log4j-api + org.eclipse.jetty.fcgi + fcgi-server true - ch.qos.logback - logback-core + org.eclipse.jetty.gcloud + jetty-gcloud-session-manager true + + org.eclipse.jetty.http2 + http2-server + + + org.eclipse.jetty.http3 + http3-server + + + org.eclipse.jetty.memcached + jetty-memcached-sessions + true + + + + org.eclipse.jetty.orbit + javax.mail.glassfish + + + org.eclipse.jetty.websocket + websocket-javax-server + + + org.eclipse.jetty.websocket + websocket-jetty-client + + + org.eclipse.jetty.websocket + websocket-jetty-server + + + org.eclipse.jetty.websocket + websocket-servlet + + + org.jboss.logging + jboss-logging + true + + + + org.ow2.asm + asm + + + org.ow2.asm + asm-analysis + + + org.ow2.asm + asm-commons + + + org.ow2.asm + asm-tree + + + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + set jetty.sh + + run + + process-resources + + + + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + posix + false + + + + binary + + single + + package + + 0 + 0 + + src/main/assembly/jetty-assembly.xml + + + + + sources + + single + + package + + + src/main/assembly/jetty-source-assembly.xml + + true + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy + + copy + + generate-resources + + + + org.eclipse.jetty + jetty-project + ${project.version} + version + txt + true + ${assembly-directory}/ + VERSION.txt + + + org.eclipse.jetty + jetty-start + ${project.version} + shaded + jar + true + ** + ${assembly-directory} + start.jar + + + + + + copy-annotations-deps + + copy-dependencies + + generate-resources + + jakarta.annotation,org.eclipse.jetty.orbit,org.ow2.asm + jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis + jar + ${assembly-directory}/lib/annotations + + + + copy-annotations-src-deps + + copy-dependencies + + generate-resources + + jakarta.annotation,org.eclipse.jetty.orbit,org.ow2.asm + jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis + jar + sources + ${source-assembly-directory}/lib/annotations + + + + copy-apache-jsp-deps + + copy-dependencies + + generate-resources + + org.eclipse.jetty,org.eclipse.jetty.toolchain,org.mortbay.jasper,org.eclipse.jdt + apache-jsp,apache-el,ecj + jar + true + ${assembly-directory}/lib/apache-jsp + + + + copy-apache-jsp-src-deps + + copy-dependencies + + generate-resources + + org.eclipse.jetty,org.eclipse.jetty.toolchain,org.mortbay.jasper,org.eclipse.jdt + apache-jsp,apache-el,ecj + jar + sources + true + ${source-assembly-directory}/lib/apache-jsp + + + + copy-apache-jstl-deps + + copy-dependencies + + generate-resources + + org.glassfish.web + taglibs-standard-spec,taglibs-standard-impl + true + jar + ${assembly-directory}/lib/apache-jstl + + + + copy-apache-jstl-src-deps + + copy-dependencies + + generate-resources + + org.glassfish.web + taglibs-standard-spec,taglibs-standard-impl + true + jar + sources + ${source-assembly-directory}/lib/apache-jstl + + + + copy-jaspi-deps + + copy-dependencies + + generate-resources + + jakarta.security.auth.message + jakarta.security.auth.message-api + jar + ${assembly-directory}/lib/jaspi + + + + copy-jaspi-src-deps + + copy-dependencies + + generate-resources + + jakarta.security.auth.message + jakarta.security.auth.message-api + jar + sources + ${source-assembly-directory}/lib/jaspi + + + + copy-lib-deps + + copy-dependencies + + generate-resources + + jakarta.transaction,org.eclipse.jetty + org.eclipse.jetty.demo,org.eclipse.jetty.orbit,org.eclipse.jetty.http2,org.eclipse.jetty.http3,org.eclipse.jetty.quic,org.eclipse.jetty.websocket,org.eclipse.jetty.fcgi,org.eclipse.jetty.toolchain,org.apache.taglibs + apache-jsp,apache-jstl,jetty-start,jetty-slf4j-impl,javadoc + jar + ${assembly-directory}/lib + + + + copy-lib-fcgi-deps + + copy-dependencies + + generate-resources + + org.eclipse.jetty.fcgi + jar + ${assembly-directory}/lib/fcgi + + + + copy-lib-fcgi-src-deps + + copy-dependencies + + generate-resources + + org.eclipse.jetty.fcgi + jar + sources + ${source-assembly-directory}/lib/fcgi + + + + copy-lib-http2-deps + + copy-dependencies + + generate-resources + + org.eclipse.jetty.http2 + http2-hpack,http2-common,http2-server + jar + ${assembly-directory}/lib/http2 + + + + copy-lib-http2-src-deps + + copy-dependencies + + generate-resources + + org.eclipse.jetty.http2 + http2-hpack,http2-common,http2-server + jar + sources + ${source-assembly-directory}/lib/http2 + + + + copy-lib-http3-deps + + copy-dependencies + + generate-resources + + org.eclipse.jetty.http3,org.eclipse.jetty.quic,org.eclipse.jetty.quiche + http3-server,http3-common,http3-qpack,quic-server,quic-common,quic-quiche-common,quic-quiche-jna,quic-quiche-foreign-incubator,jetty-quiche-native + jar + ${assembly-directory}/lib/http3 + + + + copy-lib-http3-src-deps + + copy-dependencies + + generate-resources + + org.eclipse.jetty.http3 + http3-server + jar + sources + ${source-assembly-directory}/lib/http3 + + + + copy-lib-javax-websocket-deps + + copy-dependencies + + generate-resources + + org.eclipse.jetty.toolchain + jetty-javax-websocket-api + jar + ${assembly-directory}/lib/websocket + + + + copy-lib-javax-websocket-src-deps + + copy-dependencies + + generate-resources + + org.eclipse.jetty.toolchain + jetty-javax-websocket-api + jar + sources + ${source-assembly-directory}/lib/websocket + + + + copy-lib-logging-deps + + copy-dependencies + + generate-resources + + org.eclipse.jetty,org.slf4j + jetty-slf4j-impl,slf4j-api + jar + ${assembly-directory}/lib/logging + + + + copy-lib-logging-src-deps + + copy-dependencies + + generate-resources + + org.eclipse.jetty,org.slf4j + jetty-slf4j-impl,slf4j-api + jar + sources + ${source-assembly-directory}/lib/logging + + + + copy-lib-src-deps + + copy-dependencies + + generate-resources + + jakarta.transaction,org.eclipse.jetty + org.eclipse.jetty.orbit,org.eclipse.jetty.http2,org.eclipse.jetty.http3,org.eclipse.jetty.quic,org.eclipse.jetty.websocket,org.eclipse.jetty.fcgi,org.eclipse.jetty.toolchain,org.apache.taglibs + apache-jsp,apache-jstl,jetty-start + jar + sources + ${source-assembly-directory}/lib + + + + copy-lib-websocket-deps + + copy-dependencies + + generate-resources + + org.eclipse.jetty.websocket + jar + ${assembly-directory}/lib/websocket + + + + copy-lib-websocket-src-deps + + copy-dependencies + + generate-resources + + org.eclipse.jetty.websocket + jar + sources + ${source-assembly-directory}/lib/websocket + + + + copy-servlet-api-deps + + copy + + generate-resources + + + + org.eclipse.jetty.toolchain + jetty-servlet-api + ${jetty.servlet.api.version} + true + ${assembly-directory}/lib + jetty-servlet-api-${jetty.servlet.api.version}.jar + + + + + + copy-servlet-src-deps + + copy-dependencies + + generate-resources + + org.eclipse.jetty.toolchain + jar + sources + ${source-assembly-directory}/lib/servlet-api + + + + copy-setuid-deps + + copy + + generate-resources + + + + org.eclipse.jetty.toolchain.setuid + jetty-setuid-java + ${jetty-setuid-version} + jar + true + ${assembly-directory}/lib/setuid + + + org.eclipse.jetty.toolchain.setuid + libsetuid-linux + ${jetty-setuid-version} + so + true + ${assembly-directory}/lib/setuid + libsetuid-linux.so + + + org.eclipse.jetty.toolchain.setuid + libsetuid-osx + ${jetty-setuid-version} + so + true + ${assembly-directory}/lib/setuid + libsetuid-osx.so + + + + + + unpack-config-deps + + unpack-dependencies + + generate-resources + + org.eclipse.jetty, org.eclipse.jetty.websocket, org.eclipse.jetty.demos + infinispan-embedded,infinispan-remote,jetty-test-helper,alpn-api,jakarta.security.auth.message-api,javax.activation + config + false + META-INF/**,webapps/**,start.d/**,start.ini + ${assembly-directory} + + + + unpack-infinispan-config + + unpack + + generate-resources + + + + org.eclipse.jetty + infinispan-embedded + ${project.version} + config + jar + + + org.eclipse.jetty + infinispan-remote + ${project.version} + config + jar + + + META-INF/** + ${assembly-directory} + + + + + + org.apache.maven.plugins + maven-resources-plugin + + + copy-base-assembly-tree + + copy-resources + + generate-resources + + false + true + ${assembly-directory} + UTF-8 + false + + @ + + + + ${basedir}/src/main/resources + true + + + + + + + + + diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml index 0f0f19504de..cf24a9e5e02 100644 --- a/jetty-http-spi/pom.xml +++ b/jetty-http-spi/pom.xml @@ -1,28 +1,19 @@ + + 4.0.0 org.eclipse.jetty jetty-project 10.0.20-SNAPSHOT - 4.0.0 jetty-http-spi Jetty :: Http Service Provider Interface ${project.groupId}.http.spi - org.eclipse.jetty.http.spi.* true + org.eclipse.jetty.http.spi.* - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - org.eclipse.jetty - jetty-client - test - org.eclipse.jetty jetty-server @@ -33,21 +24,6 @@ slf4j-api provided - - org.slf4j - jul-to-slf4j - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - jakarta.xml.ws - jakarta.xml.ws-api - test - com.sun.xml.ws jaxws-rt @@ -58,16 +34,34 @@ jakarta.activation-api test + + jakarta.xml.ws + jakarta.xml.ws-api + test + + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + org.slf4j + jul-to-slf4j + test + - - org.apache.maven.plugins - maven-surefire-plugin - - false - - org.apache.felix maven-bundle-plugin @@ -81,6 +75,13 @@ + + org.apache.maven.plugins + maven-surefire-plugin + + false + + diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index 3e79f39a2f3..43a5d3c1e86 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -1,12 +1,12 @@ - - jetty-project - org.eclipse.jetty - 10.0.20-SNAPSHOT - 4.0.0 + + org.eclipse.jetty + jetty-project + 10.0.20-SNAPSHOT + jetty-http Jetty :: Http Utility @@ -18,11 +18,11 @@ org.eclipse.jetty - jetty-util + jetty-io org.eclipse.jetty - jetty-io + jetty-util org.slf4j @@ -49,10 +49,8 @@ true - osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.http.HttpFieldPreEncoder)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.http.HttpFieldPreEncoder - + osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.http.HttpFieldPreEncoder)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.http.HttpFieldPreEncoder @@ -61,10 +59,10 @@ maven-shade-plugin - package shade + package ${jmhjar.name} true @@ -102,9 +100,7 @@ org.apache.maven.plugins maven-surefire-plugin - - @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.http=org.eclipse.jetty.logging - + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.http=org.eclipse.jetty.logging diff --git a/jetty-http2/http2-client/pom.xml b/jetty-http2/http2-client/pom.xml index f935ca05075..adc33146ba2 100644 --- a/jetty-http2/http2-client/pom.xml +++ b/jetty-http2/http2-client/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.http2 http2-parent 10.0.20-SNAPSHOT - - 4.0.0 http2-client Jetty :: HTTP2 :: Client @@ -14,43 +14,27 @@ ${project.groupId}.client - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} - --add-reads org.eclipse.jetty.http2.client=org.eclipse.jetty.http2.hpack - --add-reads org.eclipse.jetty.http2.client=org.eclipse.jetty.logging - - - - - - - - org.eclipse.jetty.http2 - http2-common - org.eclipse.jetty jetty-alpn-client + + org.eclipse.jetty.http2 + http2-common + org.slf4j slf4j-api - - org.eclipse.jetty - jetty-slf4j-impl + org.awaitility + awaitility test - org.eclipse.jetty.toolchain - jetty-test-helper + org.eclipse.jetty + jetty-proxy test @@ -68,9 +52,10 @@ jetty-servlets test + org.eclipse.jetty - jetty-proxy + jetty-slf4j-impl test @@ -79,10 +64,23 @@ test - org.awaitility - awaitility + org.eclipse.jetty.toolchain + jetty-test-helper test + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} + --add-reads org.eclipse.jetty.http2.client=org.eclipse.jetty.http2.hpack + --add-reads org.eclipse.jetty.http2.client=org.eclipse.jetty.logging + + + + + diff --git a/jetty-http2/http2-common/pom.xml b/jetty-http2/http2-common/pom.xml index 1e219598d37..0bd6b1cbf13 100644 --- a/jetty-http2/http2-common/pom.xml +++ b/jetty-http2/http2-common/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.http2 http2-parent 10.0.20-SNAPSHOT - - 4.0.0 http2-common Jetty :: HTTP2 :: Common @@ -15,6 +15,12 @@ + + + org.eclipse.jetty + jetty-jmx + true + org.eclipse.jetty.http2 http2-hpack @@ -23,12 +29,6 @@ org.slf4j slf4j-api - - - org.eclipse.jetty - jetty-jmx - true - org.eclipse.jetty jetty-slf4j-impl diff --git a/jetty-http2/http2-hpack/pom.xml b/jetty-http2/http2-hpack/pom.xml index 3befe1d4410..2902982d426 100644 --- a/jetty-http2/http2-hpack/pom.xml +++ b/jetty-http2/http2-hpack/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.http2 http2-parent 10.0.20-SNAPSHOT - - 4.0.0 http2-hpack Jetty :: HTTP2 :: HPACK @@ -14,6 +14,46 @@ ${project.groupId}.hpack + + + org.eclipse.jetty + jetty-http + + + org.eclipse.jetty + jetty-io + + + org.eclipse.jetty + jetty-util + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty + jetty-util-ajax + test + + + + org.eclipse.jetty.tests + jetty-http-tools + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + @@ -32,44 +72,4 @@ - - - org.eclipse.jetty - jetty-util - - - org.eclipse.jetty - jetty-http - - - org.eclipse.jetty - jetty-io - - - org.slf4j - slf4j-api - - - - org.eclipse.jetty.tests - jetty-http-tools - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - org.eclipse.jetty - jetty-util-ajax - test - - - diff --git a/jetty-http2/http2-http-client-transport/pom.xml b/jetty-http2/http2-http-client-transport/pom.xml index e8a1283e40a..f8554320df7 100644 --- a/jetty-http2/http2-http-client-transport/pom.xml +++ b/jetty-http2/http2-http-client-transport/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.http2 http2-parent 10.0.20-SNAPSHOT - - 4.0.0 http2-http-client-transport Jetty :: HTTP2 :: HTTP Client Transport @@ -15,6 +15,10 @@ + + org.eclipse.jetty + jetty-alpn-java-client + org.eclipse.jetty jetty-client @@ -23,14 +27,15 @@ org.eclipse.jetty.http2 http2-client - - org.eclipse.jetty - jetty-alpn-java-client - org.slf4j slf4j-api + + org.awaitility + awaitility + test + org.eclipse.jetty @@ -39,17 +44,12 @@ org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.toolchain - jetty-test-helper + jetty-server test org.eclipse.jetty - jetty-server + jetty-slf4j-impl test @@ -58,8 +58,8 @@ test - org.awaitility - awaitility + org.eclipse.jetty.toolchain + jetty-test-helper test diff --git a/jetty-http2/http2-server/pom.xml b/jetty-http2/http2-server/pom.xml index 7e3f86dc0fb..85f44222cd3 100644 --- a/jetty-http2/http2-server/pom.xml +++ b/jetty-http2/http2-server/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.http2 http2-parent 10.0.20-SNAPSHOT - - 4.0.0 http2-server Jetty :: HTTP2 :: Server @@ -15,17 +15,55 @@ 28888 + + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty.http2 + http2-common + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-alpn-server + test + + + org.eclipse.jetty + jetty-servlet + test + + + org.eclipse.jetty + jetty-servlets + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + maven-surefire-plugin - - @{argLine} ${jetty.surefire.argLine} + @{argLine} ${jetty.surefire.argLine} --add-modules jetty.servlet.api --add-reads org.eclipse.jetty.http2.server=jetty.servlet.api - --add-reads org.eclipse.jetty.http2.server=org.eclipse.jetty.logging - + --add-reads org.eclipse.jetty.http2.server=org.eclipse.jetty.logging @@ -45,56 +83,16 @@ h2spec - test h2spec + test - - - org.eclipse.jetty.http2 - http2-common - - - org.eclipse.jetty - jetty-server - - - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-servlet - test - - - org.eclipse.jetty - jetty-servlets - test - - - org.eclipse.jetty - jetty-alpn-server - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - run-spec-server @@ -106,6 +104,9 @@ spec-server-run + + java + test org.eclipse.jetty.http2.server.H2SpecServer @@ -114,9 +115,6 @@ ${manual.test.port} - - java - diff --git a/jetty-http2/pom.xml b/jetty-http2/pom.xml index 863276cdc3c..8d068549a16 100644 --- a/jetty-http2/pom.xml +++ b/jetty-http2/pom.xml @@ -1,12 +1,12 @@ - - jetty-project - org.eclipse.jetty - 10.0.20-SNAPSHOT - 4.0.0 + + org.eclipse.jetty + jetty-project + 10.0.20-SNAPSHOT + org.eclipse.jetty.http2 http2-parent pom diff --git a/jetty-http3/http3-client/pom.xml b/jetty-http3/http3-client/pom.xml index cabf282ed4d..ca45e70cf16 100644 --- a/jetty-http3/http3-client/pom.xml +++ b/jetty-http3/http3-client/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.http3 http3-parent 10.0.20-SNAPSHOT - - 4.0.0 http3-client Jetty :: HTTP3 :: Client @@ -15,14 +15,6 @@ - - org.eclipse.jetty.http3 - http3-common - - - org.eclipse.jetty.quic - quic-client - org.eclipse.jetty jetty-io @@ -31,6 +23,14 @@ org.eclipse.jetty jetty-util + + org.eclipse.jetty.http3 + http3-common + + + org.eclipse.jetty.quic + quic-client + diff --git a/jetty-http3/http3-common/pom.xml b/jetty-http3/http3-common/pom.xml index 4a2f6baaadf..1457a170660 100644 --- a/jetty-http3/http3-common/pom.xml +++ b/jetty-http3/http3-common/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.http3 http3-parent 10.0.20-SNAPSHOT - - 4.0.0 http3-common Jetty :: HTTP3 :: Common @@ -16,8 +16,12 @@ - org.slf4j - slf4j-api + org.eclipse.jetty + jetty-io + + + org.eclipse.jetty + jetty-util org.eclipse.jetty.http3 @@ -28,12 +32,8 @@ quic-common - org.eclipse.jetty - jetty-io - - - org.eclipse.jetty - jetty-util + org.slf4j + slf4j-api org.eclipse.jetty diff --git a/jetty-http3/http3-http-client-transport/pom.xml b/jetty-http3/http3-http-client-transport/pom.xml index b547ffb1ba9..5bf1d1058ed 100644 --- a/jetty-http3/http3-http-client-transport/pom.xml +++ b/jetty-http3/http3-http-client-transport/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.http3 http3-parent 10.0.20-SNAPSHOT - - 4.0.0 http3-http-client-transport Jetty :: HTTP3 :: HTTP Client Transport @@ -15,14 +15,14 @@ - - org.eclipse.jetty.http3 - http3-client - org.eclipse.jetty jetty-client + + org.eclipse.jetty.http3 + http3-client + org.eclipse.jetty.http3 diff --git a/jetty-http3/http3-qpack/pom.xml b/jetty-http3/http3-qpack/pom.xml index 19a40e56c9f..915402d2231 100644 --- a/jetty-http3/http3-qpack/pom.xml +++ b/jetty-http3/http3-qpack/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.http3 http3-parent 10.0.20-SNAPSHOT - - 4.0.0 http3-qpack Jetty :: HTTP3 :: QPACK @@ -14,6 +14,46 @@ ${project.groupId}.qpack + + + org.eclipse.jetty + jetty-http + + + org.eclipse.jetty + jetty-io + + + org.eclipse.jetty + jetty-util + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty + jetty-util-ajax + test + + + + org.eclipse.jetty.tests + jetty-http-tools + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + @@ -32,44 +72,4 @@ - - - org.eclipse.jetty - jetty-util - - - org.eclipse.jetty - jetty-http - - - org.eclipse.jetty - jetty-io - - - org.slf4j - slf4j-api - - - - org.eclipse.jetty.tests - jetty-http-tools - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - org.eclipse.jetty - jetty-util-ajax - test - - - diff --git a/jetty-http3/http3-server/pom.xml b/jetty-http3/http3-server/pom.xml index 1aa1e55e154..a164ddae308 100644 --- a/jetty-http3/http3-server/pom.xml +++ b/jetty-http3/http3-server/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.http3 http3-parent 10.0.20-SNAPSHOT - - 4.0.0 http3-server Jetty :: HTTP3 :: Server diff --git a/jetty-http3/http3-tests/pom.xml b/jetty-http3/http3-tests/pom.xml index e4777ba4f15..57887d9303e 100644 --- a/jetty-http3/http3-tests/pom.xml +++ b/jetty-http3/http3-tests/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.http3 http3-parent 10.0.20-SNAPSHOT - - 4.0.0 http3-tests Jetty :: HTTP3 :: Tests @@ -16,6 +16,31 @@ + + org.awaitility + awaitility + test + + + org.eclipse.jetty + jetty-alpn-java-server + test + + + org.eclipse.jetty + jetty-jmx + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.http2 + http2-server + test + org.eclipse.jetty.http3 http3-client @@ -36,31 +61,6 @@ quic-server test - - org.eclipse.jetty - jetty-alpn-java-server - test - - - org.eclipse.jetty - jetty-jmx - test - - - org.eclipse.jetty.http2 - http2-server - test - - - org.awaitility - awaitility - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - diff --git a/jetty-http3/pom.xml b/jetty-http3/pom.xml index 3b0c89ed918..0591f455320 100644 --- a/jetty-http3/pom.xml +++ b/jetty-http3/pom.xml @@ -1,12 +1,12 @@ - - jetty-project - org.eclipse.jetty - 10.0.20-SNAPSHOT - 4.0.0 + + org.eclipse.jetty + jetty-project + 10.0.20-SNAPSHOT + org.eclipse.jetty.http3 http3-parent pom diff --git a/jetty-infinispan/infinispan-common/pom.xml b/jetty-infinispan/infinispan-common/pom.xml index 5e32bdc5f63..71d7bd3f826 100644 --- a/jetty-infinispan/infinispan-common/pom.xml +++ b/jetty-infinispan/infinispan-common/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty infinispan-parent 10.0.20-SNAPSHOT - 4.0.0 infinispan-common Jetty :: Infinispan Session Manager Common @@ -12,6 +13,10 @@ + + org.eclipse.jetty + jetty-server + org.infinispan infinispan-core @@ -23,25 +28,10 @@ - - org.infinispan.protostream - protostream - true - provided - - - org.eclipse.jetty - jetty-server - org.slf4j slf4j-api - - org.eclipse.jetty - jetty-slf4j-impl - test - org.infinispan infinispan-client-hotrod @@ -52,5 +42,16 @@ infinispan-remote-query-client provided + + org.infinispan.protostream + protostream + provided + true + + + org.eclipse.jetty + jetty-slf4j-impl + test + diff --git a/jetty-infinispan/infinispan-embedded-query/pom.xml b/jetty-infinispan/infinispan-embedded-query/pom.xml index b956d89d256..92e4c710874 100644 --- a/jetty-infinispan/infinispan-embedded-query/pom.xml +++ b/jetty-infinispan/infinispan-embedded-query/pom.xml @@ -1,28 +1,93 @@ + + 4.0.0 org.eclipse.jetty infinispan-parent 10.0.20-SNAPSHOT - 4.0.0 infinispan-embedded-query Jetty :: Infinispan Session Manager Embedded with Querying ${project.groupId}.infinispan.embedded.query + + + org.eclipse.jetty + infinispan-common + + + org.infinispan + infinispan-commons + + + org.infinispan + infinispan-core + + + + + org.infinispan + infinispan-query + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + install + + org.apache.maven.plugins + maven-antrun-plugin + + + process-deps + + run + + process-resources + + + + + + + + + process-mod + + run + + process-resources + + + + + + + + + + + org.apache.maven.plugins maven-dependency-plugin build-deps-file - generate-resources list + generate-resources false ${project.build.directory}/deps.txt @@ -34,70 +99,6 @@ - - org.apache.maven.plugins - maven-antrun-plugin - - - process-deps - process-resources - - run - - - - - - - - - - process-mod - process-resources - - run - - - - - - - - - - - - - - - org.eclipse.jetty - infinispan-common - - - org.infinispan - infinispan-core - - - org.infinispan - infinispan-commons - - - - - org.infinispan - infinispan-query - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - - diff --git a/jetty-infinispan/infinispan-embedded/pom.xml b/jetty-infinispan/infinispan-embedded/pom.xml index ae9dfa5cd12..d6742e32856 100644 --- a/jetty-infinispan/infinispan-embedded/pom.xml +++ b/jetty-infinispan/infinispan-embedded/pom.xml @@ -1,77 +1,17 @@ + + 4.0.0 org.eclipse.jetty infinispan-parent 10.0.20-SNAPSHOT - 4.0.0 infinispan-embedded pom Jetty :: Infinispan Session Manager Embedded ${project.groupId}.infinispan.embedded - - install - - - org.apache.maven.plugins - maven-dependency-plugin - - - build-deps-file - generate-resources - - list - - - false - ${project.build.directory}/deps.txt - true - org.eclipse.jetty,javax.servlet,org.slf4j - true - runtime - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - process-deps - process-resources - - run - - - - - - - - - - process-mod - process-resources - - run - - - - - - - - - - - - - - - org.eclipse.jetty @@ -88,4 +28,65 @@ + + install + + + org.apache.maven.plugins + maven-antrun-plugin + + + process-deps + + run + + process-resources + + + + + + + + + process-mod + + run + + process-resources + + + + + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + build-deps-file + + list + + generate-resources + + false + ${project.build.directory}/deps.txt + true + org.eclipse.jetty,javax.servlet,org.slf4j + true + runtime + + + + + + + diff --git a/jetty-infinispan/infinispan-remote-query/pom.xml b/jetty-infinispan/infinispan-remote-query/pom.xml index 5e89093985b..a2a7c5ef357 100644 --- a/jetty-infinispan/infinispan-remote-query/pom.xml +++ b/jetty-infinispan/infinispan-remote-query/pom.xml @@ -1,28 +1,111 @@ + + 4.0.0 org.eclipse.jetty infinispan-parent 10.0.20-SNAPSHOT - 4.0.0 infinispan-remote-query Jetty :: Infinispan Session Manager Remote with Querying ${project.groupId}.infinispan.remote.query 11.0.9.Final + + + com.google.code.gson + gson + + + org.eclipse.jetty + infinispan-common + + + org.infinispan + infinispan-commons + + + org.infinispan + infinispan-core + + + + + org.infinispan + infinispan-client-hotrod + + + org.infinispan + infinispan-query + + + org.infinispan + infinispan-remote-query-client + + + org.slf4j + slf4j-simple + test + + + org.testcontainers + junit-jupiter + test + + + org.testcontainers + testcontainers + test + + + + org.apache.maven.plugins + maven-antrun-plugin + + + process-deps + + run + + process-resources + + + + + + + + + + process-mod + + run + + process-resources + + + + + + + + + + + org.apache.maven.plugins maven-dependency-plugin build-deps-file - generate-resources list + generate-resources false ${project.build.directory}/deps.txt @@ -34,41 +117,6 @@ - - org.apache.maven.plugins - maven-antrun-plugin - - - process-deps - process-resources - - run - - - - - - - - - - - process-mod - process-resources - - run - - - - - - - - - - - - org.apache.maven.plugins maven-surefire-plugin @@ -80,51 +128,4 @@ - - - org.eclipse.jetty - infinispan-common - - - org.infinispan - infinispan-core - - - org.infinispan - infinispan-commons - - - - - org.infinispan - infinispan-query - - - org.infinispan - infinispan-client-hotrod - - - org.infinispan - infinispan-remote-query-client - - - com.google.code.gson - gson - - - org.slf4j - slf4j-simple - test - - - org.testcontainers - testcontainers - test - - - org.testcontainers - junit-jupiter - test - - diff --git a/jetty-infinispan/infinispan-remote/pom.xml b/jetty-infinispan/infinispan-remote/pom.xml index f5deb4d1708..4608e425b93 100644 --- a/jetty-infinispan/infinispan-remote/pom.xml +++ b/jetty-infinispan/infinispan-remote/pom.xml @@ -1,77 +1,17 @@ + + 4.0.0 org.eclipse.jetty infinispan-parent 10.0.20-SNAPSHOT - 4.0.0 infinispan-remote pom Jetty :: Infinispan Session Manager Remote ${project.groupId}.infinispan.remote - - install - - - org.apache.maven.plugins - maven-dependency-plugin - - - build-deps-file - generate-resources - - list - - - false - ${project.build.directory}/deps.txt - true - org.eclipse.jetty,javax.servlet - true - provided - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - process-deps - process-resources - - run - - - - - - - - - - - process-mod - process-resources - - run - - - - - - - - - - - - - - org.eclipse.jetty @@ -93,4 +33,65 @@ provided + + install + + + org.apache.maven.plugins + maven-antrun-plugin + + + process-deps + + run + + process-resources + + + + + + + + + + process-mod + + run + + process-resources + + + + + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + build-deps-file + + list + + generate-resources + + false + ${project.build.directory}/deps.txt + true + org.eclipse.jetty,javax.servlet + true + provided + + + + + + diff --git a/jetty-infinispan/pom.xml b/jetty-infinispan/pom.xml index ae2a838e433..35e4a499189 100644 --- a/jetty-infinispan/pom.xml +++ b/jetty-infinispan/pom.xml @@ -1,20 +1,16 @@ + + 4.0.0 org.eclipse.jetty jetty-project 10.0.20-SNAPSHOT - - 4.0.0 org.eclipse.jetty infinispan-parent pom Jetty :: Infinispan - - - ${project.groupId}.infinispan - infinispan-common infinispan-embedded @@ -23,4 +19,8 @@ infinispan-remote-query + + ${project.groupId}.infinispan + + diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml index 8bbfd352bac..5d1bc7a00fa 100644 --- a/jetty-io/pom.xml +++ b/jetty-io/pom.xml @@ -1,11 +1,11 @@ + 4.0.0 - jetty-project org.eclipse.jetty + jetty-project 10.0.20-SNAPSHOT - 4.0.0 jetty-io Jetty :: IO Utility @@ -14,17 +14,17 @@ - org.slf4j - slf4j-api + org.eclipse.jetty + jetty-jmx + true org.eclipse.jetty jetty-util - org.eclipse.jetty - jetty-jmx - true + org.slf4j + slf4j-api org.eclipse.jetty @@ -43,9 +43,7 @@ org.apache.maven.plugins maven-surefire-plugin - - @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.io=org.eclipse.jetty.logging - + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.io=org.eclipse.jetty.logging diff --git a/jetty-jaas/pom.xml b/jetty-jaas/pom.xml index 2d00d86a6f1..b456dae9ec6 100644 --- a/jetty-jaas/pom.xml +++ b/jetty-jaas/pom.xml @@ -1,106 +1,28 @@ - + + + 4.0.0 org.eclipse.jetty jetty-project 10.0.20-SNAPSHOT - - 4.0.0 jetty-jaas Jetty :: JAAS Jetty JAAS support - ${project.groupId}.jaas - 2.0.0.AM27 2.1.5 + 2.0.0.AM27 + ${project.groupId}.jaas org.eclipse.jetty.jaas.* - - org.eclipse.jetty - jetty-security - - - - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - org.apache.directory.server - apacheds-test-framework - ${apacheds.version} - test - - - junit - junit - - - - org.apache.directory.shared - shared-ldap-schema - - - org.apache.directory.api - api-ldap-schema-data - - - - - org.apache.directory.server - apacheds-server-integ - ${apacheds.version} - test - - - - org.apache.directory.shared - shared-ldap-schema - - - org.apache.directory.api - api-ldap-schema-data - - - - - org.apache.directory.server - apacheds-core-integ - ${apacheds.version} - test - - - - org.apache.directory.shared - shared-ldap-schema - - - org.apache.directory.api - api-ldap-schema-data - - - org.apache.directory.api - api-ldap-schema-data + api-asn1-api ${apache.directory.api.version} - test org.apache.directory.api @@ -112,10 +34,88 @@ api-util ${apache.directory.api.version} + + org.eclipse.jetty + jetty-security + + + + org.slf4j + slf4j-api + org.apache.directory.api - api-asn1-api + api-ldap-schema-data ${apache.directory.api.version} + test + + + org.apache.directory.server + apacheds-core-integ + ${apacheds.version} + test + + + org.apache.directory.api + api-ldap-schema-data + + + + org.apache.directory.shared + shared-ldap-schema + + + + + org.apache.directory.server + apacheds-server-integ + ${apacheds.version} + test + + + org.apache.directory.api + api-ldap-schema-data + + + + org.apache.directory.shared + shared-ldap-schema + + + + + org.apache.directory.server + apacheds-test-framework + ${apacheds.version} + test + + + junit + junit + + + org.apache.directory.api + api-ldap-schema-data + + + + org.apache.directory.shared + shared-ldap-schema + + + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index 28e8d6842ac..7084ea5efd0 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty jetty-project 10.0.20-SNAPSHOT - - 4.0.0 jetty-jaspi Jetty :: JASPI Security Jetty security infrastructure @@ -15,6 +16,46 @@ org.eclipse.jetty.jaspi.* + + + jakarta.security.auth.message + jakarta.security.auth.message-api + + + org.eclipse.jetty + jetty-security + + + org.slf4j + slf4j-api + + + jakarta.activation + jakarta.activation-api + test + + + jakarta.xml.bind + jakarta.xml.bind-api + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + org.glassfish.jaxb + jaxb-runtime + test + + + @@ -30,44 +71,4 @@ - - - - jakarta.security.auth.message - jakarta.security.auth.message-api - - - org.eclipse.jetty - jetty-security - - - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - jakarta.xml.bind - jakarta.xml.bind-api - test - - - org.glassfish.jaxb - jaxb-runtime - test - - - jakarta.activation - jakarta.activation-api - test - - diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml index a908e2ac390..688614d3da1 100644 --- a/jetty-jmx/pom.xml +++ b/jetty-jmx/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty jetty-project 10.0.20-SNAPSHOT - 4.0.0 jetty-jmx Jetty :: JMX Management JMX management artifact for jetty. @@ -12,18 +13,6 @@ ${project.groupId}.jmx org.eclipse.jetty.jmx.* - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} --add-opens org.eclipse.jetty.jmx/org.eclipse.jetty.jmx=ALL-UNNAMED --add-opens org.eclipse.jetty.jmx/org.eclipse.jetty.logging.jmx=ALL-UNNAMED - - - - - org.eclipse.jetty @@ -33,6 +22,11 @@ org.slf4j slf4j-api + + com.openpojo + openpojo + test + org.eclipse.jetty jetty-slf4j-impl @@ -43,11 +37,16 @@ jetty-test-helper test - - com.openpojo - openpojo - test - + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} --add-opens org.eclipse.jetty.jmx/org.eclipse.jetty.jmx=ALL-UNNAMED --add-opens org.eclipse.jetty.jmx/org.eclipse.jetty.logging.jmx=ALL-UNNAMED + + + + diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml index dd7ac0cd15a..9a42e01a86b 100644 --- a/jetty-jndi/pom.xml +++ b/jetty-jndi/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty jetty-project 10.0.20-SNAPSHOT - - 4.0.0 jetty-jndi Jetty :: JNDI Naming JNDI spi impl for java namespace. @@ -15,29 +16,6 @@ org.eclipse.jetty.jndi.* - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} --add-modules javax.mail.glassfish - - - - - org.apache.felix - maven-bundle-plugin - true - - - ${osgi.slf4j.import.packages},javax.mail.*;resolution:=optional,* - - - - - - org.eclipse.jetty @@ -49,22 +27,12 @@ org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - org.eclipse.jetty - jetty-server + jetty-security provided org.eclipse.jetty - jetty-security + jetty-server provided @@ -78,5 +46,36 @@ + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + + + + org.apache.felix + maven-bundle-plugin + true + + + ${osgi.slf4j.import.packages},javax.mail.*;resolution:=optional,* + + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} --add-modules javax.mail.glassfish + + + + diff --git a/jetty-jspc-maven-plugin/pom.xml b/jetty-jspc-maven-plugin/pom.xml index 9a9cc608098..2eb0ddcc446 100644 --- a/jetty-jspc-maven-plugin/pom.xml +++ b/jetty-jspc-maven-plugin/pom.xml @@ -1,98 +1,21 @@ + 4.0.0 org.eclipse.jetty jetty-project 10.0.20-SNAPSHOT - 4.0.0 jetty-jspc-maven-plugin maven-plugin Jetty :: Jetty JSPC Maven Plugin ${project.groupId}.jspc.plugin - - - - org.apache.maven.plugins - maven-plugin-plugin - - - exec-plugin-doc - process-classes - - descriptor - helpmojo - - - - - - org.apache.maven.plugins - maven-invoker-plugin - - - integration-test - - install - integration-test - verify - - - - - true - - ${maven.surefire.plugin.version} - - - clean - - - - - - org.eclipse.jetty - jetty-util - - - org.apache.maven - maven-plugin-api - provided - - - javax.annotation - javax.annotation-api - - - - - org.apache.maven.plugin-tools - maven-plugin-annotations - provided - - - org.apache.maven - maven-core - provided - - - org.apache.maven - maven-model - provided - - - org.apache.maven - maven-settings - provided - - - org.apache.maven - maven-artifact - provided + org.apache.ant + ant org.apache.maven.plugin-tools @@ -115,8 +38,85 @@ ${project.version} - org.apache.ant - ant + org.eclipse.jetty + jetty-util + + + org.apache.maven + maven-artifact + provided + + + org.apache.maven + maven-core + provided + + + org.apache.maven + maven-model + provided + + + org.apache.maven + maven-plugin-api + provided + + + javax.annotation + javax.annotation-api + + + + + org.apache.maven + maven-settings + provided + + + org.apache.maven.plugin-tools + maven-plugin-annotations + provided + + + + org.apache.maven.plugins + maven-invoker-plugin + + true + + ${maven.surefire.plugin.version} + + + clean + + + + + integration-test + + install + integration-test + verify + + + + + + org.apache.maven.plugins + maven-plugin-plugin + + + exec-plugin-doc + + descriptor + helpmojo + + process-classes + + + + + diff --git a/jetty-keystore/pom.xml b/jetty-keystore/pom.xml index 6cf4c4d935c..6c77ef18ded 100644 --- a/jetty-keystore/pom.xml +++ b/jetty-keystore/pom.xml @@ -1,19 +1,19 @@ + 4.0.0 org.eclipse.jetty jetty-project 10.0.20-SNAPSHOT - 4.0.0 jetty-keystore jar Jetty :: Test Keystore Test keystore with self-signed SSL Certificate. - ${project.groupId}.keystore 1.77 + ${project.groupId}.keystore @@ -36,10 +36,9 @@ org.eclipse.jetty jetty-util - org.eclipse.jetty - jetty-slf4j-impl + jetty-client test @@ -47,9 +46,10 @@ jetty-server test + org.eclipse.jetty - jetty-client + jetty-slf4j-impl test diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml index b5193112608..a03f550795f 100644 --- a/jetty-maven-plugin/pom.xml +++ b/jetty-maven-plugin/pom.xml @@ -1,160 +1,29 @@ + + 4.0.0 org.eclipse.jetty jetty-project 10.0.20-SNAPSHOT - 4.0.0 jetty-maven-plugin maven-plugin Jetty :: Jetty Maven Plugin Jetty maven plugins ${project.groupId}.maven.plugin - FREEBEER + FREEBEER - - - - org.codehaus.mojo - build-helper-maven-plugin - - - test-reserve-ports - process-test-classes - - reserve-network-port - - - - test.stopPort - test.jettyPort - - - - - reserve-ports - pre-integration-test - - reserve-network-port - - - - jetty.stopPort - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - -Dstop.port=@{test.stopPort} -Djetty.port=@{test.jettyPort} - - **/IntegrationTest*.java - - - - - org.apache.maven.plugins - maven-plugin-plugin - - - exec-plugin-doc - generate-sources - - helpmojo - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - test-jar - - - - - - org.apache.maven.plugins - maven-invoker-plugin - - - integration-test - integration-test - - install - integration-test - verify - - - - org.eclipse.jetty:jetty-home:${project.version}:zip - - - - - - true - - it-parent-pom/pom.xml - - - ${jetty.stopKey} - ${jetty.stopPort} - ${maven.surefire.plugin.version} - ${jetty.servlet.api.version} - - - clean - - - - - - org.apache.maven - maven-plugin-api - provided - - - javax.annotation - javax.annotation-api - - + jakarta.transaction + jakarta.transaction-api + compile - org.apache.maven - maven-model - provided - - - org.apache.maven - maven-settings - provided - - - org.apache.maven - maven-artifact - provided - - - org.apache.maven - maven-core - provided - - - org.apache.maven.resolver - maven-resolver-api - ${maven.resolver.version} - provided + org.apache.maven.plugin-tools + maven-plugin-tools-api org.codehaus.plexus @@ -165,13 +34,56 @@ plexus-xml - org.apache.maven.plugin-tools - maven-plugin-tools-api + org.eclipse.jetty + apache-jsp - org.apache.maven.plugin-tools - maven-plugin-annotations - provided + org.eclipse.jetty + apache-jstl + + + org.eclipse.jetty + jetty-annotations + + + org.eclipse.jetty + jetty-client + + + org.eclipse.jetty + jetty-http + + + org.eclipse.jetty + jetty-io + + + org.eclipse.jetty + jetty-jaas + + + org.eclipse.jetty + jetty-jmx + + + org.eclipse.jetty + jetty-jndi + + + org.eclipse.jetty + jetty-plus + + + org.eclipse.jetty + jetty-quickstart + + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-servlet org.eclipse.jetty @@ -187,50 +99,6 @@ - - org.eclipse.jetty - jetty-quickstart - - - org.eclipse.jetty - jetty-jaas - - - org.eclipse.jetty - jetty-plus - - - org.eclipse.jetty - jetty-jndi - - - org.eclipse.jetty - jetty-server - - - org.eclipse.jetty - jetty-servlet - - - org.eclipse.jetty - jetty-client - - - org.eclipse.jetty - jetty-http - - - org.eclipse.jetty - jetty-io - - - org.eclipse.jetty - jetty-jmx - - - org.eclipse.jetty - jetty-annotations - org.eclipse.jetty.websocket websocket-javax-server @@ -239,35 +107,79 @@ org.eclipse.jetty.websocket websocket-jetty-server - - org.eclipse.jetty - apache-jsp - - - org.eclipse.jetty - apache-jstl - org.slf4j slf4j-api - jakarta.transaction - jakarta.transaction-api - compile + org.apache.maven + maven-artifact + provided - org.eclipse.jetty - jetty-slf4j-impl - test + org.apache.maven + maven-core + provided + + + org.apache.maven + maven-model + provided + + + org.apache.maven + maven-plugin-api + provided + + + javax.annotation + javax.annotation-api + + + + + org.apache.maven + maven-settings + provided + + + org.apache.maven.plugin-tools + maven-plugin-annotations + provided + + + org.apache.maven.resolver + maven-resolver-api + ${maven.resolver.version} + provided org.eclipse.jetty jetty-home - test zip + test true + + jakarta.security.auth.message + jakarta.security.auth.message-api + + + org.eclipse.jetty + infinispan-embedded + + + org.eclipse.jetty + infinispan-embedded-query + + + org.eclipse.jetty + infinispan-remote + + + org.eclipse.jetty + infinispan-remote-query + @@ -291,12 +203,12 @@ jetty-continuation - org.eclipse.jetty.gcloud - jetty-gcloud-session-manager + org.eclipse.jetty + jetty-hazelcast org.eclipse.jetty - jetty-hazelcast + jetty-infinispan org.eclipse.jetty @@ -307,79 +219,168 @@ jetty-jaspi - org.eclipse.jetty.memcached - jetty-memcached-sessions + org.eclipse.jetty + jetty-nosql org.eclipse.jetty jetty-openid - - org.eclipse.jetty.fcgi - fcgi-server - org.eclipse.jetty jetty-start - - org.eclipse.jetty - jetty-nosql - org.eclipse.jetty jetty-unixsocket - org.eclipse.jetty - jetty-infinispan + org.eclipse.jetty.fcgi + fcgi-server + + + org.eclipse.jetty.gcloud + jetty-gcloud-session-manager org.eclipse.jetty.http2 http2-server - org.eclipse.jetty - infinispan-embedded - - - org.eclipse.jetty - infinispan-embedded-query - - - org.eclipse.jetty - infinispan-remote - - - org.eclipse.jetty - infinispan-remote-query + org.eclipse.jetty.memcached + jetty-memcached-sessions org.eclipse.jetty.orbit javax.mail.glassfish - jakarta.security.auth.message - jakarta.security.auth.message-api - - - org.ow2.asm - asm-tree + org.jboss.logging + jboss-logging org.ow2.asm asm-analysis - org.jboss.logging - jboss-logging + org.ow2.asm + asm-tree + + org.eclipse.jetty + jetty-slf4j-impl + test + org.eclipse.jetty.toolchain jetty-test-helper test + + + + org.apache.maven.plugins + maven-invoker-plugin + + true + + it-parent-pom/pom.xml + + + ${jetty.stopKey} + ${jetty.stopPort} + ${maven.surefire.plugin.version} + ${jetty.servlet.api.version} + + + clean + + + + + integration-test + + install + integration-test + verify + + integration-test + + + org.eclipse.jetty:jetty-home:${project.version}:zip + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + test-jar + + + + + + org.apache.maven.plugins + maven-plugin-plugin + + + exec-plugin-doc + + helpmojo + + generate-sources + + + + + org.apache.maven.plugins + maven-surefire-plugin + + -Dstop.port=@{test.stopPort} -Djetty.port=@{test.jettyPort} + + **/IntegrationTest*.java + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + test-reserve-ports + + reserve-network-port + + process-test-classes + + + test.stopPort + test.jettyPort + + + + + reserve-ports + + reserve-network-port + + pre-integration-test + + + jetty.stopPort + + + + + + + diff --git a/jetty-memcached/jetty-memcached-sessions/pom.xml b/jetty-memcached/jetty-memcached-sessions/pom.xml index 04a4d81be3d..28e52d4d9d1 100644 --- a/jetty-memcached/jetty-memcached-sessions/pom.xml +++ b/jetty-memcached/jetty-memcached-sessions/pom.xml @@ -1,28 +1,32 @@ + + 4.0.0 org.eclipse.jetty.memcached memcached-parent 10.0.20-SNAPSHOT - - 4.0.0 jetty-memcached-sessions Jetty :: Memcached :: Sessions + + ${project.groupId}.session + + - - org.eclipse.jetty - jetty-server - com.googlecode.xmemcached xmemcached ${xmemcached.version} - org.slf4j - slf4j-simple + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-client test @@ -30,22 +34,18 @@ jetty-webapp test - - org.eclipse.jetty - jetty-client - test - org.eclipse.jetty.toolchain jetty-test-helper test + + org.slf4j + slf4j-simple + test + - - ${project.groupId}.session - - diff --git a/jetty-memcached/pom.xml b/jetty-memcached/pom.xml index 186a8d1f9ec..4fd4828cdd5 100644 --- a/jetty-memcached/pom.xml +++ b/jetty-memcached/pom.xml @@ -1,12 +1,12 @@ - - jetty-project - org.eclipse.jetty - 10.0.20-SNAPSHOT - 4.0.0 + + org.eclipse.jetty + jetty-project + 10.0.20-SNAPSHOT + org.eclipse.jetty.memcached memcached-parent pom diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml index 790d98f088d..4f74fd9f20d 100644 --- a/jetty-nosql/pom.xml +++ b/jetty-nosql/pom.xml @@ -1,29 +1,26 @@ + + 4.0.0 org.eclipse.jetty jetty-project 10.0.20-SNAPSHOT - 4.0.0 jetty-nosql Jetty :: NoSQL Session Managers ${project.groupId}.nosql - - install - - - - org.eclipse.jetty - jetty-server - org.eclipse.jetty jetty-jmx true + + org.eclipse.jetty + jetty-server + org.mongodb mongo-java-driver @@ -35,4 +32,8 @@ slf4j-api + + install + + diff --git a/jetty-openid/pom.xml b/jetty-openid/pom.xml index 1c3a531d137..e187e87040d 100644 --- a/jetty-openid/pom.xml +++ b/jetty-openid/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty jetty-project 10.0.20-SNAPSHOT - - 4.0.0 jetty-openid Jetty :: OpenID Jetty OpenID Connect infrastructure @@ -15,6 +16,44 @@ org.eclipse.jetty.security.openid.* + + + org.eclipse.jetty + jetty-client + + + org.eclipse.jetty + jetty-security + + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-util-ajax + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-servlet + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + @@ -30,42 +69,4 @@ - - - - org.eclipse.jetty - jetty-server - - - org.eclipse.jetty - jetty-client - - - org.eclipse.jetty - jetty-security - - - org.eclipse.jetty - jetty-util-ajax - - - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty - jetty-servlet - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - diff --git a/jetty-osgi/jetty-osgi-alpn/pom.xml b/jetty-osgi/jetty-osgi-alpn/pom.xml index e93cd98a47d..c90f32a0f96 100644 --- a/jetty-osgi/jetty-osgi-alpn/pom.xml +++ b/jetty-osgi/jetty-osgi-alpn/pom.xml @@ -1,16 +1,17 @@ + + + + + 4.0.0 org.eclipse.jetty.osgi jetty-osgi-project 10.0.20-SNAPSHOT - - - - 4.0.0 jetty-osgi-alpn - Jetty :: OSGi ALPN Fragment jar + Jetty :: OSGi ALPN Fragment ${project.groupId}.alpn.fragment diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml index 551545c3ccb..c415d2f304d 100644 --- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty.osgi jetty-osgi-project 10.0.20-SNAPSHOT - 4.0.0 jetty-osgi-boot-jsp Jetty :: OSGi :: Boot JSP Jetty OSGi Boot JSP bundle @@ -13,14 +14,19 @@ org.eclipse.jetty.osgi.boot.jasper.*,org.eclipse.jetty.osgi.boot.jsp.* + + + org.eclipse.jetty + apache-jsp + org.eclipse.jetty jetty-deploy + - org.eclipse.jetty.osgi - jetty-osgi-boot - provided + org.eclipse.jetty.toolchain + jetty-servlet-api org.eclipse.platform @@ -30,38 +36,15 @@ org.eclipse.platform org.eclipse.osgi.services - - org.eclipse.jetty.toolchain - jetty-servlet-api - - - - org.eclipse.jetty - apache-jsp + org.eclipse.jetty.osgi + jetty-osgi-boot + provided - - - org.codehaus.mojo - build-helper-maven-plugin - - - set-jsp-api-version - validate - - parse-version - - - ${jsp.impl.version} - jspImpl - - - - org.apache.felix @@ -70,11 +53,10 @@ Jetty-OSGi-Jasper Integration - + org.eclipse.jetty.osgi.boot !org.eclipse.jetty.osgi.boot.* - - ${osgi.slf4j.import.packages}, + ${osgi.slf4j.import.packages}, org.eclipse.jdt.*;resolution:=optional, org.eclipse.jdt.core.compiler.*;resolution:=optional, com.sun.el;resolution:=optional, @@ -137,15 +119,31 @@ javax.xml.*;resolution:=optional, org.w3c.dom;resolution:=optional, org.w3c.dom.ls;resolution:=optional, - javax.xml.parser;resolution:=optional - + javax.xml.parser;resolution:=optional org.eclipse.jetty.jsp.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))", org.apache.jasper.*;version="[$(version;===;${jspImpl.osgiVersion}),$(version;+;${jspImpl.osgiVersion}))", - org.apache.el.*;version="[$(version;===;${jspImpl.osgiVersion}),$(version;+;${jspImpl.osgiVersion}))" - + org.apache.el.*;version="[$(version;===;${jspImpl.osgiVersion}),$(version;+;${jspImpl.osgiVersion}))" + + + org.codehaus.mojo + build-helper-maven-plugin + + + set-jsp-api-version + + parse-version + + validate + + ${jsp.impl.version} + jspImpl + + + + diff --git a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml index 79ab7f06515..ded58e444ff 100644 --- a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml @@ -1,11 +1,12 @@ + + 4.0.0 org.eclipse.jetty.osgi jetty-osgi-project 10.0.20-SNAPSHOT ../pom.xml - 4.0.0 jetty-osgi-boot-warurl Jetty :: OSGi :: Boot :: Warurl Jetty OSGi Boot-Warurl bundle diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml index d687f893dd6..84fb024d244 100644 --- a/jetty-osgi/jetty-osgi-boot/pom.xml +++ b/jetty-osgi/jetty-osgi-boot/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty.osgi jetty-osgi-project 10.0.20-SNAPSHOT - 4.0.0 jetty-osgi-boot Jetty :: OSGi :: Boot Jetty OSGi Boot bundle @@ -18,11 +19,6 @@ jetty-annotations ${project.version} - - org.eclipse.jetty - jetty-webapp - ${project.version} - org.eclipse.jetty jetty-deploy @@ -33,6 +29,11 @@ jetty-jmx ${project.version} + + org.eclipse.jetty + jetty-webapp + ${project.version} + org.eclipse.platform org.eclipse.osgi @@ -57,27 +58,6 @@ - - maven-antrun-plugin - - - process-resources - - - - - - - - - - - - run - - - - org.apache.felix maven-bundle-plugin @@ -87,8 +67,7 @@ org.eclipse.jetty.osgi.boot;singleton:=true org.eclipse.jetty.osgi.boot.JettyBootstrapActivator org.eclipse.jetty.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;+;${parsedVersion.osgiVersion}))" - - ${osgi.slf4j.import.packages}, + ${osgi.slf4j.import.packages}, javax.mail;version="1.4.0";resolution:=optional, javax.mail.event;version="1.4.0";resolution:=optional, javax.mail.internet;version="1.4.0";resolution:=optional, @@ -110,18 +89,34 @@ org.xml.sax, org.xml.sax.helpers, org.eclipse.jetty.annotations;resolution:=optional, - * - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.webapp.Configuration - + * + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.webapp.Configuration <_nouses>true + + maven-antrun-plugin + + + + run + + process-resources + + + + + + + + + + + + + diff --git a/jetty-osgi/jetty-osgi-httpservice/pom.xml b/jetty-osgi/jetty-osgi-httpservice/pom.xml index 838a692fddb..5555e5fcd76 100644 --- a/jetty-osgi/jetty-osgi-httpservice/pom.xml +++ b/jetty-osgi/jetty-osgi-httpservice/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty.osgi jetty-osgi-project 10.0.20-SNAPSHOT - 4.0.0 jetty-httpservice Jetty :: OSGi :: HttpService Jetty OSGi HttpService bundle @@ -14,48 +15,30 @@ - org.eclipse.jetty - jetty-util + org.eclipse.equinox.http + servlet org.eclipse.jetty jetty-servlet - org.eclipse.equinox.http - servlet + org.eclipse.jetty + jetty-util + + + org.eclipse.jetty.toolchain + jetty-servlet-api org.eclipse.platform org.eclipse.osgi provided - - org.eclipse.jetty.toolchain - jetty-servlet-api - - - maven-antrun-plugin - - - process-resources - - - - - - - - - run - - - - org.apache.felix maven-bundle-plugin @@ -65,17 +48,33 @@ org.eclipse.jetty.osgi.httpservice OSGi HttpService contexts/httpservice.xml - - org.eclipse.jetty.server.handler;version="[10,11.0)", + org.eclipse.jetty.server.handler;version="[10,11.0)", org.eclipse.jetty.util.component;version="[10,11.0)", org.eclipse.jetty.server.session;version="[10,11.0)", org.eclipse.jetty.servlet;version="[10,11.0)", - org.eclipse.equinox.http.servlet, * - + org.eclipse.equinox.http.servlet, * <_nouses>true + + maven-antrun-plugin + + + + run + + process-resources + + + + + + + + + + diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml index b98ab345391..d2a45cc31bf 100644 --- a/jetty-osgi/pom.xml +++ b/jetty-osgi/pom.xml @@ -1,32 +1,16 @@ + + + 4.0.0 org.eclipse.jetty jetty-project 10.0.20-SNAPSHOT - - 4.0.0 org.eclipse.jetty.osgi jetty-osgi-project - Jetty :: OSGi pom - - - 3.18.600 - 3.11.200 - 1.6.1 - 1.5.1 - 1.4.1 - 3.7.300 - 1.2.0 - 1.3.0 - 1.0.2 - 1.0.1 - 1.5.4 - 1.0.2 - 1.0.0-v20070606 - true - + Jetty :: OSGi jetty-osgi-boot @@ -42,37 +26,35 @@ test-jetty-osgi - - - - META-INF/.. - true - - **/.* - **/*.jar - .settings/**/* - pom.xml - - jettyhome/**/* - src/**/* - target/**/* - build.properties - - - META-INF/**/* - - - - src/main/java - - **/*.java - - - - + + 1.0.0-v20070606 + true + 1.6.1 + 1.5.1 + 1.4.1 + 3.11.200 + 1.2.0 + 1.0.2 + 1.0.1 + 1.3.0 + 1.5.4 + 3.7.300 + 1.0.2 + 3.18.600 + + + org.eclipse.equinox.http + servlet + ${equinox-http-servlet-version} + + + org.eclipse.platform + org.eclipse.osgi + ${osgi-version} + org.eclipse.platform org.eclipse.osgi.services @@ -90,11 +72,6 @@ - - org.eclipse.platform - org.eclipse.osgi - ${osgi-version} - org.osgi org.osgi.service.cm @@ -115,12 +92,36 @@ org.osgi.util.tracker ${osgi-util-tracker-version} - - org.eclipse.equinox.http - servlet - ${equinox-http-servlet-version} - + + + + true + META-INF/.. + + META-INF/**/* + + + **/.* + **/*.jar + .settings/**/* + pom.xml + + jettyhome/**/* + src/**/* + target/**/* + build.properties + + + + src/main/java + + **/*.java + + + + + diff --git a/jetty-osgi/test-jetty-osgi-context/pom.xml b/jetty-osgi/test-jetty-osgi-context/pom.xml index 38fb7083c90..181a5524cad 100644 --- a/jetty-osgi/test-jetty-osgi-context/pom.xml +++ b/jetty-osgi/test-jetty-osgi-context/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty.osgi jetty-osgi-project 10.0.20-SNAPSHOT - 4.0.0 test-jetty-osgi-context Jetty :: OSGi :: Test Context Test Jetty OSGi bundle with a ContextHandler @@ -54,8 +55,7 @@ of the packages it uses; no need to reflect some tight dependency determined at compilation time. --> <_nouses>true - - javax.servlet;version="[$(version;==;${jetty.servlet.api.version}),$(version;+;${jetty.servlet.api.version}))", + javax.servlet;version="[$(version;==;${jetty.servlet.api.version}),$(version;+;${jetty.servlet.api.version}))", javax.servlet.resources;version="[$(version;==;${jetty.servlet.api.version}),$(version;+;${jetty.servlet.api.version}))", org.osgi.framework, org.osgi.service.cm;version="${osgi-service-cm-version}", @@ -63,8 +63,7 @@ org.osgi.service.startlevel;version="1.0.0", org.osgi.service.url;version="1.0.0", org.osgi.util.tracker;version="${osgi-util-tracker-version}", - * - + * org.eclipse.jetty.*;version="[$(version;==;${parsedVersion.osgiVersion}),$(version;+;${parsedVersion.osgiVersion}))" diff --git a/jetty-osgi/test-jetty-osgi-fragment/pom.xml b/jetty-osgi/test-jetty-osgi-fragment/pom.xml index 45a410f2b6b..d6a8aef196b 100644 --- a/jetty-osgi/test-jetty-osgi-fragment/pom.xml +++ b/jetty-osgi/test-jetty-osgi-fragment/pom.xml @@ -1,11 +1,12 @@ + + 4.0.0 org.eclipse.jetty.osgi jetty-osgi-project 10.0.20-SNAPSHOT ../pom.xml - 4.0.0 test-jetty-osgi-fragment Jetty :: OSGi :: WebApp Fragment Test Jetty OSGi Webapp Fragment bundle diff --git a/jetty-osgi/test-jetty-osgi-server/pom.xml b/jetty-osgi/test-jetty-osgi-server/pom.xml index 065ad4b16b5..4f9ee15b2ef 100644 --- a/jetty-osgi/test-jetty-osgi-server/pom.xml +++ b/jetty-osgi/test-jetty-osgi-server/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty.osgi jetty-osgi-project 10.0.20-SNAPSHOT - 4.0.0 test-jetty-osgi-server Jetty :: OSGi :: Server Test Jetty OSGi bundle with a Server @@ -46,8 +47,7 @@ of the packages it uses; no need to reflect some tight dependency determined at compilation time. --> <_nouses>true - - org.osgi.framework, + org.osgi.framework, org.osgi.service.cm;version="${osgi-service-cm-version}", org.osgi.service.packageadmin, org.osgi.service.startlevel;version="1.0.0", @@ -55,8 +55,7 @@ org.osgi.util.tracker;version="${osgi-util-tracker-version}", org.xml.sax, org.xml.sax.helpers, - * - + * org.eclipse.jetty.*;version="[$(version;==;${parsedVersion.osgiVersion}),$(version;+;${parsedVersion.osgiVersion}))" diff --git a/jetty-osgi/test-jetty-osgi-webapp-resources/pom.xml b/jetty-osgi/test-jetty-osgi-webapp-resources/pom.xml index 028f0690ddb..fb59378a64e 100644 --- a/jetty-osgi/test-jetty-osgi-webapp-resources/pom.xml +++ b/jetty-osgi/test-jetty-osgi-webapp-resources/pom.xml @@ -1,42 +1,28 @@ + 4.0.0 org.eclipse.jetty.osgi jetty-osgi-project 10.0.20-SNAPSHOT - 4.0.0 test-jetty-osgi-webapp-resources - OSGi Test :: Webapp With Resources war + OSGi Test :: Webapp With Resources ${project.groupId}.webapp.resources true true + + + org.eclipse.jetty.toolchain + jetty-servlet-api + provided + + - - org.apache.maven.plugins - maven-resources-plugin - - - copy-resources - validate - - copy-resources - - - ${basedir}/target/classes - - - src/main/resources - - - - - - org.apache.felix maven-bundle-plugin @@ -51,6 +37,27 @@ + + org.apache.maven.plugins + maven-resources-plugin + + + copy-resources + + copy-resources + + validate + + ${basedir}/target/classes + + + src/main/resources + + + + + + maven-war-plugin @@ -62,11 +69,4 @@ - - - org.eclipse.jetty.toolchain - jetty-servlet-api - provided - - diff --git a/jetty-osgi/test-jetty-osgi-webapp/pom.xml b/jetty-osgi/test-jetty-osgi-webapp/pom.xml index d2bab21580d..1dd824a0873 100644 --- a/jetty-osgi/test-jetty-osgi-webapp/pom.xml +++ b/jetty-osgi/test-jetty-osgi-webapp/pom.xml @@ -1,11 +1,12 @@ + + 4.0.0 org.eclipse.jetty.osgi jetty-osgi-project 10.0.20-SNAPSHOT ../pom.xml - 4.0.0 test-jetty-osgi-webapp Jetty :: OSGi :: Test WebApp Test Jetty OSGi Webapp bundle diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index 100b79ea0f0..b4c5bf2e334 100644 --- a/jetty-osgi/test-jetty-osgi/pom.xml +++ b/jetty-osgi/test-jetty-osgi/pom.xml @@ -1,115 +1,27 @@ + + 4.0.0 org.eclipse.jetty.osgi jetty-osgi-project 10.0.20-SNAPSHOT ../pom.xml - 4.0.0 test-jetty-osgi Jetty :: OSGi :: Test Jetty OSGi Integration test - ${project.groupId}.boot.test.osgi - https://download.eclipse.org/jetty/orbit/ target/distribution + ${project.groupId}.boot.test.osgi + 1.2 + https://download.eclipse.org/jetty/orbit/ + true 4.13.5 2.6.14 1.8.3 3.0.0 - 1.2 - true - - - org.ops4j.pax.exam - pax-exam - ${pax.exam.version} - test - - - org.ops4j.pax.exam - pax-exam-inject - ${pax.exam.version} - test - - - - org.ops4j.pax.exam - pax-exam-container-forked - ${pax.exam.version} - test - - - biz.aQute.bnd - bndlib - - - org.ops4j.pax.tinybundles - tinybundles - - - - - org.ops4j.pax.tinybundles - tinybundles - ${tinybundles.version} - - - org.ops4j.pax.swissbox - pax-swissbox-framework - ${swissbox.version} - test - - - org.ops4j.base - ops4j-base-monitors - - - - - org.ops4j.pax.swissbox - pax-swissbox-tracker - ${swissbox.version} - test - - - org.ops4j.pax.exam - pax-exam-junit4 - ${pax.exam.version} - test - - - org.ops4j.pax.exam - pax-exam-link-mvn - ${pax.exam.version} - test - - - org.ops4j.pax.url - pax-url-aether - ${pax.url.version} - test - - - javax.annotation - javax.annotation-api - - - - - org.ops4j.pax.url - pax-url-wrap - ${pax.url.version} - test - - - biz.aQute.bnd - bndlib - - - biz.aQute.bnd biz.aQute.bndlib @@ -121,49 +33,151 @@ - org.eclipse.platform - org.eclipse.osgi + org.eclipse.jetty.demos + demo-mock-resources + ${project.version} + + + org.eclipse.jetty.http2 + http2-hpack + + + org.eclipse.jetty.http2 + http2-server + + + org.eclipse.jetty.orbit + javax.servlet.jsp.jstl + + + + org.eclipse.jetty.toolchain + jetty-servlet-api + + + org.glassfish.web + javax.servlet.jsp.jstl + + + org.ops4j.pax.tinybundles + tinybundles + ${tinybundles.version} + + + + + org.eclipse.jetty + jetty-annotations + runtime + + + org.eclipse.jetty + jetty-client + runtime + + + org.eclipse.jetty + jetty-deploy + runtime + + + org.eclipse.jetty + jetty-jmx + runtime + + + org.eclipse.jetty + jetty-plus + runtime + + + org.eclipse.jetty + jetty-security + runtime + + + org.eclipse.jetty + jetty-server + runtime + + + org.eclipse.jetty + jetty-servlet + runtime + + + org.eclipse.jetty + jetty-servlets + runtime + + + org.eclipse.jetty + jetty-util + runtime + + + org.eclipse.jetty + jetty-webapp + runtime + + + org.eclipse.jetty + jetty-xml + runtime + + + org.eclipse.jetty.toolchain + jetty-javax-websocket-api + runtime + + + org.eclipse.jetty.websocket + websocket-javax-client + runtime + + + org.eclipse.jetty.websocket + websocket-javax-server + runtime + + + org.eclipse.jetty.websocket + websocket-jetty-api + runtime + + + org.eclipse.jetty.websocket + websocket-jetty-client + runtime + + + org.eclipse.jetty.websocket + websocket-jetty-common + runtime + + + org.eclipse.jetty.websocket + websocket-jetty-server + runtime + + + org.eclipse.jetty.websocket + websocket-servlet + runtime + + + jakarta.activation + jakarta.activation-api test - org.eclipse.platform - org.eclipse.osgi.services + jakarta.el + jakarta.el-api test - org.eclipse.platform - org.eclipse.osgi.util - ${osgi-util-version} - test - - - org.osgi - org.osgi.util.function - ${osgi-util-function-version} - test - - - org.osgi - org.osgi.util.promise - ${osgi-util-promise-version} - test - - - org.osgi - org.osgi.util.measurement - ${osgi-util-measurement-version} - test - - - org.osgi - org.osgi.util.position - ${osgi-util-position-version} - test - - - org.osgi - org.osgi.util.xml - ${osgi-util-xml-version} + jakarta.enterprise + jakarta.enterprise.cdi-api test @@ -171,12 +185,64 @@ jakarta.inject-api test - - org.slf4j - slf4j-api - test - + jakarta.interceptor + jakarta.interceptor-api + test + + + jakarta.transaction + jakarta.transaction-api + test + + + org.apache.aries.spifly + org.apache.aries.spifly.dynamic.bundle + 1.3.7 + test + + + org.apache.felix + org.apache.felix.framework + + + + + org.conscrypt + conscrypt-openjdk-uber + ${conscrypt.version} + test + + + org.eclipse.jetty + jetty-alpn-conscrypt-client + ${project.version} + test + + + org.eclipse.jetty + jetty-alpn-conscrypt-server + ${project.version} + test + + + org.eclipse.jetty + jetty-alpn-java-client + ${project.version} + test + + + org.eclipse.jetty + jetty-alpn-java-server + ${project.version} + test + + + org.eclipse.jetty + jetty-alpn-server + ${project.version} + test + + + org.eclipse.jetty.demos + demo-jsp-webapp + ${project.version} + webbundle + test + + + org.eclipse.jetty.demos + demo-spec-webapp + ${project.version} + war + test + + + org.eclipse.jetty.http2 + http2-client + ${project.version} + test + + + org.eclipse.jetty.http2 + http2-http-client-transport + ${project.version} + test + + + org.eclipse.jetty.osgi + jetty-httpservice + test + + + org.eclipse.jetty.osgi + jetty-osgi-alpn + test + org.eclipse.jetty.osgi jetty-osgi-boot @@ -221,216 +338,10 @@ org.eclipse.jetty.osgi - jetty-httpservice - test - - - - org.eclipse.jetty.toolchain - jetty-servlet-api - - - jakarta.transaction - jakarta.transaction-api - test - - - jakarta.interceptor - jakarta.interceptor-api - test - - - jakarta.enterprise - jakarta.enterprise.cdi-api - test - - - jakarta.el - jakarta.el-api - test - - - org.apache.aries.spifly - org.apache.aries.spifly.dynamic.bundle - 1.3.7 - test - - - org.apache.felix - org.apache.felix.framework - - - - - jakarta.activation - jakarta.activation-api - test - - - org.glassfish.web - javax.servlet.jsp.jstl - - - org.eclipse.jetty.orbit - javax.servlet.jsp.jstl - - - - - org.eclipse.jetty - jetty-annotations - runtime - - - org.eclipse.jetty - jetty-webapp - runtime - - - org.eclipse.jetty - jetty-deploy - runtime - - - org.eclipse.jetty - jetty-server - runtime - - - org.eclipse.jetty - jetty-servlet - runtime - - - org.eclipse.jetty - jetty-servlets - runtime - - - org.eclipse.jetty - jetty-security - runtime - - - org.eclipse.jetty - jetty-xml - runtime - - - org.eclipse.jetty - jetty-jmx - runtime - - - org.eclipse.jetty - jetty-util - runtime - - - org.eclipse.jetty - jetty-client - runtime - - - org.eclipse.jetty.websocket - websocket-jetty-api - runtime - - - org.eclipse.jetty.websocket - websocket-jetty-common - runtime - - - org.eclipse.jetty.websocket - websocket-jetty-client - runtime - - - org.eclipse.jetty.websocket - websocket-javax-client - runtime - - - org.eclipse.jetty.websocket - websocket-servlet - runtime - - - org.eclipse.jetty.websocket - websocket-jetty-server - runtime - - - org.eclipse.jetty.toolchain - jetty-javax-websocket-api - runtime - - - org.eclipse.jetty.websocket - websocket-javax-server - runtime - - - org.eclipse.jetty.http2 - http2-server - - - org.eclipse.jetty.http2 - http2-hpack - - - org.eclipse.jetty.osgi - jetty-osgi-alpn - test - - - org.eclipse.jetty - jetty-alpn-server + test-jetty-osgi-context ${project.version} test - - org.eclipse.jetty - jetty-plus - runtime - - - - - org.eclipse.jetty.demos - demo-jsp-webapp - ${project.version} - webbundle - test - - - org.eclipse.jetty.demos - demo-jetty-webapp - ${project.version} - webbundle - test - - - org.eclipse.jetty.demos - demo-spec-webapp - ${project.version} - war - test - - - org.eclipse.jetty.demos - demo-container-initializer - ${project.version} - test - - - org.eclipse.jetty.osgi - test-jetty-osgi-webapp-resources - ${project.version} - war - test - org.eclipse.jetty.osgi test-jetty-osgi-fragment @@ -443,21 +354,17 @@ ${project.version} test - - org.eclipse.jetty.demos - demo-mock-resources - ${project.version} - org.eclipse.jetty.osgi - test-jetty-osgi-context + test-jetty-osgi-webapp ${project.version} test org.eclipse.jetty.osgi - test-jetty-osgi-webapp + test-jetty-osgi-webapp-resources ${project.version} + war test @@ -465,76 +372,170 @@ jetty-test-helper test + + org.eclipse.platform + org.eclipse.osgi + test + + + org.eclipse.platform + org.eclipse.osgi.services + test + + + org.eclipse.platform + org.eclipse.osgi.util + ${osgi-util-version} + test + + + + org.ops4j.pax.exam + pax-exam + ${pax.exam.version} + test + + + + org.ops4j.pax.exam + pax-exam-container-forked + ${pax.exam.version} + test + + + biz.aQute.bnd + bndlib + + + org.ops4j.pax.tinybundles + tinybundles + + + + + org.ops4j.pax.exam + pax-exam-inject + ${pax.exam.version} + test + + + org.ops4j.pax.exam + pax-exam-junit4 + ${pax.exam.version} + test + + + org.ops4j.pax.exam + pax-exam-link-mvn + ${pax.exam.version} + test + + + org.ops4j.pax.swissbox + pax-swissbox-framework + ${swissbox.version} + test + + + org.ops4j.base + ops4j-base-monitors + + + + + org.ops4j.pax.swissbox + pax-swissbox-tracker + ${swissbox.version} + test + + + org.ops4j.pax.url + pax-url-aether + ${pax.url.version} + test + + + javax.annotation + javax.annotation-api + + + + + org.ops4j.pax.url + pax-url-wrap + ${pax.url.version} + test + + + biz.aQute.bnd + bndlib + + + + + org.osgi + org.osgi.util.function + ${osgi-util-function-version} + test + + + org.osgi + org.osgi.util.measurement + ${osgi-util-measurement-version} + test + + + org.osgi + org.osgi.util.position + ${osgi-util-position-version} + test + + + org.osgi + org.osgi.util.promise + ${osgi-util-promise-version} + test + + + org.osgi + org.osgi.util.xml + ${osgi-util-xml-version} + test + org.ow2.asm asm - test ${asm.version} - - - org.ow2.asm - asm-commons test - ${asm.version} - - - org.ow2.asm - asm-tree - test - ${asm.version} org.ow2.asm asm-analysis - test ${asm.version} + test + + + org.ow2.asm + asm-commons + ${asm.version} + test + + + org.ow2.asm + asm-tree + ${asm.version} + test org.ow2.asm asm-util - test ${asm.version} - - - org.eclipse.jetty.http2 - http2-client - ${project.version} test + - org.eclipse.jetty.http2 - http2-http-client-transport - ${project.version} - test - - - org.eclipse.jetty - jetty-alpn-conscrypt-server - ${project.version} - test - - - org.eclipse.jetty - jetty-alpn-conscrypt-client - ${project.version} - test - - - org.conscrypt - conscrypt-openjdk-uber - ${conscrypt.version} - test - - - org.eclipse.jetty - jetty-alpn-java-server - ${project.version} - test - - - org.eclipse.jetty - jetty-alpn-java-client - ${project.version} + org.slf4j + slf4j-api test @@ -590,7 +591,7 @@ - + @@ -602,20 +603,20 @@ maven-dependency-plugin - - - copy - process-test-resources - - copy-dependencies - - - test-jetty-osgi-webapp-resources target true + + + copy + + copy-dependencies + + process-test-resources + + org.apache.servicemix.tooling diff --git a/jetty-p2/pom.xml b/jetty-p2/pom.xml index 7230938fa18..76d1377a8ce 100644 --- a/jetty-p2/pom.xml +++ b/jetty-p2/pom.xml @@ -1,43 +1,18 @@ - + + + 4.0.0 org.eclipse.jetty jetty-project 10.0.20-SNAPSHOT - 4.0.0 jetty-p2 + pom Jetty :: P2 Generates a (maven based) P2 Updatesite - pom 4.0.4 - - - - org.eclipse.tycho - tycho-p2-repository-plugin - ${tycho-version} - - - - Jetty Bundles - true - false - true - - maven-p2-site - prepare-package - - assemble-maven-repository - - - - - - @@ -47,6 +22,10 @@ ${project.version} pom + + org.eclipse.jetty.osgi + jetty-httpservice + org.eclipse.jetty.osgi jetty-osgi-alpn @@ -63,9 +42,29 @@ org.eclipse.jetty.osgi jetty-osgi-boot-warurl - - org.eclipse.jetty.osgi - jetty-httpservice - + + + + org.eclipse.tycho + tycho-p2-repository-plugin + ${tycho-version} + + + maven-p2-site + + assemble-maven-repository + + prepare-package + + Jetty Bundles + true + false + true + + + + + + diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml index b42775b17a6..4ebeb7e068f 100644 --- a/jetty-plus/pom.xml +++ b/jetty-plus/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty jetty-project 10.0.20-SNAPSHOT - - 4.0.0 jetty-plus Jetty :: Plus Jetty JavaEE style services @@ -15,27 +16,6 @@ org.eclipse.jetty.plus.* - - - - org.apache.felix - maven-bundle-plugin - true - - - ${osgi.slf4j.import.packages},javax.transaction.*;version="1.1",* - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.webapp.Configuration - - - - - - - jakarta.transaction @@ -65,4 +45,21 @@ + + + + org.apache.felix + maven-bundle-plugin + true + + + ${osgi.slf4j.import.packages},javax.transaction.*;version="1.1",* + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.webapp.Configuration + + + + + + diff --git a/jetty-proxy/pom.xml b/jetty-proxy/pom.xml index 0ecd5f9681e..f40dc020fb5 100644 --- a/jetty-proxy/pom.xml +++ b/jetty-proxy/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty jetty-project 10.0.20-SNAPSHOT - - 4.0.0 jetty-proxy Jetty :: Proxy Jetty Proxy @@ -15,25 +16,24 @@ org.eclipse.jetty.proxy.* - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} - --add-reads org.eclipse.jetty.proxy=org.eclipse.jetty.logging - - - - - - + + org.eclipse.jetty + jetty-client + + + org.eclipse.jetty + jetty-util + org.slf4j slf4j-api + + org.eclipse.jetty + jetty-servlet + provided + org.eclipse.jetty.toolchain jetty-servlet-api @@ -41,16 +41,13 @@ org.eclipse.jetty - jetty-servlet - provided + jetty-rewrite + test org.eclipse.jetty - jetty-util - - - org.eclipse.jetty - jetty-client + jetty-slf4j-impl + test org.eclipse.jetty @@ -62,20 +59,22 @@ jetty-http-tools test - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty - jetty-rewrite - test - org.eclipse.jetty.toolchain jetty-test-helper test + + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} + --add-reads org.eclipse.jetty.proxy=org.eclipse.jetty.logging + + + + diff --git a/jetty-quic/pom.xml b/jetty-quic/pom.xml index ba79b495285..a95c8ef242a 100644 --- a/jetty-quic/pom.xml +++ b/jetty-quic/pom.xml @@ -1,12 +1,12 @@ - - jetty-project - org.eclipse.jetty - 10.0.20-SNAPSHOT - 4.0.0 + + org.eclipse.jetty + jetty-project + 10.0.20-SNAPSHOT + org.eclipse.jetty.quic quic-parent pom diff --git a/jetty-quic/quic-client/pom.xml b/jetty-quic/quic-client/pom.xml index 67b1fa8bfb6..97196543c1e 100644 --- a/jetty-quic/quic-client/pom.xml +++ b/jetty-quic/quic-client/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.quic quic-parent 10.0.20-SNAPSHOT - - 4.0.0 quic-client Jetty :: QUIC :: Client @@ -15,10 +15,6 @@ - - org.slf4j - slf4j-api - org.eclipse.jetty.quic quic-common @@ -28,13 +24,12 @@ quic-quiche-jna - org.eclipse.jetty.quic - quic-server - test + org.slf4j + slf4j-api - org.eclipse.jetty.http2 - http2-server + org.eclipse.jetty + jetty-slf4j-impl test @@ -43,8 +38,13 @@ test - org.eclipse.jetty - jetty-slf4j-impl + org.eclipse.jetty.http2 + http2-server + test + + + org.eclipse.jetty.quic + quic-server test @@ -71,13 +71,11 @@ maven-surefire-plugin - - @{argLine} + @{argLine} ${jetty.surefire.argLine} --add-modules=jdk.incubator.foreign --add-opens jdk.incubator.foreign/jdk.incubator.foreign=ALL-UNNAMED - --enable-native-access ALL-UNNAMED - + --enable-native-access ALL-UNNAMED diff --git a/jetty-quic/quic-common/pom.xml b/jetty-quic/quic-common/pom.xml index 4a197141fb1..981917fd22f 100644 --- a/jetty-quic/quic-common/pom.xml +++ b/jetty-quic/quic-common/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.quic quic-parent 10.0.20-SNAPSHOT - - 4.0.0 quic-common Jetty :: QUIC :: Common @@ -15,18 +15,18 @@ + - org.slf4j - slf4j-api + org.eclipse.jetty + jetty-io org.eclipse.jetty.quic quic-quiche-common - - org.eclipse.jetty - jetty-io + org.slf4j + slf4j-api diff --git a/jetty-quic/quic-quiche/pom.xml b/jetty-quic/quic-quiche/pom.xml index 2de4233a2af..8a23cdae469 100644 --- a/jetty-quic/quic-quiche/pom.xml +++ b/jetty-quic/quic-quiche/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.quic quic-parent 10.0.20-SNAPSHOT - - 4.0.0 quic-quiche pom Jetty :: QUIC :: Quiche diff --git a/jetty-quic/quic-quiche/quic-quiche-common/pom.xml b/jetty-quic/quic-quiche/quic-quiche-common/pom.xml index 26d4fe2a2ba..7c0e6e8ff88 100644 --- a/jetty-quic/quic-quiche/quic-quiche-common/pom.xml +++ b/jetty-quic/quic-quiche/quic-quiche-common/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.quic quic-quiche 10.0.20-SNAPSHOT - - 4.0.0 quic-quiche-common Jetty :: QUIC :: Quiche :: Common @@ -16,10 +16,6 @@ - - org.slf4j - slf4j-api - org.eclipse.jetty jetty-util @@ -28,6 +24,10 @@ org.mortbay.jetty.quiche jetty-quiche-native + + org.slf4j + slf4j-api + org.eclipse.jetty jetty-slf4j-impl diff --git a/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/pom.xml b/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/pom.xml index ffbb8c1294d..23d30bf4531 100644 --- a/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/pom.xml +++ b/jetty-quic/quic-quiche/quic-quiche-foreign-incubator/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.quic quic-quiche 10.0.20-SNAPSHOT - - 4.0.0 quic-quiche-foreign-incubator Jetty :: QUIC :: Quiche :: Foreign Binding (incubator) @@ -14,6 +14,26 @@ ${project.groupId}.quic-quiche-foreign-incubator + + + org.eclipse.jetty + jetty-util + + + org.eclipse.jetty.quic + quic-quiche-common + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + @@ -47,37 +67,15 @@ maven-surefire-plugin - - @{argLine} + @{argLine} ${jetty.surefire.argLine} --add-opens org.eclipse.jetty.quic.quiche.foreign.incubator/org.eclipse.jetty.quic.quiche.foreign.incubator=ALL-UNNAMED - --enable-native-access org.eclipse.jetty.quic.quiche.foreign.incubator - + --enable-native-access org.eclipse.jetty.quic.quiche.foreign.incubator - - - org.slf4j - slf4j-api - - - org.eclipse.jetty.quic - quic-quiche-common - - - org.eclipse.jetty - jetty-util - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - + + + + + + + + + + + + + + org.apache.maven.plugins maven-dependency-plugin build-deps-file - generate-resources list + generate-resources false ${project.build.directory}/deps.txt @@ -56,34 +84,6 @@ - - org.apache.maven.plugins - maven-antrun-plugin - - - process-deps - process-resources - - run - - - - - - - - - - - - - - - - - - - diff --git a/jetty-unixsocket/pom.xml b/jetty-unixsocket/pom.xml index 43e1ca139bd..e9ee6faf885 100644 --- a/jetty-unixsocket/pom.xml +++ b/jetty-unixsocket/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty jetty-project 10.0.20-SNAPSHOT - - 4.0.0 jetty-unixsocket pom Jetty :: UnixSocket diff --git a/jetty-util-ajax/pom.xml b/jetty-util-ajax/pom.xml index 680c3ef67da..207658b8729 100644 --- a/jetty-util-ajax/pom.xml +++ b/jetty-util-ajax/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty jetty-project 10.0.20-SNAPSHOT - 4.0.0 jetty-util-ajax Jetty :: Utilities :: Ajax(JSON) JSON/Ajax Utility classes for Jetty @@ -17,15 +18,15 @@ org.eclipse.jetty jetty-util + + org.slf4j + slf4j-api + org.eclipse.jetty.toolchain jetty-servlet-api provided - - org.slf4j - slf4j-api - org.eclipse.jetty diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index bcf255105ed..c89b8c51b7b 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty jetty-project 10.0.20-SNAPSHOT - 4.0.0 jetty-util Jetty :: Utilities Utility classes for Jetty @@ -12,42 +13,40 @@ ${project.groupId}.util org.eclipse.jetty.util.* + + + org.slf4j + slf4j-api + + + org.awaitility + awaitility + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.toolchain + jetty-perf-helper + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + - src/main/resources true + src/main/resources - - org.codehaus.mojo - buildnumber-maven-plugin - - - create-buildnumber - - create - - - false - false - ${nonCanonicalRevision} - - jgit - - ../ - - - - - - org.apache.maven.scm - maven-scm-provider-jgit - 2.0.1 - - - org.apache.felix maven-bundle-plugin @@ -65,37 +64,37 @@ ${settings.localRepository} - - @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.util=org.eclipse.jetty.logging - + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.util=org.eclipse.jetty.logging + + org.codehaus.mojo + buildnumber-maven-plugin + + + org.apache.maven.scm + maven-scm-provider-jgit + 2.0.1 + + + + + create-buildnumber + + create + + + false + false + ${nonCanonicalRevision} + + jgit + + ../ + + + + - - - org.slf4j - slf4j-api - - - org.awaitility - awaitility - test - - - org.eclipse.jetty.toolchain - jetty-perf-helper - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - - diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index 138bb3e0df0..48b58d7952d 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty jetty-project 10.0.20-SNAPSHOT - - 4.0.0 jetty-webapp Jetty :: Webapp Application Support Jetty web application support @@ -15,56 +16,6 @@ org.eclipse.jetty.webapp.* - - - - src/main/resources - - - src/main/config/etc - org/eclipse/jetty/webapp - false - - webdefault.xml - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} - - false - - ${basedir}/src/test/resources/module/foo-bar-janb.jar - - - org.eclipse.jetty.webapp.WebAppClassLoaderUrlStreamTest - - - - - org.apache.felix - maven-bundle-plugin - true - - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)", osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.webapp.Configuration)";cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.webapp.Configuration - - - - - - - org.eclipse.jetty @@ -78,6 +29,11 @@ org.slf4j slf4j-api + + org.eclipse.jetty + jetty-client + test + org.eclipse.jetty jetty-slf4j-impl @@ -93,10 +49,49 @@ jetty-test-helper test - - org.eclipse.jetty - jetty-client - test - + + + + + src/main/resources + + + org/eclipse/jetty/webapp + false + src/main/config/etc + + webdefault.xml + + + + + + + org.apache.felix + maven-bundle-plugin + true + + + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)", osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.webapp.Configuration)";cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.webapp.Configuration + + + + + org.apache.maven.plugins + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} + false + + ${basedir}/src/test/resources/module/foo-bar-janb.jar + + + org.eclipse.jetty.webapp.WebAppClassLoaderUrlStreamTest + + + + + diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml index 1b39a9958b4..9baa058cc0a 100644 --- a/jetty-websocket/pom.xml +++ b/jetty-websocket/pom.xml @@ -1,16 +1,16 @@ - - jetty-project - org.eclipse.jetty - 10.0.20-SNAPSHOT - 4.0.0 + + org.eclipse.jetty + jetty-project + 10.0.20-SNAPSHOT + org.eclipse.jetty.websocket websocket-parent - Jetty :: Websocket :: Parent pom + Jetty :: Websocket :: Parent websocket-core-common diff --git a/jetty-websocket/websocket-core-client/pom.xml b/jetty-websocket/websocket-core-client/pom.xml index 58d8962376b..36672f070a8 100644 --- a/jetty-websocket/websocket-core-client/pom.xml +++ b/jetty-websocket/websocket-core-client/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.websocket websocket-parent 10.0.20-SNAPSHOT - - 4.0.0 websocket-core-client Jetty :: Websocket :: Core :: Client @@ -15,10 +15,6 @@ - - org.eclipse.jetty.websocket - websocket-core-common - org.eclipse.jetty jetty-client @@ -28,6 +24,10 @@ jetty-xml true + + org.eclipse.jetty.websocket + websocket-core-common + diff --git a/jetty-websocket/websocket-core-common/pom.xml b/jetty-websocket/websocket-core-common/pom.xml index 939eec329f5..34f49efc768 100644 --- a/jetty-websocket/websocket-core-common/pom.xml +++ b/jetty-websocket/websocket-core-common/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.websocket websocket-parent 10.0.20-SNAPSHOT - - 4.0.0 websocket-core-common Jetty :: Websocket :: Core :: Common @@ -17,11 +17,11 @@ org.eclipse.jetty - jetty-io + jetty-http org.eclipse.jetty - jetty-http + jetty-io org.slf4j @@ -39,12 +39,8 @@ Jetty Websocket Core Common *,org.eclipse.jetty.websocket.core.common.internal.* - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)"; resolution:=optional - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.websocket.core.Extension - + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)"; resolution:=optional + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.websocket.core.Extension diff --git a/jetty-websocket/websocket-core-server/pom.xml b/jetty-websocket/websocket-core-server/pom.xml index bfe03911dcc..ef5871a76cf 100644 --- a/jetty-websocket/websocket-core-server/pom.xml +++ b/jetty-websocket/websocket-core-server/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.websocket websocket-parent 10.0.20-SNAPSHOT - - 4.0.0 websocket-core-server Jetty :: Websocket :: Core :: Server @@ -15,14 +15,14 @@ - - org.eclipse.jetty.websocket - websocket-core-common - org.eclipse.jetty jetty-server + + org.eclipse.jetty.websocket + websocket-core-common + diff --git a/jetty-websocket/websocket-core-tests/pom.xml b/jetty-websocket/websocket-core-tests/pom.xml index 57487be048c..810054498c4 100644 --- a/jetty-websocket/websocket-core-tests/pom.xml +++ b/jetty-websocket/websocket-core-tests/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.websocket websocket-parent 10.0.20-SNAPSHOT - - 4.0.0 websocket-core-tests Jetty :: Websocket :: Core :: Tests @@ -23,11 +23,11 @@ org.eclipse.jetty.websocket - websocket-core-server + websocket-core-common org.eclipse.jetty.websocket - websocket-core-common + websocket-core-server org.eclipse.jetty diff --git a/jetty-websocket/websocket-javax-client/pom.xml b/jetty-websocket/websocket-javax-client/pom.xml index 167b47d0bd0..5e4e6b7f6f2 100644 --- a/jetty-websocket/websocket-javax-client/pom.xml +++ b/jetty-websocket/websocket-javax-client/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.websocket websocket-parent 10.0.20-SNAPSHOT - - 4.0.0 websocket-javax-client Jetty :: Websocket :: javax.websocket :: Client @@ -15,31 +15,26 @@ - - org.eclipse.jetty.toolchain - jetty-javax-websocket-api - - - org.eclipse.jetty.websocket - websocket-javax-common - - - org.eclipse.jetty.websocket - websocket-core-client - org.eclipse.jetty jetty-client + + org.eclipse.jetty.toolchain + jetty-javax-websocket-api + org.eclipse.jetty.toolchain jetty-servlet-api true - org.eclipse.jetty - jetty-xml - test + org.eclipse.jetty.websocket + websocket-core-client + + + org.eclipse.jetty.websocket + websocket-javax-common org.eclipse.jetty @@ -51,6 +46,11 @@ jetty-slf4j-impl test + + org.eclipse.jetty + jetty-xml + test + @@ -62,16 +62,10 @@ javax.websocket.client Implementation - - org.eclipse.jetty.websocket.javax.client.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - - - osgi.serviceloader;osgi.serviceloader=javax.websocket.ContainerProvider, - osgi.serviceloader;osgi.serviceloader=javax.servlet.ServletContainerInitializer - + org.eclipse.jetty.websocket.javax.client.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional + osgi.serviceloader;osgi.serviceloader=javax.websocket.ContainerProvider, + osgi.serviceloader;osgi.serviceloader=javax.servlet.ServletContainerInitializer diff --git a/jetty-websocket/websocket-javax-common/pom.xml b/jetty-websocket/websocket-javax-common/pom.xml index 38023859dca..44f02a1645c 100644 --- a/jetty-websocket/websocket-javax-common/pom.xml +++ b/jetty-websocket/websocket-javax-common/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.websocket websocket-parent 10.0.20-SNAPSHOT - - 4.0.0 websocket-javax-common Jetty :: Websocket :: javax.websocket :: Common @@ -14,24 +14,6 @@ ${project.groupId}.javax.common - - - - org.apache.felix - maven-bundle-plugin - true - - - javax.websocket.client Implementation - - org.eclipse.jetty.websocket.javax.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - - - - - - - org.eclipse.jetty.toolchain @@ -51,4 +33,20 @@ test + + + + + org.apache.felix + maven-bundle-plugin + true + + + javax.websocket.client Implementation + org.eclipse.jetty.websocket.javax.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" + + + + + diff --git a/jetty-websocket/websocket-javax-server/pom.xml b/jetty-websocket/websocket-javax-server/pom.xml index 81d893a07ad..fb32f02575e 100644 --- a/jetty-websocket/websocket-javax-server/pom.xml +++ b/jetty-websocket/websocket-javax-server/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.websocket websocket-parent 10.0.20-SNAPSHOT - - 4.0.0 websocket-javax-server Jetty :: Websocket :: javax.websocket :: Server @@ -15,14 +15,6 @@ - - org.eclipse.jetty.websocket - websocket-javax-client - - - org.eclipse.jetty.websocket - websocket-servlet - org.eclipse.jetty jetty-annotations @@ -31,6 +23,14 @@ org.eclipse.jetty.toolchain jetty-javax-websocket-api + + org.eclipse.jetty.websocket + websocket-javax-client + + + org.eclipse.jetty.websocket + websocket-servlet + org.slf4j slf4j-api @@ -44,14 +44,6 @@ - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.websocket.javax.server=org.eclipse.jetty.security --add-reads org.eclipse.jetty.websocket.javax.common=org.eclipse.jetty.websocket.javax.server - - - org.apache.felix maven-bundle-plugin @@ -59,16 +51,18 @@ javax.websocket.server Implementation - - org.eclipse.jetty.websocket.javax.server.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - + org.eclipse.jetty.websocket.javax.server.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - - osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.webapp.Configuration,osgi.serviceloader;osgi.serviceloader=javax.servlet.ServletContainerInitializer,osgi.serviceloader;osgi.serviceloader=javax.websocket.server.ServerEndpointConfig$Configurator - + osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.webapp.Configuration,osgi.serviceloader;osgi.serviceloader=javax.servlet.ServletContainerInitializer,osgi.serviceloader;osgi.serviceloader=javax.websocket.server.ServerEndpointConfig$Configurator + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.websocket.javax.server=org.eclipse.jetty.security --add-reads org.eclipse.jetty.websocket.javax.common=org.eclipse.jetty.websocket.javax.server + + diff --git a/jetty-websocket/websocket-javax-tests/pom.xml b/jetty-websocket/websocket-javax-tests/pom.xml index 4ae79630f77..e86ba868cb0 100644 --- a/jetty-websocket/websocket-javax-tests/pom.xml +++ b/jetty-websocket/websocket-javax-tests/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.websocket websocket-parent 10.0.20-SNAPSHOT - - 4.0.0 websocket-javax-tests Jetty :: Websocket :: javax.websocket :: Tests @@ -18,8 +18,16 @@ - org.slf4j - slf4j-api + org.eclipse.jetty.tests + jetty-http-tools + + + org.eclipse.jetty.toolchain + jetty-javax-websocket-api + + + org.eclipse.jetty.toolchain + jetty-test-helper org.eclipse.jetty.websocket @@ -30,17 +38,12 @@ websocket-javax-server - org.eclipse.jetty.tests - jetty-http-tools + org.junit.jupiter + junit-jupiter - org.eclipse.jetty.toolchain - jetty-javax-websocket-api - - - org.eclipse.jetty - jetty-util-ajax - test + org.slf4j + slf4j-api org.eclipse.jetty @@ -48,12 +51,9 @@ test - org.eclipse.jetty.toolchain - jetty-test-helper - - - org.junit.jupiter - junit-jupiter + org.eclipse.jetty + jetty-util-ajax + test @@ -66,9 +66,7 @@ javax.websocket Integration Tests - - org.eclipse.jetty.websocket.javax.tests.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - + org.eclipse.jetty.websocket.javax.tests.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" diff --git a/jetty-websocket/websocket-jetty-api/pom.xml b/jetty-websocket/websocket-jetty-api/pom.xml index 2379268ab80..f8ab1e3ceca 100644 --- a/jetty-websocket/websocket-jetty-api/pom.xml +++ b/jetty-websocket/websocket-jetty-api/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.websocket websocket-parent 10.0.20-SNAPSHOT - - 4.0.0 websocket-jetty-api Jetty :: Websocket :: org.eclipse.jetty.websocket :: API diff --git a/jetty-websocket/websocket-jetty-client/pom.xml b/jetty-websocket/websocket-jetty-client/pom.xml index 3f5cda46c9f..e2e39f250db 100644 --- a/jetty-websocket/websocket-jetty-client/pom.xml +++ b/jetty-websocket/websocket-jetty-client/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.websocket websocket-parent 10.0.20-SNAPSHOT - - 4.0.0 websocket-jetty-client Jetty :: Websocket :: org.eclipse.jetty.websocket :: Client @@ -14,39 +14,7 @@ ${project.groupId}.client - - - - org.apache.felix - maven-bundle-plugin - true - - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.webapp.Configuration - - - - - - - - - org.eclipse.jetty.websocket - websocket-jetty-api - - - org.eclipse.jetty.websocket - websocket-jetty-common - - - org.eclipse.jetty.websocket - websocket-core-client - org.eclipse.jetty jetty-client @@ -56,6 +24,18 @@ jetty-webapp true + + org.eclipse.jetty.websocket + websocket-core-client + + + org.eclipse.jetty.websocket + websocket-jetty-api + + + org.eclipse.jetty.websocket + websocket-jetty-common + org.slf4j slf4j-api @@ -67,4 +47,20 @@ + + + + org.apache.felix + maven-bundle-plugin + true + + + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.webapp.Configuration + + + + + + diff --git a/jetty-websocket/websocket-jetty-common/pom.xml b/jetty-websocket/websocket-jetty-common/pom.xml index 0dddc4cd4e9..751b4e32e7d 100644 --- a/jetty-websocket/websocket-jetty-common/pom.xml +++ b/jetty-websocket/websocket-jetty-common/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.websocket websocket-parent 10.0.20-SNAPSHOT - - 4.0.0 websocket-jetty-common Jetty :: Websocket :: org.eclipse.jetty.websocket :: Common @@ -14,6 +14,22 @@ ${project.groupId}.common + + + org.eclipse.jetty.websocket + websocket-core-common + + + org.eclipse.jetty.websocket + websocket-jetty-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + @@ -22,31 +38,11 @@ true - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.websocket.api.ExtensionConfig$Parser - + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.websocket.api.ExtensionConfig$Parser - - - - org.eclipse.jetty.websocket - websocket-jetty-api - - - org.eclipse.jetty.websocket - websocket-core-common - - - org.eclipse.jetty - jetty-slf4j-impl - test - - diff --git a/jetty-websocket/websocket-jetty-server/pom.xml b/jetty-websocket/websocket-jetty-server/pom.xml index 4cc81f82255..909af3e97b8 100644 --- a/jetty-websocket/websocket-jetty-server/pom.xml +++ b/jetty-websocket/websocket-jetty-server/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.websocket websocket-parent 10.0.20-SNAPSHOT - - 4.0.0 websocket-jetty-server Jetty :: Websocket :: org.eclipse.jetty.websocket :: Server @@ -15,6 +15,23 @@ + + org.eclipse.jetty + jetty-jmx + true + + + org.eclipse.jetty + jetty-servlet + + + org.eclipse.jetty + jetty-webapp + + + org.eclipse.jetty.toolchain + jetty-servlet-api + org.eclipse.jetty.websocket websocket-jetty-api @@ -27,23 +44,6 @@ org.eclipse.jetty.websocket websocket-servlet - - org.eclipse.jetty.toolchain - jetty-servlet-api - - - org.eclipse.jetty - jetty-servlet - - - org.eclipse.jetty - jetty-webapp - - - org.eclipse.jetty - jetty-jmx - true - org.slf4j slf4j-api @@ -64,13 +64,9 @@ Jetty Websocket Server - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - - - osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.webapp.Configuration, - osgi.serviceloader;osgi.serviceloader=javax.servlet.ServletContainerInitializer - + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional + osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.webapp.Configuration, + osgi.serviceloader;osgi.serviceloader=javax.servlet.ServletContainerInitializer diff --git a/jetty-websocket/websocket-jetty-tests/pom.xml b/jetty-websocket/websocket-jetty-tests/pom.xml index acc7ad0062f..c58d5f4ea7a 100644 --- a/jetty-websocket/websocket-jetty-tests/pom.xml +++ b/jetty-websocket/websocket-jetty-tests/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.websocket websocket-parent 10.0.20-SNAPSHOT - - 4.0.0 websocket-jetty-tests Jetty :: Websocket :: org.eclipse.jetty.websocket :: Tests @@ -18,8 +18,43 @@ - org.slf4j - slf4j-api + org.eclipse.jetty + jetty-alpn-java-server + test + + + org.eclipse.jetty + jetty-alpn-server + test + + + org.eclipse.jetty + jetty-annotations + test + + + org.eclipse.jetty + jetty-jmx + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.http2 + http2-http-client-transport + test + + + org.eclipse.jetty.http2 + http2-server + test + + + org.eclipse.jetty.tests + jetty-http-tools test @@ -38,43 +73,8 @@ test - org.eclipse.jetty.tests - jetty-http-tools - test - - - org.eclipse.jetty.http2 - http2-server - test - - - org.eclipse.jetty - jetty-alpn-server - test - - - org.eclipse.jetty - jetty-alpn-java-server - test - - - org.eclipse.jetty.http2 - http2-http-client-transport - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty - jetty-jmx - test - - - org.eclipse.jetty - jetty-annotations + org.slf4j + slf4j-api test @@ -88,13 +88,10 @@ jetty.websocket Integration Tests - - org.eclipse.jetty.websocket.jetty.tests.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - + org.eclipse.jetty.websocket.jetty.tests.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - diff --git a/jetty-websocket/websocket-servlet/pom.xml b/jetty-websocket/websocket-servlet/pom.xml index 2e9f73dd151..acf1c843bc8 100644 --- a/jetty-websocket/websocket-servlet/pom.xml +++ b/jetty-websocket/websocket-servlet/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.websocket websocket-parent 10.0.20-SNAPSHOT - - 4.0.0 websocket-servlet Jetty :: Websocket :: Servlet @@ -15,14 +15,14 @@ - - org.eclipse.jetty.websocket - websocket-core-server - org.eclipse.jetty jetty-servlet + + org.eclipse.jetty.websocket + websocket-core-server + org.slf4j slf4j-api diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index 7a44c33e491..5b3bf40e3af 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty jetty-project 10.0.20-SNAPSHOT - 4.0.0 jetty-xml Jetty :: XML utilities The jetty xml utilities. @@ -12,30 +13,6 @@ ${project.groupId}.xml org.eclipse.jetty.xml.* - - - - org.apache.felix - maven-bundle-plugin - true - - - osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.xml.ConfigurationProcessorFactory)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.xml=org.eclipse.jetty.logging - - - - - org.eclipse.jetty @@ -56,4 +33,25 @@ test + + + + org.apache.felix + maven-bundle-plugin + true + + + osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.xml.ConfigurationProcessorFactory)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional + + + + + org.apache.maven.plugins + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.xml=org.eclipse.jetty.logging + + + + diff --git a/pom.xml b/pom.xml index 9d62c460d41..10223f9e3ff 100644 --- a/pom.xml +++ b/pom.xml @@ -5,177 +5,16 @@ org.eclipse.jetty jetty-project 10.0.20-SNAPSHOT + pom Jetty :: Project The Eclipse Jetty Project - pom https://eclipse.dev/jetty 1995 - - - 11 - 11 - 11 - false - https://eclipse.dev/jetty/ - benchmarks - org.slf4j;version="[1.7,3.0)", org.slf4j.event;version="[1.7,3.0)", org.slf4j.helpers;version="[1.7,3.0)", org.slf4j.spi;version="[1.7,3.0)" - UTF-8 - - - 2.0.10 - 1.10.14 - 1.11.3 - 4.5.14 - 4.4.16 - 2.2.14 - 2.5.11 - 2.2.3 - 9.6 - 4.2.0 - 6.3.1 - 1.5 - 10.12.7 - 1.16.0 - 1.25.0 - 2.15.1 - 3.14.0 - 2.5.2 - 3.4.2 - 7.0.5 - 3.0.2 - 2.24.0 - 1.60.1 - 2.10.1 - 33.0.0-jre - 5.1.0 - 2.2 - 3.0.0 - 5.2.1 - 4.6.5.Final - 11.0.18.Final - 2.16.1 - 1.2.2 - 1.3.5 - 3.0.3 - 2.0.2 - 1.0.5 - 1.2.5 - 4.0.4 - 2.3.6 - 1.2.7 - 1.2.0.v201105211821 - 1.3.3 - 1.1.2 - 2.3.3 - 2.3.9 - 2.3.7 - 2.3.3 - 2.82 - 1.1.0.v201105071233 - 2.0 - 1.4.1.v201005082020 - 1.1.3 - 1.2.5 - 2.2.1.Final - 2.2.1.Final - 3.5.3.Final - 3.0.4.Final - 3.5.1.Final - 1.1 - 1.0.7 - 0.18.0 - 4.0.6 - 1.2 - 6.0 - 1.37 - 5.14.0 - 0.10.4 - 0.32.16 - 2.2.15 - 3.1.18 - 0.38.21 - 1.7.2 - 1.1.1 - 2.5.0 - 9.0.83.1 - 5.10.1 - 2.0.3 - 2.22.1 - 1.3.14 - 3.3.2 - 10.3.6 - 1.9.18 - 3.9.0 - 3.12.14 - 0.9.1 - 8.1.0 - 6.0.0 - 1.2.0 - 1.3.0 - 2.2.0 - 4.0.0 - 4.0.3 - 2.0.5 - 2.1.1.RELEASE - 1.2.5 - 1.2.5 - 1.19.3 - 3.1.9.Final - 1.7.0.Final - 2.2.2.Final - 2.4.8 - - - 2.2.4 - 3.5.0 - 3.2.0 - 1.5.0 - 1.5.0 - 1.0.10 - 0.8.11 - 2.7 - 4.3 - 3.1.0 - 3.6.0 - 5.1.9 - 3.3.2 - 3.3.1 - 3.12.1 - 3.6.1 - 3.1.1 - 3.4.1 - 3.1.1 - 3.1.0 - 3.1.1 - 3.6.0 - 4.0.6 - 3.3.0 - 3.6.3 - 3.10.2 - 3.10.2 - 3.0.1 - 3.1.0 - 3.3.1 - 3.5.1 - 3.2.3 - 3.3.0 - 3.4.0 - 4.8.2.0 - 2.16.2 - - - false - false - ${project.build.directory}/local-repo - -Dfile.encoding=UTF-8 -Duser.language=en -Duser.region=US -showversion -Xmx4g -Xms2g -Xlog:gc:stderr:time,level,tags - false - /tmp - - 3.2.20 - src/it/settings.xml - 0 - + + Webtide + https://webtide.com + @@ -188,11 +27,89 @@ - - scm:git:https://github.com/jetty/jetty.project.git - scm:git:git@github.com:jetty/jetty.project.git - https://github.com/jetty/jetty.project - + + + gregw + Greg Wilkins + gregw@webtide.com + Webtide, LLC + https://webtide.com + 10 + + + janb + Jan Bartel + janb@webtide.com + Webtide, LLC + https://webtide.com + 10 + + + jesse + Jesse McConnell + jesse.mcconnell@gmail.com + Webtide, LLC + https://webtide.com + -6 + + + joakime + Joakim Erdfelt + joakim.erdfelt@gmail.com + Webtide, LLC + https://webtide.com + -6 + + + sbordet + Simone Bordet + simone.bordet@gmail.com + Webtide, LLC + https://webtide.com + 1 + + + djencks + David Jencks + david.a.jencks@gmail.com + IBM + -8 + + + olamy + Olivier Lamy + oliver.lamy@gmail.com + Webtide, LLC + https://webtide.com + Australia/Brisbane + + + lorban + Ludovic Orban + lorban@bitronix.be + Webtide, LLC + https://webtide.com + 1 + + + + + + Jetty Developer Mailing List + https://accounts.eclipse.org/mailing-list/jetty-dev + https://www.eclipse.org/lists/jetty-dev/ + + + Jetty Users Mailing List + https://accounts.eclipse.org/mailing-list/jetty-users + https://www.eclipse.org/lists/jetty-users/ + + + Jetty Announce Mailing List + https://accounts.eclipse.org/mailing-list/jetty-announce + https://www.eclipse.org/lists/jetty-announce/ + + build-resources @@ -251,710 +168,233 @@ javadoc - - - - com.diffplug.spotless - spotless-maven-plugin - 2.39.0 - - - - pom.xml - - - 2 - - recommended_2008_06 - - true - - - - true - - scope,groupId,artifactId - - groupId,artifactId - - groupId,artifactId - - - - true - - - - - - check - - validate - - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - ban-javax-servlet-api - - enforce - - validate - - - - - javax.servlet:* - servletapi - org.eclipse.jetty.orbit:javax.servlet - *:javax.servlet - org.mortbay.jetty:servlet-api - jetty:servlet-api - jetty-servlet-api - javax.websocket - javax.el:* - javax.annotation:javax.annotation-api - - true - - - - - - enforce-java - - enforce - - validate - - - - [3.5.0,) - [ERROR] OLD MAVEN [${maven.version}] in use, Jetty ${project.version} requires Maven 3.5.0 or newer - - - [11,) - [ERROR] OLD JDK [${java.version}] in use. Jetty ${project.version} requires JDK 11 or newer - - - - - - - - - - - - - org.eclipse.jetty.toolchain - jetty-build-support - ${build-support.version} - - - - - org.jacoco - jacoco-maven-plugin - - - - **/org/eclipse/jetty/ant/** - - **/org/eclipse/jetty/embedded/** - **/org/eclipse/jetty/asyncrest/** - **/org/eclipse/jetty/demo/** - - **/org/eclipse/jetty/gcloud/** - **/org/eclipse/jetty/infinispan/** - **/org/eclipse/jetty/osgi/** - **/org/eclipse/jetty/spring/** - **/org/eclipse/jetty/http/spi/** - - **/org/eclipse/jetty/tests/** - **/org/eclipse/jetty/test/** - - - - - jacoco-initialize - initialize - - prepare-agent - - - - jacoco-setup-m-invoker-p - initialize - - - invoker.mavenOpts - - - prepare-agent - - - - jacoco-site - package - - report - - - - - **/org/eclipse/jetty/** - - - - - - - org.apache.maven.plugins - maven-release-plugin - - true - false - deploy - -Peclipse-release - clean install - forked-path - - - - org.apache.maven.plugins - maven-remote-resources-plugin - - - copy-shared-resources - generate-resources - - process - - - - org.eclipse.jetty:build-resources:${project.version} - - - - - - - - - org.apache.maven.plugins - maven-source-plugin - true - - - attach-sources - package - - jar-no-fork - - - - - - com.mycila - license-maven-plugin - false - - true - true - true - - - - check-java-headers - verify - - check - - -
header-template.txt
- - DOUBLESLASH_STYLE - DOUBLESLASH_STYLE - - - **/*.java - **/*.adoc - - - - jetty-ant/src/main/java/org/eclipse/jetty/ant/AntWebAppContext.java - jetty-ant/src/main/java/org/eclipse/jetty/ant/types/Connectors.java - jetty-ant/src/main/java/org/eclipse/jetty/ant/types/ContextHandlers.java - jetty-ant/src/main/java/org/eclipse/jetty/ant/types/FileMatchingConfiguration.java - jetty-ant/src/main/java/org/eclipse/jetty/ant/types/LoginServices.java - jetty-ant/src/main/java/org/eclipse/jetty/ant/types/SystemProperties.java - jetty-ant/src/main/java/org/eclipse/jetty/ant/utils/ServerProxy.java - jetty-ant/src/main/java/org/eclipse/jetty/ant/utils/TaskLog.java - jetty-ant/src/main/java/org/eclipse/jetty/ant/AntWebXmlConfiguration.java - jetty-ant/src/main/java/org/eclipse/jetty/ant/JettyRunTask.java - jetty-ant/src/main/java/org/eclipse/jetty/ant/ServerProxyImpl.java - - jetty-util/src/main/java/org/eclipse/jetty/util/security/UnixCrypt.java - - jetty-home/src/main/resources/README.adoc - - - - - - - org.apache.felix - maven-bundle-plugin - - - process-classes - - manifest - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - set-osgi-version - validate - - parse-version - - - - - - org.eclipse.jetty.toolchain - jetty-version-maven-plugin - - - attach-version - process-resources - - attach-version-text - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - ${maven.checkstyle.plugin.version} - - jetty-checkstyle.xml - true - warning - true - - - ${project.build.sourceDirectory} - ${project.build.testSourceDirectory} - - - - - org.eclipse.jetty - build-resources - ${project.version} - - - com.puppycrawl.tools - checkstyle - ${checkstyle.version} - - - - - checkstyle-check - validate - - check - - - - - + + scm:git:https://github.com/jetty/jetty.project.git + scm:git:git@github.com:jetty/jetty.project.git + https://github.com/jetty/jetty.project + - - - - org.apache.maven.plugins - maven-antrun-plugin - ${maven.antrun.plugin.version} - - - org.apache.ant - ant - ${ant.version} - - - - - org.apache.maven.plugins - maven-assembly-plugin - ${maven.assembly.plugin.version} - - - org.eclipse.jetty.toolchain - jetty-assembly-descriptors - ${jetty-assembly-descriptors.version} - - - - - org.apache.maven.plugins - maven-clean-plugin - ${maven.clean.plugin.version} - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven.compiler.plugin.version} - - ${compiler.source} - ${compiler.target} - ${compiler.release} - true - - -Xlint:exports - - -nowarn - - - - org.apache.maven.plugins - maven-dependency-plugin - ${maven.dependency.plugin.version} - - - org.apache.maven.plugins - maven-deploy-plugin - ${maven.deploy.plugin.version} - - 10 - - - - org.apache.maven.plugins - maven-enforcer-plugin - ${maven.enforcer.plugin.version} - - - org.apache.maven.plugins - maven-failsafe-plugin - ${maven.surefire.plugin.version} - - - org.apache.maven.plugins - maven-invoker-plugin - ${maven.invoker.plugin.version} - - ${invoker.mergeUserSettings} - true - org.eclipse.jetty.maven.its - ${it.debug} - ${java.home} - - ${java.home} - - src/it - 300 - ${project.build.directory}/it - ${localRepoPath} - ${settingsPath} - ${skipTests} - true - - */pom.xml - - - ${localRepoPath} - - - - - org.apache.maven.plugins - maven-install-plugin - ${maven.install.plugin.version} - - - org.apache.maven.plugins - maven-jar-plugin - ${maven.jar.plugin.version} - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - ${project.version} - Eclipse Jetty Project - ${jetty.url} - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven.javadoc.plugin.version} - - true - true - 11 - UTF-8 - UTF-8 - UTF-8 - -html5 - true - false - false - false - protected - true - true - com.*:org.slf4j*:org.mortbay*:*.jmh*:org.eclipse.jetty.embedded*:org.eclipse.jetty.example.asyncrest*:org.eclipse.jetty.test* - - - - org.apache.maven.plugins - maven-plugin-plugin - ${maven-plugin.plugin.version} - - - org.apache.maven.plugins - maven-release-plugin - ${maven.release.plugin.version} - - - org.apache.maven.plugins - maven-remote-resources-plugin - ${maven.remote-resources-plugin.version} - - - org.apache.maven.plugins - maven-resources-plugin - ${maven.resources.plugin.version} - - ${project.build.sourceEncoding} - - - - org.apache.maven.plugins - maven-shade-plugin - ${maven.shade.plugin.version} - - false - - - - org.apache.maven.plugins - maven-source-plugin - ${maven.source.plugin.version} - - - - 2 - ${project.name} - ${bundle-symbolic-name}.source - Eclipse Jetty Project - ${parsedVersion.osgiVersion} - ${bundle-symbolic-name};version="${parsedVersion.osgiVersion}";roots:="." - - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven.surefire.plugin.version} - - false - ${surefire.rerunFailingTestsCount} - 3600 - - @{argLine} ${jetty.surefire.argLine} - - false - 1 - true - - alphabetical - - ${project.build.directory} - ${jetty.unixdomain.dir} - true - ${jetty.testtracker.log} - - - - en_US.UTF-8 - - - - - org.ow2.asm - asm-commons - ${asm.version} - - - - - org.apache.maven.plugins - maven-war-plugin - ${maven.war.plugin.version} - - - org.eclipse.jetty.toolchain - jetty-version-maven-plugin - ${jetty-version.maven.plugin.version} - - - org.jacoco - jacoco-maven-plugin - ${jacoco.maven.plugin.version} - - - com.mycila - license-maven-plugin - ${license.maven.plugin.version} - - - org.apache.felix - maven-bundle-plugin - ${maven.bundle.plugin.version} - - - jar - maven-plugin - - - ${bundle-symbolic-name} - Jetty module for ${project.name} - JavaSE-11 - ${jetty.url} - Eclipse Jetty Project - . - Copyright (c) 2008-2022 Mort Bay Consulting Pty Ltd and others. - - ${osgi.slf4j.import.packages}, - * - - <_provider-policy>]]> - <_consumer-policy>]]> - <_noee>true - - - - - org.apache.servicemix.tooling - depends-maven-plugin - ${depends.maven.plugin.version} - - - org.asciidoctor - asciidoctor-maven-plugin - ${asciidoctor.maven.plugin.version} - - - org.asciidoctor - asciidoctorj-diagram - ${asciidoctorj-diagram.version} - - - - html5 - - asciidoctor-diagram - - - https://eclipse.dev/jetty/javadoc/jetty-10 - ${basedir}/.. - https://github.com/jetty/jetty.project/tree/jetty-10.0.x - https://github.com/jetty/jetty.project/tree/jetty-10.0.x/documentation/jetty-documentation/src/main/asciidoc - http://central.maven.org/maven2 - ${project.version} - ${maven.build.timestamp} - left - font - - - - - index - generate-resources - - process-asciidoc - - - src/main/asciidoc - index.adoc - ${project.build.directory}/html - - - - - - org.codehaus.mojo - build-helper-maven-plugin - ${build-helper.maven.plugin.version} - - - org.codehaus.mojo - buildnumber-maven-plugin - ${buildnumber.maven.plugin.version} - - - org.codehaus.mojo - exec-maven-plugin - ${maven.exec.plugin.version} - - - org.mortbay.jetty - h2spec-maven-plugin - ${h2spec.maven.plugin.version} - - - org.codehaus.mojo - versions-maven-plugin - ${versions.maven.plugin.version} - - true - true - true - true - - - - - + + github + https://github.com/jetty/jetty.project/issues + - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - org.junit.jupiter - junit-jupiter - test - - + + + oss.sonatype.org + Jetty Staging Repository + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + oss.sonatype.org + Jetty Snapshot Repository + https://oss.sonatype.org/content/repositories/jetty-snapshots/ + + + + + + + 2.0.10 + 1.10.14 + 1.11.3 + 4.5.14 + 4.4.16 + + + 2.2.4 + 2.2.14 + 2.5.11 + 9.6 + 4.2.0 + 6.3.1 + 3.5.0 + 1.5 + 3.2.0 + 10.12.7 + 1.16.0 + 3.14.0 + 1.25.0 + 2.15.1 + 11 + + 11 + 11 + 2.5.2 + 1.5.0 + 3.4.2 + 7.0.5 + 3.0.2 + 1.5.0 + 2.24.0 + 4.0.6 + 1.60.1 + 2.10.1 + 33.0.0-jre + 5.1.0 + 1.0.10 + 2.2 + 3.0.0 + 5.2.1 + 4.6.5.Final + 11.0.18.Final + + + false + false + 2.16.1 + 0.8.11 + 1.2.2 + 1.3.5 + 3.0.3 + 2.0.2 + 1.0.5 + 1.2.5 + 1.1.3 + 4.0.4 + 2.3.6 + 1.2.7 + 1.2.0.v201105211821 + 1.3.3 + 1.1.2 + 2.3.3 + 2.3.9 + 2.3.7 + 2.3.3 + 2.82 + 1.1.0.v201105071233 + 2.0 + 1.4.1.v201005082020 + 1.2.5 + 3.0.4.Final + 3.5.1.Final + 2.2.1.Final + 2.2.1.Final + 3.5.3.Final + 1.1 + 0.18.0 + 1.2 + 2.7 + 1.0.7 + 4.0.6 + -Dfile.encoding=UTF-8 -Duser.language=en -Duser.region=US -showversion -Xmx4g -Xms2g -Xlog:gc:stderr:time,level,tags + 6.0 + false + /tmp + https://eclipse.dev/jetty/ + 1.37 + benchmarks + 5.14.0 + 0.10.4 + 0.32.16 + 2.2.15 + 3.1.18 + 0.38.21 + 1.7.2 + 1.1.1 + 2.5.0 + 9.0.83.1 + 5.10.1 + 2.0.3 + 4.3 + ${project.build.directory}/local-repo + 2.22.1 + 1.3.14 + 10.3.6 + 3.3.2 + 3.10.2 + 3.1.0 + 3.6.0 + 5.1.9 + 3.3.1 + 3.3.2 + false + 3.12.1 + 3.6.1 + 3.1.1 + 3.4.1 + 3.1.1 + 3.1.0 + 3.1.1 + 3.6.0 + 3.3.0 + 3.6.3 + 3.10.2 + 3.0.1 + 3.1.0 + 1.9.18 + 3.3.1 + 3.5.1 + 3.3.0 + 3.2.3 + 3.9.0 + 3.4.0 + 2.2.3 + + 3.2.20 + 3.12.14 + 0.9.1 + 8.1.0 + 6.0.0 + 1.2.0 + 1.3.0 + org.slf4j;version="[1.7,3.0)", org.slf4j.event;version="[1.7,3.0)", org.slf4j.helpers;version="[1.7,3.0)", org.slf4j.spi;version="[1.7,3.0)" + 2.2.0 + 4.0.0 + 4.0.3 + UTF-8 + src/it/settings.xml + 2.0.5 + 4.8.2.0 + 2.1.1.RELEASE + 0 + 1.2.5 + 1.2.5 + 1.19.3 + 2.16.2 + 3.1.9.Final + 1.7.0.Final + 2.2.2.Final + 2.4.8 + + + com.fasterxml.jackson + jackson-bom + ${jackson.version} + pom + import + + + org.infinispan + infinispan-bom + ${infinispan.version} + pom + import + + + org.junit + junit-bom + ${junit.version} + pom + import + + + org.ow2.asm + asm-bom + ${asm.version} + pom + import + + + org.testcontainers + testcontainers-bom + ${testcontainers.version} + pom + import + biz.aQute.bnd biz.aQute.bndlib @@ -995,16 +435,16 @@ jsr305 ${findbugs.jsr305.version} - - com.google.errorprone - error_prone_annotations - ${google.errorprone.version} - com.google.code.gson gson ${gson.version} + + com.google.errorprone + error_prone_annotations + ${google.errorprone.version} + com.google.guava guava @@ -1043,12 +483,6 @@ - - org.jolokia - jolokia-war - ${jolokia.version} - war - com.openpojo openpojo @@ -1080,16 +514,6 @@ ${hawtio.version} war - - jakarta.el - jakarta.el-api - ${jakarta.el-api.version} - - - jakarta.enterprise - jakarta.enterprise.cdi-api - ${jakarta.enterprise.cdi.api.version} - jakarta.activation jakarta.activation-api @@ -1101,15 +525,30 @@ ${jakarta.annotation.api.version} - jakarta.interceptor - jakarta.interceptor-api - ${jakarta.interceptor.api.version} + jakarta.el + jakarta.el-api + ${jakarta.el-api.version} + + + jakarta.enterprise + jakarta.enterprise.cdi-api + ${jakarta.enterprise.cdi.api.version} jakarta.inject jakarta.inject-api ${jakarta.inject.api.version} + + jakarta.interceptor + jakarta.interceptor-api + ${jakarta.interceptor.api.version} + + + jakarta.security.auth.message + jakarta.security.auth.message-api + ${jakarta.security.auth.message.version} + jakarta.servlet jakarta.servlet-api @@ -1160,6 +599,16 @@ ant-launcher ${ant.version} + + org.apache.avro + avro + ${apache.avro.version} + + + org.apache.commons + commons-compress + ${commons.compress.version} + org.apache.commons commons-lang3 @@ -1190,14 +639,14 @@ maven-core ${maven.version} - - javax.inject - javax.inject - com.google.code.findbugs jsr305 + + javax.inject + javax.inject + @@ -1232,17 +681,16 @@ maven-settings ${maven.version} - - org.apache.maven.plugin-tools - maven-plugin-annotations - ${maven.plugin-tools.version} - provided - org.apache.maven.plugin-tools maven-plugin-tools-api ${maven.plugin-tools.version} + + org.apache.mina + mina-core + ${mina.core.version} + org.apache.taglibs taglibs-standard-impl @@ -1268,9 +716,9 @@ - org.awaitility - awaitility - ${awaitility.version} + org.asciidoctor + asciidoctor-maven-plugin + ${asciidoctor.maven.plugin.version} org.asciidoctor @@ -1278,14 +726,9 @@ ${asciidoctorj.version} - org.asciidoctor - asciidoctor-maven-plugin - ${asciidoctor.maven.plugin.version} - - - org.conscrypt - conscrypt-openjdk-uber - ${conscrypt.version} + org.awaitility + awaitility + ${awaitility.version} org.codehaus.plexus @@ -1302,6 +745,11 @@ plexus-xml ${plexus-xml.version} + + org.conscrypt + conscrypt-openjdk-uber + ${conscrypt.version} + org.eclipse.jetty apache-jsp @@ -1312,6 +760,33 @@ apache-jstl ${project.version} + + org.eclipse.jetty + infinispan-common + ${project.version} + + + org.eclipse.jetty + infinispan-embedded + ${project.version} + config + + + org.eclipse.jetty + infinispan-embedded-query + ${project.version} + + + org.eclipse.jetty + infinispan-remote + ${project.version} + config + + + org.eclipse.jetty + infinispan-remote-query + ${project.version} + org.eclipse.jetty jetty-alpn-client @@ -1329,12 +804,12 @@ org.eclipse.jetty - jetty-alpn-java-server + jetty-alpn-java-client ${project.version} org.eclipse.jetty - jetty-alpn-java-client + jetty-alpn-java-server ${project.version} @@ -1378,12 +853,6 @@ ${project.version} zip - - org.eclipse.jetty.tests - jetty-home-tester - ${project.version} - test - org.eclipse.jetty jetty-http @@ -1394,43 +863,11 @@ jetty-http-spi ${project.version} - - org.eclipse.jetty - infinispan-common - ${project.version} - - - org.eclipse.jetty - infinispan-embedded - config - ${project.version} - - - org.eclipse.jetty - infinispan-embedded-query - ${project.version} - - - org.eclipse.jetty - infinispan-remote - config - ${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 @@ -1466,6 +903,11 @@ jetty-maven-plugin ${project.version} + + org.eclipse.jetty + jetty-nosql + ${project.version} + org.eclipse.jetty jetty-openid @@ -1618,13 +1060,13 @@ org.eclipse.jetty.demos - demo-spec-webapp + demo-simple-webapp ${project.version} war org.eclipse.jetty.demos - demo-simple-webapp + demo-spec-webapp ${project.version} war @@ -1685,12 +1127,12 @@ org.eclipse.jetty.http3 - http3-qpack + http3-http-client-transport ${project.version} org.eclipse.jetty.http3 - http3-http-client-transport + http3-qpack ${project.version} @@ -1703,6 +1145,36 @@ jetty-memcached-sessions ${project.version} + + org.eclipse.jetty.orbit + javax.activation + ${javax.activation.impl.version} + + + org.eclipse.jetty.orbit + javax.mail.glassfish + ${javax.mail.glassfish.version} + + + org.eclipse.jetty.orbit + javax.servlet.jsp.jstl + ${jakarta.servlet.jsp.jstl.impl.version} + + + org.eclipse.jetty.orbit + javax.servlet + + + org.eclipse.jetty.orbit + javax.servlet.jsp + + + + + org.eclipse.jetty.osgi + jetty-httpservice + ${project.version} + org.eclipse.jetty.osgi jetty-osgi-alpn @@ -1723,11 +1195,6 @@ jetty-osgi-boot-warurl ${project.version} - - org.eclipse.jetty.osgi - jetty-httpservice - ${project.version} - org.eclipse.jetty.quic @@ -1746,12 +1213,12 @@ org.eclipse.jetty.quic - quic-quiche-jna + quic-quiche-foreign-incubator ${project.version} org.eclipse.jetty.quic - quic-quiche-foreign-incubator + quic-quiche-jna ${project.version} @@ -1774,6 +1241,26 @@ test-sessions-common ${project.version} + + org.eclipse.jetty.toolchain + jetty-javax-websocket-api + ${jakarta.websocket.api.version} + + + org.eclipse.jetty.toolchain + jetty-perf-helper + ${jetty.perf-helper.version} + + + org.eclipse.jetty.toolchain + jetty-servlet-api + ${jetty.servlet.api.version} + + + org.eclipse.jetty.toolchain + jetty-test-helper + ${jetty.test.version} + org.eclipse.jetty.websocket websocket-core-client @@ -1789,11 +1276,6 @@ websocket-core-server ${project.version} - - org.eclipse.jetty.websocket - websocket-javax-server - ${project.version} - org.eclipse.jetty.websocket websocket-javax-client @@ -1804,6 +1286,11 @@ websocket-javax-common ${project.version} + + org.eclipse.jetty.websocket + websocket-javax-server + ${project.version} + org.eclipse.jetty.websocket websocket-jetty-api @@ -1829,56 +1316,6 @@ websocket-servlet ${project.version} - - org.eclipse.jetty.orbit - javax.activation - ${javax.activation.impl.version} - - - org.eclipse.jetty.orbit - javax.mail.glassfish - ${javax.mail.glassfish.version} - - - jakarta.security.auth.message - jakarta.security.auth.message-api - ${jakarta.security.auth.message.version} - - - org.eclipse.jetty.orbit - javax.servlet.jsp.jstl - ${jakarta.servlet.jsp.jstl.impl.version} - - - org.eclipse.jetty.orbit - javax.servlet - - - org.eclipse.jetty.orbit - javax.servlet.jsp - - - - - org.eclipse.jetty.toolchain - jetty-javax-websocket-api - ${jakarta.websocket.api.version} - - - org.eclipse.jetty.toolchain - jetty-perf-helper - ${jetty.perf-helper.version} - - - org.eclipse.jetty.toolchain - jetty-servlet-api - ${jetty.servlet.api.version} - - - org.eclipse.jetty.toolchain - jetty-test-helper - ${jetty.test.version} - org.glassfish.jaxb jaxb-runtime @@ -1889,10 +1326,9 @@ javax.servlet.jsp.jstl ${javax.servlet.jsp.jstl.impl.version} - - javax.servlet.jsp.jstl - jstl-api + javax.el + el-api javax.servlet @@ -1902,9 +1338,10 @@ javax.servlet.jsp jsp-api + - javax.el - el-api + javax.servlet.jsp.jstl + jstl-api @@ -1913,50 +1350,11 @@ hamcrest ${hamcrest.version} - - org.infinispan - infinispan-bom - ${infinispan.version} - pom - import - org.infinispan.protostream protostream ${infinispan.protostream.version} - - org.apache.avro - avro - ${apache.avro.version} - - - org.apache.commons - commons-compress - ${commons.compress.version} - - - org.apache.mina - mina-core - ${mina.core.version} - - - com.fasterxml.jackson - jackson-bom - ${jackson.version} - pom - import - - - org.wildfly.common - wildfly-common - ${wildfly.common.version} - - - org.wildfly.security - wildfly-elytron - ${wildfly.elytron.version} - org.jboss.logging jboss-logging @@ -1983,11 +1381,10 @@ ${jboss-threads.version} - org.junit - junit-bom - ${junit.version} - pom - import + org.jolokia + jolokia-war + ${jolokia.version} + war org.mariadb.jdbc @@ -2010,17 +1407,6 @@ org.osgi.core ${org.osgi.core.version} - - org.osgi - - osgi.core - ${org.osgi.core.version} - - - org.osgi - osgi.annotation - ${org.osgi.annotation.version} - org.osgi org.osgi.util.function @@ -2032,11 +1418,15 @@ ${org.osgi.util.promise.version} - org.ow2.asm - asm-bom - ${asm.version} - pom - import + org.osgi + osgi.annotation + ${org.osgi.annotation.version} + + + org.osgi + + osgi.core + ${org.osgi.core.version} org.slf4j @@ -2064,15 +1454,729 @@ ${slf4j.version} - org.testcontainers - testcontainers-bom - ${testcontainers.version} - pom - import + org.wildfly.common + wildfly-common + ${wildfly.common.version} + + + org.wildfly.security + wildfly-elytron + ${wildfly.elytron.version} + + + org.apache.maven.plugin-tools + maven-plugin-annotations + ${maven.plugin-tools.version} + provided + + + org.eclipse.jetty.tests + jetty-home-tester + ${project.version} + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + org.junit.jupiter + junit-jupiter + test + + + + + + + + + com.mycila + license-maven-plugin + ${license.maven.plugin.version} + + + org.apache.felix + maven-bundle-plugin + ${maven.bundle.plugin.version} + + + jar + maven-plugin + + + ${bundle-symbolic-name} + Jetty module for ${project.name} + JavaSE-11 + ${jetty.url} + Eclipse Jetty Project + . + Copyright (c) 2008-2022 Mort Bay Consulting Pty Ltd and others. + ${osgi.slf4j.import.packages}, + * + <_provider-policy>]]> + <_consumer-policy>]]> + <_noee>true + + + + + org.apache.maven.plugins + maven-antrun-plugin + ${maven.antrun.plugin.version} + + + org.apache.ant + ant + ${ant.version} + + + + + org.apache.maven.plugins + maven-assembly-plugin + ${maven.assembly.plugin.version} + + + org.eclipse.jetty.toolchain + jetty-assembly-descriptors + ${jetty-assembly-descriptors.version} + + + + + org.apache.maven.plugins + maven-clean-plugin + ${maven.clean.plugin.version} + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven.compiler.plugin.version} + + ${compiler.source} + ${compiler.target} + ${compiler.release} + true + + -Xlint:exports + + -nowarn + + + + org.apache.maven.plugins + maven-dependency-plugin + ${maven.dependency.plugin.version} + + + org.apache.maven.plugins + maven-deploy-plugin + ${maven.deploy.plugin.version} + + 10 + + + + org.apache.maven.plugins + maven-enforcer-plugin + ${maven.enforcer.plugin.version} + + + org.apache.maven.plugins + maven-failsafe-plugin + ${maven.surefire.plugin.version} + + + org.apache.maven.plugins + maven-install-plugin + ${maven.install.plugin.version} + + + org.apache.maven.plugins + maven-invoker-plugin + ${maven.invoker.plugin.version} + + ${invoker.mergeUserSettings} + true + org.eclipse.jetty.maven.its + ${it.debug} + ${java.home} + + ${java.home} + + src/it + 300 + ${project.build.directory}/it + ${localRepoPath} + ${settingsPath} + ${skipTests} + true + + */pom.xml + + + ${localRepoPath} + + + + + org.apache.maven.plugins + maven-jar-plugin + ${maven.jar.plugin.version} + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + ${project.version} + Eclipse Jetty Project + ${jetty.url} + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven.javadoc.plugin.version} + + true + true + 11 + UTF-8 + UTF-8 + UTF-8 + -html5 + true + false + false + false + protected + true + true + com.*:org.slf4j*:org.mortbay*:*.jmh*:org.eclipse.jetty.embedded*:org.eclipse.jetty.example.asyncrest*:org.eclipse.jetty.test* + + + + org.apache.maven.plugins + maven-plugin-plugin + ${maven-plugin.plugin.version} + + + org.apache.maven.plugins + maven-release-plugin + ${maven.release.plugin.version} + + + org.apache.maven.plugins + maven-remote-resources-plugin + ${maven.remote-resources-plugin.version} + + + org.apache.maven.plugins + maven-resources-plugin + ${maven.resources.plugin.version} + + ${project.build.sourceEncoding} + + + + org.apache.maven.plugins + maven-shade-plugin + ${maven.shade.plugin.version} + + false + + + + org.apache.maven.plugins + maven-source-plugin + ${maven.source.plugin.version} + + + + 2 + ${project.name} + ${bundle-symbolic-name}.source + Eclipse Jetty Project + ${parsedVersion.osgiVersion} + ${bundle-symbolic-name};version="${parsedVersion.osgiVersion}";roots:="." + + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven.surefire.plugin.version} + + false + ${surefire.rerunFailingTestsCount} + 3600 + @{argLine} ${jetty.surefire.argLine} + false + 1 + true + + + alphabetical + + ${project.build.directory} + ${jetty.unixdomain.dir} + true + ${jetty.testtracker.log} + + + + en_US.UTF-8 + + + + + org.ow2.asm + asm-commons + ${asm.version} + + + + + org.apache.maven.plugins + maven-war-plugin + ${maven.war.plugin.version} + + + org.apache.servicemix.tooling + depends-maven-plugin + ${depends.maven.plugin.version} + + + org.asciidoctor + asciidoctor-maven-plugin + ${asciidoctor.maven.plugin.version} + + html5 + + asciidoctor-diagram + + + https://eclipse.dev/jetty/javadoc/jetty-10 + ${basedir}/.. + https://github.com/jetty/jetty.project/tree/jetty-10.0.x + https://github.com/jetty/jetty.project/tree/jetty-10.0.x/documentation/jetty-documentation/src/main/asciidoc + http://central.maven.org/maven2 + ${project.version} + ${maven.build.timestamp} + left + font + + + + + org.asciidoctor + asciidoctorj-diagram + ${asciidoctorj-diagram.version} + + + + + index + + process-asciidoc + + generate-resources + + src/main/asciidoc + index.adoc + ${project.build.directory}/html + + + + + + org.codehaus.mojo + build-helper-maven-plugin + ${build-helper.maven.plugin.version} + + + org.codehaus.mojo + buildnumber-maven-plugin + ${buildnumber.maven.plugin.version} + + + org.codehaus.mojo + exec-maven-plugin + ${maven.exec.plugin.version} + + + org.codehaus.mojo + versions-maven-plugin + ${versions.maven.plugin.version} + + true + true + true + true + + + + org.eclipse.jetty.toolchain + jetty-version-maven-plugin + ${jetty-version.maven.plugin.version} + + + org.jacoco + jacoco-maven-plugin + ${jacoco.maven.plugin.version} + + + org.mortbay.jetty + h2spec-maven-plugin + ${h2spec.maven.plugin.version} + + + + + + com.diffplug.spotless + spotless-maven-plugin + 2.39.0 + + + + pom.xml + + + 2 + + recommended_2008_06 + + true + + + + true + + scope,groupId,artifactId + + groupId,artifactId + + groupId,artifactId + + + + true + + + + + + check + + validate + + + + + com.mycila + license-maven-plugin + false + + true + true + true + + + + check-java-headers + + check + + verify + +
header-template.txt
+ + DOUBLESLASH_STYLE + DOUBLESLASH_STYLE + + + **/*.java + **/*.adoc + + + + jetty-ant/src/main/java/org/eclipse/jetty/ant/AntWebAppContext.java + jetty-ant/src/main/java/org/eclipse/jetty/ant/types/Connectors.java + jetty-ant/src/main/java/org/eclipse/jetty/ant/types/ContextHandlers.java + jetty-ant/src/main/java/org/eclipse/jetty/ant/types/FileMatchingConfiguration.java + jetty-ant/src/main/java/org/eclipse/jetty/ant/types/LoginServices.java + jetty-ant/src/main/java/org/eclipse/jetty/ant/types/SystemProperties.java + jetty-ant/src/main/java/org/eclipse/jetty/ant/utils/ServerProxy.java + jetty-ant/src/main/java/org/eclipse/jetty/ant/utils/TaskLog.java + jetty-ant/src/main/java/org/eclipse/jetty/ant/AntWebXmlConfiguration.java + jetty-ant/src/main/java/org/eclipse/jetty/ant/JettyRunTask.java + jetty-ant/src/main/java/org/eclipse/jetty/ant/ServerProxyImpl.java + + jetty-util/src/main/java/org/eclipse/jetty/util/security/UnixCrypt.java + + jetty-home/src/main/resources/README.adoc + + + + + + + org.apache.felix + maven-bundle-plugin + + + + manifest + + process-classes + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + ${maven.checkstyle.plugin.version} + + jetty-checkstyle.xml + true + warning + true + + + ${project.build.sourceDirectory} + ${project.build.testSourceDirectory} + + + + + com.puppycrawl.tools + checkstyle + ${checkstyle.version} + + + org.eclipse.jetty + build-resources + ${project.version} + + + + + checkstyle-check + + check + + validate + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + org.eclipse.jetty.toolchain + jetty-build-support + ${build-support.version} + + + + + ban-javax-servlet-api + + enforce + + validate + + + + + javax.servlet:* + servletapi + org.eclipse.jetty.orbit:javax.servlet + *:javax.servlet + org.mortbay.jetty:servlet-api + jetty:servlet-api + jetty-servlet-api + javax.websocket + javax.el:* + javax.annotation:javax.annotation-api + + true + + + + + + enforce-java + + enforce + + validate + + + + [3.5.0,) + [ERROR] OLD MAVEN [${maven.version}] in use, Jetty ${project.version} requires Maven 3.5.0 or newer + + + [11,) + [ERROR] OLD JDK [${java.version}] in use. Jetty ${project.version} requires JDK 11 or newer + + + + + + + + + + + + + org.apache.maven.plugins + maven-release-plugin + + true + false + deploy + -Peclipse-release + clean install + forked-path + + + + org.apache.maven.plugins + maven-remote-resources-plugin + + + copy-shared-resources + + process + + generate-resources + + + org.eclipse.jetty:build-resources:${project.version} + + + + + + + + + org.apache.maven.plugins + maven-source-plugin + true + + + attach-sources + + jar-no-fork + + package + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + set-osgi-version + + parse-version + + validate + + + + + org.eclipse.jetty.toolchain + jetty-version-maven-plugin + + + attach-version + + attach-version-text + + process-resources + + + + + org.jacoco + jacoco-maven-plugin + + + + **/org/eclipse/jetty/ant/** + + **/org/eclipse/jetty/embedded/** + **/org/eclipse/jetty/asyncrest/** + **/org/eclipse/jetty/demo/** + + **/org/eclipse/jetty/gcloud/** + **/org/eclipse/jetty/infinispan/** + **/org/eclipse/jetty/osgi/** + **/org/eclipse/jetty/spring/** + **/org/eclipse/jetty/http/spi/** + + **/org/eclipse/jetty/tests/** + **/org/eclipse/jetty/test/** + + + + + jacoco-initialize + + prepare-agent + + initialize + + + jacoco-setup-m-invoker-p + + prepare-agent + + initialize + + + invoker.mavenOpts + + + + jacoco-site + + report + + package + + + + **/org/eclipse/jetty/** + + + + + + + + jdk17 @@ -2131,16 +2235,34 @@ + + org.apache.maven.plugins + maven-assembly-plugin + + + config-assembly + + single + + package + + + config + + + + + org.apache.maven.plugins maven-resources-plugin copy-resources - process-resources copy-resources + process-resources UTF-8 false @@ -2161,24 +2283,6 @@ - - org.apache.maven.plugins - maven-assembly-plugin - - - config-assembly - package - - single - - - - config - - - - - @@ -2191,16 +2295,33 @@ + + org.apache.maven.plugins + maven-assembly-plugin + + + + single + + package + + + src/main/assembly/config.xml + + + + + org.apache.maven.plugins maven-resources-plugin copy-resources - process-resources copy-resources + process-resources UTF-8 false @@ -2221,23 +2342,6 @@ - - org.apache.maven.plugins - maven-assembly-plugin - - - package - - single - - - - src/main/assembly/config.xml - - - - - @@ -2245,6 +2349,14 @@ eclipse-release + + org.apache.maven.plugins + maven-deploy-plugin + true + + true + + maven-enforcer-plugin @@ -2265,9 +2377,23 @@ - true + org.apache.maven.plugins + maven-gpg-plugin + ${maven.gpg.plugin.version} + + + sign-artifacts + + sign + + verify + + + + org.apache.maven.plugins maven-javadoc-plugin + true attach-javadoc-jar @@ -2277,48 +2403,26 @@ - - true - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-gpg-plugin - ${maven.gpg.plugin.version} - - - sign-artifacts - verify - - sign - - - - ci - - 0 - ${env.GLOBAL_MVN_SETTINGS} - false - - Medium - - Default - false - org.eclipse.jetty.* - - javadoc + + + ${env.GLOBAL_MVN_SETTINGS} + + Default + false + org.eclipse.jetty.* + false + + Medium + 0 + @@ -2376,11 +2480,11 @@ gen-versiontxt - generate-resources update-version-text tag + generate-resources true true @@ -2420,6 +2524,15 @@ 1.4.3 + + + + false + + cbi-releases + https://repo.eclipse.org/content/repositories/cbi-releases/ + + @@ -2430,24 +2543,15 @@ sign - package sign + package - - - cbi-releases - https://repo.eclipse.org/content/repositories/cbi-releases/ - - false - - - snapshot-repositories @@ -2456,142 +2560,35 @@ - jetty-snapshots - jetty-snapshots - https://oss.sonatype.org/content/repositories/jetty-snapshots true + jetty-snapshots + jetty-snapshots + https://oss.sonatype.org/content/repositories/jetty-snapshots - oss.snapshots - OSS Snapshots - https://oss.sonatype.org/content/repositories/snapshots false true + oss.snapshots + OSS Snapshots + https://oss.sonatype.org/content/repositories/snapshots fast - true true true true + true true - - - github - https://github.com/jetty/jetty.project/issues - - - - - Jetty Developer Mailing List - https://www.eclipse.org/lists/jetty-dev/ - https://accounts.eclipse.org/mailing-list/jetty-dev - - - Jetty Users Mailing List - https://www.eclipse.org/lists/jetty-users/ - https://accounts.eclipse.org/mailing-list/jetty-users - - - Jetty Announce Mailing List - https://www.eclipse.org/lists/jetty-announce/ - https://accounts.eclipse.org/mailing-list/jetty-announce - - - - - - gregw - Greg Wilkins - gregw@webtide.com - Webtide, LLC - https://webtide.com - 10 - - - janb - Jan Bartel - janb@webtide.com - Webtide, LLC - https://webtide.com - 10 - - - jesse - Jesse McConnell - jesse.mcconnell@gmail.com - Webtide, LLC - https://webtide.com - -6 - - - joakime - Joakim Erdfelt - joakim.erdfelt@gmail.com - Webtide, LLC - https://webtide.com - -6 - - - sbordet - Simone Bordet - simone.bordet@gmail.com - Webtide, LLC - https://webtide.com - 1 - - - djencks - David Jencks - david.a.jencks@gmail.com - IBM - -8 - - - olamy - Olivier Lamy - oliver.lamy@gmail.com - Webtide, LLC - https://webtide.com - Australia/Brisbane - - - lorban - Ludovic Orban - lorban@bitronix.be - Webtide, LLC - https://webtide.com - 1 - - - - - Webtide - https://webtide.com - - - - - oss.sonatype.org - Jetty Staging Repository - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - oss.sonatype.org - Jetty Snapshot Repository - https://oss.sonatype.org/content/repositories/jetty-snapshots/ - - diff --git a/tests/jetty-home-tester/pom.xml b/tests/jetty-home-tester/pom.xml index 8270297b4b3..6c4ef5e3160 100644 --- a/tests/jetty-home-tester/pom.xml +++ b/tests/jetty-home-tester/pom.xml @@ -1,14 +1,15 @@ + + + 4.0.0 org.eclipse.jetty.tests tests-parent 10.0.20-SNAPSHOT - - 4.0.0 jetty-home-tester - Jetty Tests :: jetty-home Tester jar + Jetty Tests :: jetty-home Tester ${project.groupId}.tests.hometester @@ -16,8 +17,8 @@ - org.slf4j - slf4j-api + jakarta.inject + jakarta.inject-api org.apache.maven @@ -28,19 +29,6 @@ org.apache.maven maven-resolver-provider - - jakarta.inject - jakarta.inject-api - - - org.apache.maven.resolver - maven-resolver-util - ${maven.resolver.version} - - - org.awaitility - awaitility - org.apache.maven.resolver maven-resolver-api @@ -48,7 +36,7 @@ org.apache.maven.resolver - maven-resolver-spi + maven-resolver-connector-basic ${maven.resolver.version} @@ -65,7 +53,7 @@ org.apache.maven.resolver - maven-resolver-connector-basic + maven-resolver-spi ${maven.resolver.version} @@ -79,15 +67,28 @@ ${maven.resolver.version} - org.junit.jupiter - junit-jupiter - compile + org.apache.maven.resolver + maven-resolver-util + ${maven.resolver.version} + + + org.awaitility + awaitility org.eclipse.jetty.toolchain jetty-test-helper compile + + org.junit.jupiter + junit-jupiter + compile + + + org.slf4j + slf4j-api + diff --git a/tests/jetty-http-tools/pom.xml b/tests/jetty-http-tools/pom.xml index aee23d0858a..2d08bc18d43 100644 --- a/tests/jetty-http-tools/pom.xml +++ b/tests/jetty-http-tools/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.tests tests-parent 10.0.20-SNAPSHOT - - 4.0.0 jetty-http-tools Jetty Tests :: HTTP Utilities diff --git a/tests/jetty-jmh/pom.xml b/tests/jetty-jmh/pom.xml index 77b2f525801..3c4fc07d79e 100644 --- a/tests/jetty-jmh/pom.xml +++ b/tests/jetty-jmh/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.tests tests-parent 10.0.20-SNAPSHOT - - 4.0.0 jetty-jmh Jetty :: Jmh Jmh classes for Jetty @@ -15,7 +16,71 @@ true + + + org.eclipse.jetty + jetty-client + + + org.eclipse.jetty + jetty-http + + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-util + + + org.eclipse.jetty.toolchain + jetty-servlet-api + + + org.eclipse.jetty.toolchain + jetty-test-helper + + + org.openjdk.jmh + jmh-core + ${jmh.version} + + + org.openjdk.jmh + jmh-generator-annprocess + ${jmh.version} + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + + + + Jetty Jmh Support Classes + + + + + + org.apache.felix @@ -30,10 +95,10 @@ maven-shade-plugin - package shade + package ${jmhjar.name} true @@ -57,69 +122,5 @@ - - - - org.apache.maven.plugins - maven-jar-plugin - - - - - - - Jetty Jmh Support Classes - - - - - - - - - - org.eclipse.jetty - jetty-util - - - org.eclipse.jetty - jetty-server - - - org.eclipse.jetty - jetty-http - - - org.eclipse.jetty.toolchain - jetty-servlet-api - - - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty - jetty-client - - - org.eclipse.jetty.toolchain - jetty-test-helper - - - org.openjdk.jmh - jmh-core - ${jmh.version} - - - org.openjdk.jmh - jmh-generator-annprocess - ${jmh.version} - - diff --git a/tests/pom.xml b/tests/pom.xml index a3b15c1663b..09ac7425378 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -9,14 +9,8 @@ org.eclipse.jetty.tests tests-parent - Jetty Tests :: Parent pom - - true - true - true - true - + Jetty Tests :: Parent jetty-jmh jetty-http-tools @@ -33,5 +27,11 @@ test-jpms test-websocket-autobahn + + true + true + true + true + diff --git a/tests/test-cdi/pom.xml b/tests/test-cdi/pom.xml index f279d6df2fe..6215a06b9d1 100644 --- a/tests/test-cdi/pom.xml +++ b/tests/test-cdi/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.tests tests-parent 10.0.20-SNAPSHOT - - 4.0.0 test-cdi jar Test :: CDI @@ -25,14 +25,33 @@ jetty-webapp compile + + org.eclipse.jetty.toolchain + jetty-test-helper + org.slf4j slf4j-api compile - org.slf4j - jul-to-slf4j + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.websocket + websocket-javax-server + test + + + org.eclipse.jetty.websocket + websocket-jetty-client + test + + + org.eclipse.jetty.websocket + websocket-jetty-server test @@ -52,29 +71,10 @@ - org.eclipse.jetty - jetty-slf4j-impl + org.slf4j + jul-to-slf4j test - - org.eclipse.jetty.websocket - websocket-javax-server - test - - - org.eclipse.jetty.websocket - websocket-jetty-server - test - - - org.eclipse.jetty.websocket - websocket-jetty-client - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - diff --git a/tests/test-distribution/pom.xml b/tests/test-distribution/pom.xml index eea325c4028..3cbe0257711 100644 --- a/tests/test-distribution/pom.xml +++ b/tests/test-distribution/pom.xml @@ -1,14 +1,15 @@ + + + 4.0.0 org.eclipse.jetty.tests tests-parent 10.0.20-SNAPSHOT - - 4.0.0 test-distribution - Jetty Tests :: Distribution Tests jar + Jetty Tests :: Distribution Tests ${project.groupId}.tests.distribution @@ -17,6 +18,14 @@ + + org.eclipse.jetty.toolchain + jetty-test-helper + + + org.junit.jupiter + junit-jupiter + org.codehaus.plexus plexus-xml @@ -28,14 +37,9 @@ - - org.eclipse.jetty.tests - jetty-home-tester - test - org.eclipse.jetty - jetty-slf4j-impl + jetty-client test @@ -46,7 +50,39 @@ org.eclipse.jetty - jetty-client + jetty-openid + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty + jetty-unixsocket-client + test + + + org.eclipse.jetty + jetty-unixsocket-server + test + + + org.eclipse.jetty + jetty-util-ajax + test + + + org.eclipse.jetty.demos + demo-jetty-webapp + war + test + + + org.eclipse.jetty.demos + demo-simple-webapp + war test @@ -60,8 +96,21 @@ test - org.eclipse.jetty.demos - demo-simple-webapp + org.eclipse.jetty.tests + jetty-home-tester + test + + + org.eclipse.jetty.tests + test-bad-websocket-webapp + ${project.version} + war + test + + + org.eclipse.jetty.tests + test-felix-webapp + ${project.version} war test @@ -74,84 +123,31 @@ org.eclipse.jetty.tests - test-weld-cdi-webapp + test-websocket-webapp ${project.version} war test - org.eclipse.jetty.demos - demo-jetty-webapp + org.eclipse.jetty.tests + test-weld-cdi-webapp + ${project.version} war test - - org.eclipse.jetty.toolchain - jetty-test-helper - - - org.junit.jupiter - junit-jupiter - - - org.eclipse.jetty - jetty-unixsocket-server - test - - - org.eclipse.jetty - jetty-unixsocket-client - test - - - org.eclipse.jetty.websocket - websocket-jetty-client - test - - - org.eclipse.jetty - jetty-util-ajax - test - org.eclipse.jetty.websocket websocket-jetty-api test - org.eclipse.jetty - jetty-openid + org.eclipse.jetty.websocket + websocket-jetty-client test - org.eclipse.jetty.tests - test-felix-webapp - ${project.version} - test - war - - - org.eclipse.jetty.tests - test-websocket-webapp - ${project.version} - test - war - - - org.eclipse.jetty.tests - test-bad-websocket-webapp - ${project.version} - test - war - - - org.testcontainers - testcontainers - test - - - org.testcontainers - mariadb + org.mariadb.jdbc + mariadb-java-client test @@ -159,6 +155,16 @@ gcloud test + + org.testcontainers + junit-jupiter + test + + + org.testcontainers + mariadb + test + org.testcontainers mongodb @@ -166,12 +172,7 @@ org.testcontainers - junit-jupiter - test - - - org.mariadb.jdbc - mariadb-java-client + testcontainers test diff --git a/tests/test-http-client-transport/pom.xml b/tests/test-http-client-transport/pom.xml index 805c63663c0..bf784c2a0d0 100644 --- a/tests/test-http-client-transport/pom.xml +++ b/tests/test-http-client-transport/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.tests tests-parent 10.0.20-SNAPSHOT - - 4.0.0 test-http-client-transport jar Test :: HTTP Client Transports @@ -17,6 +17,83 @@ true + + + org.eclipse.jetty.toolchain + jetty-test-helper + + + org.awaitility + awaitility + test + + + org.eclipse.jetty + jetty-alpn-java-client + test + + + org.eclipse.jetty + jetty-alpn-java-server + test + + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty + jetty-jmx + test + + + org.eclipse.jetty + jetty-servlet + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty + jetty-unixdomain-server + test + + + org.eclipse.jetty.fcgi + fcgi-server + test + + + org.eclipse.jetty.http2 + http2-http-client-transport + test + + + org.eclipse.jetty.http2 + http2-server + test + + + org.eclipse.jetty.http3 + http3-http-client-transport + test + + + org.eclipse.jetty.http3 + http3-server + test + + + org.slf4j + slf4j-api + test + + + @@ -44,12 +121,10 @@ maven-surefire-plugin - - @{argLine} + @{argLine} ${jetty.surefire.argLine} --add-modules jdk.incubator.foreign - --enable-native-access ALL-UNNAMED - + --enable-native-access ALL-UNNAMED @@ -65,10 +140,8 @@ maven-surefire-plugin - - @{argLine} - --enable-preview - + @{argLine} + --enable-preview @@ -76,81 +149,4 @@ - - - org.slf4j - slf4j-api - test - - - org.awaitility - awaitility - test - - - org.eclipse.jetty - jetty-alpn-java-client - test - - - org.eclipse.jetty - jetty-alpn-java-server - test - - - org.eclipse.jetty - jetty-jmx - test - - - org.eclipse.jetty - jetty-servlet - test - - - org.eclipse.jetty - jetty-client - test - - - org.eclipse.jetty.http2 - http2-server - test - - - org.eclipse.jetty.http2 - http2-http-client-transport - test - - - org.eclipse.jetty.http3 - http3-server - test - - - org.eclipse.jetty.http3 - http3-http-client-transport - test - - - org.eclipse.jetty - jetty-unixdomain-server - test - - - org.eclipse.jetty.fcgi - fcgi-server - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - - - diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml index c0ac39fb28d..8b3122b4b2a 100644 --- a/tests/test-integration/pom.xml +++ b/tests/test-integration/pom.xml @@ -1,20 +1,114 @@ + 4.0.0 org.eclipse.jetty.tests tests-parent 10.0.20-SNAPSHOT - 4.0.0 test-integration jar Jetty Tests :: Integrations - ${project.build.directory}/test-wars - ${project.build.directory}/test-libs - ${project.build.directory}/test-dist ${project.groupId}.integrations + ${project.build.directory}/test-dist + ${project.build.directory}/test-libs + ${project.build.directory}/test-wars + + + org.eclipse.jetty + apache-jsp + + + org.eclipse.jetty + jetty-client + + + org.eclipse.jetty + jetty-deploy + + + org.eclipse.jetty + jetty-home + ${project.version} + pom + + + org.eclipse.jetty + jetty-rewrite + + + org.eclipse.jetty + jetty-webapp + + + org.eclipse.jetty.http2 + http2-server + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-alpn-server + test + + + org.eclipse.jetty + jetty-annotations + test + + + org.eclipse.jetty + jetty-servlets + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.demos + demo-jetty-webapp + war + test + + + org.eclipse.jetty.tests + jetty-http-tools + test + + + org.eclipse.jetty.tests + test-webapp-rfc2616 + ${project.version} + war + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + org.eclipse.jetty.websocket + websocket-javax-server + test + + + org.eclipse.jetty.websocket + websocket-jetty-client + test + + + org.eclipse.jetty.websocket + websocket-jetty-server + test + + @@ -23,10 +117,10 @@ copy-wars-for-testing - process-test-resources copy-dependencies + process-test-resources test war @@ -36,10 +130,10 @@ unpack-jetty-home - process-test-resources unpack + process-test-resources @@ -70,98 +164,4 @@ - - - org.eclipse.jetty - jetty-webapp - - - org.eclipse.jetty - jetty-deploy - - - org.eclipse.jetty - jetty-rewrite - - - org.eclipse.jetty - jetty-client - - - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-home - ${project.version} - pom - - - org.eclipse.jetty.tests - jetty-http-tools - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - org.eclipse.jetty - apache-jsp - - - org.eclipse.jetty.http2 - http2-server - - - org.eclipse.jetty - jetty-annotations - test - - - org.eclipse.jetty - jetty-servlets - test - - - org.eclipse.jetty.websocket - websocket-jetty-server - test - - - org.eclipse.jetty.websocket - websocket-jetty-client - test - - - org.eclipse.jetty.websocket - websocket-javax-server - test - - - org.eclipse.jetty.tests - test-webapp-rfc2616 - ${project.version} - war - test - - - org.eclipse.jetty.demos - demo-jetty-webapp - war - test - - - org.eclipse.jetty - jetty-alpn-server - test - - diff --git a/tests/test-jmx/jmx-webapp-it/pom.xml b/tests/test-jmx/jmx-webapp-it/pom.xml index b35b4d47abb..c52e2d5f56f 100644 --- a/tests/test-jmx/jmx-webapp-it/pom.xml +++ b/tests/test-jmx/jmx-webapp-it/pom.xml @@ -1,18 +1,18 @@ + 4.0.0 org.eclipse.jetty.tests test-jmx-parent 10.0.20-SNAPSHOT - 4.0.0 jmx-webapp-it jar Jetty Tests :: JMX :: WebApp Integration Tests + ${project.groupId}.jmx.webapp.it UTF-8 UTF-8 - ${project.groupId}.jmx.webapp.it ${project.build.directory}/test-base @@ -45,10 +45,10 @@ copy-apps-for-testing - process-test-resources copy-dependencies + process-test-resources jmx-webapp runtime diff --git a/tests/test-jmx/jmx-webapp/pom.xml b/tests/test-jmx/jmx-webapp/pom.xml index 81cce13cabc..74c72fcbb1a 100644 --- a/tests/test-jmx/jmx-webapp/pom.xml +++ b/tests/test-jmx/jmx-webapp/pom.xml @@ -10,15 +10,10 @@ war Jetty Tests :: JMX :: WebApp - UTF-8 ${project.groupId}.jmx.webapp + UTF-8 - - org.eclipse.jetty.toolchain - jetty-servlet-api - provided - org.eclipse.jetty jetty-jmx @@ -27,6 +22,11 @@ org.slf4j slf4j-api + + org.eclipse.jetty.toolchain + jetty-servlet-api + provided + jmx-webapp diff --git a/tests/test-jmx/pom.xml b/tests/test-jmx/pom.xml index 83677ea2754..efe2879b9e4 100644 --- a/tests/test-jmx/pom.xml +++ b/tests/test-jmx/pom.xml @@ -1,11 +1,11 @@ + 4.0.0 org.eclipse.jetty.tests tests-parent 10.0.20-SNAPSHOT - 4.0.0 test-jmx-parent pom Jetty Tests :: JMX Parent diff --git a/tests/test-jpms/pom.xml b/tests/test-jpms/pom.xml index 6554cb895be..c215f1d704a 100644 --- a/tests/test-jpms/pom.xml +++ b/tests/test-jpms/pom.xml @@ -1,11 +1,11 @@ + 4.0.0 org.eclipse.jetty.tests tests-parent 10.0.20-SNAPSHOT - 4.0.0 test-jpms pom Jetty Tests :: JPMS @@ -20,13 +20,13 @@ test - org.junit.jupiter - junit-jupiter + org.eclipse.jetty.toolchain + jetty-test-helper test - org.eclipse.jetty.toolchain - jetty-test-helper + org.junit.jupiter + junit-jupiter test diff --git a/tests/test-jpms/test-jpms-websocket-core/pom.xml b/tests/test-jpms/test-jpms-websocket-core/pom.xml index 32d09766d34..94a74fa48a6 100644 --- a/tests/test-jpms/test-jpms-websocket-core/pom.xml +++ b/tests/test-jpms/test-jpms-websocket-core/pom.xml @@ -1,11 +1,11 @@ + 4.0.0 - test-jpms org.eclipse.jetty.tests + test-jpms 10.0.20-SNAPSHOT - 4.0.0 test-jpms-websocket-core jar Jetty Tests :: JPMS :: WebSocket Core Tests @@ -13,11 +13,11 @@ org.eclipse.jetty.websocket - websocket-core-server + websocket-core-client org.eclipse.jetty.websocket - websocket-core-client + websocket-core-server diff --git a/tests/test-loginservice/pom.xml b/tests/test-loginservice/pom.xml index b2875207302..13447cddd12 100644 --- a/tests/test-loginservice/pom.xml +++ b/tests/test-loginservice/pom.xml @@ -12,21 +12,13 @@ ${project.groupId}.loginservice - - org.eclipse.jetty - jetty-server - - - org.eclipse.jetty - jetty-webapp - org.eclipse.jetty jetty-client org.eclipse.jetty - jetty-security + jetty-jndi org.eclipse.jetty @@ -34,26 +26,19 @@ org.eclipse.jetty - jetty-jndi + jetty-security - org.testcontainers - testcontainers - test + org.eclipse.jetty + jetty-server - org.testcontainers - mariadb - test + org.eclipse.jetty + jetty-webapp - org.testcontainers - junit-jupiter - test - - - org.slf4j - slf4j-simple + org.eclipse.jetty.toolchain + jetty-test-helper test @@ -63,8 +48,23 @@ test - org.eclipse.jetty.toolchain - jetty-test-helper + org.slf4j + slf4j-simple + test + + + org.testcontainers + junit-jupiter + test + + + org.testcontainers + mariadb + test + + + org.testcontainers + testcontainers test diff --git a/tests/test-quickstart/pom.xml b/tests/test-quickstart/pom.xml index 7fbbc5f5578..c09f07a88ac 100644 --- a/tests/test-quickstart/pom.xml +++ b/tests/test-quickstart/pom.xml @@ -1,12 +1,12 @@ + 4.0.0 org.eclipse.jetty.tests tests-parent 10.0.20-SNAPSHOT ../pom.xml - 4.0.0 org.eclipse.jetty test-quickstart Test :: Jetty Quick Start @@ -16,13 +16,23 @@ - org.eclipse.jetty - jetty-quickstart + jakarta.transaction + jakarta.transaction-api test org.eclipse.jetty - jetty-webapp + apache-jsp + test + + + org.eclipse.jetty + apache-jstl + test + + + org.eclipse.jetty + jetty-annotations test @@ -37,22 +47,7 @@ org.eclipse.jetty - jetty-annotations - test - - - jakarta.transaction - jakarta.transaction-api - test - - - org.eclipse.jetty.demos - demo-mock-resources - test - - - org.eclipse.jetty.orbit - javax.mail.glassfish + jetty-quickstart test @@ -60,12 +55,33 @@ jetty-servlets test + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty + jetty-webapp + test + + + org.eclipse.jetty.demos + demo-jetty-webapp + war + test + org.eclipse.jetty.demos demo-jndi-webapp war test + + org.eclipse.jetty.demos + demo-mock-resources + test + org.eclipse.jetty.demos demo-spec-webapp @@ -73,9 +89,13 @@ test - org.eclipse.jetty.demos - demo-jetty-webapp - war + org.eclipse.jetty.orbit + javax.mail.glassfish + test + + + org.eclipse.jetty.toolchain + jetty-test-helper test @@ -88,31 +108,11 @@ websocket-jetty-server test - - org.eclipse.jetty - apache-jsp - test - - - org.eclipse.jetty - apache-jstl - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - org.slf4j slf4j-api test - - org.eclipse.jetty - jetty-slf4j-impl - test - @@ -121,10 +121,10 @@ copy - process-test-classes copy + process-test-classes diff --git a/tests/test-sessions/pom.xml b/tests/test-sessions/pom.xml index 8cacf948894..2806cf182b7 100644 --- a/tests/test-sessions/pom.xml +++ b/tests/test-sessions/pom.xml @@ -7,8 +7,8 @@ 10.0.20-SNAPSHOT test-sessions-parent - Jetty Tests :: Sessions :: Parent pom + Jetty Tests :: Sessions :: Parent test-sessions-common test-file-sessions diff --git a/tests/test-sessions/test-file-sessions/pom.xml b/tests/test-sessions/test-file-sessions/pom.xml index 2f73581a748..ee6772e8f50 100644 --- a/tests/test-sessions/test-file-sessions/pom.xml +++ b/tests/test-sessions/test-file-sessions/pom.xml @@ -12,29 +12,14 @@ ${project.groupId}.sessions.file - - org.eclipse.jetty - jetty-server - test - - - org.eclipse.jetty - jetty-webapp - test - org.eclipse.jetty jetty-client test - org.eclipse.jetty.tests - test-sessions-common - test - - - org.slf4j - slf4j-api + org.eclipse.jetty + jetty-server test @@ -42,10 +27,25 @@ jetty-slf4j-impl test + + org.eclipse.jetty + jetty-webapp + test + + + org.eclipse.jetty.tests + test-sessions-common + test + org.eclipse.jetty.toolchain jetty-test-helper test + + org.slf4j + slf4j-api + test + diff --git a/tests/test-sessions/test-gcloud-sessions/pom.xml b/tests/test-sessions/test-gcloud-sessions/pom.xml index d1b31f37945..da508595d5b 100644 --- a/tests/test-sessions/test-gcloud-sessions/pom.xml +++ b/tests/test-sessions/test-gcloud-sessions/pom.xml @@ -12,6 +12,11 @@ ${project.groupId}.sessions.gcloud + + org.eclipse.jetty + jetty-client + test + org.eclipse.jetty jetty-server @@ -23,8 +28,8 @@ test - org.eclipse.jetty - jetty-client + org.eclipse.jetty.gcloud + jetty-gcloud-session-manager test @@ -32,19 +37,19 @@ test-sessions-common test - - org.eclipse.jetty.gcloud - jetty-gcloud-session-manager - test - org.eclipse.jetty.toolchain jetty-test-helper test + + org.slf4j + slf4j-simple + test + org.testcontainers - testcontainers + gcloud test @@ -54,12 +59,7 @@ org.testcontainers - gcloud - test - - - org.slf4j - slf4j-simple + testcontainers test diff --git a/tests/test-sessions/test-hazelcast-sessions/pom.xml b/tests/test-sessions/test-hazelcast-sessions/pom.xml index 197665fe3da..b43aedcdf83 100644 --- a/tests/test-sessions/test-hazelcast-sessions/pom.xml +++ b/tests/test-sessions/test-hazelcast-sessions/pom.xml @@ -11,6 +11,64 @@ ${project.groupId}.sessions.hazelcast + + + com.hazelcast + hazelcast + ${hazelcast.version} + + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty + jetty-hazelcast + test + + + org.eclipse.jetty + jetty-jmx + test + true + + + org.eclipse.jetty + jetty-server + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty + jetty-webapp + test + + + org.eclipse.jetty.tests + test-sessions-common + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + org.slf4j + jul-to-slf4j + test + + + org.slf4j + slf4j-api + test + + @@ -19,10 +77,10 @@ unpack - generate-test-resources unpack + generate-test-resources @@ -43,11 +101,9 @@ org.apache.maven.plugins maven-surefire-plugin - - --add-modules java.se --add-exports java.base/jdk.internal.ref=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED + --add-modules java.se --add-exports java.base/jdk.internal.ref=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED - --add-opens java.management/sun.management=ALL-UNNAMED --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED - + --add-opens java.management/sun.management=ALL-UNNAMED --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED true com.hazelcast.logging.Slf4jFactory @@ -58,63 +114,5 @@ - - - org.eclipse.jetty - jetty-server - test - - - org.eclipse.jetty - jetty-webapp - test - - - org.eclipse.jetty - jetty-client - test - - - org.eclipse.jetty.tests - test-sessions-common - test - - - org.eclipse.jetty - jetty-hazelcast - test - - - com.hazelcast - hazelcast - ${hazelcast.version} - - - org.eclipse.jetty - jetty-jmx - true - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - org.slf4j - slf4j-api - test - - - org.slf4j - jul-to-slf4j - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - - diff --git a/tests/test-sessions/test-infinispan-sessions/pom.xml b/tests/test-sessions/test-infinispan-sessions/pom.xml index 32a8382aaed..a14700d6538 100644 --- a/tests/test-sessions/test-infinispan-sessions/pom.xml +++ b/tests/test-sessions/test-infinispan-sessions/pom.xml @@ -10,37 +10,128 @@ Jetty Tests :: Sessions :: Infinispan ${project.groupId}.sessions.infinispan - - 11.0.9.Final infinispan/server + + 11.0.9.Final + + + com.google.code.gson + gson + ${gson.version} + test + + + org.eclipse.jetty + infinispan-embedded-query + test + + + org.eclipse.jetty + infinispan-remote-query + test + + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty + jetty-jmx + test + true + + + org.eclipse.jetty + jetty-server + test + + + org.eclipse.jetty + jetty-webapp + test + + + org.eclipse.jetty.tests + test-sessions-common + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + org.infinispan + infinispan-client-hotrod + test + + + org.infinispan + infinispan-core + test + + + org.wildfly.common + wildfly-common + + + + + org.infinispan + infinispan-query + test + + + org.infinispan + infinispan-remote-query-client + test + + + org.infinispan.protostream + protostream + test + + + org.slf4j + jul-to-slf4j + test + + + org.slf4j + slf4j-api + test + + + org.slf4j + slf4j-simple + test + + + org.testcontainers + junit-jupiter + test + + + org.testcontainers + testcontainers + test + + - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*.java - - --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED - - ${infinispan.docker.image.version} - ${infinispan.docker.image.name} - - - org.apache.maven.plugins maven-dependency-plugin unpack - generate-test-resources unpack + generate-test-resources @@ -57,113 +148,22 @@ + + org.apache.maven.plugins + maven-surefire-plugin + + + **/*.java + + --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED + + ${infinispan.docker.image.version} + ${infinispan.docker.image.name} + + + - - - org.eclipse.jetty - jetty-server - test - - - org.eclipse.jetty - jetty-webapp - test - - - org.eclipse.jetty - jetty-client - test - - - org.eclipse.jetty.tests - test-sessions-common - test - - - org.eclipse.jetty - infinispan-remote-query - test - - - org.eclipse.jetty - infinispan-embedded-query - test - - - org.eclipse.jetty - jetty-jmx - true - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - org.infinispan - infinispan-core - test - - - org.wildfly.common - wildfly-common - - - - - org.infinispan - infinispan-query - test - - - org.infinispan - infinispan-client-hotrod - test - - - org.infinispan - infinispan-remote-query-client - test - - - org.infinispan.protostream - protostream - test - - - com.google.code.gson - gson - ${gson.version} - test - - - org.slf4j - slf4j-api - test - - - org.slf4j - jul-to-slf4j - test - - - org.slf4j - slf4j-simple - test - - - org.testcontainers - testcontainers - test - - - org.testcontainers - junit-jupiter - test - - jdk16 diff --git a/tests/test-sessions/test-jdbc-sessions/pom.xml b/tests/test-sessions/test-jdbc-sessions/pom.xml index 42005412610..f02db41f343 100644 --- a/tests/test-sessions/test-jdbc-sessions/pom.xml +++ b/tests/test-sessions/test-jdbc-sessions/pom.xml @@ -11,6 +11,63 @@ ${project.groupId}.sessions.jdbc + + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty + jetty-server + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty + jetty-webapp + test + + + org.eclipse.jetty.tests + test-sessions-common + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + org.mariadb.jdbc + mariadb-java-client + test + + + org.slf4j + slf4j-api + test + + + org.testcontainers + junit-jupiter + test + + + org.testcontainers + mariadb + test + + + org.testcontainers + testcontainers + test + + @@ -24,61 +81,4 @@ - - - org.eclipse.jetty - jetty-server - test - - - org.eclipse.jetty - jetty-webapp - test - - - org.eclipse.jetty - jetty-client - test - - - org.eclipse.jetty.tests - test-sessions-common - test - - - org.slf4j - slf4j-api - test - - - org.testcontainers - testcontainers - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - org.testcontainers - mariadb - test - - - org.testcontainers - junit-jupiter - test - - - org.mariadb.jdbc - mariadb-java-client - test - - diff --git a/tests/test-sessions/test-memcached-sessions/pom.xml b/tests/test-sessions/test-memcached-sessions/pom.xml index e17d104899f..f5d3cef93a2 100644 --- a/tests/test-sessions/test-memcached-sessions/pom.xml +++ b/tests/test-sessions/test-memcached-sessions/pom.xml @@ -12,34 +12,14 @@ ${project.groupId}.sessions.memcached - - org.eclipse.jetty - jetty-server - test - - - org.eclipse.jetty - jetty-webapp - test - org.eclipse.jetty jetty-client test - org.eclipse.jetty.tests - test-sessions-common - test - - - org.eclipse.jetty.memcached - jetty-memcached-sessions - test - - - org.eclipse.jetty.toolchain - jetty-test-helper + org.eclipse.jetty + jetty-server test @@ -48,8 +28,23 @@ test - org.testcontainers - testcontainers + org.eclipse.jetty + jetty-webapp + test + + + org.eclipse.jetty.memcached + jetty-memcached-sessions + test + + + org.eclipse.jetty.tests + test-sessions-common + test + + + org.eclipse.jetty.toolchain + jetty-test-helper test @@ -57,5 +52,10 @@ junit-jupiter test + + org.testcontainers + testcontainers + test + diff --git a/tests/test-sessions/test-mongodb-sessions/pom.xml b/tests/test-sessions/test-mongodb-sessions/pom.xml index d93644b0b46..abd1d8832a6 100644 --- a/tests/test-sessions/test-mongodb-sessions/pom.xml +++ b/tests/test-sessions/test-mongodb-sessions/pom.xml @@ -12,27 +12,86 @@ ${project.groupId}.sessions.mongo localhost + + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty + jetty-jmx + test + true + + + org.eclipse.jetty + jetty-nosql + test + + + org.eclipse.jetty + jetty-server + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty + jetty-webapp + test + + + org.eclipse.jetty.tests + test-sessions-common + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + org.slf4j + slf4j-api + test + + + org.slf4j + slf4j-simple + test + + + org.testcontainers + junit-jupiter + test + + + org.testcontainers + mongodb + test + + + org.testcontainers + testcontainers + test + + - - org.apache.maven.plugins - maven-surefire-plugin - - - ${mongo.docker.version} - - - org.apache.maven.plugins maven-dependency-plugin unpack - generate-test-resources unpack + generate-test-resources @@ -49,74 +108,15 @@ + + org.apache.maven.plugins + maven-surefire-plugin + + + ${mongo.docker.version} + + + - - - org.eclipse.jetty - jetty-server - test - - - org.eclipse.jetty - jetty-webapp - test - - - org.eclipse.jetty - jetty-client - test - - - org.eclipse.jetty.tests - test-sessions-common - test - - - org.eclipse.jetty - jetty-nosql - test - - - org.eclipse.jetty - jetty-jmx - true - test - - - org.slf4j - slf4j-api - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - org.testcontainers - testcontainers - test - - - org.testcontainers - junit-jupiter - test - - - org.testcontainers - mongodb - test - - - org.slf4j - slf4j-simple - test - - diff --git a/tests/test-sessions/test-sessions-common/pom.xml b/tests/test-sessions/test-sessions-common/pom.xml index 0ec3dec738b..732fbd5efa8 100644 --- a/tests/test-sessions/test-sessions-common/pom.xml +++ b/tests/test-sessions/test-sessions-common/pom.xml @@ -11,8 +11,11 @@ ${project.groupId}.sessions.common - + + org.eclipse.jetty + jetty-client + org.eclipse.jetty jetty-server @@ -21,19 +24,6 @@ org.eclipse.jetty jetty-webapp - - org.eclipse.jetty - jetty-client - - - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-slf4j-impl - test - org.eclipse.jetty.toolchain jetty-test-helper @@ -49,5 +39,15 @@ junit-jupiter-api compile + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + + diff --git a/tests/test-webapps/pom.xml b/tests/test-webapps/pom.xml index 6224c523f0a..c89216baade 100644 --- a/tests/test-webapps/pom.xml +++ b/tests/test-webapps/pom.xml @@ -8,13 +8,8 @@ ../pom.xml test-webapps-parent - Jetty Tests :: WebApps :: Parent pom - - - true - true - + Jetty Tests :: WebApps :: Parent test-webapp-rfc2616 @@ -30,4 +25,9 @@ test-websocket-client-provided-webapp test-openid-webapp + + + true + true + diff --git a/tests/test-webapps/test-bad-websocket-webapp/pom.xml b/tests/test-webapps/test-bad-websocket-webapp/pom.xml index da0d92cf054..2e83ef6fd9f 100644 --- a/tests/test-webapps/test-bad-websocket-webapp/pom.xml +++ b/tests/test-webapps/test-bad-websocket-webapp/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.tests test-webapps-parent 10.0.20-SNAPSHOT - - 4.0.0 test-bad-websocket-webapp war @@ -20,13 +20,13 @@ provided - org.eclipse.jetty.websocket - websocket-javax-common + org.eclipse.jetty.toolchain + jetty-servlet-api provided - org.eclipse.jetty.toolchain - jetty-servlet-api + org.eclipse.jetty.websocket + websocket-javax-common provided diff --git a/tests/test-webapps/test-cdi-common-webapp/pom.xml b/tests/test-webapps/test-cdi-common-webapp/pom.xml index d196de38369..2a44cf978a9 100644 --- a/tests/test-webapps/test-cdi-common-webapp/pom.xml +++ b/tests/test-webapps/test-cdi-common-webapp/pom.xml @@ -1,26 +1,25 @@ + + 4.0.0 org.eclipse.jetty.tests test-webapps-parent 10.0.20-SNAPSHOT - - 4.0.0 test-cdi-common-webapp - Test :: CDI :: Common Demo Webapp war + Test :: CDI :: Common Demo Webapp ${project.groupId}.cdi.common - - + - org.eclipse.jetty.toolchain - jetty-servlet-api + jakarta.enterprise + jakarta.enterprise.cdi-api provided @@ -29,10 +28,10 @@ jakarta.inject-api provided - + - jakarta.enterprise - jakarta.enterprise.cdi-api + org.eclipse.jetty.toolchain + jetty-servlet-api provided diff --git a/tests/test-webapps/test-felix-webapp/pom.xml b/tests/test-webapps/test-felix-webapp/pom.xml index edfcc48dade..0363f1ed452 100644 --- a/tests/test-webapps/test-felix-webapp/pom.xml +++ b/tests/test-webapps/test-felix-webapp/pom.xml @@ -1,20 +1,32 @@ + + 4.0.0 org.eclipse.jetty.tests test-webapps-parent 10.0.20-SNAPSHOT - - 4.0.0 test-felix-webapp - Test :: Jetty Felix Webapp war + Test :: Jetty Felix Webapp ${project.groupId}.felix + + + org.apache.felix + org.apache.felix.framework + + + jakarta.servlet + jakarta.servlet-api + provided + + + @@ -34,16 +46,4 @@ - - - - jakarta.servlet - jakarta.servlet-api - provided - - - org.apache.felix - org.apache.felix.framework - - diff --git a/tests/test-webapps/test-http2-webapp/pom.xml b/tests/test-webapps/test-http2-webapp/pom.xml index da548d2f5af..e14709d4f91 100644 --- a/tests/test-webapps/test-http2-webapp/pom.xml +++ b/tests/test-webapps/test-http2-webapp/pom.xml @@ -1,20 +1,66 @@ + + 4.0.0 org.eclipse.jetty.tests test-webapps-parent 10.0.20-SNAPSHOT - - 4.0.0 test-http2-webapp - Test :: Jetty HTTP2 Webapp war + Test :: Jetty HTTP2 Webapp ${project.groupId}.http2 + + + org.eclipse.jetty + jetty-alpn-java-client + + + org.eclipse.jetty.http2 + http2-client + + + org.eclipse.jetty.toolchain + jetty-test-helper + + + org.eclipse.jetty.toolchain + jetty-servlet-api + provided + + + + org.eclipse.jetty + jetty-alpn-java-server + test + + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty + jetty-webapp + test + + + org.eclipse.jetty.http2 + http2-server + test + + + @@ -22,10 +68,10 @@ unpack-webapp - pre-integration-test unpack + pre-integration-test @@ -55,50 +101,4 @@ - - - - org.eclipse.jetty.http2 - http2-client - - - org.eclipse.jetty.toolchain - jetty-servlet-api - provided - - - org.eclipse.jetty - jetty-alpn-java-client - - - - org.eclipse.jetty - jetty-alpn-java-server - test - - - org.eclipse.jetty - jetty-client - test - - - org.eclipse.jetty - jetty-webapp - test - - - org.eclipse.jetty.http2 - http2-server - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - - - org.eclipse.jetty - jetty-slf4j-impl - test - - diff --git a/tests/test-webapps/test-openid-webapp/pom.xml b/tests/test-webapps/test-openid-webapp/pom.xml index 09c0a4222c7..f659fbda8c8 100644 --- a/tests/test-webapps/test-openid-webapp/pom.xml +++ b/tests/test-webapps/test-openid-webapp/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.tests test-webapps-parent 10.0.20-SNAPSHOT - - 4.0.0 test-openid-webapp war diff --git a/tests/test-webapps/test-owb-cdi-webapp/pom.xml b/tests/test-webapps/test-owb-cdi-webapp/pom.xml index dc0c0a7806d..cb84350ea1e 100644 --- a/tests/test-webapps/test-owb-cdi-webapp/pom.xml +++ b/tests/test-webapps/test-owb-cdi-webapp/pom.xml @@ -1,41 +1,23 @@ + + 4.0.0 org.eclipse.jetty.tests test-webapps-parent 10.0.20-SNAPSHOT - - 4.0.0 test-owb-cdi-webapp - Test :: CDI On Jetty :: OWB Demo Webapp war + Test :: CDI On Jetty :: OWB Demo Webapp ${project.groupId}.cdi.owb 2.0.27 - - owb-cdi-demo - - - - org.eclipse.jetty.toolchain - jetty-servlet-api - provided - - - - org.eclipse.jetty.tests - test-cdi-common-webapp - ${project.version} - war - runtime - - jakarta.annotation @@ -55,13 +37,31 @@ org.apache.openwebbeans - openwebbeans-web + openwebbeans-jetty9 ${openwebbeans.version} org.apache.openwebbeans - openwebbeans-jetty9 + openwebbeans-web ${openwebbeans.version} + + + org.eclipse.jetty.toolchain + jetty-servlet-api + provided + + + + org.eclipse.jetty.tests + test-cdi-common-webapp + ${project.version} + war + runtime + + + + owb-cdi-demo + diff --git a/tests/test-webapps/test-webapp-rfc2616/pom.xml b/tests/test-webapps/test-webapp-rfc2616/pom.xml index 4e15aaaa712..e01afc23dcc 100644 --- a/tests/test-webapps/test-webapp-rfc2616/pom.xml +++ b/tests/test-webapps/test-webapp-rfc2616/pom.xml @@ -7,28 +7,11 @@ 10.0.20-SNAPSHOT test-webapp-rfc2616 - Jetty Tests :: WebApp :: RFC2616 war + Jetty Tests :: WebApp :: RFC2616 ${project.groupId}.rfc2616 - - - - org.eclipse.jetty - jetty-maven-plugin - ${project.version} - - 8087 - foo - 1 - - 222 - - - - - org.eclipse.jetty @@ -40,4 +23,21 @@ provided + + + + org.eclipse.jetty + jetty-maven-plugin + ${project.version} + + 8087 + foo + 1 + + 222 + + + + + 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 3614ffb81b1..af1f2cf69d8 100644 --- a/tests/test-webapps/test-websocket-client-provided-webapp/pom.xml +++ b/tests/test-webapps/test-websocket-client-provided-webapp/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.tests test-webapps-parent 10.0.20-SNAPSHOT - - 4.0.0 test-websocket-client-provided-webapp war @@ -19,12 +19,12 @@ org.eclipse.jetty.toolchain - jetty-servlet-api + jetty-javax-websocket-api provided org.eclipse.jetty.toolchain - jetty-javax-websocket-api + jetty-servlet-api provided diff --git a/tests/test-webapps/test-websocket-client-webapp/pom.xml b/tests/test-webapps/test-websocket-client-webapp/pom.xml index f7c4fa2367a..eb2265ae7f0 100644 --- a/tests/test-webapps/test-websocket-client-webapp/pom.xml +++ b/tests/test-webapps/test-websocket-client-webapp/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.tests test-webapps-parent 10.0.20-SNAPSHOT - - 4.0.0 test-websocket-client-webapp war @@ -14,13 +14,12 @@ - org.slf4j - slf4j-simple + org.eclipse.jetty.websocket + websocket-jetty-client - org.eclipse.jetty.toolchain - jetty-servlet-api - provided + org.slf4j + slf4j-simple org.eclipse.jetty.toolchain @@ -28,8 +27,9 @@ provided - org.eclipse.jetty.websocket - websocket-jetty-client + org.eclipse.jetty.toolchain + jetty-servlet-api + provided diff --git a/tests/test-webapps/test-websocket-webapp/pom.xml b/tests/test-webapps/test-websocket-webapp/pom.xml index a9cd7abf913..3476946e238 100644 --- a/tests/test-webapps/test-websocket-webapp/pom.xml +++ b/tests/test-webapps/test-websocket-webapp/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.tests test-webapps-parent 10.0.20-SNAPSHOT - - 4.0.0 test-websocket-webapp war @@ -27,13 +27,13 @@ provided - org.eclipse.jetty.websocket - websocket-javax-common + org.eclipse.jetty.toolchain + jetty-servlet-api provided - org.eclipse.jetty.toolchain - jetty-servlet-api + org.eclipse.jetty.websocket + websocket-javax-common provided diff --git a/tests/test-webapps/test-weld-cdi-webapp/pom.xml b/tests/test-webapps/test-weld-cdi-webapp/pom.xml index 30d82869e8d..4d967e7c802 100644 --- a/tests/test-webapps/test-weld-cdi-webapp/pom.xml +++ b/tests/test-webapps/test-weld-cdi-webapp/pom.xml @@ -1,34 +1,22 @@ + + 4.0.0 org.eclipse.jetty.tests test-webapps-parent 10.0.20-SNAPSHOT - - 4.0.0 test-weld-cdi-webapp - Test :: CDI On Jetty :: Weld Demo Webapp war + Test :: CDI On Jetty :: Weld Demo Webapp ${project.groupId}.cdi.weld - - weld-cdi-demo - - - - org.eclipse.jetty.tests - test-cdi-common-webapp - ${project.version} - war - runtime - - org.jboss.weld.servlet @@ -41,5 +29,17 @@ + + + org.eclipse.jetty.tests + test-cdi-common-webapp + ${project.version} + war + runtime + + + + weld-cdi-demo + diff --git a/tests/test-websocket-autobahn/pom.xml b/tests/test-websocket-autobahn/pom.xml index 73db0cb8a46..f603cdf0cc2 100644 --- a/tests/test-websocket-autobahn/pom.xml +++ b/tests/test-websocket-autobahn/pom.xml @@ -1,17 +1,46 @@ + + 4.0.0 org.eclipse.jetty.tests tests-parent 10.0.20-SNAPSHOT - - 4.0.0 test-websocket-autobahn Jetty Tests :: WebSocket Autobahn Tests Run of Autobahn Testsuite for Jetty + + org.eclipse.jetty.websocket + websocket-javax-client + + + org.eclipse.jetty.websocket + websocket-javax-server + + + com.googlecode.json-simple + json-simple + test + + + org.codehaus.plexus + plexus-utils + test + + + org.codehaus.plexus + plexus-xml + test + + + javax.annotation + javax.annotation-api + + + org.eclipse.jetty jetty-server @@ -38,16 +67,8 @@ test - org.eclipse.jetty.websocket - websocket-javax-client - - - org.eclipse.jetty.websocket - websocket-javax-server - - - org.testcontainers - testcontainers + org.slf4j + slf4j-simple test @@ -56,29 +77,8 @@ test - org.codehaus.plexus - plexus-utils - test - - - org.codehaus.plexus - plexus-xml - test - - - javax.annotation - javax.annotation-api - - - - - com.googlecode.json-simple - json-simple - test - - - org.slf4j - slf4j-simple + org.testcontainers + testcontainers test @@ -105,9 +105,7 @@ jetty.websocket Autobahn Tests - - org.eclipse.jetty.websocket.jetty.tests.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - + org.eclipse.jetty.websocket.jetty.tests.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"