From f56155af05244aef1b3031a893087c26f2ebad26 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Tue, 26 Sep 2023 12:24:21 +1000 Subject: [PATCH] spotless:apply to all poms Signed-off-by: Olivier Lamy --- build/build-resources/pom.xml | 13 +- build/pom.xml | 14 +- .../jetty-asciidoctor-extensions/pom.xml | 6 +- documentation/jetty-documentation/pom.xml | 430 +++++------ documentation/pom.xml | 6 +- javadoc/pom.xml | 290 ++++--- .../jetty-alpn/jetty-alpn-client/pom.xml | 33 +- .../jetty-alpn-conscrypt-client/pom.xml | 4 +- .../jetty-alpn-conscrypt-server/pom.xml | 8 +- .../jetty-alpn/jetty-alpn-java-client/pom.xml | 42 +- .../jetty-alpn/jetty-alpn-java-server/pom.xml | 54 +- .../jetty-alpn/jetty-alpn-server/pom.xml | 33 +- jetty-core/jetty-alpn/pom.xml | 7 +- jetty-core/jetty-bom/pom.xml | 53 +- jetty-core/jetty-client/pom.xml | 135 ++-- .../jetty-demos/jetty-demo-handler/pom.xml | 24 +- jetty-core/jetty-demos/pom.xml | 4 +- jetty-core/jetty-deploy/pom.xml | 35 +- .../jetty-fcgi/jetty-fcgi-client/pom.xml | 4 +- .../jetty-fcgi/jetty-fcgi-proxy/pom.xml | 34 +- .../jetty-fcgi/jetty-fcgi-server/pom.xml | 30 +- jetty-core/jetty-fcgi/pom.xml | 6 +- jetty-core/jetty-http-spi/pom.xml | 5 +- jetty-core/jetty-http-tools/pom.xml | 4 +- jetty-core/jetty-http/pom.xml | 16 +- .../jetty-http2-client-transport/pom.xml | 4 +- .../jetty-http2/jetty-http2-client/pom.xml | 30 +- .../jetty-http2/jetty-http2-common/pom.xml | 4 +- .../jetty-http2/jetty-http2-hpack/pom.xml | 40 +- .../jetty-http2/jetty-http2-server/pom.xml | 4 +- .../jetty-http2/jetty-http2-tests/pom.xml | 116 ++- jetty-core/jetty-http2/pom.xml | 6 +- .../jetty-http3-client-transport/pom.xml | 4 +- .../jetty-http3/jetty-http3-client/pom.xml | 4 +- .../jetty-http3/jetty-http3-common/pom.xml | 4 +- .../jetty-http3/jetty-http3-qpack/pom.xml | 40 +- .../jetty-http3/jetty-http3-server/pom.xml | 4 +- .../jetty-http3/jetty-http3-tests/pom.xml | 6 +- jetty-core/jetty-http3/pom.xml | 10 +- jetty-core/jetty-io/pom.xml | 26 +- jetty-core/jetty-jmx/pom.xml | 25 +- jetty-core/jetty-jndi/pom.xml | 35 +- jetty-core/jetty-keystore/pom.xml | 4 +- jetty-core/jetty-openid/pom.xml | 51 +- jetty-core/jetty-osgi/pom.xml | 55 +- jetty-core/jetty-proxy/pom.xml | 32 +- .../jetty-quic/jetty-quic-client/pom.xml | 10 +- .../jetty-quic/jetty-quic-common/pom.xml | 4 +- .../jetty-quic-quiche-common/pom.xml | 4 +- .../pom.xml | 50 +- .../jetty-quic-quiche-jna/pom.xml | 4 +- .../jetty-quic/jetty-quic-quiche/pom.xml | 6 +- .../jetty-quic/jetty-quic-server/pom.xml | 4 +- jetty-core/jetty-quic/pom.xml | 8 +- jetty-core/jetty-rewrite/pom.xml | 5 +- jetty-core/jetty-security/pom.xml | 35 +- jetty-core/jetty-server/pom.xml | 33 +- jetty-core/jetty-session/pom.xml | 55 +- jetty-core/jetty-slf4j-impl/pom.xml | 41 +- jetty-core/jetty-start/pom.xml | 45 +- .../jetty-test-client-transports/pom.xml | 8 +- jetty-core/jetty-tests/pom.xml | 14 +- jetty-core/jetty-unixdomain-server/pom.xml | 4 +- jetty-core/jetty-util-ajax/pom.xml | 3 +- jetty-core/jetty-util/pom.xml | 73 +- .../jetty-websocket-core-client/pom.xml | 4 +- .../jetty-websocket-core-common/pom.xml | 12 +- .../jetty-websocket-core-server/pom.xml | 4 +- .../jetty-websocket-core-tests/pom.xml | 10 +- .../jetty-websocket-jetty-api/pom.xml | 4 +- .../jetty-websocket-jetty-client/pom.xml | 4 +- .../jetty-websocket-jetty-common/pom.xml | 40 +- .../jetty-websocket-jetty-server/pom.xml | 4 +- .../jetty-websocket-jetty-tests/pom.xml | 9 +- jetty-core/jetty-websocket/pom.xml | 4 +- jetty-core/jetty-xml/pom.xml | 48 +- jetty-core/pom.xml | 16 +- jetty-ee10/jetty-ee10-annotations/pom.xml | 60 +- jetty-ee10/jetty-ee10-apache-jsp/pom.xml | 84 +- jetty-ee10/jetty-ee10-bom/pom.xml | 53 +- jetty-ee10/jetty-ee10-cdi/pom.xml | 19 +- .../jetty-ee10-demo-async-rest-jar/pom.xml | 5 +- .../jetty-ee10-demo-async-rest-server/pom.xml | 5 +- .../jetty-ee10-demo-async-rest-webapp/pom.xml | 5 +- .../jetty-ee10-demo-async-rest/pom.xml | 7 +- .../jetty-ee10-demo-embedded/pom.xml | 3 +- .../jetty-ee10-demo-jaas-webapp/pom.xml | 4 +- .../jetty-ee10-demo-jetty-webapp/pom.xml | 230 +++--- .../jetty-ee10-demo-jndi-webapp/pom.xml | 96 +-- .../jetty-ee10-demo-jsp-webapp/pom.xml | 44 +- .../jetty-ee10-demo-mock-resources/pom.xml | 41 +- .../jetty-ee10-demo-proxy-webapp/pom.xml | 28 +- .../jetty-ee10-demo-simple-webapp/pom.xml | 6 +- .../pom.xml | 15 +- .../jetty-ee10-demo-spec-webapp/pom.xml | 224 +++--- .../jetty-ee10-demo-web-fragment/pom.xml | 5 +- .../jetty-ee10-demo-spec/pom.xml | 4 +- .../jetty-ee10-demo-template/pom.xml | 8 +- jetty-ee10/jetty-ee10-demos/pom.xml | 34 +- jetty-ee10/jetty-ee10-examples/pom.xml | 4 +- jetty-ee10/jetty-ee10-fcgi-proxy/pom.xml | 4 +- jetty-ee10/jetty-ee10-glassfish-jstl/pom.xml | 29 +- jetty-ee10/jetty-ee10-home/pom.xml | 724 +++++++++--------- jetty-ee10/jetty-ee10-jaspi/pom.xml | 51 +- jetty-ee10/jetty-ee10-jndi/pom.xml | 35 +- .../jetty-ee10-jspc-maven-plugin/pom.xml | 84 +- jetty-ee10/jetty-ee10-maven-plugin/pom.xml | 305 ++++---- .../jetty-ee10-osgi-alpn/pom.xml | 11 +- .../jetty-ee10-osgi-boot-jsp/pom.xml | 32 +- .../jetty-ee10-osgi-boot/pom.xml | 25 +- jetty-ee10/jetty-ee10-osgi/pom.xml | 27 +- .../test-jetty-ee10-osgi-fragment/pom.xml | 3 +- .../test-jetty-ee10-osgi-server/pom.xml | 9 +- .../pom.xml | 22 +- .../test-jetty-ee10-osgi/pom.xml | 35 +- jetty-ee10/jetty-ee10-plus/pom.xml | 43 +- jetty-ee10/jetty-ee10-proxy/pom.xml | 31 +- jetty-ee10/jetty-ee10-quickstart/pom.xml | 41 +- jetty-ee10/jetty-ee10-runner/pom.xml | 165 ++-- jetty-ee10/jetty-ee10-servlet/pom.xml | 32 +- jetty-ee10/jetty-ee10-servlets/pom.xml | 40 +- .../pom.xml | 4 +- .../jetty-ee10-test-cdi-common-webapp/pom.xml | 34 +- .../jetty-ee10-test-cdi/pom.xml | 4 +- .../jetty-ee10-test-client-transports/pom.xml | 86 +-- .../jetty-ee10-test-felix-webapp/pom.xml | 32 +- .../jetty-ee10-test-http2-webapp/pom.xml | 100 +-- .../jetty-ee10-test-integration/pom.xml | 100 +-- .../jetty-ee10-jmx-webapp-it/pom.xml | 6 +- .../jetty-ee10-test-jmx/pom.xml | 2 +- .../jetty-ee10-test-jndi/pom.xml | 4 +- .../jetty-ee10-test-loginservice/pom.xml | 2 +- .../jetty-ee10-test-openid-webapp/pom.xml | 4 +- .../jetty-ee10-test-owb-cdi-webapp/pom.xml | 14 +- .../jetty-ee10-test-quickstart/pom.xml | 4 +- .../jetty-ee10-test-sessions-common/pom.xml | 2 +- .../jetty-ee10-test-sessions-gcloud/pom.xml | 2 +- .../pom.xml | 34 +- .../pom.xml | 38 +- .../jetty-ee10-test-sessions-jdbc/pom.xml | 26 +- .../jetty-ee10-test-sessions-mongodb/pom.xml | 28 +- .../jetty-ee10-test-sessions/pom.xml | 20 +- .../jetty-ee10-test-webapp-rfc2616/pom.xml | 26 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../jetty-ee10-test-websocket-webapp/pom.xml | 4 +- .../jetty-ee10-test-weld-cdi-webapp/pom.xml | 14 +- jetty-ee10/jetty-ee10-tests/pom.xml | 34 +- jetty-ee10/jetty-ee10-webapp/pom.xml | 99 ++- .../pom.xml | 16 +- .../pom.xml | 16 +- .../pom.xml | 52 +- .../pom.xml | 16 +- .../pom.xml | 8 +- .../pom.xml | 34 +- .../jetty-ee10-websocket-jetty-server/pom.xml | 8 +- .../jetty-ee10-websocket-jetty-tests/pom.xml | 5 +- .../jetty-ee10-websocket-servlet/pom.xml | 4 +- jetty-ee10/jetty-ee10-websocket/pom.xml | 14 +- jetty-ee10/pom.xml | 68 +- jetty-ee8/jetty-ee8-annotations/pom.xml | 114 ++- jetty-ee8/jetty-ee8-apache-jsp/pom.xml | 86 +-- jetty-ee8/jetty-ee8-bom/pom.xml | 53 +- .../jetty-ee8-demo-async-rest-jar/pom.xml | 7 +- .../jetty-ee8-demo-async-rest-server/pom.xml | 7 +- .../jetty-ee8-demo-async-rest-webapp/pom.xml | 5 +- .../jetty-ee8-demo-async-rest/pom.xml | 7 +- .../jetty-ee8-demo-jaas-webapp/pom.xml | 4 +- .../jetty-ee8-demo-jetty-webapp/pom.xml | 230 +++--- .../jetty-ee8-demo-jndi-webapp/pom.xml | 110 +-- .../jetty-ee8-demo-jsp-webapp/pom.xml | 46 +- .../jetty-ee8-demo-mock-resources/pom.xml | 47 +- .../jetty-ee8-demo-proxy-webapp/pom.xml | 34 +- .../jetty-ee8-demo-simple-webapp/pom.xml | 10 +- .../pom.xml | 17 +- .../jetty-ee8-demo-spec-webapp/pom.xml | 198 +++-- .../jetty-ee8-demo-web-fragment/pom.xml | 7 +- .../jetty-ee8-demo-spec/pom.xml | 4 +- jetty-ee8/jetty-ee8-demos/pom.xml | 42 +- jetty-ee8/jetty-ee8-glassfish-jstl/pom.xml | 37 +- jetty-ee8/jetty-ee8-home/pom.xml | 706 +++++++++-------- jetty-ee8/jetty-ee8-jaspi/pom.xml | 81 +- jetty-ee8/jetty-ee8-jndi/pom.xml | 37 +- jetty-ee8/jetty-ee8-jspc-maven-plugin/pom.xml | 84 +- jetty-ee8/jetty-ee8-maven-plugin/pom.xml | 223 +++--- jetty-ee8/jetty-ee8-nested/pom.xml | 33 +- jetty-ee8/jetty-ee8-openid/pom.xml | 39 +- jetty-ee8/jetty-ee8-plus/pom.xml | 45 +- jetty-ee8/jetty-ee8-proxy/pom.xml | 29 +- jetty-ee8/jetty-ee8-quickstart/pom.xml | 43 +- jetty-ee8/jetty-ee8-security/pom.xml | 37 +- jetty-ee8/jetty-ee8-servlet/pom.xml | 36 +- jetty-ee8/jetty-ee8-servlets/pom.xml | 48 +- jetty-ee8/jetty-ee8-webapp/pom.xml | 93 ++- .../pom.xml | 18 +- .../jetty-ee8-websocket-javax-client/pom.xml | 18 +- .../jetty-ee8-websocket-javax-common/pom.xml | 42 +- .../jetty-ee8-websocket-javax-server/pom.xml | 18 +- .../jetty-ee8-websocket-javax-tests/pom.xml | 12 +- .../jetty-ee8-websocket-jetty-api/pom.xml | 6 +- .../pom.xml | 36 +- .../jetty-ee8-websocket-jetty-client/pom.xml | 42 +- .../jetty-ee8-websocket-jetty-common/pom.xml | 46 +- .../jetty-ee8-websocket-jetty-server/pom.xml | 16 +- .../jetty-ee8-websocket-jetty-tests/pom.xml | 11 +- .../jetty-ee8-websocket-servlet/pom.xml | 6 +- jetty-ee8/jetty-ee8-websocket/pom.xml | 24 +- jetty-ee8/pom.xml | 534 ++++++------- jetty-ee9/jetty-ee9-annotations/pom.xml | 74 +- jetty-ee9/jetty-ee9-apache-jsp/pom.xml | 84 +- jetty-ee9/jetty-ee9-bom/pom.xml | 53 +- jetty-ee9/jetty-ee9-cdi/pom.xml | 19 +- .../jetty-ee9-demo-async-rest-jar/pom.xml | 5 +- .../jetty-ee9-demo-async-rest-server/pom.xml | 5 +- .../jetty-ee9-demo-async-rest-webapp/pom.xml | 5 +- .../jetty-ee9-demo-async-rest/pom.xml | 7 +- .../jetty-ee9-demo-embedded/pom.xml | 3 +- .../jetty-ee9-demo-jaas-webapp/pom.xml | 2 +- .../jetty-ee9-demo-jetty-webapp/pom.xml | 230 +++--- .../jetty-ee9-demo-jndi-webapp/pom.xml | 106 +-- .../jetty-ee9-demo-jsp-webapp/pom.xml | 44 +- .../jetty-ee9-demo-mock-resources/pom.xml | 45 +- .../jetty-ee9-demo-proxy-webapp/pom.xml | 28 +- .../jetty-ee9-demo-simple-webapp/pom.xml | 6 +- .../pom.xml | 15 +- .../jetty-ee9-demo-spec-webapp/pom.xml | 172 ++--- .../jetty-ee9-demo-web-fragment/pom.xml | 5 +- .../jetty-ee9-demo-spec/pom.xml | 4 +- .../jetty-ee9-demo-template/pom.xml | 12 +- jetty-ee9/jetty-ee9-demos/pom.xml | 34 +- jetty-ee9/jetty-ee9-fcgi-proxy/pom.xml | 4 +- jetty-ee9/jetty-ee9-glassfish-jstl/pom.xml | 35 +- jetty-ee9/jetty-ee9-home/pom.xml | 719 +++++++++-------- jetty-ee9/jetty-ee9-jaspi/pom.xml | 37 +- jetty-ee9/jetty-ee9-jndi/pom.xml | 35 +- jetty-ee9/jetty-ee9-jspc-maven-plugin/pom.xml | 84 +- jetty-ee9/jetty-ee9-maven-plugin/pom.xml | 299 ++++---- jetty-ee9/jetty-ee9-nested/pom.xml | 35 +- jetty-ee9/jetty-ee9-openid/pom.xml | 37 +- .../jetty-ee9-osgi-boot-jsp/pom.xml | 32 +- .../jetty-ee9-osgi-boot/pom.xml | 25 +- jetty-ee9/jetty-ee9-osgi/pom.xml | 27 +- .../test-jetty-ee9-osgi-fragment/pom.xml | 3 +- .../test-jetty-ee9-osgi-server/pom.xml | 9 +- .../pom.xml | 20 +- .../test-jetty-ee9-osgi/pom.xml | 39 +- jetty-ee9/jetty-ee9-plus/pom.xml | 43 +- jetty-ee9/jetty-ee9-proxy/pom.xml | 29 +- jetty-ee9/jetty-ee9-quickstart/pom.xml | 41 +- jetty-ee9/jetty-ee9-runner/pom.xml | 157 ++-- jetty-ee9/jetty-ee9-security/pom.xml | 35 +- jetty-ee9/jetty-ee9-servlet/pom.xml | 32 +- jetty-ee9/jetty-ee9-servlets/pom.xml | 46 +- .../pom.xml | 4 +- .../jetty-ee9-test-cdi-common-webapp/pom.xml | 34 +- .../jetty-ee9-test-cdi/pom.xml | 4 +- .../jetty-ee9-test-client-transports/pom.xml | 86 +-- .../jetty-ee9-test-felix-webapp/pom.xml | 32 +- .../jetty-ee9-test-http2-webapp/pom.xml | 100 +-- .../jetty-ee9-test-integration/pom.xml | 100 +-- .../jetty-ee9-jmx-webapp-it/pom.xml | 6 +- .../jetty-ee9-test-jmx/pom.xml | 2 +- .../jetty-ee9-test-jndi/pom.xml | 4 +- .../jetty-ee9-test-loginservice/pom.xml | 2 +- .../jetty-ee9-test-openid-webapp/pom.xml | 4 +- .../jetty-ee9-test-owb-cdi-webapp/pom.xml | 14 +- .../jetty-ee9-test-quickstart/pom.xml | 4 +- .../jetty-ee9-test-sessions-common/pom.xml | 2 +- .../jetty-ee9-test-sessions-gcloud/pom.xml | 2 +- .../jetty-ee9-test-sessions-hazelcast/pom.xml | 46 +- .../pom.xml | 90 +-- .../jetty-ee9-test-sessions-jdbc/pom.xml | 26 +- .../jetty-ee9-test-sessions-mongodb/pom.xml | 28 +- .../jetty-ee9-test-sessions/pom.xml | 20 +- .../jetty-ee9-test-webapp-rfc2616/pom.xml | 26 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../jetty-ee9-test-websocket-webapp/pom.xml | 4 +- .../jetty-ee9-test-weld-cdi-webapp/pom.xml | 14 +- jetty-ee9/jetty-ee9-tests/pom.xml | 36 +- jetty-ee9/jetty-ee9-webapp/pom.xml | 97 ++- .../pom.xml | 16 +- .../pom.xml | 16 +- .../pom.xml | 40 +- .../pom.xml | 16 +- .../jetty-ee9-websocket-jakarta-tests/pom.xml | 10 +- .../jetty-ee9-websocket-jetty-api/pom.xml | 4 +- .../pom.xml | 34 +- .../jetty-ee9-websocket-jetty-client/pom.xml | 4 +- .../jetty-ee9-websocket-jetty-common/pom.xml | 46 +- .../jetty-ee9-websocket-jetty-server/pom.xml | 14 +- .../jetty-ee9-websocket-jetty-tests/pom.xml | 9 +- .../jetty-ee9-websocket-servlet/pom.xml | 4 +- jetty-ee9/jetty-ee9-websocket/pom.xml | 18 +- jetty-ee9/pom.xml | 89 +-- jetty-home/pom.xml | 540 +++++++------ .../jetty-gcloud-session-manager/pom.xml | 22 +- jetty-integrations/jetty-gcloud/pom.xml | 12 +- jetty-integrations/jetty-hazelcast/pom.xml | 6 +- .../jetty-infinispan-common/pom.xml | 51 +- .../jetty-infinispan-embedded-query/pom.xml | 77 +- .../jetty-infinispan-embedded/pom.xml | 49 +- .../jetty-infinispan-remote-query/pom.xml | 113 +-- .../jetty-infinispan-remote/pom.xml | 61 +- jetty-integrations/jetty-infinispan/pom.xml | 14 +- .../jetty-memcached-sessions/pom.xml | 12 +- jetty-integrations/jetty-memcached/pom.xml | 4 +- jetty-integrations/jetty-nosql/pom.xml | 11 +- jetty-integrations/pom.xml | 6 +- tests/jetty-home-tester/pom.xml | 7 +- tests/jetty-jmh/pom.xml | 127 +-- tests/jetty-test-session-common/pom.xml | 33 +- tests/pom.xml | 16 +- tests/test-distribution/pom.xml | 21 +- .../test-distribution-common/pom.xml | 33 +- .../test-ee10-distribution/pom.xml | 21 +- .../test-ee9-distribution/pom.xml | 23 +- tests/test-integration/pom.xml | 2 +- 318 files changed, 7202 insertions(+), 7446 deletions(-) diff --git a/build/build-resources/pom.xml b/build/build-resources/pom.xml index 537cbaa1237d..37d7bf32cfd1 100644 --- a/build/build-resources/pom.xml +++ b/build/build-resources/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 3.1.0 3.1.2 - true - true + UTF-8 true @@ -27,12 +28,12 @@ ${project.basedir}/src/main/resources + META-INF ${project.basedir}/../ LICENSE NOTICE.txt - META-INF @@ -43,10 +44,10 @@ create-shared-resources - process-resources bundle + process-resources ${project.build.outputDirectory} diff --git a/build/pom.xml b/build/pom.xml index 7e75bb49fb37..2c9786edfb90 100644 --- a/build/pom.xml +++ b/build/pom.xml @@ -1,22 +1,22 @@ + + 4.0.0 org.eclipse.jetty jetty-project 12.0.2-SNAPSHOT - - 4.0.0 org.eclipse.jetty.build build - Build pom - - - true - + Build build-resources + + + true + diff --git a/documentation/jetty-asciidoctor-extensions/pom.xml b/documentation/jetty-asciidoctor-extensions/pom.xml index c1556620c1a5..df3659d2a8b5 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 12.0.2-SNAPSHOT - - 4.0.0 jetty-asciidoctor-extensions - Documentation :: AsciiDoctor Extensions jar + Documentation :: AsciiDoctor Extensions ${project.groupId}.asciidoctor.extensions diff --git a/documentation/jetty-documentation/pom.xml b/documentation/jetty-documentation/pom.xml index e8654daed3b6..260784dc75bc 100644 --- a/documentation/jetty-documentation/pom.xml +++ b/documentation/jetty-documentation/pom.xml @@ -1,89 +1,146 @@ + + 4.0.0 org.eclipse.jetty.documentation documentation 12.0.2-SNAPSHOT - - 4.0.0 jetty-documentation - Documentation :: Guides jar + Documentation :: Guides - ${project.groupId} ${skipTests} + ${project.groupId} true - - - jdk17-18 - - [17,19) - - - - - maven-compiler-plugin - - - **/ArchitectureDocs.java - - - - - - - - jdk19-20 - - [19,21) - - - - - maven-compiler-plugin - - ${java.specification.version} - ${java.specification.version} - ${java.specification.version} - true - - - - - - - jdk21+ - - [21,) - - - - - maven-compiler-plugin - - ${java.specification.version} - ${java.specification.version} - ${java.specification.version} - - - - - - + + + + org.eclipse.jetty.ee10 + jetty-ee10-bom + ${project.version} + pom + import + + + + + + + org.eclipse.jetty + jetty-alpn-server + + + org.eclipse.jetty + jetty-client + + + org.eclipse.jetty + jetty-jmx + + + org.eclipse.jetty + jetty-rewrite + + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + + + org.eclipse.jetty.ee10 + jetty-ee10-servlets + + + org.eclipse.jetty + jetty-util-ajax + + + org.eclipse.jetty.ee10 + jetty-ee10-webapp + + + org.eclipse.jetty.fcgi + jetty-fcgi-client + + + org.eclipse.jetty.http2 + jetty-http2-server + + + org.eclipse.jetty.http2 + jetty-http2-client-transport + + + org.eclipse.jetty.http3 + jetty-http3-server + + + org.eclipse.jetty.http3 + jetty-http3-client-transport + + + org.eclipse.jetty + jetty-unixdomain-server + + + org.eclipse.jetty + jetty-slf4j-impl + runtime + + + org.eclipse.jetty.memcached + jetty-memcached-sessions + + + org.eclipse.jetty + jetty-nosql + + + org.eclipse.jetty.websocket + jetty-websocket-jetty-client + + + org.eclipse.jetty.websocket + jetty-websocket-jetty-server + + + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jakarta-server + + + org.eclipse.jetty + jetty-home + ${project.version} + zip + true + + + org.eclipse.jetty + jetty-infinispan-embedded-query + + + org.eclipse.jetty.gcloud + jetty-gcloud-session-manager + + + ${project.build.directory}/html ${project.basedir}/src/main/asciidoc *.css - ${project.build.directory}/html @@ -102,6 +159,23 @@ org.asciidoctor asciidoctor-maven-plugin + + html5 + + asciidoctor-diagram + + + ${project.basedir} + ${project.version} + ${session.repositorySession.localRepository.basedir.absolutePath} + ${project.version} + + ../programming-guide/index.html + ../operations-guide/index.html + https://eclipse.dev/jetty/javadoc/jetty-12 + + + org.asciidoctor @@ -130,82 +204,65 @@ ${apache.httpclient.version} - - html5 - - asciidoctor-diagram - - - ${project.basedir} - ${project.version} - ${session.repositorySession.localRepository.basedir.absolutePath} - ${project.version} - - ../programming-guide/index.html - ../operations-guide/index.html - https://eclipse.dev/jetty/javadoc/jetty-12 - - - - index - prepare-package + contribution-guide process-asciidoc + prepare-package - src/main/asciidoc + ${basedir}/src/main/asciidoc/contribution-guide index.adoc - ${project.build.directory}/html + ${project.build.directory}/html/contribution-guide - operations-guide - prepare-package + index process-asciidoc + prepare-package - src/main/asciidoc/operations-guide + src/main/asciidoc index.adoc - ${project.build.directory}/html/operations-guide + ${project.build.directory}/html - contribution-guide - prepare-package + old_docs process-asciidoc + prepare-package - ${basedir}/src/main/asciidoc/contribution-guide + ${basedir}/src/main/asciidoc/old_docs index.adoc - ${project.build.directory}/html/contribution-guide + ${project.build.directory}/html/old_docs - programming-guide - prepare-package + operations-guide process-asciidoc + prepare-package - ${basedir}/src/main/asciidoc/programming-guide + src/main/asciidoc/operations-guide index.adoc - ${project.build.directory}/html/programming-guide + ${project.build.directory}/html/operations-guide - old_docs - prepare-package + programming-guide process-asciidoc + prepare-package - ${basedir}/src/main/asciidoc/old_docs + ${basedir}/src/main/asciidoc/programming-guide index.adoc - ${project.build.directory}/html/old_docs + ${project.build.directory}/html/programming-guide @@ -216,10 +273,10 @@ unpack-jetty-home - generate-resources unpack + generate-resources @@ -244,128 +301,71 @@ make-assembly - package single + package - - - - org.eclipse.jetty.ee10 - jetty-ee10-bom - ${project.version} - pom - import - - - - - - - org.eclipse.jetty - jetty-alpn-server - - - org.eclipse.jetty - jetty-client - - - org.eclipse.jetty - jetty-jmx - - - org.eclipse.jetty - jetty-rewrite - - - org.eclipse.jetty - jetty-server - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - - - org.eclipse.jetty.ee10 - jetty-ee10-servlets - - - org.eclipse.jetty - jetty-util-ajax - - - org.eclipse.jetty.ee10 - jetty-ee10-webapp - - - org.eclipse.jetty.fcgi - jetty-fcgi-client - - - org.eclipse.jetty.http2 - jetty-http2-server - - - org.eclipse.jetty.http2 - jetty-http2-client-transport - - - org.eclipse.jetty.http3 - jetty-http3-server - - - org.eclipse.jetty.http3 - jetty-http3-client-transport - - - org.eclipse.jetty - jetty-unixdomain-server - - - org.eclipse.jetty - jetty-slf4j-impl - runtime - - - org.eclipse.jetty.memcached - jetty-memcached-sessions - - - org.eclipse.jetty - jetty-nosql - - - org.eclipse.jetty.websocket - jetty-websocket-jetty-client - - - org.eclipse.jetty.websocket - jetty-websocket-jetty-server - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jakarta-server - - - org.eclipse.jetty - jetty-home - ${project.version} - zip - true - - - org.eclipse.jetty - jetty-infinispan-embedded-query - - - org.eclipse.jetty.gcloud - jetty-gcloud-session-manager - - + + + jdk17-18 + + [17,19) + + + + + maven-compiler-plugin + + + **/ArchitectureDocs.java + + + + + + + + jdk19-20 + + [19,21) + + + + + maven-compiler-plugin + + ${java.specification.version} + ${java.specification.version} + ${java.specification.version} + true + + + + + + + jdk21+ + + [21,) + + + + + maven-compiler-plugin + + ${java.specification.version} + ${java.specification.version} + ${java.specification.version} + + + + + + diff --git a/documentation/pom.xml b/documentation/pom.xml index e6ea4326d0a1..0dbd6ebfefb3 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -1,16 +1,16 @@ + + 4.0.0 org.eclipse.jetty jetty-project 12.0.2-SNAPSHOT - - 4.0.0 org.eclipse.jetty.documentation documentation - Documentation pom + Documentation jetty-asciidoctor-extensions diff --git a/javadoc/pom.xml b/javadoc/pom.xml index 1f37e6538a1b..1030b17cdfb8 100644 --- a/javadoc/pom.xml +++ b/javadoc/pom.xml @@ -1,174 +1,33 @@ + + 4.0.0 org.eclipse.jetty jetty-project 12.0.2-SNAPSHOT - - 4.0.0 javadoc - Javadocs jar + Javadocs - ${project.build.directory}/jetty-sources - true - true - 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, - jetty-quic-foreign-incubator, - jetty-quic-foreign-jna, - alpn-api, - javax.servlet, - javax.websocket, - jakarta.servlet, - jakarta.websocket, - jetty-servlet-api, - jetty-javax-websocket-api, - jetty-jakarta-servlet-api, - jetty-jakarta-websocket-api, - javax.mail, - jakarta.mail-api, - mailapi, - javax.security.auth.message, - plexus-utils, - plexus-interpolation, - jetty-quic-quiche-foreign-incubator - - 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.transport.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.quiche; org.eclipse.jetty.quic.quiche.foreign.*; org.eclipse.jetty.quic.quiche.*; org.eclipse.jetty.quic.server.internal; - - - - - - - - org.eclipse.jetty.ee10 jetty-ee10-bom ${project.version} - import pom + import @@ -491,4 +350,137 @@ provided + + + + + 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 + + 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, + jetty-quic-foreign-incubator, + jetty-quic-foreign-jna, + alpn-api, + javax.servlet, + javax.websocket, + jakarta.servlet, + jakarta.websocket, + jetty-servlet-api, + jetty-javax-websocket-api, + jetty-jakarta-servlet-api, + jetty-jakarta-websocket-api, + javax.mail, + jakarta.mail-api, + mailapi, + javax.security.auth.message, + plexus-utils, + plexus-interpolation, + jetty-quic-quiche-foreign-incubator + sources + false + META-INF/**,module-info.java + ${sources-directory} + + + + + + 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.transport.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.quiche; org.eclipse.jetty.quic.quiche.foreign.*; org.eclipse.jetty.quic.quiche.*; org.eclipse.jetty.quic.server.internal; + + + + + + ${sources-directory} + diff --git a/jetty-core/jetty-alpn/jetty-alpn-client/pom.xml b/jetty-core/jetty-alpn/jetty-alpn-client/pom.xml index d7dd2b008cf2..bd6960c1c06a 100644 --- a/jetty-core/jetty-alpn/jetty-alpn-client/pom.xml +++ b/jetty-core/jetty-alpn/jetty-alpn-client/pom.xml @@ -1,31 +1,17 @@ + + 4.0.0 org.eclipse.jetty jetty-alpn 12.0.2-SNAPSHOT - 4.0.0 jetty-alpn-client Core :: ALPN :: Client ${project.groupId}.alpn.client org.eclipse.jetty.alpn.* - - - - org.apache.felix - maven-bundle-plugin - true - - - ${osgi.slf4j.import.packages},org.eclipse.jetty.alpn;resolution:=optional,* - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional, osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.io.ssl.ALPNProcessor$Client)";resolution:=optional;cardinality:=multiple - - - - - org.eclipse.jetty @@ -46,4 +32,19 @@ test + + + + org.apache.felix + maven-bundle-plugin + true + + + ${osgi.slf4j.import.packages},org.eclipse.jetty.alpn;resolution:=optional,* + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional, osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.io.ssl.ALPNProcessor$Client)";resolution:=optional;cardinality:=multiple + + + + + diff --git a/jetty-core/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml b/jetty-core/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml index 1d998fce47e7..083611f55737 100644 --- a/jetty-core/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml +++ b/jetty-core/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml @@ -1,13 +1,13 @@ + 4.0.0 + org.eclipse.jetty jetty-alpn 12.0.2-SNAPSHOT - - 4.0.0 jetty-alpn-conscrypt-client Core :: ALPN :: Conscrypt Client diff --git a/jetty-core/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml b/jetty-core/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml index a312b4ad89a4..091811934cce 100644 --- a/jetty-core/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml +++ b/jetty-core/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty jetty-alpn 12.0.2-SNAPSHOT - - 4.0.0 jetty-alpn-conscrypt-server Core :: ALPN :: Conscrypt Server @@ -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-core/jetty-alpn/jetty-alpn-java-client/pom.xml b/jetty-core/jetty-alpn/jetty-alpn-java-client/pom.xml index 2c4133801785..d04aa0461f9b 100644 --- a/jetty-core/jetty-alpn/jetty-alpn-java-client/pom.xml +++ b/jetty-core/jetty-alpn/jetty-alpn-java-client/pom.xml @@ -1,13 +1,13 @@ + 4.0.0 + org.eclipse.jetty jetty-alpn 12.0.2-SNAPSHOT - - 4.0.0 jetty-alpn-java-client Core :: ALPN :: Java Client @@ -15,25 +15,6 @@ ${project.groupId}.alpn.java.client - - - - org.apache.felix - maven-bundle-plugin - true - - - JDK9 Client ALPN - * - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.io.ssl.ALPNProcessor$Client - <_nouses>true - - - - - - org.eclipse.jetty @@ -56,4 +37,23 @@ + + + + org.apache.felix + maven-bundle-plugin + true + + + JDK9 Client ALPN + * + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.io.ssl.ALPNProcessor$Client + <_nouses>true + + + + + + diff --git a/jetty-core/jetty-alpn/jetty-alpn-java-server/pom.xml b/jetty-core/jetty-alpn/jetty-alpn-java-server/pom.xml index 5fe3fa677784..e1c71b4947c6 100644 --- a/jetty-core/jetty-alpn/jetty-alpn-java-server/pom.xml +++ b/jetty-core/jetty-alpn/jetty-alpn-java-server/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty jetty-alpn 12.0.2-SNAPSHOT - - 4.0.0 jetty-alpn-java-server Core :: ALPN :: Java Server @@ -14,32 +14,6 @@ ${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 @@ -70,4 +44,28 @@ + + + + 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 + + + + + + diff --git a/jetty-core/jetty-alpn/jetty-alpn-server/pom.xml b/jetty-core/jetty-alpn/jetty-alpn-server/pom.xml index b757eacbbea9..18e0e0c6c4d3 100644 --- a/jetty-core/jetty-alpn/jetty-alpn-server/pom.xml +++ b/jetty-core/jetty-alpn/jetty-alpn-server/pom.xml @@ -1,31 +1,17 @@ + + 4.0.0 org.eclipse.jetty jetty-alpn 12.0.2-SNAPSHOT - 4.0.0 jetty-alpn-server Core :: ALPN :: Server ${project.groupId}.alpn.server org.eclipse.jetty.alpn.* - - - - 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 @@ -46,4 +32,19 @@ 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 + + + + + diff --git a/jetty-core/jetty-alpn/pom.xml b/jetty-core/jetty-alpn/pom.xml index d53b63dab7aa..4256f44cbe1b 100644 --- a/jetty-core/jetty-alpn/pom.xml +++ b/jetty-core/jetty-alpn/pom.xml @@ -1,21 +1,22 @@ + + 4.0.0 org.eclipse.jetty jetty-core 12.0.2-SNAPSHOT - 4.0.0 jetty-alpn pom Core :: ALPN - jetty-alpn-server jetty-alpn-client - jetty-alpn-conscrypt-server jetty-alpn-conscrypt-client + jetty-alpn-conscrypt-server jetty-alpn-java-client jetty-alpn-java-server + jetty-alpn-server diff --git a/jetty-core/jetty-bom/pom.xml b/jetty-core/jetty-bom/pom.xml index c03e9d50224a..7d9f4c7a3fe8 100644 --- a/jetty-core/jetty-bom/pom.xml +++ b/jetty-core/jetty-bom/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 @@ -8,34 +9,9 @@ jetty-bom + pom Core :: BOM Jetty Core BOM artifact - pom - - - - - org.codehaus.mojo - flatten-maven-plugin - - - flatten - - flatten - - process-resources - - - flatten-clean - - clean - - clean - - - - - @@ -316,4 +292,29 @@ + + + + + org.codehaus.mojo + flatten-maven-plugin + + + flatten-clean + + clean + + clean + + + flatten + + flatten + + process-resources + + + + + diff --git a/jetty-core/jetty-client/pom.xml b/jetty-core/jetty-client/pom.xml index e9fff869812b..b132ba8eb23a 100644 --- a/jetty-core/jetty-client/pom.xml +++ b/jetty-core/jetty-client/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty jetty-core 12.0.2-SNAPSHOT - - 4.0.0 jetty-client Core :: HTTP Client @@ -14,17 +15,75 @@ org.eclipse.jetty.client.* + + + 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 + jetty-server + test + + + org.eclipse.jetty + jetty-security + test + + + org.eclipse.jetty + jetty-session + 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 + + + maven-surefire-plugin - - @{argLine} ${jetty.surefire.argLine} + @{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 - + --add-reads org.eclipse.jetty.client=org.eclipse.jetty.logging @@ -33,10 +92,10 @@ unpack - generate-test-resources unpack + generate-test-resources @@ -58,10 +117,10 @@ maven-shade-plugin - package shade + package false true @@ -93,64 +152,4 @@ - - - - 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 - jetty-server - test - - - org.eclipse.jetty - jetty-security - test - - - org.eclipse.jetty - jetty-session - 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 - - diff --git a/jetty-core/jetty-demos/jetty-demo-handler/pom.xml b/jetty-core/jetty-demos/jetty-demo-handler/pom.xml index 4b23ad10d5d2..ea5fa1f0bd66 100644 --- a/jetty-core/jetty-demos/jetty-demo-handler/pom.xml +++ b/jetty-core/jetty-demos/jetty-demo-handler/pom.xml @@ -1,29 +1,17 @@ + 4.0.0 org.eclipse.jetty.demos jetty-demos 12.0.2-SNAPSHOT - 4.0.0 jetty-demo-handler Core :: Demo Handler ${project.groupId}.demos org.eclipse.jetty.demos.* - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.io=org.eclipse.jetty.logging - - - - - org.slf4j @@ -49,4 +37,14 @@ test + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.io=org.eclipse.jetty.logging + + + + diff --git a/jetty-core/jetty-demos/pom.xml b/jetty-core/jetty-demos/pom.xml index a0df5e300754..5223afdcb0b9 100644 --- a/jetty-core/jetty-demos/pom.xml +++ b/jetty-core/jetty-demos/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty jetty-core 12.0.2-SNAPSHOT - - 4.0.0 org.eclipse.jetty.demos jetty-demos pom diff --git a/jetty-core/jetty-deploy/pom.xml b/jetty-core/jetty-deploy/pom.xml index ea3be250a060..8116e9726ee8 100644 --- a/jetty-core/jetty-deploy/pom.xml +++ b/jetty-core/jetty-deploy/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty jetty-core 12.0.2-SNAPSHOT - - 4.0.0 jetty-deploy Core :: Deployers Jetty deployers @@ -15,22 +16,6 @@ org.eclipse.jetty.deploy.* - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} - --add-modules org.eclipse.jetty.jmx - --add-reads org.eclipse.jetty.deploy=org.eclipse.jetty.http - --add-reads org.eclipse.jetty.deploy=org.eclipse.jetty.logging - - - - - - org.eclipse.jetty @@ -65,4 +50,18 @@ test + + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} + --add-modules org.eclipse.jetty.jmx + --add-reads org.eclipse.jetty.deploy=org.eclipse.jetty.http + --add-reads org.eclipse.jetty.deploy=org.eclipse.jetty.logging + + + + diff --git a/jetty-core/jetty-fcgi/jetty-fcgi-client/pom.xml b/jetty-core/jetty-fcgi/jetty-fcgi-client/pom.xml index ef75c9e917f3..d05ab2717f29 100644 --- a/jetty-core/jetty-fcgi/jetty-fcgi-client/pom.xml +++ b/jetty-core/jetty-fcgi/jetty-fcgi-client/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.fcgi jetty-fcgi 12.0.2-SNAPSHOT - - 4.0.0 jetty-fcgi-client Core :: FastCGI :: Client diff --git a/jetty-core/jetty-fcgi/jetty-fcgi-proxy/pom.xml b/jetty-core/jetty-fcgi/jetty-fcgi-proxy/pom.xml index fccf13c50311..9af3203ae0db 100644 --- a/jetty-core/jetty-fcgi/jetty-fcgi-proxy/pom.xml +++ b/jetty-core/jetty-fcgi/jetty-fcgi-proxy/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.fcgi jetty-fcgi 12.0.2-SNAPSHOT - - 4.0.0 jetty-fcgi-proxy Core :: FastCGI :: Proxy @@ -14,22 +14,6 @@ ${project.groupId}.proxy - - - - maven-surefire-plugin - - - @{argLine} - ${jetty.surefire.argLine} - --add-exports org.eclipse.jetty.fcgi.client/org.eclipse.jetty.fcgi.generator=ALL-UNNAMED - --add-exports org.eclipse.jetty.fcgi.client/org.eclipse.jetty.fcgi.parser=ALL-UNNAMED - - - - - - org.eclipse.jetty @@ -60,4 +44,18 @@ test + + + + + maven-surefire-plugin + + @{argLine} + ${jetty.surefire.argLine} + --add-exports org.eclipse.jetty.fcgi.client/org.eclipse.jetty.fcgi.generator=ALL-UNNAMED + --add-exports org.eclipse.jetty.fcgi.client/org.eclipse.jetty.fcgi.parser=ALL-UNNAMED + + + + diff --git a/jetty-core/jetty-fcgi/jetty-fcgi-server/pom.xml b/jetty-core/jetty-fcgi/jetty-fcgi-server/pom.xml index 2714732b0aaf..3a29f2bc04d2 100644 --- a/jetty-core/jetty-fcgi/jetty-fcgi-server/pom.xml +++ b/jetty-core/jetty-fcgi/jetty-fcgi-server/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.fcgi jetty-fcgi 12.0.2-SNAPSHOT - - 4.0.0 jetty-fcgi-server Core :: FastCGI :: Server @@ -14,20 +14,6 @@ ${project.groupId}.server - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} - --add-reads org.eclipse.jetty.fcgi.server=org.eclipse.jetty.logging - - - - - - org.slf4j @@ -67,4 +53,16 @@ test + + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} + --add-reads org.eclipse.jetty.fcgi.server=org.eclipse.jetty.logging + + + + diff --git a/jetty-core/jetty-fcgi/pom.xml b/jetty-core/jetty-fcgi/pom.xml index 1c2940bf8efd..992b89773b91 100644 --- a/jetty-core/jetty-fcgi/pom.xml +++ b/jetty-core/jetty-fcgi/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty jetty-core 12.0.2-SNAPSHOT - - 4.0.0 org.eclipse.jetty.fcgi jetty-fcgi pom @@ -14,8 +14,8 @@ jetty-fcgi-client - jetty-fcgi-server jetty-fcgi-proxy + jetty-fcgi-server diff --git a/jetty-core/jetty-http-spi/pom.xml b/jetty-core/jetty-http-spi/pom.xml index dc7385178535..1949ac9b1e60 100644 --- a/jetty-core/jetty-http-spi/pom.xml +++ b/jetty-core/jetty-http-spi/pom.xml @@ -1,16 +1,17 @@ + + 4.0.0 org.eclipse.jetty jetty-core 12.0.2-SNAPSHOT - 4.0.0 jetty-http-spi Core :: HTTP SPI ${project.groupId}.http.spi - org.eclipse.jetty.http.spi.* true + org.eclipse.jetty.http.spi.* diff --git a/jetty-core/jetty-http-tools/pom.xml b/jetty-core/jetty-http-tools/pom.xml index 88976097cc66..44918739b293 100644 --- a/jetty-core/jetty-http-tools/pom.xml +++ b/jetty-core/jetty-http-tools/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty jetty-core 12.0.2-SNAPSHOT - - 4.0.0 jetty-http-tools Core :: HTTP Tools diff --git a/jetty-core/jetty-http/pom.xml b/jetty-core/jetty-http/pom.xml index 77514c6597c7..94404d0cfd05 100644 --- a/jetty-core/jetty-http/pom.xml +++ b/jetty-core/jetty-http/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty jetty-core 12.0.2-SNAPSHOT - - 4.0.0 jetty-http Core :: HTTP @@ -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-core/jetty-http2/jetty-http2-client-transport/pom.xml b/jetty-core/jetty-http2/jetty-http2-client-transport/pom.xml index dea7b1d84e15..616280e960f8 100644 --- a/jetty-core/jetty-http2/jetty-http2-client-transport/pom.xml +++ b/jetty-core/jetty-http2/jetty-http2-client-transport/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.http2 jetty-http2 12.0.2-SNAPSHOT - - 4.0.0 jetty-http2-client-transport Core :: HTTP2 :: Client Transport diff --git a/jetty-core/jetty-http2/jetty-http2-client/pom.xml b/jetty-core/jetty-http2/jetty-http2-client/pom.xml index 9e00c328e842..a03f44581771 100644 --- a/jetty-core/jetty-http2/jetty-http2-client/pom.xml +++ b/jetty-core/jetty-http2/jetty-http2-client/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.http2 jetty-http2 12.0.2-SNAPSHOT - - 4.0.0 jetty-http2-client Core :: HTTP2 :: Client @@ -14,20 +14,6 @@ ${project.groupId}.client - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} - --add-reads org.eclipse.jetty.http2.client=org.eclipse.jetty.http2.hpack - - - - - - org.eclipse.jetty.http2 @@ -43,4 +29,16 @@ + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} + --add-reads org.eclipse.jetty.http2.client=org.eclipse.jetty.http2.hpack + + + + + diff --git a/jetty-core/jetty-http2/jetty-http2-common/pom.xml b/jetty-core/jetty-http2/jetty-http2-common/pom.xml index bae58272b2ec..03c55a606394 100644 --- a/jetty-core/jetty-http2/jetty-http2-common/pom.xml +++ b/jetty-core/jetty-http2/jetty-http2-common/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.http2 jetty-http2 12.0.2-SNAPSHOT - - 4.0.0 jetty-http2-common Core :: HTTP2 :: Common diff --git a/jetty-core/jetty-http2/jetty-http2-hpack/pom.xml b/jetty-core/jetty-http2/jetty-http2-hpack/pom.xml index 0b69a4aac6c2..0bbe9a78c4a6 100644 --- a/jetty-core/jetty-http2/jetty-http2-hpack/pom.xml +++ b/jetty-core/jetty-http2/jetty-http2-hpack/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.http2 jetty-http2 12.0.2-SNAPSHOT - - 4.0.0 jetty-http2-hpack Core :: HTTP2 :: HPACK @@ -14,24 +14,6 @@ ${project.groupId}.hpack - - - - org.apache.felix - maven-bundle-plugin - true - - - Http2 Hpack - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.http.HttpFieldPreEncoder - <_nouses>true - - - - - - org.eclipse.jetty @@ -72,4 +54,22 @@ + + + + org.apache.felix + maven-bundle-plugin + true + + + Http2 Hpack + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional + osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.http.HttpFieldPreEncoder + <_nouses>true + + + + + + diff --git a/jetty-core/jetty-http2/jetty-http2-server/pom.xml b/jetty-core/jetty-http2/jetty-http2-server/pom.xml index 27ffe7e91847..d9df80fd7f82 100644 --- a/jetty-core/jetty-http2/jetty-http2-server/pom.xml +++ b/jetty-core/jetty-http2/jetty-http2-server/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.http2 jetty-http2 12.0.2-SNAPSHOT - - 4.0.0 jetty-http2-server Core :: HTTP2 :: Server diff --git a/jetty-core/jetty-http2/jetty-http2-tests/pom.xml b/jetty-core/jetty-http2/jetty-http2-tests/pom.xml index c5330f2c6ab2..4561372b4018 100644 --- a/jetty-core/jetty-http2/jetty-http2-tests/pom.xml +++ b/jetty-core/jetty-http2/jetty-http2-tests/pom.xml @@ -1,29 +1,75 @@ + + 4.0.0 org.eclipse.jetty.http2 jetty-http2 12.0.2-SNAPSHOT - - 4.0.0 jetty-http2-tests Core :: HTTP2 :: Tests - true ${skipTests} + true + + + org.eclipse.jetty + jetty-alpn-java-server + test + + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty + jetty-proxy + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty + jetty-server + test + + + org.eclipse.jetty.http2 + jetty-http2-client + test + + + org.eclipse.jetty.http2 + jetty-http2-client-transport + test + + + org.eclipse.jetty.http2 + jetty-http2-server + test + + + org.awaitility + awaitility + test + + + maven-surefire-plugin - - @{argLine} ${jetty.surefire.argLine} - --add-reads org.eclipse.jetty.http2.server=org.eclipse.jetty.logging - + @{argLine} ${jetty.surefire.argLine} + --add-reads org.eclipse.jetty.http2.server=org.eclipse.jetty.logging @@ -43,10 +89,10 @@ h2spec - test h2spec + test @@ -64,6 +110,9 @@ spec-server-run + + java + test org.eclipse.jetty.http2.tests.H2SpecServer @@ -72,9 +121,6 @@ ${manual.test.port} - - java - @@ -83,52 +129,4 @@ - - - org.eclipse.jetty - jetty-alpn-java-server - test - - - org.eclipse.jetty - jetty-client - test - - - org.eclipse.jetty - jetty-proxy - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty - jetty-server - test - - - org.eclipse.jetty.http2 - jetty-http2-client - test - - - org.eclipse.jetty.http2 - jetty-http2-client-transport - test - - - org.eclipse.jetty.http2 - jetty-http2-server - test - - - org.awaitility - awaitility - test - - - diff --git a/jetty-core/jetty-http2/pom.xml b/jetty-core/jetty-http2/pom.xml index f91f66b3bf46..c38a9cea542f 100644 --- a/jetty-core/jetty-http2/pom.xml +++ b/jetty-core/jetty-http2/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty jetty-core 12.0.2-SNAPSHOT - - 4.0.0 org.eclipse.jetty.http2 jetty-http2 pom @@ -14,9 +14,9 @@ jetty-http2-client + jetty-http2-client-transport jetty-http2-common jetty-http2-hpack - jetty-http2-client-transport jetty-http2-server jetty-http2-tests diff --git a/jetty-core/jetty-http3/jetty-http3-client-transport/pom.xml b/jetty-core/jetty-http3/jetty-http3-client-transport/pom.xml index 3c175c9345c9..d6735b7e8f6d 100644 --- a/jetty-core/jetty-http3/jetty-http3-client-transport/pom.xml +++ b/jetty-core/jetty-http3/jetty-http3-client-transport/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.http3 jetty-http3 12.0.2-SNAPSHOT - - 4.0.0 jetty-http3-client-transport Core :: HTTP3 :: HTTP Client Transport diff --git a/jetty-core/jetty-http3/jetty-http3-client/pom.xml b/jetty-core/jetty-http3/jetty-http3-client/pom.xml index 7f37c85d027d..08427eabb633 100644 --- a/jetty-core/jetty-http3/jetty-http3-client/pom.xml +++ b/jetty-core/jetty-http3/jetty-http3-client/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.http3 jetty-http3 12.0.2-SNAPSHOT - - 4.0.0 jetty-http3-client Core :: HTTP3 :: Client diff --git a/jetty-core/jetty-http3/jetty-http3-common/pom.xml b/jetty-core/jetty-http3/jetty-http3-common/pom.xml index 5cf117e57550..9f36be3bffa8 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/pom.xml +++ b/jetty-core/jetty-http3/jetty-http3-common/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.http3 jetty-http3 12.0.2-SNAPSHOT - - 4.0.0 jetty-http3-common Core :: HTTP3 :: Common diff --git a/jetty-core/jetty-http3/jetty-http3-qpack/pom.xml b/jetty-core/jetty-http3/jetty-http3-qpack/pom.xml index 56f9ec031674..04f441076ff8 100644 --- a/jetty-core/jetty-http3/jetty-http3-qpack/pom.xml +++ b/jetty-core/jetty-http3/jetty-http3-qpack/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.http3 jetty-http3 12.0.2-SNAPSHOT - - 4.0.0 jetty-http3-qpack Core :: HTTP3 :: QPACK @@ -14,24 +14,6 @@ ${project.groupId}.qpack - - - - org.apache.felix - maven-bundle-plugin - true - - - Http3 Qpack - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.http.HttpFieldPreEncoder - <_nouses>true - - - - - - org.eclipse.jetty @@ -72,4 +54,22 @@ + + + + org.apache.felix + maven-bundle-plugin + true + + + Http3 Qpack + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional + osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.http.HttpFieldPreEncoder + <_nouses>true + + + + + + diff --git a/jetty-core/jetty-http3/jetty-http3-server/pom.xml b/jetty-core/jetty-http3/jetty-http3-server/pom.xml index 59beeb6e9509..4aa3c2177aa4 100644 --- a/jetty-core/jetty-http3/jetty-http3-server/pom.xml +++ b/jetty-core/jetty-http3/jetty-http3-server/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.http3 jetty-http3 12.0.2-SNAPSHOT - - 4.0.0 jetty-http3-server Core :: HTTP3 :: Server diff --git a/jetty-core/jetty-http3/jetty-http3-tests/pom.xml b/jetty-core/jetty-http3/jetty-http3-tests/pom.xml index 1d86d5f6db83..cd8d862e4fd2 100644 --- a/jetty-core/jetty-http3/jetty-http3-tests/pom.xml +++ b/jetty-core/jetty-http3/jetty-http3-tests/pom.xml @@ -1,19 +1,19 @@ + + 4.0.0 org.eclipse.jetty.http3 jetty-http3 12.0.2-SNAPSHOT - - 4.0.0 jetty-http3-tests Core :: HTTP3 :: Tests + 2 false - 2 true true diff --git a/jetty-core/jetty-http3/pom.xml b/jetty-core/jetty-http3/pom.xml index c795b988252f..1849f8b5f67e 100644 --- a/jetty-core/jetty-http3/pom.xml +++ b/jetty-core/jetty-http3/pom.xml @@ -1,23 +1,23 @@ + + 4.0.0 org.eclipse.jetty jetty-core 12.0.2-SNAPSHOT - - 4.0.0 org.eclipse.jetty.http3 jetty-http3 pom Core :: HTTP3 - jetty-http3-qpack - jetty-http3-common - jetty-http3-server jetty-http3-client jetty-http3-client-transport + jetty-http3-common + jetty-http3-qpack + jetty-http3-server jetty-http3-tests diff --git a/jetty-core/jetty-io/pom.xml b/jetty-core/jetty-io/pom.xml index 4437a759321b..5d0676ea3a29 100644 --- a/jetty-core/jetty-io/pom.xml +++ b/jetty-core/jetty-io/pom.xml @@ -1,30 +1,17 @@ + 4.0.0 org.eclipse.jetty jetty-core 12.0.2-SNAPSHOT - 4.0.0 jetty-io Core :: IO ${project.groupId}.io org.eclipse.jetty.io.* - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} - --add-reads org.eclipse.jetty.io=org.eclipse.jetty.logging - - - - - org.slf4j @@ -50,4 +37,15 @@ test + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} + --add-reads org.eclipse.jetty.io=org.eclipse.jetty.logging + + + + diff --git a/jetty-core/jetty-jmx/pom.xml b/jetty-core/jetty-jmx/pom.xml index ce409fa1d870..75b3b3bef049 100644 --- a/jetty-core/jetty-jmx/pom.xml +++ b/jetty-core/jetty-jmx/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty jetty-core 12.0.2-SNAPSHOT - 4.0.0 jetty-jmx Core :: JMX 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 @@ -49,5 +38,15 @@ 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-core/jetty-jndi/pom.xml b/jetty-core/jetty-jndi/pom.xml index 04cc6fd4a418..34030bf7355b 100644 --- a/jetty-core/jetty-jndi/pom.xml +++ b/jetty-core/jetty-jndi/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty jetty-core 12.0.2-SNAPSHOT - - 4.0.0 jetty-jndi Core :: JNDI JNDI spi impl for java namespace. @@ -15,21 +16,6 @@ org.eclipse.jetty.jndi.* - - - - org.apache.felix - maven-bundle-plugin - true - - - ${osgi.slf4j.import.packages},jakarta.mail.*;resolution:=optional,* - - - - - - org.eclipse.jetty @@ -73,4 +59,19 @@ true --> + + + + + org.apache.felix + maven-bundle-plugin + true + + + ${osgi.slf4j.import.packages},jakarta.mail.*;resolution:=optional,* + + + + + diff --git a/jetty-core/jetty-keystore/pom.xml b/jetty-core/jetty-keystore/pom.xml index 8a585ebd4eae..10662091493e 100644 --- a/jetty-core/jetty-keystore/pom.xml +++ b/jetty-core/jetty-keystore/pom.xml @@ -1,19 +1,19 @@ + 4.0.0 org.eclipse.jetty jetty-core 12.0.2-SNAPSHOT - 4.0.0 jetty-keystore jar Core :: Test Keystore Test keystore with self-signed SSL Certificate. - ${project.groupId}.keystore 1.76 + ${project.groupId}.keystore diff --git a/jetty-core/jetty-openid/pom.xml b/jetty-core/jetty-openid/pom.xml index 11c03db1cf04..53eca8aaa0ee 100644 --- a/jetty-core/jetty-openid/pom.xml +++ b/jetty-core/jetty-openid/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty jetty-core 12.0.2-SNAPSHOT - - 4.0.0 jetty-openid EE10 :: OpenID Jetty OpenID Connect Infrastructure @@ -15,29 +16,6 @@ org.eclipse.jetty.security.openid.* - - - - org.apache.felix - maven-bundle-plugin - true - - - - manifest - - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.security.Authenticator$Factory - - - - - - - - org.eclipse.jetty @@ -75,4 +53,27 @@ test + + + + + org.apache.felix + maven-bundle-plugin + true + + + + manifest + + + + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.security.Authenticator$Factory + + + + + + + diff --git a/jetty-core/jetty-osgi/pom.xml b/jetty-core/jetty-osgi/pom.xml index c3e3e2a03812..5b5593e595e3 100644 --- a/jetty-core/jetty-osgi/pom.xml +++ b/jetty-core/jetty-osgi/pom.xml @@ -1,46 +1,22 @@ + + + 4.0.0 org.eclipse.jetty jetty-core 12.0.2-SNAPSHOT - - 4.0.0 jetty-osgi Core :: OSGi Support for OSGi integration ${project.groupId}.osgi - org.eclipse.jetty.osgi.* true + org.eclipse.jetty.osgi.* - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.server=org.eclipse.jetty.logging --add-opens org.eclipse.jetty.server/org.eclipse.jetty.server=ALL-UNNAMED - - - - - org.apache.felix - maven-bundle-plugin - true - - - org.eclipse.jetty.osgi.JettyBootstrapActivator - org.eclipse.jetty.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))" - <_nouses>true - - - - - - org.eclipse.jetty @@ -85,4 +61,27 @@ test + + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.server=org.eclipse.jetty.logging --add-opens org.eclipse.jetty.server/org.eclipse.jetty.server=ALL-UNNAMED + + + + org.apache.felix + maven-bundle-plugin + true + + + org.eclipse.jetty.osgi.JettyBootstrapActivator + org.eclipse.jetty.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))" + <_nouses>true + + + + + diff --git a/jetty-core/jetty-proxy/pom.xml b/jetty-core/jetty-proxy/pom.xml index 2551e15a6ea4..a747af838bfb 100644 --- a/jetty-core/jetty-proxy/pom.xml +++ b/jetty-core/jetty-proxy/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty jetty-core 12.0.2-SNAPSHOT - - 4.0.0 jetty-proxy jar Core :: Proxy @@ -16,21 +16,6 @@ ${project.groupId}.proxy - - - - maven-surefire-plugin - - - @{argLine} - ${jetty.surefire.argLine} - --add-exports org.eclipse.jetty.client/org.eclipse.jetty.client.internal=ALL-UNNAMED - - - - - - org.slf4j @@ -67,4 +52,17 @@ + + + + maven-surefire-plugin + + @{argLine} + ${jetty.surefire.argLine} + --add-exports org.eclipse.jetty.client/org.eclipse.jetty.client.internal=ALL-UNNAMED + + + + + diff --git a/jetty-core/jetty-quic/jetty-quic-client/pom.xml b/jetty-core/jetty-quic/jetty-quic-client/pom.xml index 82f1de3ef993..1ef22a3cd54d 100644 --- a/jetty-core/jetty-quic/jetty-quic-client/pom.xml +++ b/jetty-core/jetty-quic/jetty-quic-client/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.quic jetty-quic 12.0.2-SNAPSHOT - - 4.0.0 jetty-quic-client Core :: QUIC :: Client @@ -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-core/jetty-quic/jetty-quic-common/pom.xml b/jetty-core/jetty-quic/jetty-quic-common/pom.xml index 5adffe6c1a8e..869e6079139a 100644 --- a/jetty-core/jetty-quic/jetty-quic-common/pom.xml +++ b/jetty-core/jetty-quic/jetty-quic-common/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.quic jetty-quic 12.0.2-SNAPSHOT - - 4.0.0 jetty-quic-common Core :: QUIC :: Common diff --git a/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-common/pom.xml b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-common/pom.xml index dc067fd8645c..ad0869b63c61 100644 --- a/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-common/pom.xml +++ b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-common/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.quic jetty-quic-quiche 12.0.2-SNAPSHOT - - 4.0.0 jetty-quic-quiche-common Core :: QUIC :: Quiche :: Common diff --git a/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/pom.xml b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/pom.xml index 646c08711aff..cc2583f154db 100644 --- a/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/pom.xml +++ b/jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.quic jetty-quic-quiche 12.0.2-SNAPSHOT - - 4.0.0 jetty-quic-quiche-foreign-incubator Core :: QUIC :: Quiche :: Foreign (Java 17) @@ -15,6 +15,26 @@ true + + + org.slf4j + slf4j-api + + + org.eclipse.jetty.quic + jetty-quic-quiche-common + + + org.eclipse.jetty + jetty-util + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + @@ -37,37 +57,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 - jetty-quic-quiche-common - - - org.eclipse.jetty - jetty-util - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - false - - @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.logging=java.management - + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.logging=java.management @@ -42,25 +54,10 @@ osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - osgi.serviceloader;osgi.serviceloader=org.slf4j.spi.SLF4JServiceProvider - + osgi.serviceloader;osgi.serviceloader=org.slf4j.spi.SLF4JServiceProvider - - - - org.slf4j - slf4j-api - - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - diff --git a/jetty-core/jetty-start/pom.xml b/jetty-core/jetty-start/pom.xml index e030d85fd40d..f2a2e3f235e7 100644 --- a/jetty-core/jetty-start/pom.xml +++ b/jetty-core/jetty-start/pom.xml @@ -1,23 +1,41 @@ + + 4.0.0 org.eclipse.jetty jetty-core 12.0.2-SNAPSHOT - 4.0.0 jetty-start Core :: Start The start utility - false ${project.groupId}.start + false org.eclipse.jetty.start.* + + + org.eclipse.jetty + jetty-util + + + org.slf4j + slf4j-api + + + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + - src/main/resources true + src/main/resources @@ -53,10 +71,10 @@ maven-shade-plugin - package shade + package false true @@ -89,10 +107,10 @@ unpack - process-test-resources unpack + process-test-resources @@ -110,21 +128,4 @@ - - - org.eclipse.jetty - jetty-util - - - org.slf4j - slf4j-api - - - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - diff --git a/jetty-core/jetty-tests/jetty-test-client-transports/pom.xml b/jetty-core/jetty-tests/jetty-test-client-transports/pom.xml index b3884d08b0af..5428cbd7ebf8 100644 --- a/jetty-core/jetty-tests/jetty-test-client-transports/pom.xml +++ b/jetty-core/jetty-tests/jetty-test-client-transports/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty jetty-tests 12.0.2-SNAPSHOT - - 4.0.0 jetty-test-client-transports Core :: Tests :: Client Transports @@ -80,9 +80,7 @@ maven-surefire-plugin - - @{argLine} --enable-preview - + @{argLine} --enable-preview diff --git a/jetty-core/jetty-tests/pom.xml b/jetty-core/jetty-tests/pom.xml index 8744441da41f..a806520d09c2 100644 --- a/jetty-core/jetty-tests/pom.xml +++ b/jetty-core/jetty-tests/pom.xml @@ -1,22 +1,22 @@ + + 4.0.0 org.eclipse.jetty jetty-core 12.0.2-SNAPSHOT - - 4.0.0 jetty-tests - Core :: Tests pom - - - true - + Core :: Tests jetty-test-client-transports + + true + + diff --git a/jetty-core/jetty-unixdomain-server/pom.xml b/jetty-core/jetty-unixdomain-server/pom.xml index 49b1c0a5051e..665203047d43 100644 --- a/jetty-core/jetty-unixdomain-server/pom.xml +++ b/jetty-core/jetty-unixdomain-server/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty jetty-core 12.0.2-SNAPSHOT - - 4.0.0 jetty-unixdomain-server Core :: Unix-Domain Sockets :: Server Jetty Unix-Domain Sockets Server diff --git a/jetty-core/jetty-util-ajax/pom.xml b/jetty-core/jetty-util-ajax/pom.xml index 9f644de3d5ff..916f04e60845 100644 --- a/jetty-core/jetty-util-ajax/pom.xml +++ b/jetty-core/jetty-util-ajax/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty jetty-core 12.0.2-SNAPSHOT - 4.0.0 jetty-util-ajax Core :: Utilities :: JSON JSON/Ajax Utility classes for Jetty diff --git a/jetty-core/jetty-util/pom.xml b/jetty-core/jetty-util/pom.xml index 780ee4c98af8..0f07687f2652 100644 --- a/jetty-core/jetty-util/pom.xml +++ b/jetty-core/jetty-util/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty jetty-core 12.0.2-SNAPSHOT - 4.0.0 jetty-util Core :: Utilities Utility classes for Jetty @@ -12,11 +13,43 @@ ${project.groupId}.util org.eclipse.jetty.util.* + + + org.slf4j + slf4j-api + + + com.google.jimfs + jimfs + 1.3.0 + test + + + 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 + + - src/main/resources true + src/main/resources @@ -58,43 +91,9 @@ ${session.repositorySession.localRepository.basedir.absolutePath} - - @{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.slf4j - slf4j-api - - - com.google.jimfs - jimfs - 1.3.0 - test - - - 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-core/jetty-websocket/jetty-websocket-core-client/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-core-client/pom.xml index 1f378b859c4d..c59442b21b22 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-core-client/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-core-client/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.websocket jetty-websocket 12.0.2-SNAPSHOT - - 4.0.0 jetty-websocket-core-client Core :: Websocket :: Client diff --git a/jetty-core/jetty-websocket/jetty-websocket-core-common/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-core-common/pom.xml index 53638783a430..15dace994976 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-core-common/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-core-common/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.websocket jetty-websocket 12.0.2-SNAPSHOT - - 4.0.0 jetty-websocket-core-common Core :: Websocket :: Common @@ -39,12 +39,8 @@ Jetty Websocket Core Common * - - 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-core/jetty-websocket/jetty-websocket-core-server/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-core-server/pom.xml index 04c78396b12f..2fc8c6da534e 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-core-server/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-core-server/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.websocket jetty-websocket 12.0.2-SNAPSHOT - - 4.0.0 jetty-websocket-core-server Core :: Websocket :: Server diff --git a/jetty-core/jetty-websocket/jetty-websocket-core-tests/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-core-tests/pom.xml index d7bf62004a3e..4f7040d683bc 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-core-tests/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-core-tests/pom.xml @@ -1,20 +1,20 @@ + + 4.0.0 org.eclipse.jetty.websocket jetty-websocket 12.0.2-SNAPSHOT - - 4.0.0 jetty-websocket-core-tests Core :: Websocket :: Tests - false ${project.groupId}.core.tests - true + false true + true @@ -77,7 +77,7 @@ - + Jetty Websocket Test Support Classes diff --git a/jetty-core/jetty-websocket/jetty-websocket-jetty-api/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-jetty-api/pom.xml index d6ed20b27226..7750421bdc53 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-jetty-api/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-jetty-api/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.websocket jetty-websocket 12.0.2-SNAPSHOT - - 4.0.0 jetty-websocket-jetty-api Core :: Websocket :: Jetty API diff --git a/jetty-core/jetty-websocket/jetty-websocket-jetty-client/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-jetty-client/pom.xml index 65bbcefb7319..2b7b2c1f046d 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-jetty-client/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-jetty-client/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.websocket jetty-websocket 12.0.2-SNAPSHOT - - 4.0.0 jetty-websocket-jetty-client Core :: Websocket :: Jetty Client diff --git a/jetty-core/jetty-websocket/jetty-websocket-jetty-common/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-jetty-common/pom.xml index 932ac057d382..b9ba3d183540 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-jetty-common/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-jetty-common/pom.xml @@ -1,38 +1,18 @@ + + 4.0.0 org.eclipse.jetty.websocket jetty-websocket 12.0.2-SNAPSHOT - - 4.0.0 jetty-websocket-jetty-common Core :: Websocket :: Jetty Common ${project.groupId}.common - - - - - org.apache.felix - maven-bundle-plugin - true - - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.websocket.api.ExtensionConfig$Parser - - - - - - org.eclipse.jetty.websocket @@ -48,4 +28,20 @@ test + + + + + org.apache.felix + maven-bundle-plugin + true + + + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.websocket.api.ExtensionConfig$Parser + + + + + diff --git a/jetty-core/jetty-websocket/jetty-websocket-jetty-server/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-jetty-server/pom.xml index 80779fe3ae0e..678dca4fe304 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-jetty-server/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-jetty-server/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.websocket jetty-websocket 12.0.2-SNAPSHOT - - 4.0.0 jetty-websocket-jetty-server Core :: Websocket :: Jetty Server diff --git a/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/pom.xml index ccde778e43d2..2f7612e1b4ef 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.websocket jetty-websocket 12.0.2-SNAPSHOT - - 4.0.0 jetty-websocket-jetty-tests Core :: Websocket :: Jetty Tests @@ -88,9 +88,7 @@ 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}" @@ -99,4 +97,3 @@ - diff --git a/jetty-core/jetty-websocket/pom.xml b/jetty-core/jetty-websocket/pom.xml index 152ec8e5c827..8233a82678d5 100644 --- a/jetty-core/jetty-websocket/pom.xml +++ b/jetty-core/jetty-websocket/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty jetty-core 12.0.2-SNAPSHOT - - 4.0.0 org.eclipse.jetty.websocket jetty-websocket pom diff --git a/jetty-core/jetty-xml/pom.xml b/jetty-core/jetty-xml/pom.xml index dbf13b7a6dd9..c22ab25b941b 100644 --- a/jetty-core/jetty-xml/pom.xml +++ b/jetty-core/jetty-xml/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty jetty-core 12.0.2-SNAPSHOT - 4.0.0 jetty-xml Core :: XML 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/jetty-core/pom.xml b/jetty-core/pom.xml index 1d3b41250dc7..39384849c01f 100644 --- a/jetty-core/pom.xml +++ b/jetty-core/pom.xml @@ -1,28 +1,28 @@ + + 4.0.0 org.eclipse.jetty jetty-project 12.0.2-SNAPSHOT - - 4.0.0 jetty-core - Core pom + Core jetty-alpn jetty-bom jetty-client - jetty-deploy jetty-demos + jetty-deploy jetty-fcgi jetty-http - jetty-http2 - jetty-http3 jetty-http-spi jetty-http-tools + jetty-http2 + jetty-http3 jetty-io jetty-jmx jetty-jndi @@ -32,9 +32,9 @@ jetty-proxy jetty-quic jetty-rewrite + jetty-security jetty-server jetty-session - jetty-security jetty-slf4j-impl jetty-start jetty-tests @@ -71,10 +71,10 @@ core-report - validate dependency-updates-aggregate-report + validate html diff --git a/jetty-ee10/jetty-ee10-annotations/pom.xml b/jetty-ee10/jetty-ee10-annotations/pom.xml index 1e27295808ce..2be143472cb6 100644 --- a/jetty-ee10/jetty-ee10-annotations/pom.xml +++ b/jetty-ee10/jetty-ee10-annotations/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee10-annotations EE10 :: Servlet Annotations Annotation support for deploying servlets in jetty. @@ -14,36 +15,6 @@ org.eclipse.jetty.ee10.annotations.* - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} - --add-reads org.eclipse.jetty.ee10.annotations=org.eclipse.jetty.logging - --add-opens org.eclipse.jetty.ee10.annotations/org.eclipse.jetty.ee10.annotations.resources=org.eclipse.jetty.ee10.plus - - - - - 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=jakarta.servlet.ServletContainerInitializer)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee10.webapp.Configuration - - - - - - - org.eclipse.jetty.ee10 @@ -94,4 +65,29 @@ test + + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} + --add-reads org.eclipse.jetty.ee10.annotations=org.eclipse.jetty.logging + --add-opens org.eclipse.jetty.ee10.annotations/org.eclipse.jetty.ee10.annotations.resources=org.eclipse.jetty.ee10.plus + + + + 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=jakarta.servlet.ServletContainerInitializer)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee10.webapp.Configuration + + + + + diff --git a/jetty-ee10/jetty-ee10-apache-jsp/pom.xml b/jetty-ee10/jetty-ee10-apache-jsp/pom.xml index d84f74d5af60..2d154c4e564c 100644 --- a/jetty-ee10/jetty-ee10-apache-jsp/pom.xml +++ b/jetty-ee10/jetty-ee10-apache-jsp/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee10-apache-jsp EE10 :: Apache JSP @@ -14,48 +15,6 @@ true - - - - org.apache.felix - maven-bundle-plugin - true - - - Jetty-specific ServletContainerInitializer for Jasper - - org.eclipse.jetty.ee10.apache.jsp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}", org.eclipse.jetty.ee10.jsp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - - - osgi.serviceloader;osgi.serviceloader=jakarta.servlet.ServletContainerInitializer,osgi.serviceloader;osgi.serviceloader=org.apache.juli.logging.Log - - <_nouses>true - - - - - org.apache.maven.plugins - maven-jar-plugin - - - nolog-jar - - jar - - - nolog - - META-INF/services/org.apache.juli.logging.Log - - - - - - - - org.slf4j @@ -96,4 +55,41 @@ + + + + org.apache.felix + maven-bundle-plugin + true + + + Jetty-specific ServletContainerInitializer for Jasper + org.eclipse.jetty.ee10.apache.jsp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}", org.eclipse.jetty.ee10.jsp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional + osgi.serviceloader;osgi.serviceloader=jakarta.servlet.ServletContainerInitializer,osgi.serviceloader;osgi.serviceloader=org.apache.juli.logging.Log + <_nouses>true + + + + + org.apache.maven.plugins + maven-jar-plugin + + + nolog-jar + + jar + + + nolog + + META-INF/services/org.apache.juli.logging.Log + + + + + + + + diff --git a/jetty-ee10/jetty-ee10-bom/pom.xml b/jetty-ee10/jetty-ee10-bom/pom.xml index 6ed67cdb090d..a2a4b9a8106a 100644 --- a/jetty-ee10/jetty-ee10-bom/pom.xml +++ b/jetty-ee10/jetty-ee10-bom/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 @@ -8,34 +9,9 @@ jetty-ee10-bom + pom EE10 :: BOM Jetty EE10 APIs BOM artifact - pom - - - - - org.codehaus.mojo - flatten-maven-plugin - - - flatten - - flatten - - process-resources - - - flatten-clean - - clean - - clean - - - - - @@ -172,4 +148,29 @@ + + + + + org.codehaus.mojo + flatten-maven-plugin + + + flatten-clean + + clean + + clean + + + flatten + + flatten + + process-resources + + + + + diff --git a/jetty-ee10/jetty-ee10-cdi/pom.xml b/jetty-ee10/jetty-ee10-cdi/pom.xml index 014a041ccca5..656a8c0a0bad 100644 --- a/jetty-ee10/jetty-ee10-cdi/pom.xml +++ b/jetty-ee10/jetty-ee10-cdi/pom.xml @@ -1,13 +1,14 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.2-SNAPSHOT - 4.0.0 jetty-ee10-cdi - EE10 :: CDI jar + EE10 :: CDI ${project.groupId}.cdi @@ -34,19 +35,15 @@ - + org.apache.felix maven-bundle-plugin true - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee10.webapp.Configuration, - osgi.serviceloader; osgi.serviceloader=jakarta.servlet.ServletContainerInitializer - + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee10.webapp.Configuration, + osgi.serviceloader; osgi.serviceloader=jakarta.servlet.ServletContainerInitializer @@ -56,7 +53,7 @@ ${maven.surefire.plugin.version} --add-opens java.base/java.lang=ALL-UNNAMED - + diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-jar/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-jar/pom.xml index 1a6068291691..357afb0b35e6 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-jar/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-jar/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.ee10.demos jetty-ee10-demo-async-rest 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee10-demo-async-rest-jar jar EE10 :: Demo :: Async Rest :: Jar diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-server/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-server/pom.xml index 2d3eed831301..6f50085340db 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-server/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-server/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.ee10.demos jetty-ee10-demo-async-rest 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee10-demo-async-rest-server jar EE10 :: Demo :: Async Rest :: Server diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-webapp/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-webapp/pom.xml index 94de0eaba596..cbbafc942515 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-webapp/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.ee10.demos jetty-ee10-demo-async-rest 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee10-demo-async-rest-webapp war EE10 :: Demo :: Async Rest :: WebApp diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/pom.xml index c98db74073e5..88d3fee30002 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/pom.xml @@ -1,19 +1,20 @@ + + + 4.0.0 org.eclipse.jetty.ee10.demos jetty-ee10-demos 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee10-demo-async-rest pom EE10 :: Demo :: Async Rest jetty-ee10-demo-async-rest-jar - jetty-ee10-demo-async-rest-webapp jetty-ee10-demo-async-rest-server + jetty-ee10-demo-async-rest-webapp diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/pom.xml index eb0d82eacdaa..c1094d3d7757 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty.ee10.demos jetty-ee10-demos 12.0.2-SNAPSHOT - 4.0.0 jetty-ee10-demo-embedded EE10 :: Demo :: Embedded Jetty Embedded Jetty Demos diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/pom.xml index 64dd435bc1eb..a57ad1c6f0ca 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/pom.xml @@ -7,13 +7,13 @@ 12.0.2-SNAPSHOT jetty-ee10-demo-jaas-webapp - EE10 :: Demo :: JAAS WebApp war + EE10 :: Demo :: JAAS WebApp ${project.groupId}.jaas - - /ee10-demo-jetty - - .,WEB-INF/classes - ee10 - - - - - - maven-war-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - - - - org.eclipse.jetty - jetty-maven-plugin - ${project.version} - - - org.eclipse.jetty - jetty-client - ${project.version} - - - org.eclipse.jetty.ee10 - jetty-servlets - ${project.version} - - - - 8087 - foo - 1 - - 222 - - - /test - ${project.build.directory}/work - - - - Test Realm - src/test/resources/test-realm.properties - - - - - - - org.eclipse.jetty.ee10 @@ -197,4 +84,117 @@ 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.ee10 + jetty-servlets + ${project.version} + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/WebAppTest.java + **/Test*.java + + + + + test + test + + + + + 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.felix + maven-bundle-plugin + true + + + war + + + jakarta.servlet.jsp.*;version="[3,4)",org.eclipse.jetty.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))",* + !org.example* + + /ee10-demo-jetty + + .,WEB-INF/classes + ee10 + + + + + + maven-war-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/pom.xml index 52fdba5ad02d..0eb167bd536e 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/pom.xml @@ -7,32 +7,73 @@ 12.0.2-SNAPSHOT jetty-ee10-demo-jndi-webapp - EE10 :: Demo :: JNDI WebApp war + EE10 :: Demo :: JNDI WebApp ${project.groupId}.jndi + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-mock-resources + provided + + + jakarta.transaction + jakarta.transaction-api + provided + + + jakarta.servlet + jakarta.servlet-api + provided + + + + + + org.eclipse.jetty + jetty-maven-plugin + ${project.version} + + ${project.build.directory}/plugin-context.xml + + src/main/webapp + src/main/webapp/WEB-INF/web.xml + /test-jndi + + + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-mock-resources + ${project.version} + + + + + maven-antrun-plugin generate-xml-files + + run + process-resources - + - + - - run - @@ -41,10 +82,10 @@ maven-dependency-plugin - package copy-dependencies + package jakarta.transaction-api,ee10-demo-mock-resources ${project.build.directory}/lib/jndi @@ -53,46 +94,5 @@ - - - - org.eclipse.jetty - jetty-maven-plugin - ${project.version} - - ${project.build.directory}/plugin-context.xml - - src/main/webapp - src/main/webapp/WEB-INF/web.xml - /test-jndi - - - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-mock-resources - ${project.version} - - - - - - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-mock-resources - provided - - - jakarta.transaction - jakarta.transaction-api - provided - - - jakarta.servlet - jakarta.servlet-api - provided - - diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jsp-webapp/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jsp-webapp/pom.xml index 7d1ae686225d..68423e9108da 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jsp-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jsp-webapp/pom.xml @@ -1,20 +1,38 @@ + + 4.0.0 org.eclipse.jetty.ee10.demos jetty-ee10-demos 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee10-demo-jsp-webapp - EE10 :: Demo :: JSP WebApp war + EE10 :: Demo :: JSP WebApp ${project.groupId}.jsp + + + jakarta.servlet + jakarta.servlet-api + provided + + + jakarta.servlet.jsp + jakarta.servlet.jsp-api + provided + + + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + provided + + + @@ -48,10 +66,10 @@ web-bundle-assembly - package single + package src/main/assembly/web-bundle.xml @@ -66,24 +84,6 @@ - - - jakarta.servlet - jakarta.servlet-api - provided - - - jakarta.servlet.jsp - jakarta.servlet.jsp-api - provided - - - jakarta.servlet.jsp.jstl - jakarta.servlet.jsp.jstl-api - provided - - - precompile-jsp diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-mock-resources/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-mock-resources/pom.xml index 7a428d193390..96fe2c203884 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-mock-resources/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-mock-resources/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 @@ -5,33 +6,12 @@ jetty-ee10-demos 12.0.2-SNAPSHOT - EE10 :: Demo :: Mock Resources jetty-ee10-demo-mock-resources jar + EE10 :: Demo :: Mock Resources ${project.groupId}.mocks - - - - org.apache.felix - maven-bundle-plugin - - - org.eclipse.jetty.ee10.demos.demo-mock-resources - Mock resources used for testing - - org.example;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - - - javax.sql, jakarta.transaction;version="2.0.0" - - <_nouses>true - - - - - jakarta.transaction @@ -49,4 +29,21 @@ provided + + + + org.apache.felix + maven-bundle-plugin + + + org.eclipse.jetty.ee10.demos.demo-mock-resources + Mock resources used for testing + org.example;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" + javax.sql, jakarta.transaction;version="2.0.0" + <_nouses>true + + + + + diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/pom.xml index 7e7f2516c761..5a6f4e045ba9 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/pom.xml @@ -1,29 +1,17 @@ + 4.0.0 org.eclipse.jetty.ee10.demos jetty-ee10-demos 12.0.2-SNAPSHOT - 4.0.0 jetty-ee10-demo-proxy-webapp - EE10 :: Demo :: Proxy WebApp war + EE10 :: Demo :: Proxy WebApp ${project.groupId}.proxy - - - - maven-war-plugin - - - src/main/webapp/META-INF/MANIFEST.MF - - - - - org.slf4j @@ -88,4 +76,16 @@ provided + + + + maven-war-plugin + + + src/main/webapp/META-INF/MANIFEST.MF + + + + + diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-simple-webapp/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-simple-webapp/pom.xml index d839ca171a51..25f818dce18b 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-simple-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-simple-webapp/pom.xml @@ -1,15 +1,15 @@ + + 4.0.0 org.eclipse.jetty.ee10.demos jetty-ee10-demos 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee10-demo-simple-webapp - EE10 :: Demo :: Simple WebApp war + EE10 :: Demo :: Simple WebApp ${project.groupId}.simple diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-container-initializer/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-container-initializer/pom.xml index 32fe2122a65f..caa3788a987a 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-container-initializer/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-container-initializer/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 @@ -12,6 +13,13 @@ ${project.groupId}.sci + + + jakarta.servlet + jakarta.servlet-api + provided + + @@ -31,11 +39,4 @@ - - - jakarta.servlet - jakarta.servlet-api - provided - - diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/pom.xml index 8fb1fd6092ee..e11cb205d20b 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/pom.xml @@ -7,13 +7,98 @@ 12.0.2-SNAPSHOT ../../pom.xml - EE10 :: Demo :: Servlet Spec :: WebApp jetty-ee10-demo-spec-webapp war + EE10 :: Demo :: Servlet Spec :: WebApp ${project.groupId}.spec.webapp + + + + jakarta.transaction + jakarta.transaction-api + provided + + + jakarta.servlet + jakarta.servlet-api + provided + + + jakarta.annotation + jakarta.annotation-api + provided + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-web-fragment + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-container-initializer + + + org.eclipse.jetty.ee10 + jetty-ee10-webapp + test + + + org.eclipse.jetty.ee10 + jetty-ee10-annotations + test + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-mock-resources + test + + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + + + + 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 + .*/jakarta.servlet-api-[^/]*\.jar$ + true + ${basedir}/src/main/webapp/WEB-INF/jetty-env.xml + + + + Test Realm + src/etc/realm.properties + + + + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-mock-resources + ${project.version} + + + + + org.apache.maven.plugins @@ -21,10 +106,10 @@ web-bundle-assembly - package single + package src/main/assembly/web-bundle.xml @@ -65,10 +150,8 @@ Test Webapp for Servlet 6.0 Features - - jakarta.transaction*;version="2.0.0", jakarta.servlet*;version="[6,7)", 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", org.example;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}", * - - <_nouses /> + jakarta.transaction*;version="2.0.0", jakarta.servlet*;version="[6,7)", 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", org.example;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}", * + <_nouses> org.example.test;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}";-noimport:=true /ee10-demo-spec .,WEB-INF/classes,WEB-INF/lib @@ -83,20 +166,20 @@ generate-xml-files + + run + process-resources - + - + - - run - @@ -105,62 +188,62 @@ maven-dependency-plugin - package + unpack-jetty-ee10-demo-container-initializer copy + process-test-resources org.eclipse.jetty.ee10.demos - jetty-ee10-demo-mock-resources - ${project.version} + jetty-ee10-demo-container-initializer jar - ** - true - ${project.build.directory}/lib/jndi + false + ${project.build.directory}/ + jetty-ee10-demo-container-initializer.jar + true - unpack-jetty-ee10-demo-container-initializer - process-test-resources + unpack-jetty-ee10-demo-web-fragment copy + process-test-resources org.eclipse.jetty.ee10.demos - jetty-ee10-demo-container-initializer + jetty-ee10-demo-web-fragment jar false ${project.build.directory}/ - jetty-ee10-demo-container-initializer.jar + jetty-ee10-demo-web-fragment.jar true - unpack-jetty-ee10-demo-web-fragment - process-test-resources copy + package org.eclipse.jetty.ee10.demos - jetty-ee10-demo-web-fragment + jetty-ee10-demo-mock-resources + ${project.version} jar - false - ${project.build.directory}/ - jetty-ee10-demo-web-fragment.jar + ** + true + ${project.build.directory}/lib/jndi - true @@ -187,90 +270,5 @@ - - - - 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 - .*/jakarta.servlet-api-[^/]*\.jar$ - true - ${basedir}/src/main/webapp/WEB-INF/jetty-env.xml - - - - Test Realm - src/etc/realm.properties - - - - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-mock-resources - ${project.version} - - - - - - - - - jakarta.transaction - jakarta.transaction-api - provided - - - jakarta.servlet - jakarta.servlet-api - provided - - - jakarta.annotation - jakarta.annotation-api - provided - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-web-fragment - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-container-initializer - - - org.eclipse.jetty.ee10 - jetty-ee10-webapp - test - - - org.eclipse.jetty.ee10 - jetty-ee10-annotations - test - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-mock-resources - test - - - org.eclipse.jetty - jetty-client - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - - diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-web-fragment/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-web-fragment/pom.xml index 45db3575479d..cd7daeead171 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-web-fragment/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-web-fragment/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 @@ -6,11 +7,11 @@ 12.0.2-SNAPSHOT ../../pom.xml - - EE10 :: Demo :: Servlet Spec :: Fragment Jar jetty-ee10-demo-web-fragment jar + EE10 :: Demo :: Servlet Spec :: Fragment Jar + ${project.groupId}.spec.fragment diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/pom.xml index 974b6da09176..c47431bc7e64 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/pom.xml @@ -6,13 +6,13 @@ jetty-ee10-demos 12.0.2-SNAPSHOT - EE10 :: Demo :: Servlet Spec jetty-ee10-demo-spec pom + EE10 :: Demo :: Servlet Spec - jetty-ee10-demo-spec-webapp jetty-ee10-demo-container-initializer + jetty-ee10-demo-spec-webapp jetty-ee10-demo-web-fragment diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-template/pom.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-template/pom.xml index 5cd6efd4ed35..a9867d1c6b72 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-template/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-template/pom.xml @@ -1,19 +1,19 @@ + + 4.0.0 org.eclipse.jetty.ee10.demos jetty-ee10-demos 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee10-demo-template - EE10 :: Demo :: Template jar + EE10 :: Demo :: Template - + org.apache.maven.plugins maven-jar-plugin diff --git a/jetty-ee10/jetty-ee10-demos/pom.xml b/jetty-ee10/jetty-ee10-demos/pom.xml index fce267b99fb0..abd139be03cf 100644 --- a/jetty-ee10/jetty-ee10-demos/pom.xml +++ b/jetty-ee10/jetty-ee10-demos/pom.xml @@ -1,16 +1,30 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.2-SNAPSHOT - - 4.0.0 org.eclipse.jetty.ee10.demos jetty-ee10-demos - EE10 :: Demos pom + EE10 :: Demos + + + jetty-ee10-demo-async-rest + jetty-ee10-demo-embedded + jetty-ee10-demo-jaas-webapp + jetty-ee10-demo-jetty-webapp + jetty-ee10-demo-jndi-webapp + jetty-ee10-demo-jsp-webapp + jetty-ee10-demo-mock-resources + jetty-ee10-demo-proxy-webapp + jetty-ee10-demo-simple-webapp + jetty-ee10-demo-spec + jetty-ee10-demo-template + true @@ -28,18 +42,4 @@ - - - jetty-ee10-demo-async-rest - jetty-ee10-demo-jaas-webapp - jetty-ee10-demo-jndi-webapp - jetty-ee10-demo-jetty-webapp - jetty-ee10-demo-proxy-webapp - jetty-ee10-demo-simple-webapp - jetty-ee10-demo-jsp-webapp - jetty-ee10-demo-mock-resources - jetty-ee10-demo-spec - jetty-ee10-demo-template - jetty-ee10-demo-embedded - diff --git a/jetty-ee10/jetty-ee10-examples/pom.xml b/jetty-ee10/jetty-ee10-examples/pom.xml index 8fa7589f146a..89684c3aa141 100644 --- a/jetty-ee10/jetty-ee10-examples/pom.xml +++ b/jetty-ee10/jetty-ee10-examples/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee10-examples EE10 :: Examples diff --git a/jetty-ee10/jetty-ee10-fcgi-proxy/pom.xml b/jetty-ee10/jetty-ee10-fcgi-proxy/pom.xml index d27ef964869a..f7ad2ac59918 100644 --- a/jetty-ee10/jetty-ee10-fcgi-proxy/pom.xml +++ b/jetty-ee10/jetty-ee10-fcgi-proxy/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee10-fcgi-proxy EE10 :: FCGI Proxy diff --git a/jetty-ee10/jetty-ee10-glassfish-jstl/pom.xml b/jetty-ee10/jetty-ee10-glassfish-jstl/pom.xml index d7fd1cd4fae3..f614692fea20 100644 --- a/jetty-ee10/jetty-ee10-glassfish-jstl/pom.xml +++ b/jetty-ee10/jetty-ee10-glassfish-jstl/pom.xml @@ -1,31 +1,20 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.2-SNAPSHOT - 4.0.0 jetty-ee10-glassfish-jstl + jar EE10 :: Glassfish JSTL https://projects.eclipse.org/projects/ee4j.glassfish - jar ${project.groupId}.glassfish.jstl true - - - - org.apache.maven.plugins - maven-surefire-plugin - - false - - - - - @@ -69,4 +58,16 @@ + + + + org.apache.maven.plugins + maven-surefire-plugin + + false + + + + + diff --git a/jetty-ee10/jetty-ee10-home/pom.xml b/jetty-ee10/jetty-ee10-home/pom.xml index 8216348e7bae..82f87cd8aa4a 100644 --- a/jetty-ee10/jetty-ee10-home/pom.xml +++ b/jetty-ee10/jetty-ee10-home/pom.xml @@ -1,15 +1,15 @@ + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.2-SNAPSHOT ../pom.xml - 4.0.0 jetty-ee10-home - EE10 :: Home Assembly pom + EE10 :: Home Assembly ${basedir}/target/jetty-ee10-home @@ -17,6 +17,194 @@ true + + + org.ow2.asm + asm + + + org.ow2.asm + asm-commons + + + org.ow2.asm + asm-tree + + + org.ow2.asm + asm-analysis + + + + + org.eclipse.jetty.ee10 + jetty-ee10-quickstart + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + + + org.eclipse.jetty.ee10 + jetty-ee10-servlets + + + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-servlet + + + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jetty-server + + + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jetty-client-webapp + + + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jakarta-server + + + org.eclipse.jetty.ee10 + jetty-ee10-apache-jsp + + + org.eclipse.jetty.ee10 + jetty-ee10-glassfish-jstl + + + javax.el + el-api + + + jakarta.el + jakarta.el-api + + + + + org.eclipse.jetty.ee10 + jetty-ee10-plus + + + org.eclipse.jetty.ee10 + jetty-ee10-proxy + + + org.eclipse.jetty.ee10 + jetty-ee10-cdi + true + + + org.eclipse.jetty + jetty-security + true + + + org.eclipse.jetty.ee10 + jetty-ee10-annotations + + + org.eclipse.jetty + jetty-openid + true + + + org.eclipse.jetty.ee10 + jetty-ee10-jaspi + true + + + org.eclipse.jetty.ee10 + jetty-ee10-jndi + true + + + org.eclipse.jetty.ee10 + jetty-ee10-fcgi-proxy + true + + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-mock-resources + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-jetty-webapp + ${project.version} + config + jar + true + + + javax.el + el-api + + + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-jaas-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-jndi-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-spec-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-async-rest-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-proxy-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-simple-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-jsp-webapp + ${project.version} + config + jar + true + + + @@ -24,327 +212,325 @@ maven-dependency-plugin - unpack-config-deps - generate-resources + copy-ee10-annotations-deps - unpack-dependencies + copy-dependencies + generate-resources - - org.eclipse.jetty.ee10, org.eclipse.jetty.ee10.demos - - - config - false - META-INF/**,webapps/**,start.d/**,start.ini - ${assembly-directory} + jakarta.annotation,org.ow2.asm + jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis + jar + ${assembly-directory}/lib/ee10-annotations - copy-lib-core-websocket-deps - generate-resources + copy-ee10-annotations-src-deps copy-dependencies + generate-resources - org.eclipse.jetty.websocket + jakarta.annotation,org.ow2.asm + jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis jar - ${assembly-directory}/lib + sources + ${source-assembly-directory}/lib/ee10-annotations + - copy-lib-ee10-websocket-deps - generate-resources + copy-ee10-deps copy-dependencies + generate-resources - org.eclipse.jetty.ee10.websocket + org.eclipse.jetty.ee10 + jetty-websocket-core-client,jetty-websocket-core-common,jetty-websocket-core-server,jetty-websocket-jetty-api,jetty-websocket-jetty-client,jetty-websocket-jetty-common,jetty-websocket-jetty-server + org.eclipse.jetty.ee10.demos,org.eclipse.jetty.ee10.websocket jar - ${assembly-directory}/lib/ee10-websocket + ${assembly-directory}/lib - copy-lib-core-websocket-src-deps - generate-resources + copy-ee10-jaspi-deps copy-dependencies + generate-resources - org.eclipse.jetty.websocket + jakarta.authentication + jakarta.authentication-api jar - sources - ${source-assembly-directory}/lib + ${assembly-directory}/lib/ee10-jaspi - copy-lib-ee10-websocket-src-deps - generate-resources + copy-ee10-jaspi-src-deps copy-dependencies + generate-resources - org.eclipse.jetty.ee10.websocket + jakarta.authentication + jakarta.authentication-api jar sources - ${source-assembly-directory}/lib/ee10-websocket + ${source-assembly-directory}/lib/ee10-jaspi - copy-ee10-lib-jakarta-websocket-deps - generate-resources + copy-ee10-jsp-deps copy-dependencies + generate-resources - jakarta.websocket + true + jakarta.servlet.jsp,jakarta.el,org.mortbay.jasper,org.eclipse.jdt + jakarta.servlet.jsp-api,jakarta.el-api,apache-el,apache-jsp,ecj jar - ${assembly-directory}/lib/ee10-websocket + ${assembly-directory}/lib/ee10-apache-jsp - copy-ee10-lib-jakarta-websocket-src-deps - generate-resources + copy-ee10-jsp-src-deps copy-dependencies + generate-resources - jakarta.websocket + true + jakarta.servlet.jsp,jakart.el,org.mortbay.jasper,org.eclipse.jdt + jakart.servlet.jsp-api,jakarta.el-api,apache-el,apache-jsp,ecj jar sources - ${source-assembly-directory}/lib/ee10-websocket + ${source-assembly-directory}/lib/ee10-apache-jsp - copy-lib-servlet-api-deps - generate-resources + copy-ee10-jstl-deps - copy + copy-dependencies + generate-resources - - - jakarta.servlet - jakarta.servlet-api - ${jakarta.servlet.api.version} - - - ${assembly-directory}/lib + true + jakarta.servlet.jsp.jstl,org.glassfish.web + jakarta.servlet.jsp.jstl-api,jakarta.servlet.jsp.jstl + jar + ${assembly-directory}/lib/ee10-glassfish-jstl - copy-lib-servlet-api-src-deps - generate-resources + copy-ee10-jstl-src-deps - copy + copy-dependencies + generate-resources - - - jakarta.servlet - jakarta.servlet-api - ${jakarta.servlet.api.version} - sources - - - ${source-assembly-directory}/lib + true + jakarta.servlet.jsp.jstl,org.glassfish.web + jakarta.servlet.jsp.jstl-api,jakarta.servlet.jsp.jstl + jar + sources + ${source-assembly-directory}/lib/ee10-glassfish-jstl - copy-lib-transaction-api-deps - generate-resources + copy-ee10-lib-jakarta-websocket-deps - copy + copy-dependencies + generate-resources - - - jakarta.transaction - jakarta.transaction-api - ${jakarta.transaction-api.version} - - - jakarta.interceptor - jakarta.interceptor-api - ${jakarta.interceptor.api.version} - - - jakarta.enterprise - jakarta.enterprise.cdi-api - ${jakarta.enterprise.cdi.api.version} - - - jakarta.inject - jakarta.inject-api - ${jakarta.inject.api.version} - - - jakarta.enterprise - jakarta.enterprise.lang-model - ${jakarta.enterprise.lang.model.version} - - - ${assembly-directory}/lib + jakarta.websocket + jar + ${assembly-directory}/lib/ee10-websocket - - copy-lib-transaction-api-src-deps - generate-resources + copy-ee10-lib-jakarta-websocket-src-deps - copy + copy-dependencies + generate-resources - - - jakarta.transaction - jakarta.transaction-api - ${jakarta.transaction-api.version} - sources - - - ${source-assembly-directory}/lib + jakarta.websocket + jar + sources + ${source-assembly-directory}/lib/ee10-websocket - copy-ee10-annotations-deps - generate-resources + copy-ee10-src-deps copy-dependencies + generate-resources - jakarta.annotation,org.ow2.asm - jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis + org.eclipse.jetty.ee10 jar - ${assembly-directory}/lib/ee10-annotations + org.eclipse.jetty.ee10.demos,org.eclipse.jetty.ee10.websocket + sources + ${source-assembly-directory}/lib - copy-ee10-annotations-src-deps - generate-resources + copy-lib-core-websocket-deps copy-dependencies + generate-resources - jakarta.annotation,org.ow2.asm - jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis + org.eclipse.jetty.websocket jar - sources - ${source-assembly-directory}/lib/ee10-annotations + ${assembly-directory}/lib - copy-ee10-jsp-src-deps - generate-resources + copy-lib-core-websocket-src-deps copy-dependencies + generate-resources - true - jakarta.servlet.jsp,jakart.el,org.mortbay.jasper,org.eclipse.jdt - jakart.servlet.jsp-api,jakarta.el-api,apache-el,apache-jsp,ecj + org.eclipse.jetty.websocket jar sources - ${source-assembly-directory}/lib/ee10-apache-jsp + ${source-assembly-directory}/lib - copy-ee10-jsp-deps - generate-resources + copy-lib-ee10-websocket-deps copy-dependencies + generate-resources - true - jakarta.servlet.jsp,jakarta.el,org.mortbay.jasper,org.eclipse.jdt - jakarta.servlet.jsp-api,jakarta.el-api,apache-el,apache-jsp,ecj + org.eclipse.jetty.ee10.websocket jar - ${assembly-directory}/lib/ee10-apache-jsp + ${assembly-directory}/lib/ee10-websocket - copy-ee10-jstl-src-deps - generate-resources + copy-lib-ee10-websocket-src-deps copy-dependencies + generate-resources - true - jakarta.servlet.jsp.jstl,org.glassfish.web - jakarta.servlet.jsp.jstl-api,jakarta.servlet.jsp.jstl + org.eclipse.jetty.ee10.websocket jar sources - ${source-assembly-directory}/lib/ee10-glassfish-jstl + ${source-assembly-directory}/lib/ee10-websocket - copy-ee10-jstl-deps - generate-resources + copy-lib-servlet-api-deps - copy-dependencies + copy + generate-resources - true - jakarta.servlet.jsp.jstl,org.glassfish.web - jakarta.servlet.jsp.jstl-api,jakarta.servlet.jsp.jstl - jar - ${assembly-directory}/lib/ee10-glassfish-jstl + + + jakarta.servlet + jakarta.servlet-api + ${jakarta.servlet.api.version} + + + ${assembly-directory}/lib - copy-ee10-jaspi-deps - generate-resources + copy-lib-servlet-api-src-deps - copy-dependencies + copy + generate-resources - jakarta.authentication - jakarta.authentication-api - jar - ${assembly-directory}/lib/ee10-jaspi + + + jakarta.servlet + jakarta.servlet-api + ${jakarta.servlet.api.version} + sources + + + ${source-assembly-directory}/lib - copy-ee10-jaspi-src-deps - generate-resources + copy-lib-transaction-api-deps - copy-dependencies + copy + generate-resources - jakarta.authentication - jakarta.authentication-api - jar - sources - ${source-assembly-directory}/lib/ee10-jaspi + + + jakarta.transaction + jakarta.transaction-api + ${jakarta.transaction-api.version} + + + jakarta.interceptor + jakarta.interceptor-api + ${jakarta.interceptor.api.version} + + + jakarta.enterprise + jakarta.enterprise.cdi-api + ${jakarta.enterprise.cdi.api.version} + + + jakarta.inject + jakarta.inject-api + ${jakarta.inject.api.version} + + + jakarta.enterprise + jakarta.enterprise.lang-model + ${jakarta.enterprise.lang.model.version} + + + ${assembly-directory}/lib - copy-ee10-deps - generate-resources + copy-lib-transaction-api-src-deps - copy-dependencies + copy + generate-resources - org.eclipse.jetty.ee10 - jetty-websocket-core-client,jetty-websocket-core-common,jetty-websocket-core-server,jetty-websocket-jetty-api,jetty-websocket-jetty-client,jetty-websocket-jetty-common,jetty-websocket-jetty-server - org.eclipse.jetty.ee10.demos,org.eclipse.jetty.ee10.websocket - jar - ${assembly-directory}/lib + + + jakarta.transaction + jakarta.transaction-api + ${jakarta.transaction-api.version} + sources + + + ${source-assembly-directory}/lib - copy-ee10-src-deps - generate-resources + unpack-config-deps - copy-dependencies + unpack-dependencies + generate-resources - org.eclipse.jetty.ee10 - jar - org.eclipse.jetty.ee10.demos,org.eclipse.jetty.ee10.websocket - sources - ${source-assembly-directory}/lib + org.eclipse.jetty.ee10, org.eclipse.jetty.ee10.demos + + config + false + META-INF/**,webapps/**,start.d/**,start.ini + ${assembly-directory} @@ -359,10 +545,10 @@ binary - package single + package src/main/assembly/jetty-assembly.xml @@ -371,10 +557,10 @@ sources - package single + package src/main/assembly/jetty-source-assembly.xml @@ -387,192 +573,4 @@ - - - org.ow2.asm - asm - - - org.ow2.asm - asm-commons - - - org.ow2.asm - asm-tree - - - org.ow2.asm - asm-analysis - - - - - org.eclipse.jetty.ee10 - jetty-ee10-quickstart - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - - - org.eclipse.jetty.ee10 - jetty-ee10-servlets - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-servlet - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jetty-server - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jetty-client-webapp - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jakarta-server - - - org.eclipse.jetty.ee10 - jetty-ee10-apache-jsp - - - org.eclipse.jetty.ee10 - jetty-ee10-glassfish-jstl - - - javax.el - el-api - - - jakarta.el - jakarta.el-api - - - - - org.eclipse.jetty.ee10 - jetty-ee10-plus - - - org.eclipse.jetty.ee10 - jetty-ee10-proxy - - - org.eclipse.jetty.ee10 - jetty-ee10-cdi - true - - - org.eclipse.jetty - jetty-security - true - - - org.eclipse.jetty.ee10 - jetty-ee10-annotations - - - org.eclipse.jetty - jetty-openid - true - - - org.eclipse.jetty.ee10 - jetty-ee10-jaspi - true - - - org.eclipse.jetty.ee10 - jetty-ee10-jndi - true - - - org.eclipse.jetty.ee10 - jetty-ee10-fcgi-proxy - true - - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-mock-resources - ${project.version} - config - jar - true - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-jetty-webapp - ${project.version} - config - jar - true - - - javax.el - el-api - - - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-jaas-webapp - ${project.version} - config - jar - true - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-jndi-webapp - ${project.version} - config - jar - true - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-spec-webapp - ${project.version} - config - jar - true - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-async-rest-webapp - ${project.version} - config - jar - true - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-proxy-webapp - ${project.version} - config - jar - true - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-simple-webapp - ${project.version} - config - jar - true - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-jsp-webapp - ${project.version} - config - jar - true - - - diff --git a/jetty-ee10/jetty-ee10-jaspi/pom.xml b/jetty-ee10/jetty-ee10-jaspi/pom.xml index f67cd5443ad7..4acada756d09 100644 --- a/jetty-ee10/jetty-ee10-jaspi/pom.xml +++ b/jetty-ee10/jetty-ee10-jaspi/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee10-jaspi EE10 :: JASPI Jetty security infrastructure @@ -15,29 +16,6 @@ org.eclipse.jetty.ee10.security.jaspi.* - - - - org.apache.felix - maven-bundle-plugin - true - - - - manifest - - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.ee10.servlet.security.Authenticator$Factory - - - - - - - - jakarta.authentication @@ -71,4 +49,27 @@ test + + + + + org.apache.felix + maven-bundle-plugin + true + + + + manifest + + + + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.ee10.servlet.security.Authenticator$Factory + + + + + + + diff --git a/jetty-ee10/jetty-ee10-jndi/pom.xml b/jetty-ee10/jetty-ee10-jndi/pom.xml index 1c63fd381f4f..43a76e2b6ec6 100644 --- a/jetty-ee10/jetty-ee10-jndi/pom.xml +++ b/jetty-ee10/jetty-ee10-jndi/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee10-jndi EE10 :: JNDI EE10 JNDI factories @@ -15,21 +16,6 @@ org.eclipse.jetty.ee10.jndi.* - - - - org.apache.felix - maven-bundle-plugin - true - - - ${osgi.slf4j.import.packages},jakarta.mail.*;resolution:=optional,* - - - - - - org.eclipse.jetty @@ -60,4 +46,19 @@ test + + + + + org.apache.felix + maven-bundle-plugin + true + + + ${osgi.slf4j.import.packages},jakarta.mail.*;resolution:=optional,* + + + + + diff --git a/jetty-ee10/jetty-ee10-jspc-maven-plugin/pom.xml b/jetty-ee10/jetty-ee10-jspc-maven-plugin/pom.xml index c9838c0f02fb..d0135b2efd2c 100644 --- a/jetty-ee10/jetty-ee10-jspc-maven-plugin/pom.xml +++ b/jetty-ee10/jetty-ee10-jspc-maven-plugin/pom.xml @@ -1,59 +1,19 @@ + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.2-SNAPSHOT - 4.0.0 jetty-ee10-jspc-maven-plugin maven-plugin EE10 :: Jetty JSPC Maven Plugin ${project.groupId}.jspc.plugin - true true + true - - - - 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 - - - - - - ${maven.surefire.plugin.version} - - - clean - - - - - org.eclipse.jetty @@ -103,4 +63,44 @@ ant + + + + org.apache.maven.plugins + maven-plugin-plugin + + + exec-plugin-doc + + descriptor + helpmojo + + process-classes + + + + + org.apache.maven.plugins + maven-invoker-plugin + + + ${maven.surefire.plugin.version} + + + clean + + + + + integration-test + + install + integration-test + verify + + + + + + diff --git a/jetty-ee10/jetty-ee10-maven-plugin/pom.xml b/jetty-ee10/jetty-ee10-maven-plugin/pom.xml index 6e7dde7f8009..ac2b7c09dcdc 100644 --- a/jetty-ee10/jetty-ee10-maven-plugin/pom.xml +++ b/jetty-ee10/jetty-ee10-maven-plugin/pom.xml @@ -1,171 +1,25 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.2-SNAPSHOT ../pom.xml - 4.0.0 jetty-ee10-maven-plugin maven-plugin EE10 :: Jetty Maven Plugin Jetty EE10 maven plugins - false ${project.groupId}.maven.plugin - FREEBEER - true + + FREEBEER + false - - - - 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 - - jetty - - - - exec-plugin-doc - generate-sources - - helpmojo - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - test-jar - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy - package - - copy - - - - - - - org.eclipse.jetty - jetty-home - zip - false - ${project.build.directory} - ${jettyHomeZipFileName} - - - false - true - - - - org.apache.maven.plugins - maven-invoker-plugin - - - integration-test - integration-test - - install - integration-test - verify - - - - - - org.eclipse.jetty:jetty-slf4j-impl:${project.version} - org.eclipse.jetty.ee10:jetty-ee10-apache-jsp:${project.version} - org.eclipse.jetty.ee10:jetty-ee10-glassfish-jstl:${project.version} - org.eclipse.jetty.ee10:jetty-ee10-webapp:${project.version} - org.eclipse.jetty:jetty-server:${project.version} - org.eclipse.jetty:jetty-deploy:${project.version} - org.eclipse.jetty:jetty-home:${project.version}:zip - - org.eclipse.jetty.maven.its.ee10 - - it-parent-pom/pom.xml - - - - javax-annotation-api/pom.xml - - jetty-start-gwt-it/pom.xml - - jetty-start-war-mojo-it/pom.xml - - - ${jetty.stopKey} - ${jetty.stopPort} - ${maven.surefire.plugin.version} - ${localRepoPath} - ${jettyHomeZip} - - - clean - - - - - - + org.codehaus.plexus plexus-xml @@ -329,4 +183,151 @@ test + + + + 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 + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + -Dstop.port=@{test.stopPort} -Djetty.port=@{test.jettyPort} + + **/IntegrationTest*.java + + + + + org.apache.maven.plugins + maven-plugin-plugin + + jetty + + + + exec-plugin-doc + + helpmojo + + generate-sources + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + test-jar + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + + org.eclipse.jetty + jetty-home + zip + false + ${project.build.directory} + ${jettyHomeZipFileName} + + + false + true + + + + copy + + copy + + package + + + + + org.apache.maven.plugins + maven-invoker-plugin + + + org.eclipse.jetty:jetty-slf4j-impl:${project.version} + org.eclipse.jetty.ee10:jetty-ee10-apache-jsp:${project.version} + org.eclipse.jetty.ee10:jetty-ee10-glassfish-jstl:${project.version} + org.eclipse.jetty.ee10:jetty-ee10-webapp:${project.version} + org.eclipse.jetty:jetty-server:${project.version} + org.eclipse.jetty:jetty-deploy:${project.version} + org.eclipse.jetty:jetty-home:${project.version}:zip + + org.eclipse.jetty.maven.its.ee10 + + it-parent-pom/pom.xml + + + + javax-annotation-api/pom.xml + + jetty-start-gwt-it/pom.xml + + jetty-start-war-mojo-it/pom.xml + + + ${jetty.stopKey} + ${jetty.stopPort} + ${maven.surefire.plugin.version} + ${localRepoPath} + ${jettyHomeZip} + + + clean + + + + + integration-test + + install + integration-test + verify + + integration-test + + + + + diff --git a/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-alpn/pom.xml b/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-alpn/pom.xml index 2156e801845d..eadd1a71a020 100644 --- a/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-alpn/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-alpn/pom.xml @@ -1,16 +1,17 @@ + + + + + 4.0.0 org.eclipse.jetty.ee10.osgi jetty-ee10-osgi 12.0.2-SNAPSHOT - - - - 4.0.0 jetty-ee10-osgi-alpn - EE10 :: OSGi :: ALPN Fragment jar + EE10 :: OSGi :: ALPN Fragment ${project.groupId}.alpn.fragment diff --git a/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot-jsp/pom.xml b/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot-jsp/pom.xml index c91a9696ccef..946026d9dad2 100644 --- a/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot-jsp/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot-jsp/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty.ee10.osgi jetty-ee10-osgi 12.0.2-SNAPSHOT - 4.0.0 jetty-ee10-osgi-boot-jsp EE10 :: OSGi :: Boot JSP Jetty OSGi Boot JSP bundle @@ -50,15 +51,15 @@ build-helper-maven-plugin - set-jsp-api-version - validate - - parse-version - - - ${jsp.impl.version} - jspImpl - + set-jsp-api-version + + parse-version + + validate + + ${jsp.impl.version} + jspImpl + @@ -70,10 +71,9 @@ Jetty-OSGi-Jasper Integration - + org.eclipse.jetty.ee10.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,12 +137,10 @@ 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.ee10.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}))" diff --git a/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/pom.xml b/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/pom.xml index 2ae1ea9846e5..9dfc512c9517 100644 --- a/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty.ee10.osgi jetty-ee10-osgi 12.0.2-SNAPSHOT - 4.0.0 jetty-ee10-osgi-boot EE10 :: OSGi :: Boot Jetty OSGi Boot bundle @@ -62,20 +63,20 @@ maven-antrun-plugin + + run + process-resources - + - - run - @@ -88,8 +89,7 @@ org.eclipse.jetty.ee10.osgi.boot;singleton:=true org.eclipse.jetty.ee10.osgi.boot.EE10Activator org.eclipse.jetty.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))", org.eclipse.jetty.ee10.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))" - - ${osgi.slf4j.import.packages}, + ${osgi.slf4j.import.packages}, jakarta.mail;version="2.0";resolution:=optional, jakarta.mail.event;version="2.0";resolution:=optional, jakarta.mail.internet;version="2.0";resolution:=optional, @@ -111,14 +111,9 @@ org.xml.sax, org.xml.sax.helpers, org.eclipse.jetty.ee10.annotations;resolution:=optional, - * - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee10.webapp.Configuration - + * + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee10.webapp.Configuration <_nouses>true diff --git a/jetty-ee10/jetty-ee10-osgi/pom.xml b/jetty-ee10/jetty-ee10-osgi/pom.xml index c2fd8871f77b..991e644d9657 100644 --- a/jetty-ee10/jetty-ee10-osgi/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/pom.xml @@ -1,30 +1,31 @@ + + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.2-SNAPSHOT - - 4.0.0 org.eclipse.jetty.ee10.osgi jetty-ee10-osgi - EE10 :: OSGi pom - - - true - + EE10 :: OSGi jetty-ee10-osgi-alpn jetty-ee10-osgi-boot jetty-ee10-osgi-boot-jsp - test-jetty-ee10-osgi-webapp-resources + test-jetty-ee10-osgi test-jetty-ee10-osgi-fragment test-jetty-ee10-osgi-server - test-jetty-ee10-osgi + test-jetty-ee10-osgi-webapp-resources + + true + + @@ -43,8 +44,11 @@ - META-INF/.. true + META-INF/.. + + META-INF/**/* + **/.* **/*.jar @@ -56,9 +60,6 @@ target/**/* build.properties - - META-INF/**/* - src/main/java diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-fragment/pom.xml b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-fragment/pom.xml index 071406d1972e..47913beca127 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-fragment/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-fragment/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty.ee10.osgi jetty-ee10-osgi 12.0.2-SNAPSHOT - 4.0.0 test-jetty-ee10-osgi-fragment EE10 :: OSGi :: WebApp Fragment Test Jetty OSGi Webapp Fragment bundle diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-server/pom.xml b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-server/pom.xml index 26031e368c96..f925e793bfac 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-server/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-server/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty.ee10.osgi jetty-ee10-osgi 12.0.2-SNAPSHOT - 4.0.0 test-jetty-ee10-osgi-server EE10 :: 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="1.2.0", org.osgi.service.packageadmin, org.osgi.service.startlevel;version="1.0.0", @@ -55,8 +55,7 @@ org.osgi.util.tracker;version="1.3.0", org.xml.sax, org.xml.sax.helpers, - * - + * org.eclipse.jetty.*;version="[$(version;==;${parsedVersion.osgiVersion}),$(version;+;${parsedVersion.osgiVersion}))", org.eclipse.jetty.ee10.*;version="[$(version;==;${parsedVersion.osgiVersion}),$(version;+;${parsedVersion.osgiVersion}))" diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-webapp-resources/pom.xml b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-webapp-resources/pom.xml index 4de44e73116e..636b5053dfa8 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-webapp-resources/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi-webapp-resources/pom.xml @@ -1,19 +1,26 @@ + 4.0.0 org.eclipse.jetty.ee10.osgi jetty-ee10-osgi 12.0.2-SNAPSHOT - 4.0.0 test-jetty-ee10-osgi-webapp-resources - EE10 :: OSGi :: WebApp With Resources war + EE10 :: OSGi :: WebApp With Resources ${project.groupId}.webapp.resources true true + + + jakarta.servlet + jakarta.servlet-api + provided + + @@ -22,15 +29,15 @@ copy-resources - validate copy-resources + validate ${basedir}/target/classes - src/main/resources + src/main/resources @@ -63,11 +70,4 @@ - - - jakarta.servlet - jakarta.servlet-api - provided - - diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/pom.xml b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/pom.xml index e77492875d44..fe300eab8158 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/pom.xml @@ -1,18 +1,19 @@ + + 4.0.0 org.eclipse.jetty.ee10.osgi jetty-ee10-osgi 12.0.2-SNAPSHOT - 4.0.0 test-jetty-ee10-osgi EE10 :: OSGi :: Test Jetty OSGi Integration test - ${project.groupId}.boot.test.osgi target/distribution - true + ${project.groupId}.boot.test.osgi true + true @@ -146,10 +147,10 @@ - org.slf4j - slf4j-api - test - + org.slf4j + slf4j-api + test + org.eclipse.jetty.ee10 @@ -568,7 +569,7 @@ - + @@ -580,20 +581,20 @@ maven-dependency-plugin + + test-jetty-ee10-osgi-webapp-resources + target + true + copy - process-test-resources copy-dependencies + process-test-resources - - test-jetty-ee10-osgi-webapp-resources - target - true - org.apache.servicemix.tooling diff --git a/jetty-ee10/jetty-ee10-plus/pom.xml b/jetty-ee10/jetty-ee10-plus/pom.xml index dfbcd88f03e1..dd80ff53878d 100644 --- a/jetty-ee10/jetty-ee10-plus/pom.xml +++ b/jetty-ee10/jetty-ee10-plus/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee10-plus EE10 :: Plus Jetty JavaEE style services @@ -15,27 +16,6 @@ org.eclipse.jetty.ee10.plus.* - - - - org.apache.felix - maven-bundle-plugin - true - - - ${osgi.slf4j.import.packages},jakarta.transaction.*;version="2.0.0",* - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee10.webapp.Configuration - - - - - - - jakarta.transaction @@ -80,4 +60,21 @@ + + + + org.apache.felix + maven-bundle-plugin + true + + + ${osgi.slf4j.import.packages},jakarta.transaction.*;version="2.0.0",* + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee10.webapp.Configuration + + + + + + diff --git a/jetty-ee10/jetty-ee10-proxy/pom.xml b/jetty-ee10/jetty-ee10-proxy/pom.xml index eb1d76ed0a3e..1adae676aec4 100644 --- a/jetty-ee10/jetty-ee10-proxy/pom.xml +++ b/jetty-ee10/jetty-ee10-proxy/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee10-proxy EE10 :: Proxy Jetty Proxy @@ -15,20 +16,6 @@ org.eclipse.jetty.ee10.proxy.* - - - - org.apache.maven.plugins - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.ee10.proxy=org.eclipse.jetty.logging - - - - - - org.slf4j @@ -78,4 +65,16 @@ test + + + + + org.apache.maven.plugins + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.ee10.proxy=org.eclipse.jetty.logging + + + + diff --git a/jetty-ee10/jetty-ee10-quickstart/pom.xml b/jetty-ee10/jetty-ee10-quickstart/pom.xml index 4bfc711e2800..b084ed763978 100644 --- a/jetty-ee10/jetty-ee10-quickstart/pom.xml +++ b/jetty-ee10/jetty-ee10-quickstart/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee10-quickstart EE10 :: Quick Start Jetty Quick Start @@ -14,26 +15,6 @@ ${project.groupId}.quickstart - - - - org.apache.felix - maven-bundle-plugin - true - - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee10.webapp.Configuration - - - - - - - org.eclipse.jetty.ee10 @@ -63,4 +44,20 @@ + + + + org.apache.felix + maven-bundle-plugin + true + + + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee10.webapp.Configuration + + + + + + diff --git a/jetty-ee10/jetty-ee10-runner/pom.xml b/jetty-ee10/jetty-ee10-runner/pom.xml index d88b748e7e44..a9b240d98921 100644 --- a/jetty-ee10/jetty-ee10-runner/pom.xml +++ b/jetty-ee10/jetty-ee10-runner/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.2-SNAPSHOT - 4.0.0 jetty-ee10-runner EE10 :: Runner @@ -15,7 +16,84 @@ true + + + org.eclipse.jetty.ee10 + jetty-ee10-plus + + + org.eclipse.jetty.ee10 + jetty-ee10-annotations + + + org.eclipse.jetty + jetty-security + + + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jetty-server + + + org.eclipse.jetty + jetty-jndi + + + org.eclipse.jetty.ee10 + jetty-ee10-apache-jsp + + + org.eclipse.jetty.ee10 + jetty-ee10-glassfish-jstl + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + runtime + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-simple-webapp + war + test + + + org.eclipse.jetty + jetty-client + test + + + + + + + org.apache.felix + maven-bundle-plugin + + + true + + + + org.apache.maven.plugins + maven-jar-plugin + + + + org.eclipse.jetty.ee10.runner.Runner + + + Jetty Runner + + + + + + org.apache.maven.plugins @@ -23,14 +101,13 @@ unpack-dependencies - prepare-package unpack-dependencies + prepare-package ** - - **/MANIFEST.MF, + **/MANIFEST.MF, META-INF/LICENSE, META-INF/*.RSA, META-INF/*.DSA, @@ -39,8 +116,7 @@ readme.txt, MANIFEST.MF, about.html, - ecj.1 - + ecj.1 ${project.build.directory}/classes false true @@ -89,82 +165,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - true - - - - org.apache.maven.plugins - maven-jar-plugin - - - - org.eclipse.jetty.ee10.runner.Runner - - - Jetty Runner - - - - - - - - - - org.eclipse.jetty.ee10 - jetty-ee10-plus - - - org.eclipse.jetty.ee10 - jetty-ee10-annotations - - - org.eclipse.jetty - jetty-security - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jetty-server - - - org.eclipse.jetty - jetty-jndi - - - org.eclipse.jetty.ee10 - jetty-ee10-apache-jsp - - - org.eclipse.jetty.ee10 - jetty-ee10-glassfish-jstl - - - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-slf4j-impl - runtime - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-simple-webapp - war - test - - - org.eclipse.jetty - jetty-client - test - - diff --git a/jetty-ee10/jetty-ee10-servlet/pom.xml b/jetty-ee10/jetty-ee10-servlet/pom.xml index b09777b3ae45..9acdf6708fc9 100644 --- a/jetty-ee10/jetty-ee10-servlet/pom.xml +++ b/jetty-ee10/jetty-ee10-servlet/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee10-servlet EE10 :: Servlet Jetty Servlet Container @@ -16,21 +16,6 @@ org.eclipse.jetty.ee10.servlet.* - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} - --add-modules org.eclipse.jetty.util.ajax - --add-reads org.eclipse.jetty.ee10.servlet=org.eclipse.jetty.logging - - - - - - jakarta.servlet @@ -85,4 +70,17 @@ + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} + --add-modules org.eclipse.jetty.util.ajax + --add-reads org.eclipse.jetty.ee10.servlet=org.eclipse.jetty.logging + + + + + diff --git a/jetty-ee10/jetty-ee10-servlets/pom.xml b/jetty-ee10/jetty-ee10-servlets/pom.xml index 245f1e3d43e6..c7b95aedce8a 100644 --- a/jetty-ee10/jetty-ee10-servlets/pom.xml +++ b/jetty-ee10/jetty-ee10-servlets/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee10-servlets EE10 :: Utility Servlets and Filters Utility Servlets from Jetty @@ -16,25 +16,6 @@ org.eclipse.jetty.ee10.servlets.* - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} - --add-modules jakarta.servlet - --add-modules org.eclipse.jetty.util - --add-modules org.eclipse.jetty.io - --add-modules org.eclipse.jetty.http - --add-modules org.eclipse.jetty.server - --add-modules org.eclipse.jetty.jmx - - - - - - org.eclipse.jetty @@ -85,4 +66,21 @@ + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} + --add-modules jakarta.servlet + --add-modules org.eclipse.jetty.util + --add-modules org.eclipse.jetty.io + --add-modules org.eclipse.jetty.http + --add-modules org.eclipse.jetty.server + --add-modules org.eclipse.jetty.jmx + + + + + diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-bad-websocket-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-bad-websocket-webapp/pom.xml index 31831f6acf1b..bd28b3438324 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-bad-websocket-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-bad-websocket-webapp/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-tests 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee10-test-bad-websocket-webapp war diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-cdi-common-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-cdi-common-webapp/pom.xml index 317c2fb06f1b..3e0df9f0f953 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-cdi-common-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-cdi-common-webapp/pom.xml @@ -1,34 +1,20 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-tests 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee10-test-cdi-common-webapp - EE10 :: Tests :: CDI Common Demo WebApp war + EE10 :: Tests :: CDI Common Demo WebApp ${project.groupId}.cdi.common - - - - - org.apache.maven.plugins - maven-war-plugin - - false - - - - - - @@ -51,4 +37,18 @@ + + + + + org.apache.maven.plugins + maven-war-plugin + + false + + + + + + diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-cdi/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-cdi/pom.xml index ca6f68d7ef95..000d10011f54 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-cdi/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-cdi/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-tests 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee10-test-cdi jar EE10 :: Tests :: CDI diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-client-transports/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-client-transports/pom.xml index 51df7916b835..fce2fceea4c6 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-client-transports/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-client-transports/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-tests 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee10-test-client-transports jar EE10 :: Tests :: HTTP Client Transports @@ -17,49 +17,6 @@ true - - - enable-incubator-foreign - - [17,19) - - - - - maven-surefire-plugin - - - @{argLine} - ${jetty.surefire.argLine} - --add-modules jdk.incubator.foreign - --enable-native-access ALL-UNNAMED - - - - - - - - enable-preview - - [19,21) - - - - - maven-surefire-plugin - - - @{argLine} - --enable-preview - - - - - - - - org.slf4j @@ -142,4 +99,43 @@ + + + enable-incubator-foreign + + [17,19) + + + + + maven-surefire-plugin + + @{argLine} + ${jetty.surefire.argLine} + --add-modules jdk.incubator.foreign + --enable-native-access ALL-UNNAMED + + + + + + + enable-preview + + [19,21) + + + + + maven-surefire-plugin + + @{argLine} + --enable-preview + + + + + + + diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-felix-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-felix-webapp/pom.xml index 7649348884de..4f0313fa1d6a 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-felix-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-felix-webapp/pom.xml @@ -1,20 +1,33 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-tests 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee10-test-felix-webapp - EE10 :: Tests :: Felix WebApp war + EE10 :: Tests :: Felix WebApp ${project.groupId}.felix + + + jakarta.servlet + jakarta.servlet-api + provided + + + org.apache.felix + org.apache.felix.framework + 7.0.5 + + + @@ -34,17 +47,4 @@ - - - - jakarta.servlet - jakarta.servlet-api - provided - - - org.apache.felix - org.apache.felix.framework - 7.0.5 - - diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http2-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http2-webapp/pom.xml index 33e5f2b7c9ee..8865a3f2d981 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http2-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-http2-webapp/pom.xml @@ -1,67 +1,20 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-tests 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee10-test-http2-webapp - EE10 :: Tests :: HTTP2 WebApp war + EE10 :: Tests :: HTTP2 WebApp ${project.groupId}.http2 - - - - maven-dependency-plugin - - - unpack-webapp - pre-integration-test - - unpack - - - - - ${project.groupId} - ${project.artifactId} - ${project.version} - war - false - ${project.build.directory}/webapp - - - - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - integration-test - - integration-test - - - - verify - - verify - - - - - - - org.eclipse.jetty.http2 @@ -108,4 +61,51 @@ test + + + + + maven-dependency-plugin + + + unpack-webapp + + unpack + + pre-integration-test + + + + ${project.groupId} + ${project.artifactId} + ${project.version} + war + false + ${project.build.directory}/webapp + + + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + integration-test + + integration-test + + + + verify + + verify + + + + + + diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/pom.xml index e0f2c98d922e..4f0b8a07a2e5 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/pom.xml @@ -1,66 +1,20 @@ + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-tests 12.0.2-SNAPSHOT - 4.0.0 jetty-ee10-test-integration jar EE10 :: 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.apache.maven.plugins - maven-dependency-plugin - - - copy-wars-for-testing - process-test-resources - - copy - - - - - org.eclipse.jetty.ee10 - jetty-ee10-test-webapp-rfc2616 - ${project.version} - war - ee10-test-rfc2616.war - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-jetty-webapp - war - ee10-demo-jetty.war - - - true - ${project.build.directory}/webapps - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - true - false - - - - org.eclipse.jetty.ee10 @@ -155,4 +109,50 @@ test + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-wars-for-testing + + copy + + process-test-resources + + + + org.eclipse.jetty.ee10 + jetty-ee10-test-webapp-rfc2616 + ${project.version} + war + ee10-test-rfc2616.war + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-jetty-webapp + war + ee10-demo-jetty.war + + + true + ${project.build.directory}/webapps + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + + true + false + + + + diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/jetty-ee10-jmx-webapp-it/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/jetty-ee10-jmx-webapp-it/pom.xml index 6d63f6196cb0..3f093edfc930 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/jetty-ee10-jmx-webapp-it/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/jetty-ee10-jmx-webapp-it/pom.xml @@ -1,18 +1,18 @@ + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-test-jmx 12.0.2-SNAPSHOT - 4.0.0 jetty-ee10-jmx-webapp-it jar EE10 :: 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 jetty-ee10-jmx-webapp runtime diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/pom.xml index bdc5a916d846..9b1d134b7691 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/pom.xml @@ -1,11 +1,11 @@ + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-tests 12.0.2-SNAPSHOT - 4.0.0 jetty-ee10-test-jmx pom EE10 :: Tests :: JMX diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jndi/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jndi/pom.xml index 00ba3700c783..2a55f2e6739f 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jndi/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jndi/pom.xml @@ -1,13 +1,13 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-tests 12.0.2-SNAPSHOT ../pom.xml - - 4.0.0 jetty-ee10-test-jndi jar EE10 :: Tests :: JNDI diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-loginservice/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-loginservice/pom.xml index 5952cefc3d7e..80e4ef2e63aa 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-loginservice/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-loginservice/pom.xml @@ -9,8 +9,8 @@ jetty-ee10-test-loginservice EE10 :: Tests :: Login Service - false ${project.groupId}.loginservice + false diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-openid-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-openid-webapp/pom.xml index 6c334f4f89d5..21e64ab20d9a 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-openid-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-openid-webapp/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-tests 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee10-test-openid-webapp war diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-owb-cdi-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-owb-cdi-webapp/pom.xml index df38632a317d..53105c44b447 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-owb-cdi-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-owb-cdi-webapp/pom.xml @@ -1,25 +1,21 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-tests 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee10-test-owb-cdi-webapp - EE10 :: Tests :: CDI OWB Demo WebApp war + EE10 :: Tests :: CDI OWB Demo WebApp ${project.groupId}.cdi.owb 2.0.27 - - jetty-ee10-test-owb-cdi-demo - - @@ -64,4 +60,8 @@ ${openwebbeans.version} + + + jetty-ee10-test-owb-cdi-demo + diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-quickstart/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-quickstart/pom.xml index 2d943d6a081d..e06929f2e78c 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-quickstart/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-quickstart/pom.xml @@ -1,11 +1,11 @@ + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-tests 12.0.2-SNAPSHOT - 4.0.0 jetty-ee10-test-quickstart EE10 :: Tests :: Quick Start Jetty Quick Start Test @@ -114,10 +114,10 @@ copy - process-test-classes copy + process-test-classes diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-common/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-common/pom.xml index 1110090e0735..822f452ad954 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-common/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-common/pom.xml @@ -15,7 +15,7 @@ jakarta.servlet jakarta.servlet-api - + org.eclipse.jetty jetty-session diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-gcloud/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-gcloud/pom.xml index 6908351dc8ee..626a5f4d86c7 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-gcloud/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-gcloud/pom.xml @@ -20,8 +20,8 @@ org.eclipse.jetty jetty-session - test test-jar + test org.eclipse.jetty.ee10 diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-hazelcast/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-hazelcast/pom.xml index 941c2aa19e7e..849813f9118d 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-hazelcast/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-hazelcast/pom.xml @@ -11,20 +11,6 @@ ${project.groupId}.sessions.hazelcast - - - - 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-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 - true - 45 - 240 - - - - org.eclipse.jetty @@ -64,14 +50,14 @@ - com.hazelcast - hazelcast + com.hazelcast + hazelcast org.eclipse.jetty jetty-jmx - true test + true org.eclipse.jetty.toolchain @@ -99,5 +85,19 @@ test + + + + 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-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 + true + 45 + 240 + + + + diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-infinispan/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-infinispan/pom.xml index d22d2bd24408..527749494ac0 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-infinispan/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-infinispan/pom.xml @@ -13,24 +13,6 @@ infinispan/server - - - - 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 @@ -71,8 +53,8 @@ org.eclipse.jetty jetty-jmx - true test + true org.eclipse.jetty.toolchain @@ -147,6 +129,24 @@ 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} + + + + + jdk16 diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-jdbc/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-jdbc/pom.xml index e3b950fcea75..b1d71b493287 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-jdbc/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-jdbc/pom.xml @@ -11,19 +11,6 @@ ${project.groupId}.sessions.jdbc - - - - org.apache.maven.plugins - maven-surefire-plugin - - - ${mariadb.docker.version} - - - - - org.eclipse.jetty @@ -97,4 +84,17 @@ test + + + + org.apache.maven.plugins + maven-surefire-plugin + + + ${mariadb.docker.version} + + + + + diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-mongodb/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-mongodb/pom.xml index 1b69e4787001..d40a3db4c027 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-mongodb/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-mongodb/pom.xml @@ -11,19 +11,6 @@ ${project.groupId}.sessions.mongo - - - - org.apache.maven.plugins - maven-surefire-plugin - - - ${mongo.docker.version} - - - - - org.eclipse.jetty @@ -59,8 +46,8 @@ org.eclipse.jetty jetty-jmx - true test + true org.slf4j @@ -103,4 +90,17 @@ test + + + + org.apache.maven.plugins + maven-surefire-plugin + + + ${mongo.docker.version} + + + + + diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/pom.xml index 87a29680b6d7..ffafabbe16ba 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/pom.xml @@ -7,23 +7,23 @@ 12.0.2-SNAPSHOT jetty-ee10-test-sessions - EE10 :: Tests :: Sessions pom - - true - true - true - + EE10 :: Tests :: Sessions jetty-ee10-test-sessions-common jetty-ee10-test-sessions-file - jetty-ee10-test-sessions-jdbc - jetty-ee10-test-sessions-mongodb - jetty-ee10-test-sessions-infinispan jetty-ee10-test-sessions-gcloud - jetty-ee10-test-sessions-memcached jetty-ee10-test-sessions-hazelcast + jetty-ee10-test-sessions-infinispan + jetty-ee10-test-sessions-jdbc + jetty-ee10-test-sessions-memcached + jetty-ee10-test-sessions-mongodb + + true + true + true + diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-webapp-rfc2616/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-webapp-rfc2616/pom.xml index d117208dfe4e..b535ca9b388c 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-webapp-rfc2616/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-webapp-rfc2616/pom.xml @@ -7,13 +7,24 @@ 12.0.2-SNAPSHOT jetty-ee10-test-webapp-rfc2616 - EE10 :: Tests :: RFC2616 WebApp war + EE10 :: Tests :: RFC2616 WebApp ${project.groupId}.rfc2616 true true + + + org.eclipse.jetty.ee10 + jetty-ee10-servlets + + + jakarta.servlet + jakarta.servlet-api + provided + + @@ -25,21 +36,10 @@ foo 1 - 222 + 222 - - - org.eclipse.jetty.ee10 - jetty-ee10-servlets - - - jakarta.servlet - jakarta.servlet-api - provided - - diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-client-provided-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-client-provided-webapp/pom.xml index 115922c07a64..88f8ac2ca182 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-client-provided-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-client-provided-webapp/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-tests 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee10-test-websocket-client-provided-webapp war diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-client-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-client-webapp/pom.xml index 077dc1868519..e146b59a7d6a 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-client-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-client-webapp/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-tests 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee10-test-websocket-client-webapp war diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-webapp/pom.xml index 8e8e088c3942..c94f825ac51e 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-websocket-webapp/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-tests 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee10-test-websocket-webapp war diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-weld-cdi-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-weld-cdi-webapp/pom.xml index a5bd94479301..35493ffce065 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-weld-cdi-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-weld-cdi-webapp/pom.xml @@ -1,24 +1,20 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-tests 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee10-test-weld-cdi-webapp - EE10 :: Tests :: CDI Weld Demo WebApp war + EE10 :: Tests :: CDI Weld Demo WebApp ${project.groupId}.cdi.weld - - jetty-ee10-test-weld-cdi-demo - - @@ -41,4 +37,8 @@ ${jboss.logging.version} + + + jetty-ee10-test-weld-cdi-demo + diff --git a/jetty-ee10/jetty-ee10-tests/pom.xml b/jetty-ee10/jetty-ee10-tests/pom.xml index 859b25aeb135..599140cadfd9 100644 --- a/jetty-ee10/jetty-ee10-tests/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/pom.xml @@ -1,43 +1,43 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.2-SNAPSHOT ../pom.xml - - 4.0.0 jetty-ee10-tests - EE10 :: Tests pom - - - true - true - + EE10 :: Tests jetty-ee10-test-bad-websocket-webapp + jetty-ee10-test-badinit-webapp jetty-ee10-test-cdi - jetty-ee10-test-http2-webapp + jetty-ee10-test-cdi-common-webapp jetty-ee10-test-client-transports + jetty-ee10-test-felix-webapp + jetty-ee10-test-http2-webapp jetty-ee10-test-integration jetty-ee10-test-jmx jetty-ee10-test-jndi jetty-ee10-test-loginservice - jetty-ee10-test-quickstart - jetty-ee10-test-websocket-client-provided-webapp - jetty-ee10-test-websocket-client-webapp - jetty-ee10-test-websocket-webapp - jetty-ee10-test-cdi-common-webapp - jetty-ee10-test-felix-webapp jetty-ee10-test-openid-webapp jetty-ee10-test-owb-cdi-webapp + jetty-ee10-test-quickstart + jetty-ee10-test-sessions jetty-ee10-test-simple-session-webapp jetty-ee10-test-webapp-rfc2616 + jetty-ee10-test-websocket-client-provided-webapp + jetty-ee10-test-websocket-client-webapp + jetty-ee10-test-websocket-webapp jetty-ee10-test-weld-cdi-webapp - jetty-ee10-test-badinit-webapp - jetty-ee10-test-sessions + + + true + true + diff --git a/jetty-ee10/jetty-ee10-webapp/pom.xml b/jetty-ee10/jetty-ee10-webapp/pom.xml index 553fa907084f..98d7afc3b35b 100644 --- a/jetty-ee10/jetty-ee10-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-webapp/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee10-webapp EE10 :: WebApp Jetty web application support @@ -15,15 +16,54 @@ org.eclipse.jetty.ee10.webapp.* + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + + + org.eclipse.jetty + jetty-session + + + org.eclipse.jetty + jetty-xml + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty + jetty-http-tools + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + org.eclipse.jetty + jetty-client + test + + + src/main/resources - src/main/config/etc org/eclipse/jetty/ee10/webapp false + src/main/config/etc webdefault-ee10.xml @@ -35,10 +75,8 @@ org.apache.maven.plugins maven-surefire-plugin - - @{argLine} ${jetty.surefire.argLine} - --add-exports org.eclipse.jetty.ee10.webapp/org.acme.webapp=org.eclipse.jetty.ee10.servlet - + @{argLine} ${jetty.surefire.argLine} + --add-exports org.eclipse.jetty.ee10.webapp/org.acme.webapp=org.eclipse.jetty.ee10.servlet false ${basedir}/src/test/resources/mods/foo-bar-janb.jar @@ -54,54 +92,11 @@ true - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)", osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.ee10.webapp.Configuration)";cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee10.webapp.Configuration - + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)", osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.ee10.webapp.Configuration)";cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee10.webapp.Configuration - - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - - - org.eclipse.jetty - jetty-session - - - org.eclipse.jetty - jetty-xml - - - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty - jetty-http-tools - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - org.eclipse.jetty - jetty-client - test - - diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client-webapp/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client-webapp/pom.xml index f90446c0af79..301ddee1c279 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client-webapp/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee10.websocket jetty-ee10-websocket 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee10-websocket-jakarta-client-webapp EE10 :: Websocket :: Jakarta Client WebApp @@ -39,15 +39,9 @@ jakarta.websocket.client WebApp Implementation - - org.eclipse.jetty.ee10.websocket.jakarta.client.webapp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - - - osgi.serviceloader;osgi.serviceloader=jakarta.servlet.ServletContainerInitializer - + org.eclipse.jetty.ee10.websocket.jakarta.client.webapp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional + osgi.serviceloader;osgi.serviceloader=jakarta.servlet.ServletContainerInitializer diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client/pom.xml index b5535b045afc..d08c01569b3d 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee10.websocket jetty-ee10-websocket 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee10-websocket-jakarta-client EE10 :: Websocket :: Jakarta Client @@ -71,15 +71,9 @@ jakarta.websocket.client Implementation - - org.eclipse.jetty.ee10.websocket.jakarta.client.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - - - osgi.serviceloader;osgi.serviceloader=jakarta.websocket.ContainerProvider - + org.eclipse.jetty.ee10.websocket.jakarta.client.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional + osgi.serviceloader;osgi.serviceloader=jakarta.websocket.ContainerProvider diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/pom.xml index 4a3aabfbbe29..93b2847c38fe 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee10.websocket jetty-ee10-websocket 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee10-websocket-jakarta-common EE10 :: Websocket :: Jakarta Common @@ -14,31 +14,6 @@ ${project.groupId}.jakarta.common - - - - org.apache.felix - maven-bundle-plugin - true - - - - manifest - - - - Jakarta Websocket Common Implementation - - org.eclipse.jetty.ee10.websocket.jakarta.common.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - - - - - - - - - jakarta.websocket @@ -68,4 +43,27 @@ test + + + + + org.apache.felix + maven-bundle-plugin + true + + + + manifest + + + + Jakarta Websocket Common Implementation + org.eclipse.jetty.ee10.websocket.jakarta.common.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" + + + + + + + diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/pom.xml index 378778ceb831..6275dd17adc0 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee10.websocket jetty-ee10-websocket 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee10-websocket-jakarta-server EE10 :: Websocket :: Jakarta Server @@ -47,9 +47,7 @@ maven-surefire-plugin - - @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.websocket.jakarta.server=org.eclipse.jetty.security --add-reads org.eclipse.jetty.websocket.jakarta.common=org.eclipse.jetty.websocket.jakarta.server - + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.websocket.jakarta.server=org.eclipse.jetty.security --add-reads org.eclipse.jetty.websocket.jakarta.common=org.eclipse.jetty.websocket.jakarta.server @@ -64,13 +62,9 @@ jakarta.websocket.server Implementation - - org.eclipse.jetty.ee10.websocket.jakarta.server.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - + org.eclipse.jetty.ee10.websocket.jakarta.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.ee10.webapp.Configuration,osgi.serviceloader;osgi.serviceloader=jakarta.servlet.ServletContainerInitializer,osgi.serviceloader;osgi.serviceloader=jakarta.websocket.server.ServerEndpointConfig$Configurator - + osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.ee10.webapp.Configuration,osgi.serviceloader;osgi.serviceloader=jakarta.servlet.ServletContainerInitializer,osgi.serviceloader;osgi.serviceloader=jakarta.websocket.server.ServerEndpointConfig$Configurator diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/pom.xml index d9f0a3b7e8a4..71ae2a06556e 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee10.websocket jetty-ee10-websocket 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee10-websocket-jakarta-tests EE10 :: Websocket :: Jakarta Tests @@ -71,9 +71,7 @@ jakarta.websocket Integration Tests - - org.eclipse.jetty.websocket.jakarta.tests.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - + org.eclipse.jetty.websocket.jakarta.tests.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/pom.xml index 53f344257889..af910490ce5e 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee10.websocket jetty-ee10-websocket 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee10-websocket-jetty-client-webapp EE10 :: Websocket :: Jetty Client WebApp @@ -14,6 +14,17 @@ ${project.groupId}.client.webapp + + + org.eclipse.jetty.websocket + jetty-websocket-jetty-client + + + org.eclipse.jetty.ee10 + jetty-ee10-webapp + + + @@ -22,27 +33,12 @@ true - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee10.webapp.Configuration - + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee10.webapp.Configuration - - - org.eclipse.jetty.websocket - jetty-websocket-jetty-client - - - org.eclipse.jetty.ee10 - jetty-ee10-webapp - - - diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-server/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-server/pom.xml index 8bf2abbba479..853db2a97e99 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-server/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-server/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee10.websocket jetty-ee10-websocket 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee10-websocket-jetty-server EE10 :: Websocket :: Jetty Server @@ -65,9 +65,7 @@ Jetty Websocket Server osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - - osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.ee10.webapp.Configuration,osgi.serviceloader;osgi.serviceloader=jakarta.servlet.ServletContainerInitializer - + osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.ee10.webapp.Configuration,osgi.serviceloader;osgi.serviceloader=jakarta.servlet.ServletContainerInitializer diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/pom.xml index 94fd08b2cf52..58d4684b3851 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee10.websocket jetty-ee10-websocket 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee10-websocket-jetty-tests EE10 :: Websocket :: Jetty Tests @@ -80,4 +80,3 @@ - diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-servlet/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-servlet/pom.xml index bf79f1ec5c27..dad99b61958d 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-servlet/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-servlet/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee10.websocket jetty-ee10-websocket 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee10-websocket-servlet EE10 :: Websocket :: Servlet diff --git a/jetty-ee10/jetty-ee10-websocket/pom.xml b/jetty-ee10/jetty-ee10-websocket/pom.xml index 6f5520060288..9abe52bed3f7 100644 --- a/jetty-ee10/jetty-ee10-websocket/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/pom.xml @@ -1,20 +1,16 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.2-SNAPSHOT - - 4.0.0 org.eclipse.jetty.ee10.websocket jetty-ee10-websocket - EE10 :: Websocket pom - - - true - + EE10 :: Websocket jetty-ee10-websocket-jakarta-client @@ -28,4 +24,8 @@ jetty-ee10-websocket-servlet + + true + + diff --git a/jetty-ee10/pom.xml b/jetty-ee10/pom.xml index a7a3375281e2..ec04f1bf4aec 100644 --- a/jetty-ee10/pom.xml +++ b/jetty-ee10/pom.xml @@ -1,16 +1,42 @@ + + 4.0.0 org.eclipse.jetty jetty-project 12.0.2-SNAPSHOT - - 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 - EE10 pom + EE10 + + + jetty-ee10-annotations + jetty-ee10-apache-jsp + jetty-ee10-bom + jetty-ee10-cdi + jetty-ee10-demos + jetty-ee10-examples + jetty-ee10-fcgi-proxy + jetty-ee10-glassfish-jstl + jetty-ee10-home + jetty-ee10-jaspi + jetty-ee10-jndi + jetty-ee10-jspc-maven-plugin + jetty-ee10-maven-plugin + jetty-ee10-osgi + jetty-ee10-plus + jetty-ee10-proxy + jetty-ee10-quickstart + jetty-ee10-runner + jetty-ee10-servlet + jetty-ee10-servlets + jetty-ee10-tests + jetty-ee10-webapp + jetty-ee10-websocket + 2.1.2 @@ -22,51 +48,25 @@ 2.0.1 2.1.0 2.1.2 - 2.0.1 6.0.0 3.1.1 3.0.0 3.0.1 + 2.0.1 + 2.1.1 3.1.0 4.0.0 4.0.1 - 4.0.0 4.0.0 - 2.1.1 + 4.0.0 10.1.7 2.0.1 - 5.1.1.Final true + 5.1.1.Final - - jetty-ee10-demos - jetty-ee10-apache-jsp - jetty-ee10-glassfish-jstl - jetty-ee10-annotations - jetty-ee10-cdi - jetty-ee10-jaspi - jetty-ee10-jndi - jetty-ee10-jspc-maven-plugin - jetty-ee10-maven-plugin - jetty-ee10-osgi - jetty-ee10-plus - jetty-ee10-proxy - jetty-ee10-quickstart - jetty-ee10-runner - jetty-ee10-servlet - jetty-ee10-servlets - jetty-ee10-webapp - jetty-ee10-websocket - jetty-ee10-tests - jetty-ee10-examples - jetty-ee10-bom - jetty-ee10-home - jetty-ee10-fcgi-proxy - - @@ -406,10 +406,10 @@ ee10-report - validate dependency-updates-aggregate-report + validate html diff --git a/jetty-ee8/jetty-ee8-annotations/pom.xml b/jetty-ee8/jetty-ee8-annotations/pom.xml index c769788286ca..c928599e2ccb 100644 --- a/jetty-ee8/jetty-ee8-annotations/pom.xml +++ b/jetty-ee8/jetty-ee8-annotations/pom.xml @@ -1,76 +1,21 @@ + + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee8-annotations EE8 :: Servlet Annotations Annotation support for deploying servlets in jetty. - jetty-ee9-annotations ${project.groupId}.annotations + jetty-ee9-annotations org.eclipse.jetty.ee8.annotations.* - - - - src/test/jar - jar - - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.ee8.annotations=org.eclipse.jetty.logging --add-opens org.eclipse.jetty.ee8.annotations/org.eclipse.jetty.ee8.annotations.resources=org.eclipse.jetty.ee8.plus - - - - - - org.apache.maven.plugins - maven-resources-plugin - - - copy-ee8-test-resources - generate-test-resources - - copy-resources - - - ${project.build.testOutputDirectory} - - - ${maven.multiModuleProjectDirectory}/jetty-ee9/${ee9.module}/src/test/resources - - - - - - - - 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=jakarta.servlet.ServletContainerInitializer)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee8.webapp.Configuration - - - - - - - org.eclipse.jetty.ee8 @@ -121,4 +66,55 @@ test + + + + + jar + src/test/jar + + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.ee8.annotations=org.eclipse.jetty.logging --add-opens org.eclipse.jetty.ee8.annotations/org.eclipse.jetty.ee8.annotations.resources=org.eclipse.jetty.ee8.plus + + + + + org.apache.maven.plugins + maven-resources-plugin + + + copy-ee8-test-resources + + copy-resources + + generate-test-resources + + ${project.build.testOutputDirectory} + + + ${maven.multiModuleProjectDirectory}/jetty-ee9/${ee9.module}/src/test/resources + + + + + + + + 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=jakarta.servlet.ServletContainerInitializer)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee8.webapp.Configuration + + + + + diff --git a/jetty-ee8/jetty-ee8-apache-jsp/pom.xml b/jetty-ee8/jetty-ee8-apache-jsp/pom.xml index 5fcda8eb88fe..2295e49d2503 100644 --- a/jetty-ee8/jetty-ee8-apache-jsp/pom.xml +++ b/jetty-ee8/jetty-ee8-apache-jsp/pom.xml @@ -1,62 +1,21 @@ + + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee8-apache-jsp EE8 :: Apache JSP - jetty-ee9-apache-jsp ${project.groupId}.apache-jsp + jetty-ee9-apache-jsp true - - - - org.apache.felix - maven-bundle-plugin - true - - - Jetty-specific ServletContainerInitializer for Jasper - - org.eclipse.jetty.ee8.apache.jsp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}", org.eclipse.jetty.ee8.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 - - - - - org.apache.maven.plugins - maven-jar-plugin - - - nolog-jar - - jar - - - nolog - - META-INF/services/org.apache.juli.logging.Log - - - - - - - - org.slf4j @@ -97,4 +56,41 @@ + + + + org.apache.felix + maven-bundle-plugin + true + + + Jetty-specific ServletContainerInitializer for Jasper + org.eclipse.jetty.ee8.apache.jsp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}", org.eclipse.jetty.ee8.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 + + + + + org.apache.maven.plugins + maven-jar-plugin + + + nolog-jar + + jar + + + nolog + + META-INF/services/org.apache.juli.logging.Log + + + + + + + + diff --git a/jetty-ee8/jetty-ee8-bom/pom.xml b/jetty-ee8/jetty-ee8-bom/pom.xml index 704b2c42852d..db4cc9b533d8 100644 --- a/jetty-ee8/jetty-ee8-bom/pom.xml +++ b/jetty-ee8/jetty-ee8-bom/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 @@ -8,34 +9,9 @@ jetty-ee8-bom + pom EE8 :: BOM Jetty EE8 APIs BOM artifact - pom - - - - - org.codehaus.mojo - flatten-maven-plugin - - - flatten - - flatten - - process-resources - - - flatten-clean - - clean - - clean - - - - - @@ -157,4 +133,29 @@ + + + + + org.codehaus.mojo + flatten-maven-plugin + + + flatten-clean + + clean + + clean + + + flatten + + flatten + + process-resources + + + + + diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-jar/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-jar/pom.xml index d09f6ae16308..e03a7fd462f8 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-jar/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-jar/pom.xml @@ -1,18 +1,19 @@ + + + 4.0.0 org.eclipse.jetty.ee8.demos jetty-ee8-demo-async-rest 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee8-demo-async-rest-jar jar EE8 :: Demo :: Async Rest :: Jar - jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-jar ${project.parent.groupId}.async.rest + jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-jar diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-server/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-server/pom.xml index 78d0c157f7e7..9e3f9bef69a0 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-server/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-server/pom.xml @@ -1,18 +1,19 @@ + + + 4.0.0 org.eclipse.jetty.ee8.demos jetty-ee8-demo-async-rest 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee8-demo-async-rest-server jar EE8 :: Demo :: Async Rest :: Server - jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-server ${project.parent.groupId}.async.rest.server + jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-server diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-webapp/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-webapp/pom.xml index f2b44b6f71e6..e7a5ce93ecd2 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/jetty-ee8-demo-async-rest-webapp/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.ee8.demos jetty-ee8-demo-async-rest 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee8-demo-async-rest-webapp war EE8 :: Demo :: Async Rest :: WebApp diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/pom.xml index 60e9e0b3a45f..d007e395ee0c 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-async-rest/pom.xml @@ -1,19 +1,20 @@ + + + 4.0.0 org.eclipse.jetty.ee8.demos jetty-ee8-demos 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee8-demo-async-rest pom EE8 :: Demo :: Async Rest jetty-ee8-demo-async-rest-jar - jetty-ee8-demo-async-rest-webapp jetty-ee8-demo-async-rest-server + jetty-ee8-demo-async-rest-webapp diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jaas-webapp/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jaas-webapp/pom.xml index 44afae0df8a3..d77af82584a6 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jaas-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jaas-webapp/pom.xml @@ -7,11 +7,11 @@ 12.0.2-SNAPSHOT jetty-ee8-demo-jaas-webapp - EE8 :: Demo :: JAAS WebApp war + EE8 :: Demo :: JAAS WebApp - jetty-ee9-demos/jetty-ee9-demo-jaas-webapp ${project.groupId}.jaas + jetty-ee9-demos/jetty-ee9-demo-jaas-webapp - / - - .,WEB-INF/classes - - - - - - maven-war-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - - - - org.eclipse.jetty.ee8 - jetty-ee8-maven-plugin - ${project.version} - - - org.eclipse.jetty - jetty-client - ${project.version} - - - org.eclipse.jetty.ee8 - jetty-ee8-servlet - ${project.version} - - - - 8087 - foo - 1 - - 222 - - - /test - ${project.build.directory}/work - - - - Test Realm - ${project.build.testOutputDirectory}/test-realm.properties - - - - - - - org.eclipse.jetty.ee8 @@ -192,4 +80,116 @@ test + + + + + org.eclipse.jetty.ee8 + jetty-ee8-maven-plugin + ${project.version} + + 8087 + foo + 1 + + 222 + + + /test + ${project.build.directory}/work + + + + Test Realm + ${project.build.testOutputDirectory}/test-realm.properties + + + + + + org.eclipse.jetty + jetty-client + ${project.version} + + + org.eclipse.jetty.ee8 + jetty-ee8-servlet + ${project.version} + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/WebAppTest.java + **/Test*.java + + + + + test + test + + + + + 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.felix + maven-bundle-plugin + true + + + war + + + javax.servlet.jsp.*;version="[3,4)",org.eclipse.jetty.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))",* + !org.example* + + / + + .,WEB-INF/classes + + + + + + maven-war-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jndi-webapp/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jndi-webapp/pom.xml index da6ad5fadd82..46e69fb28812 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jndi-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jndi-webapp/pom.xml @@ -7,13 +7,59 @@ 12.0.2-SNAPSHOT jetty-ee8-demo-jndi-webapp - EE8 :: Demo :: JNDI WebApp war + EE8 :: Demo :: JNDI WebApp - jetty-ee9-demos/jetty-ee9-demo-jndi-webapp ${project.groupId}.jndi + jetty-ee9-demos/jetty-ee9-demo-jndi-webapp + + + org.eclipse.jetty.ee8.demos + jetty-ee8-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 + jetty-maven-plugin + ${project.version} + + ${project.build.directory}/plugin-context.xml + + src/main/webapp + ${project.build.directory}/webapp/WEB-INF/web.xml + /test-jndi + + + + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-mock-resources + ${project.version} + + + + + org.apache.maven.plugins @@ -21,10 +67,10 @@ copy-templates-resources - generate-resources copy-resources + generate-resources ee9-to-ee8 @@ -45,20 +91,20 @@ generate-xml-files + + run + process-resources - + - + - - run - @@ -67,10 +113,10 @@ maven-dependency-plugin - package copy-dependencies + package jakarta.transaction-api,ee8-demo-mock-resources ${project.build.directory}/lib/jndi @@ -79,51 +125,5 @@ - - - - org.eclipse.jetty - jetty-maven-plugin - ${project.version} - - ${project.build.directory}/plugin-context.xml - - src/main/webapp - ${project.build.directory}/webapp/WEB-INF/web.xml - /test-jndi - - - - - org.eclipse.jetty.ee8.demos - jetty-ee8-demo-mock-resources - ${project.version} - - - - - - - - org.eclipse.jetty.ee8.demos - jetty-ee8-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 - - diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jsp-webapp/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jsp-webapp/pom.xml index 1b008caf1010..e8ac87fbb7ab 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jsp-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jsp-webapp/pom.xml @@ -1,21 +1,39 @@ + + 4.0.0 org.eclipse.jetty.ee8.demos jetty-ee8-demos 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee8-demo-jsp-webapp - EE8 :: Demo :: JSP WebApp war + EE8 :: Demo :: JSP WebApp - jetty-ee9-demos/jetty-ee9-demo-jsp-webapp ${project.groupId}.jsp + jetty-ee9-demos/jetty-ee9-demo-jsp-webapp + + + 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 + + + @@ -48,10 +66,10 @@ web-bundle-assembly - package single + package src/main/assembly/web-bundle.xml @@ -66,24 +84,6 @@ - - - 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 diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-mock-resources/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-mock-resources/pom.xml index d81bc8a1041b..109d915bd668 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-mock-resources/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-mock-resources/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 @@ -5,13 +6,30 @@ jetty-ee8-demos 12.0.2-SNAPSHOT - EE8 :: Demo :: Mock Resources jetty-ee8-demo-mock-resources jar + EE8 :: Demo :: Mock Resources - jetty-ee9-demos/jetty-ee9-demo-mock-resources ${project.groupId}.mocks + jetty-ee9-demos/jetty-ee9-demo-mock-resources + + + jakarta.transaction + jakarta.transaction-api + provided + + + org.eclipse.jetty.toolchain + jetty-servlet-api + provided + + + org.eclipse.jetty.orbit + javax.mail.glassfish + provided + + @@ -27,12 +45,8 @@ org.eclipse.jetty.ee8.demos.ee8-demo-mock-resources Mock resources used for testing - - org.example;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - - - javax.sql, jakarta.transaction;version="1.3.3" - + org.example;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" + javax.sql, jakarta.transaction;version="1.3.3" <_nouses>true @@ -41,21 +55,4 @@ - - - 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/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-proxy-webapp/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-proxy-webapp/pom.xml index bb21a9d9a706..9c2f6dbac8af 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-proxy-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-proxy-webapp/pom.xml @@ -1,32 +1,18 @@ + 4.0.0 org.eclipse.jetty.ee8.demos jetty-ee8-demos 12.0.2-SNAPSHOT - 4.0.0 jetty-ee8-demo-proxy-webapp - EE8 :: Demo :: Proxy WebApp war + EE8 :: Demo :: Proxy WebApp - jetty-ee9-demos/jetty-ee9-demo-proxy-webapp ${project.groupId}.proxy + jetty-ee9-demos/jetty-ee9-demo-proxy-webapp - - - - maven-war-plugin - - ${warSourceDirectory} - true - - ${warSourceDirectory}/META-INF/MANIFEST.MF - - - - - org.slf4j @@ -91,4 +77,18 @@ provided + + + + maven-war-plugin + + ${warSourceDirectory} + true + + ${warSourceDirectory}/META-INF/MANIFEST.MF + + + + + diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-simple-webapp/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-simple-webapp/pom.xml index 0468ea16042f..f947679efd1a 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-simple-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-simple-webapp/pom.xml @@ -1,23 +1,21 @@ + + 4.0.0 org.eclipse.jetty.ee8.demos jetty-ee8-demos 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee8-demo-simple-webapp - EE8 :: Demo :: Simple WebApp war + EE8 :: Demo :: Simple WebApp - jetty-ee9-demos/jetty-ee9-demo-simple-webapp ${project.groupId}.simple + jetty-ee9-demos/jetty-ee9-demo-simple-webapp - - org.eclipse.jetty.toolchain diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-container-initializer/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-container-initializer/pom.xml index 97ff7af1b1ce..6cd6ff0c014b 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-container-initializer/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-container-initializer/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 @@ -9,9 +10,16 @@ jar EE8 :: Demo :: Servlet Spec :: ServletContainerInitializer Jar - jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-container-initializer ${project.groupId}.sci + jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-container-initializer + + + org.eclipse.jetty.toolchain + jetty-servlet-api + provided + + @@ -31,11 +39,4 @@ - - - org.eclipse.jetty.toolchain - jetty-servlet-api - provided - - diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-spec-webapp/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-spec-webapp/pom.xml index 98e9de7ba328..e248bbb13ae7 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-spec-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-spec-webapp/pom.xml @@ -6,14 +6,89 @@ jetty-ee8-demo-spec 12.0.2-SNAPSHOT - EE8 :: Demo :: Servlet Spec :: WebApp jetty-ee8-demo-spec-webapp war + EE8 :: Demo :: Servlet Spec :: WebApp - jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp ${project.groupId}.spec.webapp + jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp + + + + jakarta.transaction + jakarta.transaction-api + provided + + + org.eclipse.jetty.toolchain + jetty-servlet-api + provided + + + jakarta.annotation + jakarta.annotation-api + provided + + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-web-fragment + + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-container-initializer + + + + + + + + + org.eclipse.jetty.ee8 + jetty-ee8-maven-plugin + ${project.version} + + 10 + ${project.build.directory}/plugin-context.xml + + src/main/webapp + src/main/webapp/WEB-INF/web.xml + /test-spec + .*/jetty-jakarta-servlet-api-[^/]*\.jar$ + true + ${basedir}/src/main/webapp/WEB-INF/jetty-env.xml + + + + Test Realm + ${project.build.directory}/realm.properties + + + + + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-mock-resources + ${project.version} + + + + + org.apache.maven.plugins @@ -21,10 +96,10 @@ web-bundle-assembly - package single + package src/main/assembly/web-bundle.xml @@ -66,10 +141,8 @@ Test Webapp for Servlet 5.0 Features - - jakarta.transaction*;version="2.0.0", jakarta.servlet*;version="[5,6)", 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", org.example;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}", * - - <_nouses /> + jakarta.transaction*;version="2.0.0", jakarta.servlet*;version="[5,6)", 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", org.example;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}", * + <_nouses> org.example.test;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}";-noimport:=true / .,WEB-INF/classes,WEB-INF/lib @@ -82,35 +155,35 @@ maven-resources-plugin - copy-templates-resources - generate-resources + copy-realm copy-resources + generate-resources - - ee9-to-ee8 - - ${project.build.directory}/templates + ${project.build.directory}/realm - true - ${ee9.module.path}/src/main/templates + ${ee9.module.path}/src/etc - copy-realm - generate-resources + copy-templates-resources copy-resources + generate-resources - ${project.build.directory}/realm + + ee9-to-ee8 + + ${project.build.directory}/templates - ${ee9.module.path}/src/etc + true + ${ee9.module.path}/src/main/templates @@ -122,20 +195,20 @@ generate-xml-files + + run + process-resources - + - + - - run - @@ -144,10 +217,10 @@ maven-dependency-plugin - package copy + package @@ -186,80 +259,5 @@ - - - - org.eclipse.jetty.ee8 - jetty-ee8-maven-plugin - ${project.version} - - 10 - ${project.build.directory}/plugin-context.xml - - src/main/webapp - src/main/webapp/WEB-INF/web.xml - /test-spec - .*/jetty-jakarta-servlet-api-[^/]*\.jar$ - true - ${basedir}/src/main/webapp/WEB-INF/jetty-env.xml - - - - Test Realm - ${project.build.directory}/realm.properties - - - - - - org.eclipse.jetty.ee8.demos - jetty-ee8-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.ee8.demos - jetty-ee8-demo-web-fragment - - - org.eclipse.jetty.ee8.demos - jetty-ee8-demo-container-initializer - - - - - diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-web-fragment/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-web-fragment/pom.xml index 0a3524f5a5fc..aa108e9a999b 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-web-fragment/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/jetty-ee8-demo-web-fragment/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 @@ -5,14 +6,14 @@ jetty-ee8-demo-spec 12.0.2-SNAPSHOT - - EE8 :: Demo :: Servlet Spec :: Fragment Jar jetty-ee8-demo-web-fragment jar + EE8 :: Demo :: Servlet Spec :: Fragment Jar + - jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-web-fragment ${project.groupId}.spec.fragment + jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-web-fragment diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/pom.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/pom.xml index 6f0061e326ab..79a52bc883b9 100644 --- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-spec/pom.xml @@ -6,13 +6,13 @@ jetty-ee8-demos 12.0.2-SNAPSHOT - EE8 :: Demo :: Servlet Spec jetty-ee8-demo-spec pom + EE8 :: Demo :: Servlet Spec - jetty-ee8-demo-spec-webapp jetty-ee8-demo-container-initializer + jetty-ee8-demo-spec-webapp jetty-ee8-demo-web-fragment diff --git a/jetty-ee8/jetty-ee8-demos/pom.xml b/jetty-ee8/jetty-ee8-demos/pom.xml index ab7d292d1dab..2057121abd42 100644 --- a/jetty-ee8/jetty-ee8-demos/pom.xml +++ b/jetty-ee8/jetty-ee8-demos/pom.xml @@ -1,16 +1,33 @@ + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.2-SNAPSHOT - - 4.0.0 org.eclipse.jetty.ee8.demos jetty-ee8-demos - EE8 :: Demos pom + EE8 :: Demos + + + jetty-ee8-demo-async-rest + jetty-ee8-demo-jaas-webapp + jetty-ee8-demo-jetty-webapp + jetty-ee8-demo-jndi-webapp + + + jetty-ee8-demo-jsp-webapp + jetty-ee8-demo-mock-resources + + jetty-ee8-demo-proxy-webapp + jetty-ee8-demo-simple-webapp + + jetty-ee8-demo-spec + + true @@ -40,23 +57,6 @@ - - jetty-ee8-demo-simple-webapp - jetty-ee8-demo-async-rest - jetty-ee8-demo-jaas-webapp - jetty-ee8-demo-mock-resources - jetty-ee8-demo-jndi-webapp - jetty-ee8-demo-jetty-webapp - - jetty-ee8-demo-proxy-webapp - - - jetty-ee8-demo-jsp-webapp - - jetty-ee8-demo-spec - - - demo-webapp-module @@ -73,10 +73,10 @@ copy-ee8-webapp-resources - generate-resources copy-resources + generate-resources ee9-to-ee8 diff --git a/jetty-ee8/jetty-ee8-glassfish-jstl/pom.xml b/jetty-ee8/jetty-ee8-glassfish-jstl/pom.xml index b20d2875bdde..0b300be397e7 100644 --- a/jetty-ee8/jetty-ee8-glassfish-jstl/pom.xml +++ b/jetty-ee8/jetty-ee8-glassfish-jstl/pom.xml @@ -1,35 +1,21 @@ + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.2-SNAPSHOT - 4.0.0 jetty-ee8-glassfish-jstl + jar EE8 :: Glassfish JSTL https://projects.eclipse.org/projects/ee4j.glassfish - jar - jetty-ee9-glassfish-jstl ${project.groupId}.glassfish.jstl + jetty-ee9-glassfish-jstl true - - - - org.apache.maven.plugins - maven-surefire-plugin - - false - - .*/jetty-jakarta-servlet-api-[^/]*\.jar$|.*jakarta.servlet.jsp.jstl-[^/]*\.jar|.*jsp.jstl-[^/]*\.jar - - - - - - @@ -90,4 +76,19 @@ + + + + org.apache.maven.plugins + maven-surefire-plugin + + false + + .*/jetty-jakarta-servlet-api-[^/]*\.jar$|.*jakarta.servlet.jsp.jstl-[^/]*\.jar|.*jsp.jstl-[^/]*\.jar + + + + + + diff --git a/jetty-ee8/jetty-ee8-home/pom.xml b/jetty-ee8/jetty-ee8-home/pom.xml index a096911c11b4..ec6ee24ba33c 100644 --- a/jetty-ee8/jetty-ee8-home/pom.xml +++ b/jetty-ee8/jetty-ee8-home/pom.xml @@ -1,14 +1,14 @@ + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.2-SNAPSHOT - 4.0.0 jetty-ee8-home - EE8 :: Home Assembly pom + EE8 :: Home Assembly ${basedir}/target/jetty-ee8-home @@ -16,6 +16,195 @@ true + + + org.ow2.asm + asm + + + org.ow2.asm + asm-commons + + + org.ow2.asm + asm-tree + + + org.ow2.asm + asm-analysis + + + + org.eclipse.jetty.ee8 + jetty-ee8-quickstart + + + org.eclipse.jetty.ee8 + jetty-ee8-servlet + + + org.eclipse.jetty.ee8 + jetty-ee8-servlets + + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-servlet + + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-jetty-server + + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-jetty-client + + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-jetty-client-webapp + + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-javax-server + + + org.eclipse.jetty.ee8 + jetty-ee8-apache-jsp + + + org.eclipse.jetty.ee8 + jetty-ee8-glassfish-jstl + + + xalan + xalan + + + javax.el + el-api + + + jakarta.el + jakarta.el-api + + + + + xalan + xalan + + + org.eclipse.jetty.ee8 + jetty-ee8-plus + + + org.eclipse.jetty.ee8 + jetty-ee8-proxy + + + + + + + + org.eclipse.jetty.ee8 + jetty-ee8-annotations + + + org.eclipse.jetty.ee8 + jetty-ee8-openid + true + + + + + + + + org.eclipse.jetty.ee8 + jetty-ee8-jndi + true + + + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-mock-resources + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-jetty-webapp + ${project.version} + config + jar + true + + + javax.el + el-api + + + + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-jaas-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-jndi-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-spec-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-async-rest-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-proxy-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-simple-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-jsp-webapp + ${project.version} + config + jar + true + + + @@ -23,283 +212,281 @@ maven-dependency-plugin - unpack-config-deps - generate-resources + copy-ee8-annotations-deps - unpack-dependencies + copy-dependencies + generate-resources - - org.eclipse.jetty.ee8, org.eclipse.jetty.ee8.demos - - - config - false - META-INF/**,webapps/**,start.d/**,start.ini - ${assembly-directory} + jakarta.annotation,org.ow2.asm + jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis + jar + ${assembly-directory}/lib/ee8-annotations - copy-lib-core-websocket-deps - generate-resources + copy-ee8-annotations-src-deps copy-dependencies + generate-resources - org.eclipse.jetty.websocket - jetty-schemas,jetty-servlet-api,jetty-test-helper,jetty-websocket-core* + jakarta.annotation,org.ow2.asm + jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis jar - ${assembly-directory}/lib + sources + ${source-assembly-directory}/lib/ee8-annotations + + + + + + + + + + + + + + + + + + + + + + + + + + + + - copy-lib-ee8-websocket-deps - generate-resources + copy-ee8-deps copy-dependencies + generate-resources - org.eclipse.jetty.toolchain,org.eclipse.jetty.ee8.websocket - jetty-schemas,jetty-servlet-api,jetty-test-helper,jetty-websocket-core* + org.eclipse.jetty.ee8 + jetty-websocket-core-client,jetty-websocket-core-common,jetty-websocket-core-server + org.eclipse.jetty.ee8.demos,org.eclipse.jetty.ee8.websocket jar - ${assembly-directory}/lib/ee8-websocket + ${assembly-directory}/lib - copy-lib-core-websocket-src-deps - generate-resources + copy-ee8-jsp-deps copy-dependencies + generate-resources - org.eclipse.jetty.websocket + true + org.mortbay.jasper,org.eclipse.jdt + apache-jsp,apache-el,ecj jar - sources - ${source-assembly-directory}/lib + ${assembly-directory}/lib/ee8-apache-jsp - copy-lib-ee8-websocket-src-deps - generate-resources + copy-ee8-jsp-src-deps copy-dependencies + generate-resources - org.eclipse.jetty.ee8.websocket + true + org.mortbay.jasper,org.eclipse.jdt + apache-jsp,apache-el,ecj jar sources - ${source-assembly-directory}/lib/ee8-websocket + ${source-assembly-directory}/lib/ee8-apache-jsp - copy-lib-servlet-api-deps - generate-resources + copy-ee8-jstl-deps - copy + copy-dependencies + generate-resources - - - org.eclipse.jetty.toolchain - jetty-servlet-api - ${jetty.servlet.api.version} - - - ${assembly-directory}/lib + true + jakarta.servlet.jsp.jstl,org.glassfish.web + jakarta.servlet.jsp.jstl-api,javax.servlet.jsp.jstl + jar + ${assembly-directory}/lib/ee8-glassfish-jstl - copy-lib-transaction-api-deps - generate-resources + copy-ee8-jstl-src-deps - copy + copy-dependencies + generate-resources - - - jakarta.transaction - jakarta.transaction-api - ${jakarta.transaction-api.version} - - - ${assembly-directory}/lib + true + jakarta.servlet.jsp.jstl,org.glassfish.web + jakarta.servlet.jsp.jstl-api,javax.servlet.jsp.jstl + jar + sources + ${source-assembly-directory}/lib/ee8-glassfish-jstl - copy-lib-servlet-api-src-deps - generate-resources + copy-ee8-src-deps - copy + copy-dependencies + generate-resources - - - org.eclipse.jetty.toolchain - jetty-servlet-api - ${jetty.servlet.api.version} - sources - - + org.eclipse.jetty.ee8 + jar + org.eclipse.jetty.ee8.demos,org.eclipse.jetty.ee8.websocket + sources ${source-assembly-directory}/lib - copy-lib-transaction-api-src-deps - generate-resources + copy-lib-core-websocket-deps - copy + copy-dependencies + generate-resources - - - jakarta.transaction - jakarta.transaction-api - ${jakarta.transaction-api.version} - sources - - - ${source-assembly-directory}/lib + org.eclipse.jetty.websocket + jetty-schemas,jetty-servlet-api,jetty-test-helper,jetty-websocket-core* + jar + ${assembly-directory}/lib - copy-ee8-annotations-deps - generate-resources + copy-lib-core-websocket-src-deps copy-dependencies + generate-resources - jakarta.annotation,org.ow2.asm - jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis + org.eclipse.jetty.websocket jar - ${assembly-directory}/lib/ee8-annotations + sources + ${source-assembly-directory}/lib - copy-ee8-annotations-src-deps - generate-resources + copy-lib-ee8-websocket-deps copy-dependencies + generate-resources - jakarta.annotation,org.ow2.asm - jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis + org.eclipse.jetty.toolchain,org.eclipse.jetty.ee8.websocket + jetty-schemas,jetty-servlet-api,jetty-test-helper,jetty-websocket-core* jar - sources - ${source-assembly-directory}/lib/ee8-annotations + ${assembly-directory}/lib/ee8-websocket - copy-ee8-jsp-src-deps - generate-resources + copy-lib-ee8-websocket-src-deps copy-dependencies + generate-resources - true - org.mortbay.jasper,org.eclipse.jdt - apache-jsp,apache-el,ecj + org.eclipse.jetty.ee8.websocket jar sources - ${source-assembly-directory}/lib/ee8-apache-jsp + ${source-assembly-directory}/lib/ee8-websocket - copy-ee8-jsp-deps - generate-resources + copy-lib-servlet-api-deps - copy-dependencies + copy + generate-resources - true - org.mortbay.jasper,org.eclipse.jdt - apache-jsp,apache-el,ecj - jar - ${assembly-directory}/lib/ee8-apache-jsp + + + org.eclipse.jetty.toolchain + jetty-servlet-api + ${jetty.servlet.api.version} + + + ${assembly-directory}/lib - copy-ee8-jstl-src-deps - generate-resources + copy-lib-servlet-api-src-deps - copy-dependencies + copy + generate-resources - true - jakarta.servlet.jsp.jstl,org.glassfish.web - jakarta.servlet.jsp.jstl-api,javax.servlet.jsp.jstl - jar - sources - ${source-assembly-directory}/lib/ee8-glassfish-jstl + + + org.eclipse.jetty.toolchain + jetty-servlet-api + ${jetty.servlet.api.version} + sources + + + ${source-assembly-directory}/lib - copy-ee8-jstl-deps - generate-resources + copy-lib-transaction-api-deps - copy-dependencies + copy + generate-resources - true - jakarta.servlet.jsp.jstl,org.glassfish.web - jakarta.servlet.jsp.jstl-api,javax.servlet.jsp.jstl - jar - ${assembly-directory}/lib/ee8-glassfish-jstl + + + jakarta.transaction + jakarta.transaction-api + ${jakarta.transaction-api.version} + + + ${assembly-directory}/lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - copy-ee8-deps - generate-resources + copy-lib-transaction-api-src-deps - copy-dependencies + copy + generate-resources - org.eclipse.jetty.ee8 - jetty-websocket-core-client,jetty-websocket-core-common,jetty-websocket-core-server - org.eclipse.jetty.ee8.demos,org.eclipse.jetty.ee8.websocket - jar - ${assembly-directory}/lib + + + jakarta.transaction + jakarta.transaction-api + ${jakarta.transaction-api.version} + sources + + + ${source-assembly-directory}/lib - copy-ee8-src-deps - generate-resources + unpack-config-deps - copy-dependencies + unpack-dependencies + generate-resources - org.eclipse.jetty.ee8 - jar - org.eclipse.jetty.ee8.demos,org.eclipse.jetty.ee8.websocket - sources - ${source-assembly-directory}/lib + org.eclipse.jetty.ee8, org.eclipse.jetty.ee8.demos + + config + false + META-INF/**,webapps/**,start.d/**,start.ini + ${assembly-directory} @@ -314,10 +501,10 @@ binary - package single + package src/main/assembly/jetty-assembly.xml @@ -326,10 +513,10 @@ sources - package single + package src/main/assembly/jetty-source-assembly.xml @@ -342,193 +529,4 @@ - - - org.ow2.asm - asm - - - org.ow2.asm - asm-commons - - - org.ow2.asm - asm-tree - - - org.ow2.asm - asm-analysis - - - - org.eclipse.jetty.ee8 - jetty-ee8-quickstart - - - org.eclipse.jetty.ee8 - jetty-ee8-servlet - - - org.eclipse.jetty.ee8 - jetty-ee8-servlets - - - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-servlet - - - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-jetty-server - - - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-jetty-client - - - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-jetty-client-webapp - - - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-javax-server - - - org.eclipse.jetty.ee8 - jetty-ee8-apache-jsp - - - org.eclipse.jetty.ee8 - jetty-ee8-glassfish-jstl - - - xalan - xalan - - - javax.el - el-api - - - jakarta.el - jakarta.el-api - - - - - xalan - xalan - - - org.eclipse.jetty.ee8 - jetty-ee8-plus - - - org.eclipse.jetty.ee8 - jetty-ee8-proxy - - - - - - - - org.eclipse.jetty.ee8 - jetty-ee8-annotations - - - org.eclipse.jetty.ee8 - jetty-ee8-openid - true - - - - - - - - org.eclipse.jetty.ee8 - jetty-ee8-jndi - true - - - - org.eclipse.jetty.ee8.demos - jetty-ee8-demo-mock-resources - ${project.version} - config - jar - true - - - org.eclipse.jetty.ee8.demos - jetty-ee8-demo-jetty-webapp - ${project.version} - config - jar - true - - - javax.el - el-api - - - - - org.eclipse.jetty.ee8.demos - jetty-ee8-demo-jaas-webapp - ${project.version} - config - jar - true - - - org.eclipse.jetty.ee8.demos - jetty-ee8-demo-jndi-webapp - ${project.version} - config - jar - true - - - org.eclipse.jetty.ee8.demos - jetty-ee8-demo-spec-webapp - ${project.version} - config - jar - true - - - org.eclipse.jetty.ee8.demos - jetty-ee8-demo-async-rest-webapp - ${project.version} - config - jar - true - - - org.eclipse.jetty.ee8.demos - jetty-ee8-demo-proxy-webapp - ${project.version} - config - jar - true - - - org.eclipse.jetty.ee8.demos - jetty-ee8-demo-simple-webapp - ${project.version} - config - jar - true - - - org.eclipse.jetty.ee8.demos - jetty-ee8-demo-jsp-webapp - ${project.version} - config - jar - true - - - diff --git a/jetty-ee8/jetty-ee8-jaspi/pom.xml b/jetty-ee8/jetty-ee8-jaspi/pom.xml index 63f224bf9060..03b0505d4db2 100644 --- a/jetty-ee8/jetty-ee8-jaspi/pom.xml +++ b/jetty-ee8/jetty-ee8-jaspi/pom.xml @@ -1,57 +1,22 @@ + + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee8-jaspi EE8 :: Jetty :: JASPI Security Jetty security infrastructure - jetty-ee9-jaspi ${project.groupId}.security.jaspi + jetty-ee9-jaspi org.eclipse.jetty.jaspi.* - - - - org.apache.felix - maven-bundle-plugin - true - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.security.Authenticator$Factory - - - - - maven-antrun-plugin - - - process-resources - - - - - - - - - - run - - - - - - - - jakarta.security.auth.message @@ -83,8 +48,44 @@ jakarta.activation jakarta.activation-api - test 1.2.2 + test + + + + + org.apache.felix + maven-bundle-plugin + true + + + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.security.Authenticator$Factory + + + + + maven-antrun-plugin + + + + run + + process-resources + + + + + + + + + + + + + + diff --git a/jetty-ee8/jetty-ee8-jndi/pom.xml b/jetty-ee8/jetty-ee8-jndi/pom.xml index bece58850077..3dd0b2c3f28b 100644 --- a/jetty-ee8/jetty-ee8-jndi/pom.xml +++ b/jetty-ee8/jetty-ee8-jndi/pom.xml @@ -1,36 +1,22 @@ + + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee8-jndi EE8 :: JNDI EE8 JNDI factories - jetty-ee9-jndi ${project.groupId}.jndi + jetty-ee9-jndi org.eclipse.jetty.ee8.jndi.* - - - - org.apache.felix - maven-bundle-plugin - true - - - ${osgi.slf4j.import.packages},jakarta.mail.*;resolution:=optional,* - - - - - - org.eclipse.jetty @@ -62,4 +48,19 @@ test + + + + + org.apache.felix + maven-bundle-plugin + true + + + ${osgi.slf4j.import.packages},jakarta.mail.*;resolution:=optional,* + + + + + diff --git a/jetty-ee8/jetty-ee8-jspc-maven-plugin/pom.xml b/jetty-ee8/jetty-ee8-jspc-maven-plugin/pom.xml index 0b59597711fd..330392acf2a7 100644 --- a/jetty-ee8/jetty-ee8-jspc-maven-plugin/pom.xml +++ b/jetty-ee8/jetty-ee8-jspc-maven-plugin/pom.xml @@ -1,60 +1,20 @@ + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.2-SNAPSHOT - 4.0.0 jetty-ee8-jspc-maven-plugin maven-plugin EE8 :: Jetty JSPC Maven Plugin ${project.groupId}.jspc.plugin jetty-ee9-jspc-maven-plugin - true true + true - - - - 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 - - - - - - ${maven.surefire.plugin.version} - - - clean - - - - - org.eclipse.jetty @@ -104,4 +64,44 @@ ant + + + + org.apache.maven.plugins + maven-plugin-plugin + + + exec-plugin-doc + + descriptor + helpmojo + + process-classes + + + + + org.apache.maven.plugins + maven-invoker-plugin + + + ${maven.surefire.plugin.version} + + + clean + + + + + integration-test + + install + integration-test + verify + + + + + + diff --git a/jetty-ee8/jetty-ee8-maven-plugin/pom.xml b/jetty-ee8/jetty-ee8-maven-plugin/pom.xml index 8d50ff39f2ff..657891c535ea 100644 --- a/jetty-ee8/jetty-ee8-maven-plugin/pom.xml +++ b/jetty-ee8/jetty-ee8-maven-plugin/pom.xml @@ -1,128 +1,23 @@ + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.2-SNAPSHOT - 4.0.0 jetty-ee8-maven-plugin maven-plugin EE8 :: Jetty Maven Plugin Jetty maven plugins - false ${project.groupId}.maven.plugin - FREEBEER - jetty-ee9-maven-plugin true + + FREEBEER + false - - - - 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 - - - - - - - maven-surefire-plugin - - -Dstop.port=@{test.stopPort} -Djetty.port=@{test.jettyPort} - - **/IntegrationTest*.java - - - - - org.apache.maven.plugins - maven-plugin-plugin - - jetty - - - - 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.maven.its.ee8 - - it-parent-pom/pom.xml - - - ${jetty.stopKey} - ${jetty.stopPort} - - ${jetty.servlet.api.version} - - src/it/settings.xml - - - jetty-effective-web-xml-it/pom.xml - - - clean - - - - - org.codehaus.plexus @@ -184,13 +79,13 @@ org.eclipse.jetty.ee8 jetty-ee8-webapp + true jakarta.servlet servlet-api - true org.eclipse.jetty.ee8 @@ -288,4 +183,110 @@ test + + + + 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 + + + + + + + maven-surefire-plugin + + -Dstop.port=@{test.stopPort} -Djetty.port=@{test.jettyPort} + + **/IntegrationTest*.java + + + + + org.apache.maven.plugins + maven-plugin-plugin + + jetty + + + + exec-plugin-doc + + helpmojo + + generate-sources + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + test-jar + + + + + + org.apache.maven.plugins + maven-invoker-plugin + + org.eclipse.jetty.maven.its.ee8 + + it-parent-pom/pom.xml + + + ${jetty.stopKey} + ${jetty.stopPort} + + ${jetty.servlet.api.version} + + src/it/settings.xml + + + jetty-effective-web-xml-it/pom.xml + + + clean + + + + + integration-test + + install + integration-test + verify + + integration-test + + + + + diff --git a/jetty-ee8/jetty-ee8-nested/pom.xml b/jetty-ee8/jetty-ee8-nested/pom.xml index f415557e7ae2..114b6f05ac45 100644 --- a/jetty-ee8/jetty-ee8-nested/pom.xml +++ b/jetty-ee8/jetty-ee8-nested/pom.xml @@ -1,35 +1,22 @@ + + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee8-nested EE8 :: Nested The jetty core handler adapted to legacy ee8 handler. - jetty-ee9-nested ${project.groupId}.server + jetty-ee9-nested org.eclipse.jetty.ee8.server.* - - - - org.apache.maven.plugins - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.ee8.nested=org.eclipse.jetty.logging --add-opens org.eclipse.jetty.server/org.eclipse.jetty.server=ALL-UNNAMED - - - - - - org.eclipse.jetty.toolchain @@ -88,4 +75,16 @@ + + + + org.apache.maven.plugins + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.ee8.nested=org.eclipse.jetty.logging --add-opens org.eclipse.jetty.server/org.eclipse.jetty.server=ALL-UNNAMED + + + + + diff --git a/jetty-ee8/jetty-ee8-openid/pom.xml b/jetty-ee8/jetty-ee8-openid/pom.xml index e97a1e234480..191932d09eb4 100644 --- a/jetty-ee8/jetty-ee8-openid/pom.xml +++ b/jetty-ee8/jetty-ee8-openid/pom.xml @@ -1,37 +1,22 @@ + + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee8-openid EE8 :: OpenID Jetty OpenID Connect infrastructure - jetty-ee9-openid ${project.groupId}.openid + jetty-ee9-openid org.eclipse.jetty.ee8.security.openid.* - - - - org.apache.felix - maven-bundle-plugin - true - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.security.Authenticator$Factory - - - - - - org.eclipse.jetty @@ -73,4 +58,20 @@ test + + + + + org.apache.felix + maven-bundle-plugin + true + + + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.security.Authenticator$Factory + + + + + diff --git a/jetty-ee8/jetty-ee8-plus/pom.xml b/jetty-ee8/jetty-ee8-plus/pom.xml index bf12ea3763a0..d25f32d11159 100644 --- a/jetty-ee8/jetty-ee8-plus/pom.xml +++ b/jetty-ee8/jetty-ee8-plus/pom.xml @@ -1,42 +1,22 @@ + + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee8-plus EE8 :: Plus Jetty JavaEE style services - jetty-ee9-plus ${project.groupId}.plus + jetty-ee9-plus org.eclipse.jetty.ee8.plus.* - - - - org.apache.felix - maven-bundle-plugin - true - - - ${osgi.slf4j.import.packages},jakarta.transaction.*;version="2.0.0",* - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee8.webapp.Configuration - - - - - - - jakarta.transaction @@ -66,4 +46,21 @@ + + + + org.apache.felix + maven-bundle-plugin + true + + + ${osgi.slf4j.import.packages},jakarta.transaction.*;version="2.0.0",* + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee8.webapp.Configuration + + + + + + diff --git a/jetty-ee8/jetty-ee8-proxy/pom.xml b/jetty-ee8/jetty-ee8-proxy/pom.xml index 37a87a859a1e..c0eee21c1de3 100644 --- a/jetty-ee8/jetty-ee8-proxy/pom.xml +++ b/jetty-ee8/jetty-ee8-proxy/pom.xml @@ -1,32 +1,21 @@ + + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee8-proxy EE8 :: Proxy Jetty Proxy - jetty-ee9-proxy ${project.groupId}.proxy + jetty-ee9-proxy org.eclipse.jetty.ee8.proxy.* - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.ee8.proxy=org.eclipse.jetty.logging - - - - - org.slf4j @@ -76,4 +65,14 @@ test + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.ee8.proxy=org.eclipse.jetty.logging + + + + diff --git a/jetty-ee8/jetty-ee8-quickstart/pom.xml b/jetty-ee8/jetty-ee8-quickstart/pom.xml index 545b11870576..7c78a518c7aa 100644 --- a/jetty-ee8/jetty-ee8-quickstart/pom.xml +++ b/jetty-ee8/jetty-ee8-quickstart/pom.xml @@ -1,40 +1,21 @@ + + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee8-quickstart EE8 :: Quick Start Jetty Quick Start - jetty-ee9-quickstart ${project.groupId}.quickstart + jetty-ee9-quickstart - - - - org.apache.felix - maven-bundle-plugin - true - - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee8.webapp.Configuration - - - - - - - org.eclipse.jetty.ee8 @@ -64,4 +45,20 @@ + + + + org.apache.felix + maven-bundle-plugin + true + + + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee8.webapp.Configuration + + + + + + diff --git a/jetty-ee8/jetty-ee8-security/pom.xml b/jetty-ee8/jetty-ee8-security/pom.xml index c8d67867a2f9..cfabbe2c4a19 100644 --- a/jetty-ee8/jetty-ee8-security/pom.xml +++ b/jetty-ee8/jetty-ee8-security/pom.xml @@ -1,36 +1,22 @@ + + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee8-security EE8 :: Security Jetty security infrastructure - jetty-ee9-security ${project.groupId}.security + jetty-ee9-security org.eclipse.jetty.ee8.security.* - - - - org.apache.felix - maven-bundle-plugin - true - - - osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.security.Authenticator$Factory)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional - - - - - - org.eclipse.jetty.ee8 @@ -58,4 +44,19 @@ + + + + org.apache.felix + maven-bundle-plugin + true + + + osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.security.Authenticator$Factory)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional + + + + + + diff --git a/jetty-ee8/jetty-ee8-servlet/pom.xml b/jetty-ee8/jetty-ee8-servlet/pom.xml index 40eb38d5f1df..ae2a70d8a9df 100644 --- a/jetty-ee8/jetty-ee8-servlet/pom.xml +++ b/jetty-ee8/jetty-ee8-servlet/pom.xml @@ -1,38 +1,22 @@ + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee8-servlet EE8 :: Servlet Jetty Servlet Container - jetty-ee9-servlet ${project.groupId}.servlet + jetty-ee9-servlet org.eclipse.jetty.ee8.servlet.* - - - - org.apache.maven.plugins - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} - --add-modules org.eclipse.jetty.util.ajax - --add-reads org.eclipse.jetty.ee8.servlet=org.eclipse.jetty.logging - - - - - - org.eclipse.jetty.ee8 @@ -78,4 +62,18 @@ test + + + + + org.apache.maven.plugins + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} + --add-modules org.eclipse.jetty.util.ajax + --add-reads org.eclipse.jetty.ee8.servlet=org.eclipse.jetty.logging + + + + diff --git a/jetty-ee8/jetty-ee8-servlets/pom.xml b/jetty-ee8/jetty-ee8-servlets/pom.xml index 30af9201ce49..06d1f674af4c 100644 --- a/jetty-ee8/jetty-ee8-servlets/pom.xml +++ b/jetty-ee8/jetty-ee8-servlets/pom.xml @@ -1,44 +1,22 @@ + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee8-servlets EE8 :: Utility Servlets and Filters Jetty Utility Servlets - jetty-ee9-servlets ${project.groupId}.servlets + jetty-ee9-servlets org.eclipse.jetty.ee8.servlets.* - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} - --add-modules jetty.servlet.api - --add-modules org.eclipse.jetty.util - --add-modules org.eclipse.jetty.io - --add-modules org.eclipse.jetty.http - --add-modules org.eclipse.jetty.server - --add-modules org.eclipse.jetty.session - --add-modules org.eclipse.jetty.ee8.nested - --add-reads org.eclipse.jetty.ee8.servlets=java.management - --add-reads org.eclipse.jetty.ee8.servlets=org.eclipse.jetty.logging - - - - - - org.eclipse.jetty @@ -93,4 +71,24 @@ + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} + --add-modules jetty.servlet.api + --add-modules org.eclipse.jetty.util + --add-modules org.eclipse.jetty.io + --add-modules org.eclipse.jetty.http + --add-modules org.eclipse.jetty.server + --add-modules org.eclipse.jetty.session + --add-modules org.eclipse.jetty.ee8.nested + --add-reads org.eclipse.jetty.ee8.servlets=java.management + --add-reads org.eclipse.jetty.ee8.servlets=org.eclipse.jetty.logging + + + + + diff --git a/jetty-ee8/jetty-ee8-webapp/pom.xml b/jetty-ee8/jetty-ee8-webapp/pom.xml index 41b2571c3088..3f5ea937fde5 100644 --- a/jetty-ee8/jetty-ee8-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-webapp/pom.xml @@ -1,21 +1,57 @@ + + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee8-webapp EE8 :: WebApp Jetty web application support - jetty-ee9-webapp ${project.groupId}.webapp + jetty-ee9-webapp org.eclipse.jetty.ee8.webapp.* + + + org.eclipse.jetty.ee8 + jetty-ee8-servlet + + + org.eclipse.jetty + jetty-xml + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty + jetty-http-tools + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + org.eclipse.jetty + jetty-client + test + + + @@ -25,10 +61,10 @@ copy-ee8-resources - generate-resources copy-resources + generate-resources ${project.build.outputDirectory} @@ -48,10 +84,10 @@ copy-ee8-test-resources - generate-test-resources copy-resources + generate-test-resources ${project.build.testOutputDirectory} @@ -75,9 +111,7 @@ org.apache.maven.plugins maven-surefire-plugin - - @{argLine} ${jetty.surefire.argLine} - + @{argLine} ${jetty.surefire.argLine} false ${project.build.testOutputDirectory}/mods/foo-bar-janb.jar @@ -93,50 +127,11 @@ true - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)", osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.ee8.webapp.Configuration)";cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee8.webapp.Configuration - + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)", osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.ee8.webapp.Configuration)";cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee8.webapp.Configuration - - - - org.eclipse.jetty.ee8 - jetty-ee8-servlet - - - org.eclipse.jetty - jetty-xml - - - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty - jetty-http-tools - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - org.eclipse.jetty - jetty-client - test - - diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client-webapp/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client-webapp/pom.xml index a6b5873a2f8c..6efcb4b629aa 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client-webapp/pom.xml @@ -1,19 +1,19 @@ + + 4.0.0 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket 12.0.2-SNAPSHOT ../pom.xml - - 4.0.0 jetty-ee8-websocket-javax-client-webapp EE8 :: Websocket :: Javax Client Webapp - jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client-webapp ${project.groupId}.javax.client.webapp + jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client-webapp @@ -36,15 +36,9 @@ javax.websocket.client WebApp Implementation - - org.eclipse.jetty.ee8.websocket.javax.client.webapp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - - - osgi.serviceloader;osgi.serviceloader=javax.servlet.ServletContainerInitializer - + org.eclipse.jetty.ee8.websocket.javax.client.webapp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional + osgi.serviceloader;osgi.serviceloader=javax.servlet.ServletContainerInitializer diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client/pom.xml index 8d1770799d82..b643d9bc06bd 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client/pom.xml @@ -1,19 +1,19 @@ + + 4.0.0 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket 12.0.2-SNAPSHOT ../pom.xml - - 4.0.0 jetty-ee8-websocket-javax-client EE8 :: Websocket :: Javax Client - jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client ${project.groupId}.javax.client + jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client @@ -64,15 +64,9 @@ javax.websocket.client Implementation - - org.eclipse.jetty.ee8.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 - + org.eclipse.jetty.ee8.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 diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-common/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-common/pom.xml index 94cda6d1fbd5..36ce6b52f598 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-common/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-common/pom.xml @@ -1,39 +1,21 @@ + + 4.0.0 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee8-websocket-javax-common EE8 :: Websocket :: Javax Common - false - jetty-ee9-websocket/jetty-ee9-websocket-jakarta-common ${project.groupId}.javax.common + jetty-ee9-websocket/jetty-ee9-websocket-jakarta-common + false - - - - org.apache.felix - maven-bundle-plugin - true - - - javax.websocket.client Implementation - - org.eclipse.jetty.ee8.websocket.javax.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - - - - - - - org.eclipse.jetty.toolchain @@ -59,4 +41,20 @@ test + + + + + org.apache.felix + maven-bundle-plugin + true + + + javax.websocket.client Implementation + org.eclipse.jetty.ee8.websocket.javax.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" + + + + + diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-server/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-server/pom.xml index 86f282e81630..c7473456c78c 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-server/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-server/pom.xml @@ -1,18 +1,18 @@ + + 4.0.0 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee8-websocket-javax-server EE8 :: Websocket :: Javax Server - jetty-ee9-websocket/jetty-ee9-websocket-jakarta-server ${project.groupId}.javax.server + jetty-ee9-websocket/jetty-ee9-websocket-jakarta-server @@ -48,9 +48,7 @@ maven-surefire-plugin - - @{argLine} ${jetty.surefire.argLine} - + @{argLine} ${jetty.surefire.argLine} @@ -60,13 +58,9 @@ 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.ee8.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.ee8.webapp.Configuration,osgi.serviceloader;osgi.serviceloader=javax.servlet.ServletContainerInitializer,osgi.serviceloader;osgi.serviceloader=javax.websocket.server.ServerEndpointConfig$Configurator diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-tests/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-tests/pom.xml index 698a2f624b82..c99b78b2d01e 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-tests/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-tests/pom.xml @@ -1,19 +1,19 @@ + + 4.0.0 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee8-websocket-javax-tests EE8 :: Websocket :: Javax Tests - false - jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests ${project.groupId}.javax.tests + jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests + false true true @@ -68,9 +68,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-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-api/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-api/pom.xml index 68df274f1cd5..5b8e17992a9f 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-api/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-api/pom.xml @@ -1,18 +1,18 @@ + + 4.0.0 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee8-websocket-jetty-api EE8 :: Websocket :: Jetty API - jetty-ee9-websocket/jetty-ee9-websocket-jetty-api ${project.groupId}.api + jetty-ee9-websocket/jetty-ee9-websocket-jetty-api diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client-webapp/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client-webapp/pom.xml index a237e38bb0a9..acafcb1b5c05 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client-webapp/pom.xml @@ -1,20 +1,31 @@ + + 4.0.0 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee8-websocket-jetty-client-webapp EE8 :: Websocket :: Jetty Client WebApp - jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp ${project.groupId}.client.webapp + jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp + + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-jetty-client + + + org.eclipse.jetty.ee8 + jetty-ee8-webapp + + + @@ -23,27 +34,12 @@ true - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee8.webapp.Configuration - + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee8.webapp.Configuration - - - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-jetty-client - - - org.eclipse.jetty.ee8 - jetty-ee8-webapp - - - diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/pom.xml index 50e772b66704..12cffb1869e4 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/pom.xml @@ -1,40 +1,20 @@ + + 4.0.0 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee8-websocket-jetty-client EE8 :: Websocket :: Jetty Client - jetty-ee9-websocket/jetty-ee9-websocket-jetty-client ${project.groupId}.client + jetty-ee9-websocket/jetty-ee9-websocket-jetty-client - - - - org.apache.felix - maven-bundle-plugin - true - - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee8.webapp.Configuration - - - - - - - org.eclipse.jetty.ee8.websocket @@ -68,4 +48,20 @@ + + + + org.apache.felix + maven-bundle-plugin + true + + + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee8.webapp.Configuration + + + + + + diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-common/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-common/pom.xml index 5fc93e5a7074..863f7f7fe74c 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-common/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-common/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee8-websocket-jetty-common EE8 :: Websocket :: Jetty Common @@ -14,15 +14,28 @@ ${project.groupId}.common jetty-ee9-websocket/jetty-ee9-websocket-jetty-common + + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-jetty-api + + + org.eclipse.jetty.websocket + jetty-websocket-core-common + + + org.eclipse.jetty + jetty-slf4j-impl + test + + maven-surefire-plugin - - @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.ee8.websocket.jetty.common=org.eclipse.jetty.io - + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.ee8.websocket.jetty.common=org.eclipse.jetty.io @@ -31,30 +44,11 @@ true - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee8.websocket.api.ExtensionConfig$Parser - + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee8.websocket.api.ExtensionConfig$Parser - - - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-jetty-api - - - org.eclipse.jetty.websocket - jetty-websocket-core-common - - - org.eclipse.jetty - jetty-slf4j-impl - test - - diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-server/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-server/pom.xml index da999eaaa38f..f66390fd87e3 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-server/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-server/pom.xml @@ -1,18 +1,18 @@ + + 4.0.0 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee8-websocket-jetty-server EE8 :: Websocket :: Jetty Server - jetty-ee9-websocket/jetty-ee9-websocket-jetty-server ${project.groupId}.server + jetty-ee9-websocket/jetty-ee9-websocket-jetty-server @@ -65,13 +65,9 @@ Jetty Websocket Server - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - - - osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.ee8.webapp.Configuration, - osgi.serviceloader;osgi.serviceloader=jakarta.servlet.ServletContainerInitializer - + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional + osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.ee8.webapp.Configuration, + osgi.serviceloader;osgi.serviceloader=jakarta.servlet.ServletContainerInitializer diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-tests/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-tests/pom.xml index 003655683f90..74b98bdece2e 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-tests/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-tests/pom.xml @@ -1,18 +1,18 @@ + + 4.0.0 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee8-websocket-jetty-tests EE8 :: Websocket :: Jetty Tests - jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests ${project.groupId}.tests + jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests true true @@ -84,13 +84,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-ee8/jetty-ee8-websocket/jetty-ee8-websocket-servlet/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-servlet/pom.xml index ccdb0cd4d0a2..5bc107319031 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-servlet/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-servlet/pom.xml @@ -1,18 +1,18 @@ + + 4.0.0 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee8-websocket-servlet EE8 :: Websocket :: Servlet - jetty-ee9-websocket/jetty-ee9-websocket-servlet ${project.groupId}.servlet + jetty-ee9-websocket/jetty-ee9-websocket-servlet diff --git a/jetty-ee8/jetty-ee8-websocket/pom.xml b/jetty-ee8/jetty-ee8-websocket/pom.xml index d7fa4781aa33..b0f6eb987f7e 100644 --- a/jetty-ee8/jetty-ee8-websocket/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/pom.xml @@ -1,34 +1,34 @@ + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.2-SNAPSHOT ../pom.xml - - 4.0.0 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket - EE8 :: Websocket pom - - - true - + EE8 :: Websocket - jetty-ee8-websocket-javax-common - jetty-ee8-websocket-jetty-api - jetty-ee8-websocket-jetty-common jetty-ee8-websocket-javax-client jetty-ee8-websocket-javax-client-webapp - jetty-ee8-websocket-servlet + jetty-ee8-websocket-javax-common jetty-ee8-websocket-javax-server + jetty-ee8-websocket-javax-tests + jetty-ee8-websocket-jetty-api jetty-ee8-websocket-jetty-client jetty-ee8-websocket-jetty-client-webapp + jetty-ee8-websocket-jetty-common jetty-ee8-websocket-jetty-server - jetty-ee8-websocket-javax-tests jetty-ee8-websocket-jetty-tests + jetty-ee8-websocket-servlet + + + true + diff --git a/jetty-ee8/pom.xml b/jetty-ee8/pom.xml index 2ed73c0396f4..d1ccf3e78dc2 100644 --- a/jetty-ee8/pom.xml +++ b/jetty-ee8/pom.xml @@ -1,59 +1,254 @@ + + 4.0.0 org.eclipse.jetty jetty-project 12.0.2-SNAPSHOT - - 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 - EE8 pom - - - 4.0.6 - 1.3.3 - 1.3.5 - 1.4.1.v201005082020 - 1.1.2 - 9.0.52 - 3.1.9.Final - - true - true - - ${maven.multiModuleProjectDirectory}/jetty-ee9/${ee9.module} - 1.0.6 - + EE8 + jetty-ee8-annotations + jetty-ee8-apache-jsp + jetty-ee8-bom + jetty-ee8-demos + jetty-ee8-glassfish-jstl + jetty-ee8-home + jetty-ee8-jaspi + jetty-ee8-jndi + jetty-ee8-jspc-maven-plugin + jetty-ee8-maven-plugin jetty-ee8-nested + jetty-ee8-openid + jetty-ee8-plus + jetty-ee8-proxy + jetty-ee8-quickstart jetty-ee8-security jetty-ee8-servlet jetty-ee8-servlets jetty-ee8-webapp - jetty-ee8-plus - jetty-ee8-jndi - jetty-ee8-maven-plugin - jetty-ee8-jaspi - jetty-ee8-jspc-maven-plugin - jetty-ee8-proxy - jetty-ee8-annotations jetty-ee8-websocket - jetty-ee8-quickstart - jetty-ee8-openid - jetty-ee8-apache-jsp - jetty-ee8-glassfish-jstl - jetty-ee8-bom - jetty-ee8-demos - jetty-ee8-home + + + true + + ${maven.multiModuleProjectDirectory}/jetty-ee9/${ee9.module} + 1.3.5 + 1.3.3 + 1.1.2 + 1.4.1.v201005082020 + 4.0.6 + 9.0.52 + 1.0.6 + true + 3.1.9.Final + + + + + + + + org.eclipse.jetty.toolchain + jetty-servlet-api + ${jetty.servlet.api.version} + + + jakarta.transaction + jakarta.transaction-api + ${jakarta.transaction-api.version} + + + jakarta.annotation + jakarta.annotation-api + ${jakarta.annotation.api.version} + + + org.mortbay.jasper + apache-jsp + ${jsp.impl.version} + + + jakarta.activation + jakarta.activation-api + 1.2.2 + + + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + 1.2.7 + + + jakarta.servlet.jsp + jakarta.servlet.jsp-api + 2.3.6 + + + org.eclipse.jetty.orbit + javax.security.auth.message + 1.0.0.v201108011116 + + + org.glassfish.web + javax.servlet.jsp.jstl + 1.2.5 + + + xalan + xalan + 2.7.3 + + + org.eclipse.jetty.toolchain + jetty-javax-websocket-api + ${jakarta.websocket.api.version} + + + org.eclipse.jetty.orbit + javax.mail.glassfish + ${javax.mail.glassfish.version} + + + org.eclipse.jetty.ee8 + jetty-ee8-apache-jsp + ${project.version} + + + org.eclipse.jetty.ee8 + jetty-ee8-annotations + ${project.version} + + + org.eclipse.jetty.ee8 + jetty-ee8-proxy + ${project.version} + + + org.eclipse.jetty.ee8 + jetty-ee8-quickstart + ${project.version} + + + org.eclipse.jetty.ee8 + jetty-ee8-nested + ${project.version} + + + org.eclipse.jetty.ee8 + jetty-ee8-security + ${project.version} + + + org.eclipse.jetty.ee8 + jetty-ee8-servlet + ${project.version} + + + org.eclipse.jetty.ee8 + jetty-ee8-webapp + ${project.version} + + + org.eclipse.jetty.ee8 + jetty-ee8-servlets + ${project.version} + + + org.eclipse.jetty.ee8 + jetty-ee8-jndi + ${project.version} + + + org.eclipse.jetty.ee8 + jetty-ee8-plus + ${project.version} + + + org.eclipse.jetty.ee8 + jetty-ee8-openid + ${project.version} + + + org.eclipse.jetty.ee8 + jetty-ee8-glassfish-jstl + ${project.version} + + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-javax-common + ${project.version} + + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-javax-client + ${project.version} + + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-javax-client-webapp + ${project.version} + + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-servlet + ${project.version} + + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-jetty-api + ${project.version} + + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-jetty-common + ${project.version} + + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-jetty-client + ${project.version} + + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-jetty-client-webapp + ${project.version} + + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-jetty-server + ${project.version} + + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-javax-server + ${project.version} + + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-mock-resources + ${project.version} + + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-web-fragment + ${project.version} + + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-container-initializer + ${project.version} + + + + - ${project.build.directory}/generated-sources/ee8 - ${project.build.directory}/generated-test-sources/ee8 @@ -116,10 +311,10 @@ copy-ee8-resources - generate-resources copy-resources + generate-resources ${project.build.outputDirectory} @@ -134,31 +329,31 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + copy-ee8-test-resources - generate-test-resources copy-resources + generate-test-resources ee9-to-ee8 @@ -180,241 +375,46 @@ generate-ee8-sources - generate-sources modify-sources-ee9-to-ee8 + generate-sources ${ee9.module.path}/src/main/java ${project.build.sourceDirectory} - generate-ee8-test-sources - generate-test-sources + modify-services-loader-ee9-to-ee8 - modify-sources-ee9-to-ee8 + modify-service-loader-files-ee9-to-ee8 - - true - ${ee9.module.path}/src/test/java - ${project.build.testSourceDirectory} - - - - modify-services-loader-ee9-to-ee8 process-resources org.apache.juli.logging.Log + + + generate-ee8-test-sources - modify-service-loader-files-ee9-to-ee8 + modify-sources-ee9-to-ee8 + generate-test-sources + + true + ${ee9.module.path}/src/test/java + ${project.build.testSourceDirectory} + + ${project.build.directory}/generated-sources/ee8 + ${project.build.directory}/generated-test-sources/ee8 - - - - - - org.eclipse.jetty.toolchain - jetty-servlet-api - ${jetty.servlet.api.version} - - - jakarta.transaction - jakarta.transaction-api - ${jakarta.transaction-api.version} - - - jakarta.annotation - jakarta.annotation-api - ${jakarta.annotation.api.version} - - - org.mortbay.jasper - apache-jsp - ${jsp.impl.version} - - - jakarta.activation - jakarta.activation-api - 1.2.2 - - - jakarta.servlet.jsp.jstl - jakarta.servlet.jsp.jstl-api - 1.2.7 - - - jakarta.servlet.jsp - jakarta.servlet.jsp-api - 2.3.6 - - - org.eclipse.jetty.orbit - javax.security.auth.message - 1.0.0.v201108011116 - - - org.glassfish.web - javax.servlet.jsp.jstl - 1.2.5 - - - xalan - xalan - 2.7.3 - - - org.eclipse.jetty.toolchain - jetty-javax-websocket-api - ${jakarta.websocket.api.version} - - - org.eclipse.jetty.orbit - javax.mail.glassfish - ${javax.mail.glassfish.version} - - - org.eclipse.jetty.ee8 - jetty-ee8-apache-jsp - ${project.version} - - - org.eclipse.jetty.ee8 - jetty-ee8-annotations - ${project.version} - - - org.eclipse.jetty.ee8 - jetty-ee8-proxy - ${project.version} - - - org.eclipse.jetty.ee8 - jetty-ee8-quickstart - ${project.version} - - - org.eclipse.jetty.ee8 - jetty-ee8-nested - ${project.version} - - - org.eclipse.jetty.ee8 - jetty-ee8-security - ${project.version} - - - org.eclipse.jetty.ee8 - jetty-ee8-servlet - ${project.version} - - - org.eclipse.jetty.ee8 - jetty-ee8-webapp - ${project.version} - - - org.eclipse.jetty.ee8 - jetty-ee8-servlets - ${project.version} - - - org.eclipse.jetty.ee8 - jetty-ee8-jndi - ${project.version} - - - org.eclipse.jetty.ee8 - jetty-ee8-plus - ${project.version} - - - org.eclipse.jetty.ee8 - jetty-ee8-openid - ${project.version} - - - org.eclipse.jetty.ee8 - jetty-ee8-glassfish-jstl - ${project.version} - - - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-javax-common - ${project.version} - - - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-javax-client - ${project.version} - - - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-javax-client-webapp - ${project.version} - - - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-servlet - ${project.version} - - - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-jetty-api - ${project.version} - - - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-jetty-common - ${project.version} - - - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-jetty-client - ${project.version} - - - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-jetty-client-webapp - ${project.version} - - - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-jetty-server - ${project.version} - - - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-javax-server - ${project.version} - - - org.eclipse.jetty.ee8.demos - jetty-ee8-demo-mock-resources - ${project.version} - - - org.eclipse.jetty.ee8.demos - jetty-ee8-demo-web-fragment - ${project.version} - - - org.eclipse.jetty.ee8.demos - jetty-ee8-demo-container-initializer - ${project.version} - - - - - /ee9-demo-jetty - - .,WEB-INF/classes - ee9 - - - - - - maven-war-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - - - - org.eclipse.jetty.ee9 - jetty-ee9-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.ee9 @@ -203,4 +90,117 @@ test + + + + + org.eclipse.jetty.ee9 + jetty-ee9-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 + + + **/WebAppTest.java + **/Test*.java + + + + + test + test + + + + + 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.felix + maven-bundle-plugin + true + + + war + + + jakarta.servlet.jsp.*;version="[3,4)",org.eclipse.jetty.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))",* + !org.example* + + /ee9-demo-jetty + + .,WEB-INF/classes + ee9 + + + + + + maven-war-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/pom.xml index e12408df35b7..03d59d952d76 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/pom.xml @@ -7,32 +7,78 @@ 12.0.2-SNAPSHOT jetty-ee9-demo-jndi-webapp - EE9 :: Demo :: JNDI WebApp war + EE9 :: Demo :: JNDI WebApp ${project.groupId}.jndi + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-mock-resources + provided + + + jakarta.transaction + jakarta.transaction-api + provided + + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + provided + + + org.eclipse.jetty.orbit + javax.mail.glassfish + provided + + + + + + org.eclipse.jetty + jetty-maven-plugin + ${project.version} + + ${project.build.directory}/plugin-context.xml + + src/main/webapp + src/main/webapp/WEB-INF/web.xml + /test-jndi + + + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-mock-resources + ${project.version} + + + + + maven-antrun-plugin generate-xml-files + + run + process-resources - + - + - - run - @@ -41,10 +87,10 @@ maven-dependency-plugin - package copy-dependencies + package jakarta.transaction-api,ee9-demo-mock-resources ${project.build.directory}/lib/jndi @@ -53,51 +99,5 @@ - - - - org.eclipse.jetty - jetty-maven-plugin - ${project.version} - - ${project.build.directory}/plugin-context.xml - - src/main/webapp - src/main/webapp/WEB-INF/web.xml - /test-jndi - - - - - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-mock-resources - ${project.version} - - - - - - - - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-mock-resources - provided - - - jakarta.transaction - jakarta.transaction-api - provided - - - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api - provided - - - org.eclipse.jetty.orbit - javax.mail.glassfish - provided - - diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jsp-webapp/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jsp-webapp/pom.xml index c8e4aa98620e..0810eb84d7bf 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jsp-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jsp-webapp/pom.xml @@ -1,20 +1,38 @@ + + 4.0.0 org.eclipse.jetty.ee9.demos jetty-ee9-demos 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee9-demo-jsp-webapp - EE9 :: Demo :: JSP WebApp war + EE9 :: Demo :: JSP WebApp ${project.groupId}.jsp + + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + provided + + + jakarta.servlet.jsp + jakarta.servlet.jsp-api + provided + + + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + provided + + + @@ -48,10 +66,10 @@ web-bundle-assembly - package single + package src/main/assembly/web-bundle.xml @@ -66,24 +84,6 @@ - - - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api - provided - - - jakarta.servlet.jsp - jakarta.servlet.jsp-api - provided - - - jakarta.servlet.jsp.jstl - jakarta.servlet.jsp.jstl-api - provided - - - precompile-jsp diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-mock-resources/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-mock-resources/pom.xml index 322eea5efcc0..36080db8b716 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-mock-resources/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-mock-resources/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 @@ -5,12 +6,29 @@ jetty-ee9-demos 12.0.2-SNAPSHOT - EE9 :: Demo :: Mock Resources jetty-ee9-demo-mock-resources jar + EE9 :: Demo :: Mock Resources ${project.groupId}.mocks + + + jakarta.transaction + jakarta.transaction-api + provided + + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + provided + + + jakarta.mail + jakarta.mail-api + provided + + @@ -26,12 +44,8 @@ org.eclipse.jetty.ee9.demos.ee9-demo-mock-resources Mock resources used for testing - - org.example;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - - - javax.sql, jakarta.transaction;version="2.0.0" - + org.example;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" + javax.sql, jakarta.transaction;version="2.0.0" <_nouses>true @@ -40,21 +54,4 @@ - - - jakarta.transaction - jakarta.transaction-api - provided - - - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api - provided - - - jakarta.mail - jakarta.mail-api - provided - - diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/pom.xml index 9372adb92859..91de904f11d5 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/pom.xml @@ -1,29 +1,17 @@ + 4.0.0 org.eclipse.jetty.ee9.demos jetty-ee9-demos 12.0.2-SNAPSHOT - 4.0.0 jetty-ee9-demo-proxy-webapp - EE9 :: Demo :: Proxy WebApp war + EE9 :: Demo :: Proxy WebApp ${project.groupId}.proxy - - - - maven-war-plugin - - - src/main/webapp/META-INF/MANIFEST.MF - - - - - org.slf4j @@ -83,4 +71,16 @@ provided + + + + maven-war-plugin + + + src/main/webapp/META-INF/MANIFEST.MF + + + + + diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-simple-webapp/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-simple-webapp/pom.xml index fc3b82e164c2..696dbe0918f9 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-simple-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-simple-webapp/pom.xml @@ -1,15 +1,15 @@ + + 4.0.0 org.eclipse.jetty.ee9.demos jetty-ee9-demos 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee9-demo-simple-webapp - EE9 :: Demo :: Simple WebApp war + EE9 :: Demo :: Simple WebApp ${project.groupId}.simple diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-container-initializer/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-container-initializer/pom.xml index 8cb8f7d82cc6..fc60a3a592ba 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-container-initializer/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-container-initializer/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 @@ -12,6 +13,13 @@ ${project.groupId}.sci + + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + provided + + @@ -31,11 +39,4 @@ - - - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api - provided - - diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/pom.xml index 4ea34156abfc..5cacfc666fd5 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/pom.xml @@ -7,13 +7,88 @@ 12.0.2-SNAPSHOT ../../pom.xml - EE9 :: Demo :: Servlet Spec :: WebApp jetty-ee9-demo-spec-webapp war + EE9 :: Demo :: Servlet Spec :: WebApp ${project.groupId}.spec.webapp + + + + jakarta.transaction + jakarta.transaction-api + provided + + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + provided + + + jakarta.annotation + jakarta.annotation-api + provided + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-web-fragment + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-container-initializer + + + + + + + + + org.eclipse.jetty.ee9 + jetty-ee9-maven-plugin + ${project.version} + + 10 + ${project.build.directory}/plugin-context.xml + + src/main/webapp + src/main/webapp/WEB-INF/web.xml + /test-spec + .*/jetty-jakarta-servlet-api-[^/]*\.jar$ + true + ${basedir}/src/main/webapp/WEB-INF/jetty-env.xml + + + + Test Realm + src/etc/realm.properties + + + + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-mock-resources + ${project.version} + + + + + org.apache.maven.plugins @@ -21,10 +96,10 @@ web-bundle-assembly - package single + package src/main/assembly/web-bundle.xml @@ -66,10 +141,8 @@ Test Webapp for Servlet 5.0 Features - - jakarta.transaction*;version="2.0.0", jakarta.servlet*;version="[5,6)", 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", org.example;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}", * - - <_nouses /> + jakarta.transaction*;version="2.0.0", jakarta.servlet*;version="[5,6)", 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", org.example;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}", * + <_nouses> org.example.test;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}";-noimport:=true / .,WEB-INF/classes,WEB-INF/lib @@ -84,20 +157,20 @@ generate-xml-files + + run + process-resources - + - + - - run - @@ -106,10 +179,10 @@ maven-dependency-plugin - package copy + package @@ -148,80 +221,5 @@ - - - - org.eclipse.jetty.ee9 - jetty-ee9-maven-plugin - ${project.version} - - 10 - ${project.build.directory}/plugin-context.xml - - src/main/webapp - src/main/webapp/WEB-INF/web.xml - /test-spec - .*/jetty-jakarta-servlet-api-[^/]*\.jar$ - true - ${basedir}/src/main/webapp/WEB-INF/jetty-env.xml - - - - Test Realm - src/etc/realm.properties - - - - - - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-mock-resources - ${project.version} - - - - - - - - - jakarta.transaction - jakarta.transaction-api - provided - - - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api - provided - - - jakarta.annotation - jakarta.annotation-api - provided - - - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-web-fragment - - - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-container-initializer - - - - - diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-web-fragment/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-web-fragment/pom.xml index 650752ff7da2..fe408458f93f 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-web-fragment/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-web-fragment/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 @@ -6,11 +7,11 @@ 12.0.2-SNAPSHOT ../../pom.xml - - EE9 :: Demo :: Servlet Spec :: Fragment Jar jetty-ee9-demo-web-fragment jar + EE9 :: Demo :: Servlet Spec :: Fragment Jar + ${project.groupId}.spec.fragment diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/pom.xml index 11fe46410fb0..ff07e2fd5767 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/pom.xml @@ -6,13 +6,13 @@ jetty-ee9-demos 12.0.2-SNAPSHOT - EE9 :: Demo :: Servlet Spec jetty-ee9-demo-spec pom + EE9 :: Demo :: Servlet Spec - jetty-ee9-demo-spec-webapp jetty-ee9-demo-container-initializer + jetty-ee9-demo-spec-webapp jetty-ee9-demo-web-fragment diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-template/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-template/pom.xml index 76a7efba8438..f8a6036db21f 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-template/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-template/pom.xml @@ -1,25 +1,25 @@ + + 4.0.0 org.eclipse.jetty.ee9.demos jetty-ee9-demos 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee9-demo-template - EE9 :: Demo :: Template jar + EE9 :: Demo :: Template - + org.apache.maven.plugins maven-jar-plugin - index.html - small_powered_by.gif + index.html + small_powered_by.gif diff --git a/jetty-ee9/jetty-ee9-demos/pom.xml b/jetty-ee9/jetty-ee9-demos/pom.xml index 4a59f735f5a0..7af2f8cc1b6c 100644 --- a/jetty-ee9/jetty-ee9-demos/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/pom.xml @@ -1,16 +1,30 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.2-SNAPSHOT - - 4.0.0 org.eclipse.jetty.ee9.demos jetty-ee9-demos - EE9 :: Demos pom + EE9 :: Demos + + + jetty-ee9-demo-async-rest + jetty-ee9-demo-embedded + jetty-ee9-demo-jaas-webapp + jetty-ee9-demo-jetty-webapp + jetty-ee9-demo-jndi-webapp + jetty-ee9-demo-jsp-webapp + jetty-ee9-demo-mock-resources + jetty-ee9-demo-proxy-webapp + jetty-ee9-demo-simple-webapp + jetty-ee9-demo-spec + jetty-ee9-demo-template + true @@ -28,18 +42,4 @@ - - - jetty-ee9-demo-async-rest - jetty-ee9-demo-jaas-webapp - jetty-ee9-demo-jndi-webapp - jetty-ee9-demo-jetty-webapp - jetty-ee9-demo-proxy-webapp - jetty-ee9-demo-embedded - jetty-ee9-demo-simple-webapp - jetty-ee9-demo-jsp-webapp - jetty-ee9-demo-mock-resources - jetty-ee9-demo-spec - jetty-ee9-demo-template - diff --git a/jetty-ee9/jetty-ee9-fcgi-proxy/pom.xml b/jetty-ee9/jetty-ee9-fcgi-proxy/pom.xml index 38cc17769358..f56087380197 100644 --- a/jetty-ee9/jetty-ee9-fcgi-proxy/pom.xml +++ b/jetty-ee9/jetty-ee9-fcgi-proxy/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee9-fcgi-proxy EE9 :: FCGI Proxy diff --git a/jetty-ee9/jetty-ee9-glassfish-jstl/pom.xml b/jetty-ee9/jetty-ee9-glassfish-jstl/pom.xml index 77e875207dbf..bbf7a334335f 100644 --- a/jetty-ee9/jetty-ee9-glassfish-jstl/pom.xml +++ b/jetty-ee9/jetty-ee9-glassfish-jstl/pom.xml @@ -1,34 +1,20 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.2-SNAPSHOT - 4.0.0 jetty-ee9-glassfish-jstl + jar EE9 :: Glassfish JSTL https://projects.eclipse.org/projects/ee4j.glassfish - jar ${project.groupId}.glassfish.jstl true - - - - org.apache.maven.plugins - maven-surefire-plugin - - false - - .*/jetty-jakarta-servlet-api-[^/]*\.jar$|.*jakarta.servlet.jsp.jstl-[^/]*\.jar - - - - - - @@ -73,4 +59,19 @@ + + + + org.apache.maven.plugins + maven-surefire-plugin + + false + + .*/jetty-jakarta-servlet-api-[^/]*\.jar$|.*jakarta.servlet.jsp.jstl-[^/]*\.jar + + + + + + diff --git a/jetty-ee9/jetty-ee9-home/pom.xml b/jetty-ee9/jetty-ee9-home/pom.xml index 540495d1dace..baea54706364 100644 --- a/jetty-ee9/jetty-ee9-home/pom.xml +++ b/jetty-ee9/jetty-ee9-home/pom.xml @@ -1,14 +1,14 @@ + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.2-SNAPSHOT - 4.0.0 jetty-ee9-home - EE9 :: Home Assembly pom + EE9 :: Home Assembly ${basedir}/target/jetty-ee9-home @@ -16,6 +16,192 @@ true + + + org.ow2.asm + asm + + + org.ow2.asm + asm-commons + + + org.ow2.asm + asm-tree + + + org.ow2.asm + asm-analysis + + + + org.eclipse.jetty.ee9 + jetty-ee9-quickstart + + + org.eclipse.jetty.ee9 + jetty-ee9-servlet + + + org.eclipse.jetty.ee9 + jetty-ee9-servlets + + + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-servlet + + + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-server + + + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-client + + + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-client-webapp + + + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jakarta-server + + + org.eclipse.jetty.ee9 + jetty-ee9-apache-jsp + + + org.eclipse.jetty.ee9 + jetty-ee9-glassfish-jstl + + + javax.el + el-api + + + jakarta.el + jakarta.el-api + + + + + org.eclipse.jetty.ee9 + jetty-ee9-plus + + + org.eclipse.jetty.ee9 + jetty-ee9-proxy + + + org.eclipse.jetty.ee9 + jetty-ee9-cdi + true + + + org.eclipse.jetty.ee9 + jetty-ee9-annotations + + + org.eclipse.jetty.ee9 + jetty-ee9-openid + true + + + org.eclipse.jetty.ee9 + jetty-ee9-jaspi + true + + + org.eclipse.jetty.ee9 + jetty-ee9-jndi + true + + + org.eclipse.jetty.ee9 + jetty-ee9-fcgi-proxy + true + + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-mock-resources + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-jetty-webapp + ${project.version} + config + jar + true + + + javax.el + el-api + + + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-jaas-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-jndi-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-spec-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-async-rest-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-proxy-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-simple-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-jsp-webapp + ${project.version} + config + jar + true + + + @@ -23,332 +209,330 @@ maven-dependency-plugin - unpack-config-deps - generate-resources + copy-ee9-annotations-deps - unpack-dependencies + copy-dependencies + generate-resources - - org.eclipse.jetty.ee9, org.eclipse.jetty.ee9.demos - - - config - false - META-INF/**,webapps/**,start.d/**,start.ini - ${assembly-directory} + jakarta.annotation,org.ow2.asm + jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis + jar + ${assembly-directory}/lib/ee9-annotations - copy-lib-core-websocket-deps - generate-resources + copy-ee9-annotations-src-deps copy-dependencies + generate-resources - org.eclipse.jetty.websocket + jakarta.annotation,org.ow2.asm + jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis jar - ${assembly-directory}/lib + sources + ${source-assembly-directory}/lib/ee9-annotations + - copy-lib-ee9-websocket-deps - generate-resources + copy-ee9-deps copy-dependencies + generate-resources - org.eclipse.jetty.ee9.websocket + org.eclipse.jetty.ee9 + jetty-websocket-core-client,jetty-websocket-core-common,jetty-websocket-core-server + org.eclipse.jetty.ee9.demos,org.eclipse.jetty.ee9.websocket jar - ${assembly-directory}/lib/ee9-websocket + ${assembly-directory}/lib - copy-lib-core-websocket-src-deps - generate-resources + copy-ee9-jaspi-deps copy-dependencies + generate-resources - org.eclipse.jetty.websocket + jakarta.authentication + jakarta.authentication-api jar - sources - ${source-assembly-directory}/lib + ${assembly-directory}/lib/ee9-jaspi - copy-lib-ee9-websocket-src-deps - generate-resources + copy-ee9-jaspi-src-deps copy-dependencies + generate-resources - org.eclipse.jetty.ee9.websocket + jakarta.authentication + jakarta.authentication-api jar sources - ${source-assembly-directory}/lib/ee9-websocket + ${source-assembly-directory}/lib/ee9-jaspi - copy-ee9-lib-jakarta-websocket-deps - generate-resources + copy-ee9-jsp-deps - copy + copy-dependencies + generate-resources - - - org.eclipse.jetty.toolchain - jetty-jakarta-websocket-api - ${jakarta.websocket.api.version} - - - ${assembly-directory}/lib/ee9-websocket + true + org.mortbay.jasper,org.eclipse.jdt + apache-jsp,apache-el,ecj + jar + ${assembly-directory}/lib/ee9-apache-jsp - copy-ee9-lib-jakarta-websocket-src-deps - generate-resources + copy-ee9-jsp-src-deps - copy + copy-dependencies + generate-resources - - - org.eclipse.jetty.toolchain - jetty-jakarta-websocket-api - ${jakarta.websocket.api.version} - sources - - - ${source-assembly-directory}/lib/ee9-websocket + true + org.mortbay.jasper,org.eclipse.jdt + apache-jsp,apache-el,ecj + jar + sources + ${source-assembly-directory}/lib/ee9-apache-jsp - copy-lib-servlet-api-deps - generate-resources + copy-ee9-jstl-deps - copy + copy-dependencies + generate-resources - - - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api - ${jetty.servlet.api.version} - - - ${assembly-directory}/lib + true + jakarta.servlet.jsp.jstl,org.glassfish.web + jakarta.servlet.jsp.jstl-api,jakarta.servlet.jsp.jstl + jar + ${assembly-directory}/lib/ee9-glassfish-jstl - copy-lib-servlet-api-src-deps - generate-resources + copy-ee9-jstl-src-deps - copy + copy-dependencies + generate-resources - - - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api - ${jetty.servlet.api.version} - sources - - - ${source-assembly-directory}/lib + true + jakarta.servlet.jsp.jstl,org.glassfish.web + jakarta.servlet.jsp.jstl-api,jakarta.servlet.jsp.jstl + jar + sources + ${source-assembly-directory}/lib/ee9-glassfish-jstl - copy-lib-transaction-api-deps - generate-resources + copy-ee9-lib-jakarta-websocket-deps copy + generate-resources - jakarta.transaction - jakarta.transaction-api - ${jakarta.transaction-api.version} - - - jakarta.interceptor - jakarta.interceptor-api - ${jakarta.interceptor.api.version} - - - jakarta.enterprise - jakarta.enterprise.cdi-api - ${jakarta.enterprise.cdi.api.version} - - - jakarta.inject - jakarta.inject-api - ${jakarta.inject.api.version} + org.eclipse.jetty.toolchain + jetty-jakarta-websocket-api + ${jakarta.websocket.api.version} - ${assembly-directory}/lib + ${assembly-directory}/lib/ee9-websocket - - copy-lib-transaction-api-src-deps - generate-resources + copy-ee9-lib-jakarta-websocket-src-deps copy + generate-resources - jakarta.transaction - jakarta.transaction-api - ${jakarta.transaction-api.version} + org.eclipse.jetty.toolchain + jetty-jakarta-websocket-api + ${jakarta.websocket.api.version} sources - ${source-assembly-directory}/lib + ${source-assembly-directory}/lib/ee9-websocket - copy-ee9-annotations-deps - generate-resources + copy-ee9-src-deps copy-dependencies + generate-resources - jakarta.annotation,org.ow2.asm - jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis + org.eclipse.jetty.ee9 jar - ${assembly-directory}/lib/ee9-annotations + org.eclipse.jetty.ee9.demos,org.eclipse.jetty.ee9.websocket + sources + ${source-assembly-directory}/lib - copy-ee9-annotations-src-deps - generate-resources + copy-lib-core-websocket-deps copy-dependencies + generate-resources - jakarta.annotation,org.ow2.asm - jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis + org.eclipse.jetty.websocket jar - sources - ${source-assembly-directory}/lib/ee9-annotations + ${assembly-directory}/lib - copy-ee9-jsp-src-deps - generate-resources + copy-lib-core-websocket-src-deps copy-dependencies + generate-resources - true - org.mortbay.jasper,org.eclipse.jdt - apache-jsp,apache-el,ecj + org.eclipse.jetty.websocket jar sources - ${source-assembly-directory}/lib/ee9-apache-jsp + ${source-assembly-directory}/lib - copy-ee9-jsp-deps - generate-resources + copy-lib-ee9-websocket-deps copy-dependencies + generate-resources - true - org.mortbay.jasper,org.eclipse.jdt - apache-jsp,apache-el,ecj + org.eclipse.jetty.ee9.websocket jar - ${assembly-directory}/lib/ee9-apache-jsp + ${assembly-directory}/lib/ee9-websocket - copy-ee9-jstl-src-deps - generate-resources + copy-lib-ee9-websocket-src-deps copy-dependencies + generate-resources - true - jakarta.servlet.jsp.jstl,org.glassfish.web - jakarta.servlet.jsp.jstl-api,jakarta.servlet.jsp.jstl + org.eclipse.jetty.ee9.websocket jar sources - ${source-assembly-directory}/lib/ee9-glassfish-jstl + ${source-assembly-directory}/lib/ee9-websocket - copy-ee9-jstl-deps - generate-resources + copy-lib-servlet-api-deps - copy-dependencies + copy + generate-resources - true - jakarta.servlet.jsp.jstl,org.glassfish.web - jakarta.servlet.jsp.jstl-api,jakarta.servlet.jsp.jstl - jar - ${assembly-directory}/lib/ee9-glassfish-jstl + + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + ${jetty.servlet.api.version} + + + ${assembly-directory}/lib - copy-ee9-jaspi-deps - generate-resources + copy-lib-servlet-api-src-deps - copy-dependencies + copy + generate-resources - jakarta.authentication - jakarta.authentication-api - jar - ${assembly-directory}/lib/ee9-jaspi + + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + ${jetty.servlet.api.version} + sources + + + ${source-assembly-directory}/lib - copy-ee9-jaspi-src-deps - generate-resources + copy-lib-transaction-api-deps - copy-dependencies + copy + generate-resources - jakarta.authentication - jakarta.authentication-api - jar - sources - ${source-assembly-directory}/lib/ee9-jaspi + + + jakarta.transaction + jakarta.transaction-api + ${jakarta.transaction-api.version} + + + jakarta.interceptor + jakarta.interceptor-api + ${jakarta.interceptor.api.version} + + + jakarta.enterprise + jakarta.enterprise.cdi-api + ${jakarta.enterprise.cdi.api.version} + + + jakarta.inject + jakarta.inject-api + ${jakarta.inject.api.version} + + + ${assembly-directory}/lib - copy-ee9-deps - generate-resources + copy-lib-transaction-api-src-deps - copy-dependencies + copy + generate-resources - org.eclipse.jetty.ee9 - jetty-websocket-core-client,jetty-websocket-core-common,jetty-websocket-core-server - org.eclipse.jetty.ee9.demos,org.eclipse.jetty.ee9.websocket - jar - ${assembly-directory}/lib + + + jakarta.transaction + jakarta.transaction-api + ${jakarta.transaction-api.version} + sources + + + ${source-assembly-directory}/lib - copy-ee9-src-deps - generate-resources + unpack-config-deps - copy-dependencies + unpack-dependencies + generate-resources - org.eclipse.jetty.ee9 - jar - org.eclipse.jetty.ee9.demos,org.eclipse.jetty.ee9.websocket - sources - ${source-assembly-directory}/lib + org.eclipse.jetty.ee9, org.eclipse.jetty.ee9.demos + + config + false + META-INF/**,webapps/**,start.d/**,start.ini + ${assembly-directory} @@ -363,10 +547,10 @@ binary - package single + package src/main/assembly/jetty-assembly.xml @@ -375,10 +559,10 @@ sources - package single + package src/main/assembly/jetty-source-assembly.xml @@ -391,191 +575,4 @@ - - - org.ow2.asm - asm - - - org.ow2.asm - asm-commons - - - org.ow2.asm - asm-tree - - - org.ow2.asm - asm-analysis - - - - - org.eclipse.jetty.ee9 - jetty-ee9-quickstart - - - org.eclipse.jetty.ee9 - jetty-ee9-servlet - - - org.eclipse.jetty.ee9 - jetty-ee9-servlets - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-servlet - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-server - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-client - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-client-webapp - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jakarta-server - - - org.eclipse.jetty.ee9 - jetty-ee9-apache-jsp - - - org.eclipse.jetty.ee9 - jetty-ee9-glassfish-jstl - - - javax.el - el-api - - - jakarta.el - jakarta.el-api - - - - - org.eclipse.jetty.ee9 - jetty-ee9-plus - - - org.eclipse.jetty.ee9 - jetty-ee9-proxy - - - org.eclipse.jetty.ee9 - jetty-ee9-cdi - true - - - org.eclipse.jetty.ee9 - jetty-ee9-annotations - - - org.eclipse.jetty.ee9 - jetty-ee9-openid - true - - - org.eclipse.jetty.ee9 - jetty-ee9-jaspi - true - - - org.eclipse.jetty.ee9 - jetty-ee9-jndi - true - - - org.eclipse.jetty.ee9 - jetty-ee9-fcgi-proxy - true - - - - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-mock-resources - ${project.version} - config - jar - true - - - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-jetty-webapp - ${project.version} - config - jar - true - - - javax.el - el-api - - - - - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-jaas-webapp - ${project.version} - config - jar - true - - - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-jndi-webapp - ${project.version} - config - jar - true - - - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-spec-webapp - ${project.version} - config - jar - true - - - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-async-rest-webapp - ${project.version} - config - jar - true - - - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-proxy-webapp - ${project.version} - config - jar - true - - - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-simple-webapp - ${project.version} - config - jar - true - - - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-jsp-webapp - ${project.version} - config - jar - true - - - diff --git a/jetty-ee9/jetty-ee9-jaspi/pom.xml b/jetty-ee9/jetty-ee9-jaspi/pom.xml index 57b70c4f65f1..2cf9b24e056e 100644 --- a/jetty-ee9/jetty-ee9-jaspi/pom.xml +++ b/jetty-ee9/jetty-ee9-jaspi/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee9-jaspi EE9 :: JASPI Jetty security infrastructure @@ -15,22 +16,6 @@ org.eclipse.jetty.ee9.security.jaspi.* - - - - org.apache.felix - maven-bundle-plugin - true - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.security.Authenticator$Factory - - - - - - jakarta.authentication @@ -64,4 +49,20 @@ test + + + + + org.apache.felix + maven-bundle-plugin + true + + + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.security.Authenticator$Factory + + + + + diff --git a/jetty-ee9/jetty-ee9-jndi/pom.xml b/jetty-ee9/jetty-ee9-jndi/pom.xml index 07aaad855b4f..77d656a537f4 100644 --- a/jetty-ee9/jetty-ee9-jndi/pom.xml +++ b/jetty-ee9/jetty-ee9-jndi/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee9-jndi EE9 :: JNDI EE9 JNDI factories @@ -15,21 +16,6 @@ org.eclipse.jetty.ee9.jndi.* - - - - org.apache.felix - maven-bundle-plugin - true - - - ${osgi.slf4j.import.packages},jakarta.mail.*;resolution:=optional,* - - - - - - org.eclipse.jetty @@ -60,4 +46,19 @@ test + + + + + org.apache.felix + maven-bundle-plugin + true + + + ${osgi.slf4j.import.packages},jakarta.mail.*;resolution:=optional,* + + + + + diff --git a/jetty-ee9/jetty-ee9-jspc-maven-plugin/pom.xml b/jetty-ee9/jetty-ee9-jspc-maven-plugin/pom.xml index 4a26f4573198..e2ce2a12dcb8 100644 --- a/jetty-ee9/jetty-ee9-jspc-maven-plugin/pom.xml +++ b/jetty-ee9/jetty-ee9-jspc-maven-plugin/pom.xml @@ -1,59 +1,19 @@ + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.2-SNAPSHOT - 4.0.0 jetty-ee9-jspc-maven-plugin maven-plugin EE9 :: Jetty JSPC Maven Plugin ${project.groupId}.jspc.plugin - true true + true - - - - 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 - - - - - - ${maven.surefire.plugin.version} - - - clean - - - - - org.eclipse.jetty @@ -103,4 +63,44 @@ ant + + + + org.apache.maven.plugins + maven-plugin-plugin + + + exec-plugin-doc + + descriptor + helpmojo + + process-classes + + + + + org.apache.maven.plugins + maven-invoker-plugin + + + ${maven.surefire.plugin.version} + + + clean + + + + + integration-test + + install + integration-test + verify + + + + + + diff --git a/jetty-ee9/jetty-ee9-maven-plugin/pom.xml b/jetty-ee9/jetty-ee9-maven-plugin/pom.xml index e48600010a1c..68aa3209f2cc 100644 --- a/jetty-ee9/jetty-ee9-maven-plugin/pom.xml +++ b/jetty-ee9/jetty-ee9-maven-plugin/pom.xml @@ -1,165 +1,22 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.2-SNAPSHOT - 4.0.0 jetty-ee9-maven-plugin maven-plugin EE9 :: Jetty Maven Plugin Jetty maven plugins - false ${project.groupId}.maven.plugin - FREEBEER - true + + FREEBEER + false - - - - 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 - - jetty - - - - exec-plugin-doc - generate-sources - - helpmojo - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy - package - - copy - - - - - - - org.eclipse.jetty - jetty-home - zip - false - ${project.build.directory} - ${jettyHomeZipFileName} - - - false - true - - - - 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.maven.its.ee9 - - it-parent-pom/pom.xml - - - org.eclipse.jetty:jetty-slf4j-impl:${project.version} - - - - javax-annotation-api/pom.xml - - jetty-start-gwt-it/pom.xml - - jetty-start-war-mojo-it/pom.xml - - - - - ${jetty.stopKey} - ${jetty.stopPort} - ${maven.surefire.plugin.version} - ${jetty.servlet.api.version} - ${localRepoPath} - ${jettyHomeZip} - - - clean - - - - - org.apache.maven.shared @@ -215,13 +72,13 @@ org.eclipse.jetty.ee9 jetty-ee9-webapp + true jakarta.servlet servlet-api - true org.eclipse.jetty.ee9 @@ -319,4 +176,148 @@ test + + + + 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 + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + -Dstop.port=@{test.stopPort} -Djetty.port=@{test.jettyPort} + + **/IntegrationTest*.java + + + + + org.apache.maven.plugins + maven-plugin-plugin + + jetty + + + + exec-plugin-doc + + helpmojo + + generate-sources + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + + org.eclipse.jetty + jetty-home + zip + false + ${project.build.directory} + ${jettyHomeZipFileName} + + + false + true + + + + copy + + copy + + package + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + test-jar + + + + + + org.apache.maven.plugins + maven-invoker-plugin + + org.eclipse.jetty.maven.its.ee9 + + it-parent-pom/pom.xml + + + org.eclipse.jetty:jetty-slf4j-impl:${project.version} + + + + javax-annotation-api/pom.xml + + jetty-start-gwt-it/pom.xml + + jetty-start-war-mojo-it/pom.xml + + + + + ${jetty.stopKey} + ${jetty.stopPort} + ${maven.surefire.plugin.version} + ${jetty.servlet.api.version} + ${localRepoPath} + ${jettyHomeZip} + + + clean + + + + + integration-test + + install + integration-test + verify + + integration-test + + + + + diff --git a/jetty-ee9/jetty-ee9-nested/pom.xml b/jetty-ee9/jetty-ee9-nested/pom.xml index d83f5f9c1c51..ddf333b5e094 100644 --- a/jetty-ee9/jetty-ee9-nested/pom.xml +++ b/jetty-ee9/jetty-ee9-nested/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee9-nested EE9 :: Nested The jetty core handler adapted to legacy ee9 handler. @@ -15,22 +16,6 @@ org.eclipse.jetty.ee9.nested.* - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} - --add-reads org.eclipse.jetty.ee9.nested=org.eclipse.jetty.logging - --add-opens org.eclipse.jetty.server/org.eclipse.jetty.server=ALL-UNNAMED - --add-reads org.eclipse.jetty.server=org.eclipse.jetty.logging - - - - - - org.eclipse.jetty.toolchain @@ -89,4 +74,18 @@ + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} + --add-reads org.eclipse.jetty.ee9.nested=org.eclipse.jetty.logging + --add-opens org.eclipse.jetty.server/org.eclipse.jetty.server=ALL-UNNAMED + --add-reads org.eclipse.jetty.server=org.eclipse.jetty.logging + + + + + diff --git a/jetty-ee9/jetty-ee9-openid/pom.xml b/jetty-ee9/jetty-ee9-openid/pom.xml index 9f07e1d592b8..0f1284a291c7 100644 --- a/jetty-ee9/jetty-ee9-openid/pom.xml +++ b/jetty-ee9/jetty-ee9-openid/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee9-openid EE9 :: OpenID Jetty OpenID Connect infrastructure @@ -15,22 +16,6 @@ org.eclipse.jetty.ee9.security.openid.* - - - - org.apache.felix - maven-bundle-plugin - true - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.security.Authenticator$Factory - - - - - - org.eclipse.jetty @@ -76,4 +61,20 @@ test + + + + + org.apache.felix + maven-bundle-plugin + true + + + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.security.Authenticator$Factory + + + + + diff --git a/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot-jsp/pom.xml b/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot-jsp/pom.xml index 74777db8e9d7..b45183c04fed 100644 --- a/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot-jsp/pom.xml +++ b/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot-jsp/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty.ee9.osgi jetty-ee9-osgi 12.0.2-SNAPSHOT - 4.0.0 jetty-ee9-osgi-boot-jsp EE9 :: OSGi :: Boot JSP Jetty OSGi Boot JSP bundle @@ -50,15 +51,15 @@ build-helper-maven-plugin - set-jsp-api-version - validate - - parse-version - - - ${jsp.impl.version} - jspImpl - + set-jsp-api-version + + parse-version + + validate + + ${jsp.impl.version} + jspImpl + @@ -70,11 +71,10 @@ Jetty-OSGi-Jasper Integration - + org.eclipse.jetty.ee9.osgi.boot !org.eclipse.jetty.ee9.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,12 +137,10 @@ 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.ee9.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}))" diff --git a/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/pom.xml b/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/pom.xml index e403e4f0fc7e..df489332fabe 100644 --- a/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/pom.xml +++ b/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty.ee9.osgi jetty-ee9-osgi 12.0.2-SNAPSHOT - 4.0.0 jetty-ee9-osgi-boot EE9 :: OSGi :: Boot Jetty OSGi Boot bundle @@ -62,20 +63,20 @@ maven-antrun-plugin + + run + process-resources - + - - run - @@ -88,8 +89,7 @@ org.eclipse.jetty.ee9.osgi.boot;singleton:=true org.eclipse.jetty.ee9.osgi.boot.EE9Activator org.eclipse.jetty.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))", org.eclipse.jetty.ee9.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))" - - ${osgi.slf4j.import.packages}, + ${osgi.slf4j.import.packages}, jakarta.mail;version="2.0";resolution:=optional, jakarta.mail.event;version="2.0";resolution:=optional, jakarta.mail.internet;version="2.0";resolution:=optional, @@ -111,14 +111,9 @@ org.xml.sax, org.xml.sax.helpers, org.eclipse.jetty.ee9.annotations;resolution:=optional, - * - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee9.webapp.Configuration - + * + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee9.webapp.Configuration <_nouses>true diff --git a/jetty-ee9/jetty-ee9-osgi/pom.xml b/jetty-ee9/jetty-ee9-osgi/pom.xml index 2abb6644c41f..3bf6ad914e3e 100644 --- a/jetty-ee9/jetty-ee9-osgi/pom.xml +++ b/jetty-ee9/jetty-ee9-osgi/pom.xml @@ -1,29 +1,30 @@ + + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.2-SNAPSHOT - - 4.0.0 org.eclipse.jetty.ee9.osgi jetty-ee9-osgi - EE9 :: OSGi pom - - - true - + EE9 :: OSGi jetty-ee9-osgi-boot jetty-ee9-osgi-boot-jsp - test-jetty-ee9-osgi-webapp-resources + test-jetty-ee9-osgi test-jetty-ee9-osgi-fragment test-jetty-ee9-osgi-server - test-jetty-ee9-osgi + test-jetty-ee9-osgi-webapp-resources + + true + + @@ -42,8 +43,11 @@ - META-INF/.. true + META-INF/.. + + META-INF/**/* + **/.* **/*.jar @@ -55,9 +59,6 @@ target/**/* build.properties - - META-INF/**/* - src/main/java diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-fragment/pom.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-fragment/pom.xml index de67c74fb54a..abc3fbcd9a11 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-fragment/pom.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-fragment/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty.ee9.osgi jetty-ee9-osgi 12.0.2-SNAPSHOT - 4.0.0 test-jetty-ee9-osgi-fragment EE9 :: OSGi :: WebApp Fragment Test Jetty OSGi Webapp Fragment bundle diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-server/pom.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-server/pom.xml index 9e6ee57f5fa2..4dbe3f478773 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-server/pom.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-server/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty.ee9.osgi jetty-ee9-osgi 12.0.2-SNAPSHOT - 4.0.0 test-jetty-ee9-osgi-server EE9 :: OSGi :: Server Test Jetty OSGi bundle with a Server @@ -50,8 +51,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", @@ -59,8 +59,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-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-webapp-resources/pom.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-webapp-resources/pom.xml index cdc4c9fd8700..5cd75c45c200 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-webapp-resources/pom.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi-webapp-resources/pom.xml @@ -1,19 +1,26 @@ + 4.0.0 org.eclipse.jetty.ee9.osgi jetty-ee9-osgi 12.0.2-SNAPSHOT - 4.0.0 test-jetty-ee9-osgi-webapp-resources - EE9 :: OSGi :: WebApp With Resources war + EE9 :: OSGi :: WebApp With Resources ${project.groupId}.webapp.resources true true + + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + provided + + @@ -22,10 +29,10 @@ copy-resources - validate copy-resources + validate ${basedir}/target/classes @@ -63,11 +70,4 @@ - - - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api - provided - - diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/pom.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/pom.xml index 06e47aba0017..0c1673816760 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/pom.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/pom.xml @@ -1,25 +1,26 @@ + + 4.0.0 org.eclipse.jetty.ee9.osgi jetty-ee9-osgi 12.0.2-SNAPSHOT - 4.0.0 test-jetty-ee9-osgi EE9 :: OSGi :: Test Jetty OSGi Integration test + target/distribution ${project.groupId}.boot.test.osgi + 1.2 https://download.eclipse.org/jetty/orbit/ - target/distribution + true + true 4.13.5 2.6.14 + 1.3.6 1.8.3 3.0.0 - 1.3.6 - 1.2 - true - true @@ -153,10 +154,10 @@ - org.slf4j - slf4j-api - test - + org.slf4j + slf4j-api + test + org.eclipse.jetty.ee9 @@ -569,7 +570,7 @@ - + @@ -581,20 +582,20 @@ maven-dependency-plugin + + test-jetty-ee9-osgi-webapp-resources + target + true + copy - process-test-resources copy-dependencies - + process-test-resources + - - test-jetty-ee9-osgi-webapp-resources - target - true - org.apache.servicemix.tooling diff --git a/jetty-ee9/jetty-ee9-plus/pom.xml b/jetty-ee9/jetty-ee9-plus/pom.xml index 30456c20d6cf..a016c8be4080 100644 --- a/jetty-ee9/jetty-ee9-plus/pom.xml +++ b/jetty-ee9/jetty-ee9-plus/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee9-plus EE9 :: Plus Jetty JavaEE style services @@ -15,27 +16,6 @@ org.eclipse.jetty.ee9.plus.* - - - - org.apache.felix - maven-bundle-plugin - true - - - ${osgi.slf4j.import.packages},jakarta.transaction.*;version="2.0.0",* - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee9.webapp.Configuration - - - - - - - jakarta.transaction @@ -69,4 +49,21 @@ + + + + org.apache.felix + maven-bundle-plugin + true + + + ${osgi.slf4j.import.packages},jakarta.transaction.*;version="2.0.0",* + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee9.webapp.Configuration + + + + + + diff --git a/jetty-ee9/jetty-ee9-proxy/pom.xml b/jetty-ee9/jetty-ee9-proxy/pom.xml index 1db49a23333c..ee4e30a8af35 100644 --- a/jetty-ee9/jetty-ee9-proxy/pom.xml +++ b/jetty-ee9/jetty-ee9-proxy/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee9-proxy EE9 :: Proxy Jetty Proxy @@ -14,19 +15,6 @@ ${project.groupId}.proxy org.eclipse.jetty.ee9.proxy.* - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} - --add-reads org.eclipse.jetty.ee9.proxy=org.eclipse.jetty.logging - - - - - org.slf4j @@ -76,4 +64,15 @@ test + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} + --add-reads org.eclipse.jetty.ee9.proxy=org.eclipse.jetty.logging + + + + diff --git a/jetty-ee9/jetty-ee9-quickstart/pom.xml b/jetty-ee9/jetty-ee9-quickstart/pom.xml index 90e1cf31deaa..32d4c1031dc2 100644 --- a/jetty-ee9/jetty-ee9-quickstart/pom.xml +++ b/jetty-ee9/jetty-ee9-quickstart/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee9-quickstart EE9 :: Quick Start Jetty Quick Start @@ -14,26 +15,6 @@ ${project.groupId}.quickstart - - - - org.apache.felix - maven-bundle-plugin - true - - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee9.webapp.Configuration - - - - - - - org.eclipse.jetty.ee9 @@ -63,4 +44,20 @@ + + + + org.apache.felix + maven-bundle-plugin + true + + + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee9.webapp.Configuration + + + + + + diff --git a/jetty-ee9/jetty-ee9-runner/pom.xml b/jetty-ee9/jetty-ee9-runner/pom.xml index 2f0a58f2637b..68d51011caba 100644 --- a/jetty-ee9/jetty-ee9-runner/pom.xml +++ b/jetty-ee9/jetty-ee9-runner/pom.xml @@ -1,10 +1,11 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.2-SNAPSHOT - 4.0.0 jetty-ee9-runner EE9 :: Runner @@ -15,7 +16,80 @@ true + + + org.eclipse.jetty.ee9 + jetty-ee9-plus + + + org.eclipse.jetty.ee9 + jetty-ee9-annotations + + + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-server + + + org.eclipse.jetty + jetty-jndi + + + org.eclipse.jetty.ee9 + jetty-ee9-apache-jsp + + + org.eclipse.jetty.ee9 + jetty-ee9-glassfish-jstl + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + runtime + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-simple-webapp + war + test + + + org.eclipse.jetty + jetty-client + test + + + + + + + org.apache.felix + maven-bundle-plugin + + + true + + + + org.apache.maven.plugins + maven-jar-plugin + + + + org.eclipse.jetty.ee9.runner.Runner + + + Jetty Runner + + + + + + org.apache.maven.plugins @@ -23,14 +97,13 @@ unpack-dependencies - prepare-package unpack-dependencies + prepare-package ** - - **/MANIFEST.MF, + **/MANIFEST.MF, META-INF/LICENSE, META-INF/*.RSA, META-INF/*.DSA, @@ -39,8 +112,7 @@ readme.txt, MANIFEST.MF, about.html, - ecj.1 - + ecj.1 ${project.build.directory}/classes false true @@ -89,78 +161,5 @@ - - - - org.apache.felix - maven-bundle-plugin - - - true - - - - org.apache.maven.plugins - maven-jar-plugin - - - - org.eclipse.jetty.ee9.runner.Runner - - - Jetty Runner - - - - - - - - - - org.eclipse.jetty.ee9 - jetty-ee9-plus - - - org.eclipse.jetty.ee9 - jetty-ee9-annotations - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-server - - - org.eclipse.jetty - jetty-jndi - - - org.eclipse.jetty.ee9 - jetty-ee9-apache-jsp - - - org.eclipse.jetty.ee9 - jetty-ee9-glassfish-jstl - - - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-slf4j-impl - runtime - - - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-simple-webapp - war - test - - - org.eclipse.jetty - jetty-client - test - - diff --git a/jetty-ee9/jetty-ee9-security/pom.xml b/jetty-ee9/jetty-ee9-security/pom.xml index bdc877221c64..82d46907a17b 100644 --- a/jetty-ee9/jetty-ee9-security/pom.xml +++ b/jetty-ee9/jetty-ee9-security/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee9-security EE9 :: Security Jetty security infrastructure @@ -15,21 +16,6 @@ org.eclipse.jetty.ee9.security.* - - - - org.apache.felix - maven-bundle-plugin - true - - - osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.security.Authenticator$Factory)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional - - - - - - org.eclipse.jetty.ee9 @@ -61,4 +47,19 @@ + + + + org.apache.felix + maven-bundle-plugin + true + + + osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.security.Authenticator$Factory)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional + + + + + + diff --git a/jetty-ee9/jetty-ee9-servlet/pom.xml b/jetty-ee9/jetty-ee9-servlet/pom.xml index 350e6f678bc0..1c2cebdffbe4 100644 --- a/jetty-ee9/jetty-ee9-servlet/pom.xml +++ b/jetty-ee9/jetty-ee9-servlet/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee9-servlet EE9 :: Servlet Jetty Servlet Container @@ -16,21 +16,6 @@ org.eclipse.jetty.ee9.servlet.* - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} - --add-modules org.eclipse.jetty.util.ajax - --add-reads org.eclipse.jetty.ee9.servlet=org.eclipse.jetty.logging - - - - - - org.eclipse.jetty.ee9 @@ -76,4 +61,17 @@ test + + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} + --add-modules org.eclipse.jetty.util.ajax + --add-reads org.eclipse.jetty.ee9.servlet=org.eclipse.jetty.logging + + + + diff --git a/jetty-ee9/jetty-ee9-servlets/pom.xml b/jetty-ee9/jetty-ee9-servlets/pom.xml index f1af96a5053c..831ce34a4678 100644 --- a/jetty-ee9/jetty-ee9-servlets/pom.xml +++ b/jetty-ee9/jetty-ee9-servlets/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee9-servlets EE9 :: Utility Servlets and Filters Jetty Utility Servlets @@ -16,28 +16,6 @@ org.eclipse.jetty.ee9.servlets.* - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} - --add-modules jetty.servlet.api - --add-modules org.eclipse.jetty.util - --add-modules org.eclipse.jetty.io - --add-modules org.eclipse.jetty.http - --add-modules org.eclipse.jetty.server - --add-modules org.eclipse.jetty.session - --add-modules org.eclipse.jetty.ee9.nested - --add-reads org.eclipse.jetty.ee9.servlets=java.management - --add-reads org.eclipse.jetty.ee9.servlets=org.eclipse.jetty.logging - - - - - - org.eclipse.jetty @@ -93,4 +71,24 @@ + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} + --add-modules jetty.servlet.api + --add-modules org.eclipse.jetty.util + --add-modules org.eclipse.jetty.io + --add-modules org.eclipse.jetty.http + --add-modules org.eclipse.jetty.server + --add-modules org.eclipse.jetty.session + --add-modules org.eclipse.jetty.ee9.nested + --add-reads org.eclipse.jetty.ee9.servlets=java.management + --add-reads org.eclipse.jetty.ee9.servlets=org.eclipse.jetty.logging + + + + + diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-bad-websocket-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-bad-websocket-webapp/pom.xml index 4edf68e506b6..18e9b638cecc 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-bad-websocket-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-bad-websocket-webapp/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9-tests 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee9-test-bad-websocket-webapp war diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-cdi-common-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-cdi-common-webapp/pom.xml index e56aac7d7af9..a7a2cea779fe 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-cdi-common-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-cdi-common-webapp/pom.xml @@ -1,34 +1,20 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9-tests 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee9-test-cdi-common-webapp - EE9 :: Tests :: CDI Common Demo WebApp war + EE9 :: Tests :: CDI Common Demo WebApp ${project.groupId}.cdi.common - - - - - org.apache.maven.plugins - maven-war-plugin - - false - - - - - - @@ -51,4 +37,18 @@ + + + + + org.apache.maven.plugins + maven-war-plugin + + false + + + + + + diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-cdi/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-cdi/pom.xml index 29191d330e96..89e015b8eee0 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-cdi/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-cdi/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9-tests 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee9-test-cdi jar EE9 :: Tests :: CDI diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-client-transports/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-client-transports/pom.xml index 5008089b3885..ad4c8566335b 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-client-transports/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-client-transports/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9-tests 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee9-test-client-transports jar EE9 :: Tests :: HTTP Client Transports @@ -17,49 +17,6 @@ true - - - enable-incubator-foreign - - [17,19) - - - - - maven-surefire-plugin - - - @{argLine} - ${jetty.surefire.argLine} - --add-modules jdk.incubator.foreign - --enable-native-access ALL-UNNAMED - - - - - - - - enable-preview - - [19,21) - - - - - maven-surefire-plugin - - - @{argLine} - --enable-preview - - - - - - - - org.slf4j @@ -142,4 +99,43 @@ + + + enable-incubator-foreign + + [17,19) + + + + + maven-surefire-plugin + + @{argLine} + ${jetty.surefire.argLine} + --add-modules jdk.incubator.foreign + --enable-native-access ALL-UNNAMED + + + + + + + enable-preview + + [19,21) + + + + + maven-surefire-plugin + + @{argLine} + --enable-preview + + + + + + + diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-felix-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-felix-webapp/pom.xml index c2e7d58fb3c8..082f5cc382dc 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-felix-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-felix-webapp/pom.xml @@ -1,20 +1,33 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9-tests 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee9-test-felix-webapp - EE9 :: Tests :: Felix WebApp war + EE9 :: Tests :: Felix WebApp ${project.groupId}.felix + + + jakarta.servlet + jakarta.servlet-api + provided + + + org.apache.felix + org.apache.felix.framework + 7.0.5 + + + @@ -34,17 +47,4 @@ - - - - jakarta.servlet - jakarta.servlet-api - provided - - - org.apache.felix - org.apache.felix.framework - 7.0.5 - - diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http2-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http2-webapp/pom.xml index c46e26238bf7..27153f96d033 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http2-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-http2-webapp/pom.xml @@ -1,67 +1,20 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9-tests 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee9-test-http2-webapp - EE9 :: Tests :: HTTP2 WebApp war + EE9 :: Tests :: HTTP2 WebApp ${project.groupId}.http2 - - - - maven-dependency-plugin - - - unpack-webapp - pre-integration-test - - unpack - - - - - ${project.groupId} - ${project.artifactId} - ${project.version} - war - false - ${project.build.directory}/webapp - - - - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - integration-test - - integration-test - - - - verify - - verify - - - - - - - org.eclipse.jetty.http2 @@ -107,4 +60,51 @@ test + + + + + maven-dependency-plugin + + + unpack-webapp + + unpack + + pre-integration-test + + + + ${project.groupId} + ${project.artifactId} + ${project.version} + war + false + ${project.build.directory}/webapp + + + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + integration-test + + integration-test + + + + verify + + verify + + + + + + diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/pom.xml index 92cc1fcd06ae..241e6f680d58 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/pom.xml @@ -1,66 +1,20 @@ + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9-tests 12.0.2-SNAPSHOT - 4.0.0 jetty-ee9-test-integration jar EE9 :: Tests :: Integration - ${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.apache.maven.plugins - maven-dependency-plugin - - - copy-wars-for-testing - process-test-resources - - copy - - - - - org.eclipse.jetty.ee9 - jetty-ee9-test-webapp-rfc2616 - ${project.version} - war - ee9-test-rfc2616.war - - - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-jetty-webapp - war - ee9-demo-jetty.war - - - true - ${project.build.directory}/webapps - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - true - false - - - - org.eclipse.jetty.ee9 @@ -149,4 +103,50 @@ test + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-wars-for-testing + + copy + + process-test-resources + + + + org.eclipse.jetty.ee9 + jetty-ee9-test-webapp-rfc2616 + ${project.version} + war + ee9-test-rfc2616.war + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-jetty-webapp + war + ee9-demo-jetty.war + + + true + ${project.build.directory}/webapps + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + + true + false + + + + diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/jetty-ee9-jmx-webapp-it/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/jetty-ee9-jmx-webapp-it/pom.xml index 9be42e33df50..1d9852edad0c 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/jetty-ee9-jmx-webapp-it/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/jetty-ee9-jmx-webapp-it/pom.xml @@ -1,18 +1,18 @@ + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9-test-jmx 12.0.2-SNAPSHOT - 4.0.0 jetty-ee9-jmx-webapp-it jar EE9 :: Tests :: JMX :: WebApp Integration + ${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 jetty-ee9-jmx-webapp runtime diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/pom.xml index 974113dedacb..1f72d2e93e7d 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/pom.xml @@ -1,11 +1,11 @@ + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9-tests 12.0.2-SNAPSHOT - 4.0.0 jetty-ee9-test-jmx pom EE9 :: Tests :: JMX diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jndi/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jndi/pom.xml index f92bff574148..0d8ada6b2ee4 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jndi/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jndi/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9-tests 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee9-test-jndi jar EE9 :: Tests :: JNDI diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-loginservice/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-loginservice/pom.xml index a2b2bcc6d000..65b0d5480950 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-loginservice/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-loginservice/pom.xml @@ -9,8 +9,8 @@ jetty-ee9-test-loginservice EE9 :: Tests :: Login Service - false ${project.groupId}.loginservice + false diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-openid-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-openid-webapp/pom.xml index b70638b056a0..0646002fb57f 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-openid-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-openid-webapp/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9-tests 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee9-test-openid-webapp war diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-owb-cdi-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-owb-cdi-webapp/pom.xml index 130603af02f5..c2d7c7ad4568 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-owb-cdi-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-owb-cdi-webapp/pom.xml @@ -1,25 +1,21 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9-tests 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee9-test-owb-cdi-webapp - EE9 :: Tests :: CDI OWB Demo WebApp war + EE9 :: Tests :: CDI OWB Demo WebApp ${project.groupId}.cdi.owb 2.0.27 - - jetty-ee9-test-owb-cdi-demo - - @@ -64,4 +60,8 @@ ${openwebbeans.version} + + + jetty-ee9-test-owb-cdi-demo + diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-quickstart/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-quickstart/pom.xml index 8921836756cf..c30433c27f45 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-quickstart/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-quickstart/pom.xml @@ -1,11 +1,11 @@ + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9-tests 12.0.2-SNAPSHOT - 4.0.0 jetty-ee9-test-quickstart EE9 :: Tests :: Quick Start Jetty Quick Start Test @@ -114,10 +114,10 @@ copy - process-test-classes copy + process-test-classes diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-common/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-common/pom.xml index 96724422bcb1..63d25395f551 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-common/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-common/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jetty.toolchain jetty-jakarta-servlet-api - + org.eclipse.jetty jetty-session diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-gcloud/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-gcloud/pom.xml index d6b6a63f8a6d..e7781578a1bc 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-gcloud/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-gcloud/pom.xml @@ -20,8 +20,8 @@ org.eclipse.jetty jetty-session - test test-jar + test org.eclipse.jetty.ee9 diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-hazelcast/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-hazelcast/pom.xml index 83be735b59bd..b457ccf96ebf 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-hazelcast/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-hazelcast/pom.xml @@ -11,27 +11,6 @@ ${project.groupId}.sessions.hazelcast - - - - 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-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 - - true - - com.hazelcast.logging.Slf4jFactory - - 45 - 240 - - - - org.eclipse.jetty @@ -65,14 +44,14 @@ test - com.hazelcast - hazelcast + com.hazelcast + hazelcast org.eclipse.jetty jetty-jmx - true test + true org.eclipse.jetty.toolchain @@ -100,5 +79,24 @@ test + + + + 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-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 + true + + com.hazelcast.logging.Slf4jFactory + + 45 + 240 + + + + diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-infinispan/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-infinispan/pom.xml index 2fa7a3ddf329..9bd004fe8b99 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-infinispan/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-infinispan/pom.xml @@ -14,50 +14,6 @@ infinispan/server - - - - 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 - - - - - org.eclipse.jetty.toolchain - jetty-test-policy - ${jetty-test-policy.version} - jar - true - **/*.keystore,**/*.pem - ${jetty.test.policy.loc} - - - - - - - - org.eclipse.jetty @@ -98,8 +54,8 @@ org.eclipse.jetty jetty-jmx - true test + true org.eclipse.jetty.toolchain @@ -174,6 +130,50 @@ 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 + + unpack + + generate-test-resources + + + + org.eclipse.jetty.toolchain + jetty-test-policy + ${jetty-test-policy.version} + jar + true + **/*.keystore,**/*.pem + ${jetty.test.policy.loc} + + + + + + + + jdk16 diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-jdbc/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-jdbc/pom.xml index daadcfe83415..e079433bb78c 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-jdbc/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-jdbc/pom.xml @@ -11,19 +11,6 @@ ${project.groupId}.sessions.jdbc - - - - org.apache.maven.plugins - maven-surefire-plugin - - - ${mariadb.docker.version} - - - - - org.eclipse.jetty @@ -92,4 +79,17 @@ test + + + + org.apache.maven.plugins + maven-surefire-plugin + + + ${mariadb.docker.version} + + + + + diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-mongodb/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-mongodb/pom.xml index 16a64dcc3f9d..8adf1cead41d 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-mongodb/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-mongodb/pom.xml @@ -11,19 +11,6 @@ ${project.groupId}.sessions.mongo - - - - org.apache.maven.plugins - maven-surefire-plugin - - - ${mongo.docker.version} - - - - - org.eclipse.jetty @@ -59,8 +46,8 @@ org.eclipse.jetty jetty-jmx - true test + true org.slf4j @@ -103,4 +90,17 @@ test + + + + org.apache.maven.plugins + maven-surefire-plugin + + + ${mongo.docker.version} + + + + + diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/pom.xml index 4c0d818ee9ef..45d4c6814f4b 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/pom.xml @@ -7,23 +7,23 @@ 12.0.2-SNAPSHOT jetty-ee9-test-sessions - EE9 :: Tests :: Sessions pom - - true - true - true - + EE9 :: Tests :: Sessions jetty-ee9-test-sessions-common jetty-ee9-test-sessions-file - jetty-ee9-test-sessions-jdbc - jetty-ee9-test-sessions-mongodb - jetty-ee9-test-sessions-infinispan jetty-ee9-test-sessions-gcloud - jetty-ee9-test-sessions-memcached jetty-ee9-test-sessions-hazelcast + jetty-ee9-test-sessions-infinispan + jetty-ee9-test-sessions-jdbc + jetty-ee9-test-sessions-memcached + jetty-ee9-test-sessions-mongodb + + true + true + true + diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-webapp-rfc2616/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-webapp-rfc2616/pom.xml index 6d355115a7aa..5653b317f132 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-webapp-rfc2616/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-webapp-rfc2616/pom.xml @@ -7,12 +7,23 @@ 12.0.2-SNAPSHOT jetty-ee9-test-webapp-rfc2616 - EE9 :: Tests :: RFC2616 WebApp war + EE9 :: Tests :: RFC2616 WebApp ${project.groupId}.rfc2616 true + + + org.eclipse.jetty.ee9 + jetty-ee9-servlets + + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + provided + + @@ -24,21 +35,10 @@ foo 1 - 222 + 222 - - - org.eclipse.jetty.ee9 - jetty-ee9-servlets - - - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api - provided - - diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-client-provided-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-client-provided-webapp/pom.xml index 67bd8ead3b6f..0844b5e10445 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-client-provided-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-client-provided-webapp/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9-tests 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee9-test-websocket-client-provided-webapp war diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-client-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-client-webapp/pom.xml index 5ce3c2d25749..15185cc2b84a 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-client-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-client-webapp/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9-tests 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee9-test-websocket-client-webapp war diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-webapp/pom.xml index 3f79c95abe5d..566e6ff51cbd 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-websocket-webapp/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9-tests 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee9-test-websocket-webapp war diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-weld-cdi-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-weld-cdi-webapp/pom.xml index eb4856241f0a..6392f6fb543c 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-weld-cdi-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-weld-cdi-webapp/pom.xml @@ -1,24 +1,20 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9-tests 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee9-test-weld-cdi-webapp - EE9 :: Tests :: CDI Weld Demo WebApp war + EE9 :: Tests :: CDI Weld Demo WebApp ${project.groupId}.cdi.weld - - jetty-ee9-test-weld-cdi-demo - - @@ -41,4 +37,8 @@ ${jboss.logging.version} + + + jetty-ee9-test-weld-cdi-demo + diff --git a/jetty-ee9/jetty-ee9-tests/pom.xml b/jetty-ee9/jetty-ee9-tests/pom.xml index 5d9f069b87e4..e5210545b336 100644 --- a/jetty-ee9/jetty-ee9-tests/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/pom.xml @@ -1,44 +1,44 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee9-tests - EE9 :: Tests pom - - - true - true - true - + EE9 :: Tests jetty-ee9-test-bad-websocket-webapp + jetty-ee9-test-badinit-webapp jetty-ee9-test-cdi - jetty-ee9-test-http2-webapp + jetty-ee9-test-cdi-common-webapp jetty-ee9-test-client-transports + jetty-ee9-test-felix-webapp + jetty-ee9-test-http2-webapp jetty-ee9-test-integration jetty-ee9-test-jmx jetty-ee9-test-jndi jetty-ee9-test-loginservice - jetty-ee9-test-quickstart - jetty-ee9-test-websocket-client-provided-webapp - jetty-ee9-test-websocket-client-webapp - jetty-ee9-test-websocket-webapp - jetty-ee9-test-cdi-common-webapp - jetty-ee9-test-felix-webapp jetty-ee9-test-openid-webapp jetty-ee9-test-owb-cdi-webapp + jetty-ee9-test-quickstart + jetty-ee9-test-sessions jetty-ee9-test-simple-session-webapp jetty-ee9-test-webapp-rfc2616 + jetty-ee9-test-websocket-client-provided-webapp + jetty-ee9-test-websocket-client-webapp + jetty-ee9-test-websocket-webapp jetty-ee9-test-weld-cdi-webapp - jetty-ee9-test-badinit-webapp - jetty-ee9-test-sessions + + true + true + true + + diff --git a/jetty-ee9/jetty-ee9-webapp/pom.xml b/jetty-ee9/jetty-ee9-webapp/pom.xml index 44881543ab1d..12105d8d0916 100644 --- a/jetty-ee9/jetty-ee9-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-webapp/pom.xml @@ -1,11 +1,12 @@ + + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee9-webapp EE9 :: WebApp Jetty web application support @@ -15,15 +16,50 @@ org.eclipse.jetty.ee9.webapp.* + + + org.eclipse.jetty.ee9 + jetty-ee9-servlet + + + org.eclipse.jetty + jetty-xml + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty + jetty-http-tools + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + org.eclipse.jetty + jetty-client + test + + + src/main/resources - src/main/config/etc org/eclipse/jetty/ee9/webapp false + src/main/config/etc webdefault-ee9.xml @@ -34,16 +70,16 @@ src/test/resources - src/test/webapp webapp + src/test/webapp - src/test/webapp-with-resources webapp-with-resources + src/test/webapp-with-resources - src/test/webapp-alt-jsp webapp-alt-jsp + src/test/webapp-alt-jsp @@ -52,11 +88,9 @@ org.apache.maven.plugins maven-surefire-plugin - - @{argLine} ${jetty.surefire.argLine} + @{argLine} ${jetty.surefire.argLine} --add-exports org.eclipse.jetty.ee9.webapp/org.acme.webapp=org.eclipse.jetty.ee9.servlet - --add-exports org.eclipse.jetty.ee9.webapp/org.acme.webapp=org.eclipse.jetty.ee9.nested - + --add-exports org.eclipse.jetty.ee9.webapp/org.acme.webapp=org.eclipse.jetty.ee9.nested false ${project.build.testOutputDirectory}/mods/foo-bar-janb.jar @@ -72,50 +106,11 @@ true - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)", osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.ee9.webapp.Configuration)";cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee9.webapp.Configuration - + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)", osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.ee9.webapp.Configuration)";cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee9.webapp.Configuration - - - - org.eclipse.jetty.ee9 - jetty-ee9-servlet - - - org.eclipse.jetty - jetty-xml - - - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty - jetty-http-tools - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - org.eclipse.jetty - jetty-client - test - - diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client-webapp/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client-webapp/pom.xml index 1679198b452f..59b3bd6dd014 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client-webapp/pom.xml @@ -1,13 +1,13 @@ + + 4.0.0 org.eclipse.jetty.ee9.websocket jetty-ee9-websocket 12.0.2-SNAPSHOT ../pom.xml - - 4.0.0 jetty-ee9-websocket-jakarta-client-webapp EE9 :: Websocket :: Jakarta Client Webapp @@ -35,15 +35,9 @@ jakarta.websocket.client WebApp Implementation - - org.eclipse.jetty.ee9.websocket.jakarta.client.webapp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - - - osgi.serviceloader;osgi.serviceloader=jakarta.servlet.ServletContainerInitializer - + org.eclipse.jetty.ee9.websocket.jakarta.client.webapp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional + osgi.serviceloader;osgi.serviceloader=jakarta.servlet.ServletContainerInitializer diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client/pom.xml index 31c29439a24a..6b3b7eec0001 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client/pom.xml @@ -1,13 +1,13 @@ + + 4.0.0 org.eclipse.jetty.ee9.websocket jetty-ee9-websocket 12.0.2-SNAPSHOT ../pom.xml - - 4.0.0 jetty-ee9-websocket-jakarta-client EE9 :: Websocket :: Jakarta Client @@ -63,15 +63,9 @@ jakarta.websocket.client Implementation - - org.eclipse.jetty.ee9.websocket.jakarta.client.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - - - osgi.serviceloader;osgi.serviceloader=jakarta.websocket.ContainerProvider - + org.eclipse.jetty.ee9.websocket.jakarta.client.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional + osgi.serviceloader;osgi.serviceloader=jakarta.websocket.ContainerProvider diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-common/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-common/pom.xml index d4b4cbd2e2a8..be0002a9eead 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-common/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-common/pom.xml @@ -1,38 +1,20 @@ + + 4.0.0 org.eclipse.jetty.ee9.websocket jetty-ee9-websocket 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee9-websocket-jakarta-common EE9 :: Websocket :: Jakarta Common - false ${project.groupId}.jakarta.common + false - - - - org.apache.felix - maven-bundle-plugin - true - - - jakarta.websocket.client Implementation - - org.eclipse.jetty.ee9.websocket.jakarta.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - - - - - - - org.eclipse.jetty.toolchain @@ -58,4 +40,20 @@ test + + + + + org.apache.felix + maven-bundle-plugin + true + + + jakarta.websocket.client Implementation + org.eclipse.jetty.ee9.websocket.jakarta.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" + + + + + diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-server/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-server/pom.xml index 5983306f4eac..ac7ecde5c548 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-server/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-server/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee9.websocket jetty-ee9-websocket 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee9-websocket-jakarta-server EE9 :: Websocket :: Jakarta Server @@ -47,9 +47,7 @@ maven-surefire-plugin - - @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.websocket.jakarta.server=org.eclipse.jetty.security --add-reads org.eclipse.jetty.websocket.jakarta.common=org.eclipse.jetty.websocket.jakarta.server - + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.websocket.jakarta.server=org.eclipse.jetty.security --add-reads org.eclipse.jetty.websocket.jakarta.common=org.eclipse.jetty.websocket.jakarta.server @@ -59,13 +57,9 @@ jakarta.websocket.server Implementation - - org.eclipse.jetty.websocket.jakarta.server.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - + org.eclipse.jetty.websocket.jakarta.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.ee9.webapp.Configuration,osgi.serviceloader;osgi.serviceloader=jakarta.servlet.ServletContainerInitializer,osgi.serviceloader;osgi.serviceloader=jakarta.websocket.server.ServerEndpointConfig$Configurator - + osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.ee9.webapp.Configuration,osgi.serviceloader;osgi.serviceloader=jakarta.servlet.ServletContainerInitializer,osgi.serviceloader;osgi.serviceloader=jakarta.websocket.server.ServerEndpointConfig$Configurator diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/pom.xml index b0430a2a6cd4..c16719299d87 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/pom.xml @@ -1,18 +1,18 @@ + + 4.0.0 org.eclipse.jetty.ee9.websocket jetty-ee9-websocket 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee9-websocket-jakarta-tests EE9 :: Websocket :: Jakarta Tests - false ${project.groupId}.jakarta.tests + false true true @@ -67,9 +67,7 @@ jakarta.websocket Integration Tests - - org.eclipse.jetty.websocket.jakarta.tests.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - + org.eclipse.jetty.websocket.jakarta.tests.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-api/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-api/pom.xml index b6a4fee269dd..4f96e98d4ab4 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-api/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-api/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee9.websocket jetty-ee9-websocket 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee9-websocket-jetty-api EE9 :: Websocket :: Jetty API diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/pom.xml index ec835c806ecf..c50113463fe4 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee9.websocket jetty-ee9-websocket 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee9-websocket-jetty-client-webapp EE9 :: Websocket :: Jetty Client WebApp @@ -14,6 +14,17 @@ ${project.groupId}.client.webapp + + + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-client + + + org.eclipse.jetty.ee9 + jetty-ee9-webapp + + + @@ -22,27 +33,12 @@ true - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee9.webapp.Configuration - + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee9.webapp.Configuration - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-client - - - org.eclipse.jetty.ee9 - jetty-ee9-webapp - - - diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client/pom.xml index 55c9143e4282..15d8ff395b22 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee9.websocket jetty-ee9-websocket 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee9-websocket-jetty-client EE9 :: Websocket :: Jetty Client diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-common/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-common/pom.xml index d9d606998eec..88771dd82ce3 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-common/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-common/pom.xml @@ -1,27 +1,40 @@ + + 4.0.0 org.eclipse.jetty.ee9.websocket jetty-ee9-websocket 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee9-websocket-jetty-common EE9 :: Websocket :: Jetty Common ${project.groupId}.common + + + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-api + + + org.eclipse.jetty.websocket + jetty-websocket-core-common + + + org.eclipse.jetty + jetty-slf4j-impl + test + + maven-surefire-plugin - - @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.ee9.websocket.jetty.common=org.eclipse.jetty.io - + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.ee9.websocket.jetty.common=org.eclipse.jetty.io @@ -30,30 +43,11 @@ true - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee9.websocket.api.ExtensionConfig$Parser - + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee9.websocket.api.ExtensionConfig$Parser - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-api - - - org.eclipse.jetty.websocket - jetty-websocket-core-common - - - org.eclipse.jetty - jetty-slf4j-impl - test - - diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-server/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-server/pom.xml index 1552f7817bfb..248b4b8c5752 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-server/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-server/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee9.websocket jetty-ee9-websocket 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee9-websocket-jetty-server EE9 :: Websocket :: Jetty Server @@ -64,13 +64,9 @@ Jetty Websocket Server - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - - - osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.ee9.webapp.Configuration, - osgi.serviceloader;osgi.serviceloader=jakarta.servlet.ServletContainerInitializer - + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional + osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.ee9.webapp.Configuration, + osgi.serviceloader;osgi.serviceloader=jakarta.servlet.ServletContainerInitializer diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/pom.xml index ca164762ce26..27bd26179a0a 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee9.websocket jetty-ee9-websocket 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee9-websocket-jetty-tests EE9 :: Websocket :: Jetty Tests @@ -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-ee9/jetty-ee9-websocket/jetty-ee9-websocket-servlet/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-servlet/pom.xml index a58cb4ebc910..b3e3ab711e75 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-servlet/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-servlet/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.ee9.websocket jetty-ee9-websocket 12.0.2-SNAPSHOT - - 4.0.0 jetty-ee9-websocket-servlet EE9 :: Websocket :: Servlet diff --git a/jetty-ee9/jetty-ee9-websocket/pom.xml b/jetty-ee9/jetty-ee9-websocket/pom.xml index c0a411e6a20e..2e36ddbe713e 100644 --- a/jetty-ee9/jetty-ee9-websocket/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/pom.xml @@ -1,34 +1,34 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.2-SNAPSHOT ../pom.xml - - 4.0.0 org.eclipse.jetty.ee9.websocket jetty-ee9-websocket - EE9 :: Websocket pom - - - true - + EE9 :: Websocket - jetty-ee9-websocket-jakarta-common jetty-ee9-websocket-jakarta-client jetty-ee9-websocket-jakarta-client-webapp + jetty-ee9-websocket-jakarta-common jetty-ee9-websocket-jakarta-server jetty-ee9-websocket-jakarta-tests jetty-ee9-websocket-jetty-api - jetty-ee9-websocket-jetty-common jetty-ee9-websocket-jetty-client jetty-ee9-websocket-jetty-client-webapp + jetty-ee9-websocket-jetty-common jetty-ee9-websocket-jetty-server jetty-ee9-websocket-jetty-tests jetty-ee9-websocket-servlet + + + true + diff --git a/jetty-ee9/pom.xml b/jetty-ee9/pom.xml index 54f766bc3ee6..483564501f92 100644 --- a/jetty-ee9/pom.xml +++ b/jetty-ee9/pom.xml @@ -1,24 +1,46 @@ + + 4.0.0 org.eclipse.jetty jetty-project 12.0.2-SNAPSHOT - - 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 - EE9 pom + EE9 - - - 5.0.2 + + jetty-ee9-annotations + jetty-ee9-apache-jsp + jetty-ee9-bom + jetty-ee9-cdi + jetty-ee9-demos + jetty-ee9-fcgi-proxy + jetty-ee9-glassfish-jstl + jetty-ee9-home + jetty-ee9-jaspi + jetty-ee9-jndi + jetty-ee9-jspc-maven-plugin + jetty-ee9-maven-plugin + jetty-ee9-nested + jetty-ee9-openid + jetty-ee9-osgi + jetty-ee9-plus + jetty-ee9-proxy + jetty-ee9-quickstart + jetty-ee9-runner + jetty-ee9-security + jetty-ee9-servlet + jetty-ee9-servlets + jetty-ee9-tests + jetty-ee9-webapp + jetty-ee9-websocket + - - 1.1.0.v201105071233 - 1.4.1.v201005082020 + 2.0.1 2.0.0 @@ -28,52 +50,31 @@ 2.0.1 2.0.1 2.0.1 - 2.0.1 5.0.0 3.0.0 2.0.0 - 2.0.0 + 2.0.0 + 2.0.1 + 2.0.0 + 3.0.0 3.0.1 3.0.2 - 3.0.1 3.0.2 - 2.0.0 + 3.0.1 + + + 1.1.0.v201105071233 + 1.4.1.v201005082020 + + 5.0.2 10.0.14 - 4.0.3.Final true + 4.0.3.Final - - jetty-ee9-nested - jetty-ee9-security - jetty-ee9-servlet - jetty-ee9-webapp - jetty-ee9-servlets - jetty-ee9-demos - jetty-ee9-apache-jsp - jetty-ee9-glassfish-jstl - jetty-ee9-annotations - jetty-ee9-cdi - jetty-ee9-jaspi - jetty-ee9-jndi - jetty-ee9-jspc-maven-plugin - jetty-ee9-maven-plugin - jetty-ee9-openid - jetty-ee9-osgi - jetty-ee9-plus - jetty-ee9-proxy - jetty-ee9-quickstart - jetty-ee9-runner - jetty-ee9-websocket - jetty-ee9-tests - jetty-ee9-bom - jetty-ee9-home - jetty-ee9-fcgi-proxy - - @@ -286,7 +287,7 @@ ${project.version} - + org.mortbay.jasper apache-jsp ${jsp.impl.version} @@ -454,10 +455,10 @@ ee9-report - validate dependency-updates-aggregate-report + validate html diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml index b899f67b7a3b..58cec6fe8a8a 100644 --- a/jetty-home/pom.xml +++ b/jetty-home/pom.xml @@ -1,23 +1,232 @@ + 4.0.0 - jetty-project org.eclipse.jetty + jetty-project 12.0.2-SNAPSHOT ../pom.xml - 4.0.0 jetty-home - Home pom + Home ${basedir}/target/jetty-home - ${basedir}/target/jetty-home-sources 2.0.1 + ${basedir}/target/jetty-home-sources true + + + + + + + + + + + + + + + + + + + + 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-security + + + org.eclipse.jetty + jetty-openid + + + org.eclipse.jetty + jetty-util-ajax + + + org.eclipse.jetty + jetty-jmx + + + org.eclipse.jetty + jetty-start + ${project.version} + shaded + + + org.eclipse.jetty.ee10 + jetty-ee10-home + ${project.version} + zip + + + org.eclipse.jetty.ee9 + jetty-ee9-home + ${project.version} + zip + + + org.eclipse.jetty.ee8 + jetty-ee8-home + ${project.version} + zip + + + org.eclipse.jetty + jetty-client + + + org.eclipse.jetty + jetty-unixdomain-server + true + + + org.eclipse.jetty.fcgi + jetty-fcgi-proxy + true + + + org.eclipse.jetty.fcgi + jetty-fcgi-server + true + + + org.jboss.logging + jboss-logging + true + + + org.eclipse.jetty + jetty-rewrite + + + org.eclipse.jetty.http2 + jetty-http2-server + + + org.eclipse.jetty.http3 + jetty-http3-server + + + org.eclipse.jetty + jetty-alpn-server + + + org.eclipse.jetty + jetty-alpn-java-server + + + org.eclipse.jetty + jetty-alpn-conscrypt-server + + + org.eclipse.jetty.websocket + jetty-websocket-jetty-client + + + org.eclipse.jetty.websocket + jetty-websocket-jetty-server + + + + org.eclipse.jetty + jetty-infinispan-embedded + ${project.version} + pom + true + + + org.eclipse.jetty + jetty-infinispan-embedded-query + true + + + org.eclipse.jetty + jetty-infinispan-remote + ${project.version} + pom + true + + + org.wildfly.common + * + + + + + org.eclipse.jetty + jetty-infinispan-remote-query + + + org.eclipse.jetty + jetty-hazelcast + true + + + org.eclipse.jetty.gcloud + jetty-gcloud-session-manager + true + + + org.eclipse.jetty.memcached + jetty-memcached-sessions + true + + + org.eclipse.jetty + jetty-nosql + true + + + org.eclipse.jetty.demos + jetty-demo-handler + ${project.version} + true + + + org.eclipse.jetty + jetty-keystore + true + + + org.eclipse.jetty.toolchain.setuid + jetty-setuid-jna + ${jetty-setuid-version} + + + @@ -26,10 +235,10 @@ copy-base-assembly-tree - generate-resources copy-resources + generate-resources false true @@ -55,10 +264,10 @@ copy - generate-resources copy + generate-resources @@ -87,74 +296,64 @@ copy-jetty-core-deps - generate-resources copy-dependencies + generate-resources 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.ee8.websocket,org.eclipse.jetty.ee9.websocket,org.eclipse.jetty.ee10.websocket,org.eclipse.jetty.fcgi,org.eclipse.jetty.toolchain,org.apache.taglibs - - - jetty-ee8-apache-jsp,jetty-ee9-apache-jsp,jetty-ee10-apache-jsp,jetty-ee8-glassfish-jstl,jetty-ee9-glassfish-jstl,jetty-ee10-glassfish-jstl,jetty-start,jetty-slf4j-impl,javadoc - + org.eclipse.jetty.orbit,org.eclipse.jetty.http2,org.eclipse.jetty.http3,org.eclipse.jetty.quic,org.eclipse.jetty.websocket,org.eclipse.jetty.ee8.websocket,org.eclipse.jetty.ee9.websocket,org.eclipse.jetty.ee10.websocket,org.eclipse.jetty.fcgi,org.eclipse.jetty.toolchain,org.apache.taglibs + jetty-ee8-apache-jsp,jetty-ee9-apache-jsp,jetty-ee10-apache-jsp,jetty-ee8-glassfish-jstl,jetty-ee9-glassfish-jstl,jetty-ee10-glassfish-jstl,jetty-start,jetty-slf4j-impl,javadoc jar ${assembly-directory}/lib copy-jetty-core-src-deps - generate-resources copy-dependencies + generate-resources 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 - - - jetty-ee8-apache-jsp,jetty-ee8-glassfish-jstl,jetty-ee9-apache-jsp,jetty-ee9-glassfish-jstl,jetty-ee10-apache-jsp,jetty-ee10-glassfish-jtl,jetty-start - + 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 + jetty-ee8-apache-jsp,jetty-ee8-glassfish-jstl,jetty-ee9-apache-jsp,jetty-ee9-glassfish-jstl,jetty-ee10-apache-jsp,jetty-ee10-glassfish-jtl,jetty-start jar sources ${source-assembly-directory}/lib - copy-lib-logging-deps - generate-resources + copy-lib-fcgi-deps copy-dependencies + generate-resources - org.eclipse.jetty,org.slf4j - jetty-slf4j-impl,slf4j-api + org.eclipse.jetty.fcgi jar - ${assembly-directory}/lib/logging + ${assembly-directory}/lib/fcgi - copy-lib-logging-src-deps - generate-resources + copy-lib-fcgi-src-deps copy-dependencies + generate-resources - org.eclipse.jetty,org.slf4j - jetty-slf4j-impl,slf4j-api + org.eclipse.jetty.fcgi jar sources - ${source-assembly-directory}/lib/logging + ${source-assembly-directory}/lib/fcgi copy-lib-http2-deps - generate-resources copy-dependencies + generate-resources org.eclipse.jetty.http2 jetty-http2-hpack,jetty-http2-common,jetty-http2-server @@ -164,10 +363,10 @@ copy-lib-http2-src-deps - generate-resources copy-dependencies + generate-resources org.eclipse.jetty.http2 jetty-http2-hpack,jetty-http2-common,jetty-http2-server @@ -178,10 +377,10 @@ copy-lib-http3-deps - generate-resources copy-dependencies + generate-resources org.eclipse.jetty.http3,org.eclipse.jetty.quic,org.eclipse.jetty.quiche jetty-http3-server,jetty-http3-common,jetty-http3-qpack,jetty-quic-server,jetty-quic-common,jetty-quic-quiche-common,jetty-quic-quiche-jna,jetty-quic-quiche-foreign-incubator,jetty-quiche-native @@ -191,10 +390,10 @@ copy-lib-http3-src-deps - generate-resources copy-dependencies + generate-resources org.eclipse.jetty.http3 jetty-http3-server @@ -204,36 +403,54 @@ - copy-lib-fcgi-deps - generate-resources + copy-lib-logging-deps copy-dependencies + generate-resources - org.eclipse.jetty.fcgi + org.eclipse.jetty,org.slf4j + jetty-slf4j-impl,slf4j-api jar - ${assembly-directory}/lib/fcgi + ${assembly-directory}/lib/logging - copy-lib-fcgi-src-deps - generate-resources + copy-lib-logging-src-deps copy-dependencies + generate-resources - org.eclipse.jetty.fcgi + org.eclipse.jetty,org.slf4j + jetty-slf4j-impl,slf4j-api jar sources - ${source-assembly-directory}/lib/fcgi + ${source-assembly-directory}/lib/logging - unpack-eeX-home + unpack-config-deps + + unpack-dependencies + generate-resources + + + org.eclipse.jetty, org.eclipse.jetty.websocket, org.eclipse.jetty.toolchain.setuid + jetty-infinispan-embedded,jetty-infinispan-remote,jetty-test-helper,alpn-api,javax.security.auth.message,javax.activation + config + false + META-INF/**,webapps/**,start.d/**,start.ini + ${assembly-directory} + + + + unpack-eeX-home unpack + generate-resources @@ -258,30 +475,12 @@ ${assembly-directory} - - unpack-config-deps - generate-resources - - unpack-dependencies - - - - - org.eclipse.jetty, org.eclipse.jetty.websocket, org.eclipse.jetty.toolchain.setuid - - jetty-infinispan-embedded,jetty-infinispan-remote,jetty-test-helper,alpn-api,javax.security.auth.message,javax.activation - config - false - META-INF/**,webapps/**,start.d/**,start.ini - ${assembly-directory} - - unpack-infinispan-config - generate-resources unpack + generate-resources @@ -311,13 +510,13 @@ set jetty.sh - process-resources run + process-resources - + @@ -333,10 +532,10 @@ binary - package single + package 0 0 @@ -347,10 +546,10 @@ sources - package single + package src/main/assembly/jetty-source-assembly.xml @@ -400,213 +599,4 @@ - - - - - - - - - - - - - - - - - - - - - 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-security - - - org.eclipse.jetty - jetty-openid - - - org.eclipse.jetty - jetty-util-ajax - - - org.eclipse.jetty - jetty-jmx - - - org.eclipse.jetty - jetty-start - shaded - ${project.version} - - - org.eclipse.jetty.ee10 - jetty-ee10-home - ${project.version} - zip - - - org.eclipse.jetty.ee9 - jetty-ee9-home - ${project.version} - zip - - - org.eclipse.jetty.ee8 - jetty-ee8-home - ${project.version} - zip - - - org.eclipse.jetty - jetty-client - - - org.eclipse.jetty - jetty-unixdomain-server - true - - - org.eclipse.jetty.fcgi - jetty-fcgi-proxy - true - - - org.eclipse.jetty.fcgi - jetty-fcgi-server - true - - - org.jboss.logging - jboss-logging - true - - - org.eclipse.jetty - jetty-rewrite - - - org.eclipse.jetty.http2 - jetty-http2-server - - - org.eclipse.jetty.http3 - jetty-http3-server - - - org.eclipse.jetty - jetty-alpn-server - - - org.eclipse.jetty - jetty-alpn-java-server - - - org.eclipse.jetty - jetty-alpn-conscrypt-server - - - org.eclipse.jetty.websocket - jetty-websocket-jetty-client - - - org.eclipse.jetty.websocket - jetty-websocket-jetty-server - - - - org.eclipse.jetty - jetty-infinispan-embedded - ${project.version} - pom - true - - - org.eclipse.jetty - jetty-infinispan-embedded-query - true - - - org.eclipse.jetty - jetty-infinispan-remote - ${project.version} - pom - true - - - org.wildfly.common - * - - - - - org.eclipse.jetty - jetty-infinispan-remote-query - - - org.eclipse.jetty - jetty-hazelcast - true - - - org.eclipse.jetty.gcloud - jetty-gcloud-session-manager - true - - - org.eclipse.jetty.memcached - jetty-memcached-sessions - true - - - org.eclipse.jetty - jetty-nosql - true - - - org.eclipse.jetty.demos - jetty-demo-handler - ${project.version} - true - - - org.eclipse.jetty - jetty-keystore - true - - - org.eclipse.jetty.toolchain.setuid - jetty-setuid-jna - ${jetty-setuid-version} - - diff --git a/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/pom.xml b/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/pom.xml index 8e1a33243e6b..a82431a40c48 100644 --- a/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/pom.xml +++ b/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty.gcloud jetty-gcloud 12.0.2-SNAPSHOT - - 4.0.0 jetty-gcloud-session-manager Integrations :: GCloud :: Sessions @@ -57,9 +57,7 @@ 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}" @@ -69,10 +67,10 @@ build-deps-file - generate-resources list + generate-resources false ${project.build.directory}/deps.txt @@ -90,28 +88,28 @@ process-deps - process-resources run + process-resources - - + + process-mod - process-resources run + process-resources - - + + diff --git a/jetty-integrations/jetty-gcloud/pom.xml b/jetty-integrations/jetty-gcloud/pom.xml index d41e41a02bfc..ff429fd14f07 100644 --- a/jetty-integrations/jetty-gcloud/pom.xml +++ b/jetty-integrations/jetty-gcloud/pom.xml @@ -1,23 +1,23 @@ + + 4.0.0 org.eclipse.jetty jetty-integrations 12.0.2-SNAPSHOT - - 4.0.0 org.eclipse.jetty.gcloud jetty-gcloud pom Integrations :: GCloud - - 2.11.4 - - jetty-gcloud-session-manager + + 2.11.4 + + diff --git a/jetty-integrations/jetty-hazelcast/pom.xml b/jetty-integrations/jetty-hazelcast/pom.xml index 237c76987358..a4c97a37166c 100644 --- a/jetty-integrations/jetty-hazelcast/pom.xml +++ b/jetty-integrations/jetty-hazelcast/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty jetty-integrations 12.0.2-SNAPSHOT - - 4.0.0 jetty-hazelcast Integrations :: Hazelcast :: Sessions @@ -36,10 +36,10 @@ maven-assembly-plugin - package single + package config diff --git a/jetty-integrations/jetty-infinispan/jetty-infinispan-common/pom.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-common/pom.xml index c24a66da1350..d9e3b78c79ed 100644 --- a/jetty-integrations/jetty-infinispan/jetty-infinispan-common/pom.xml +++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-common/pom.xml @@ -1,38 +1,16 @@ + + 4.0.0 org.eclipse.jetty jetty-infinispan 12.0.2-SNAPSHOT - 4.0.0 jetty-infinispan-common Integrations :: Infinispan :: Sessions ${project.groupId}.infinispan.common - - - install - - - org.apache.maven.plugins - maven-assembly-plugin - - - package - - single - - - - config - - - - - - - org.infinispan @@ -48,8 +26,8 @@ org.infinispan.protostream protostream - true provided + true org.eclipse.jetty @@ -75,4 +53,27 @@ provided + + + install + + + org.apache.maven.plugins + maven-assembly-plugin + + + + single + + package + + + config + + + + + + + diff --git a/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/pom.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/pom.xml index b49095078950..618ec75a7773 100644 --- a/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/pom.xml +++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/pom.xml @@ -1,15 +1,46 @@ + + 4.0.0 org.eclipse.jetty jetty-infinispan 12.0.2-SNAPSHOT - 4.0.0 jetty-infinispan-embedded-query Integrations :: Infinispan :: Embedded with Querying ${project.groupId}.infinispan.embedded.query + + + org.eclipse.jetty + 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 + + install @@ -19,10 +50,10 @@ build-deps-file - generate-resources list + generate-resources false ${project.build.directory}/deps.txt @@ -40,28 +71,28 @@ process-deps - process-resources run + process-resources - - + + process-mod - process-resources run + process-resources - - + + @@ -70,34 +101,4 @@ - - - org.eclipse.jetty - 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-integrations/jetty-infinispan/jetty-infinispan-embedded/pom.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/pom.xml index f29f4afe736a..35088f9366a6 100644 --- a/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/pom.xml +++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/pom.xml @@ -1,16 +1,33 @@ + + 4.0.0 org.eclipse.jetty jetty-infinispan 12.0.2-SNAPSHOT - 4.0.0 jetty-infinispan-embedded pom Integrations :: Infinispan :: Embedded ${project.groupId}.infinispan.embedded + + + org.eclipse.jetty + jetty-infinispan-common + + + org.infinispan + infinispan-core + + + org.wildfly.common + wildfly-common + + + + install @@ -20,10 +37,10 @@ build-deps-file - generate-resources list + generate-resources false ${project.build.directory}/deps.txt @@ -41,28 +58,28 @@ process-deps - process-resources run + process-resources - - + + process-mod - process-resources run + process-resources - - + + @@ -72,20 +89,4 @@ - - - org.eclipse.jetty - jetty-infinispan-common - - - org.infinispan - infinispan-core - - - org.wildfly.common - wildfly-common - - - - diff --git a/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/pom.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/pom.xml index 3d3ef0937142..1b4915273b70 100644 --- a/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/pom.xml +++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/pom.xml @@ -1,15 +1,63 @@ + + 4.0.0 org.eclipse.jetty jetty-infinispan 12.0.2-SNAPSHOT - 4.0.0 jetty-infinispan-remote-query Integrations :: Infinispan :: Remote with Querying ${project.groupId}.infinispan.remote.query + + + org.eclipse.jetty + 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 + + @@ -18,10 +66,10 @@ build-deps-file - generate-resources list + generate-resources false ${project.build.directory}/deps.txt @@ -39,29 +87,29 @@ process-deps - process-resources run + process-resources - - - + + + process-mod - process-resources run + process-resources - - + + @@ -79,51 +127,4 @@ - - - org.eclipse.jetty - 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-integrations/jetty-infinispan/jetty-infinispan-remote/pom.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote/pom.xml index c7ad3043dc51..c7156f15ee38 100644 --- a/jetty-integrations/jetty-infinispan/jetty-infinispan-remote/pom.xml +++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote/pom.xml @@ -1,16 +1,38 @@ + + 4.0.0 org.eclipse.jetty jetty-infinispan 12.0.2-SNAPSHOT - 4.0.0 jetty-infinispan-remote pom Integrations :: Infinispan :: Remote ${project.groupId}.infinispan.remote + + + org.eclipse.jetty + jetty-infinispan-common + + + org.infinispan + infinispan-client-hotrod + provided + + + org.infinispan + infinispan-remote-query-client + provided + + + org.infinispan.protostream + protostream + provided + + install @@ -20,10 +42,10 @@ build-deps-file - generate-resources list + generate-resources false ${project.build.directory}/deps.txt @@ -41,29 +63,29 @@ process-deps - process-resources run + process-resources - - - + + + process-mod - process-resources run + process-resources - - + + @@ -72,25 +94,4 @@ - - - org.eclipse.jetty - jetty-infinispan-common - - - org.infinispan - infinispan-client-hotrod - provided - - - org.infinispan - infinispan-remote-query-client - provided - - - org.infinispan.protostream - protostream - provided - - diff --git a/jetty-integrations/jetty-infinispan/pom.xml b/jetty-integrations/jetty-infinispan/pom.xml index 5fb241bcfcb0..6e6defe6ea22 100644 --- a/jetty-integrations/jetty-infinispan/pom.xml +++ b/jetty-integrations/jetty-infinispan/pom.xml @@ -1,25 +1,25 @@ + + 4.0.0 org.eclipse.jetty jetty-integrations 12.0.2-SNAPSHOT - - 4.0.0 jetty-infinispan pom Integrations :: Infinispan - - - ${project.groupId}.infinispan - jetty-infinispan-common jetty-infinispan-embedded - jetty-infinispan-remote jetty-infinispan-embedded-query + jetty-infinispan-remote jetty-infinispan-remote-query + + ${project.groupId}.infinispan + + diff --git a/jetty-integrations/jetty-memcached/jetty-memcached-sessions/pom.xml b/jetty-integrations/jetty-memcached/jetty-memcached-sessions/pom.xml index 43c5b0d996a8..c37670d79746 100644 --- a/jetty-integrations/jetty-memcached/jetty-memcached-sessions/pom.xml +++ b/jetty-integrations/jetty-memcached/jetty-memcached-sessions/pom.xml @@ -1,15 +1,19 @@ + + 4.0.0 org.eclipse.jetty.memcached jetty-memcached 12.0.2-SNAPSHOT - - 4.0.0 jetty-memcached-sessions Integrations :: Memcached :: Sessions + + ${project.groupId}.session + + org.eclipse.jetty @@ -22,8 +26,4 @@ - - ${project.groupId}.session - - diff --git a/jetty-integrations/jetty-memcached/pom.xml b/jetty-integrations/jetty-memcached/pom.xml index 76bd3eb2f8c3..60aacf1c67da 100644 --- a/jetty-integrations/jetty-memcached/pom.xml +++ b/jetty-integrations/jetty-memcached/pom.xml @@ -1,12 +1,12 @@ + + 4.0.0 org.eclipse.jetty jetty-integrations 12.0.2-SNAPSHOT - - 4.0.0 org.eclipse.jetty.memcached jetty-memcached pom diff --git a/jetty-integrations/jetty-nosql/pom.xml b/jetty-integrations/jetty-nosql/pom.xml index 470cd0454ab3..7cb6d0f94211 100644 --- a/jetty-integrations/jetty-nosql/pom.xml +++ b/jetty-integrations/jetty-nosql/pom.xml @@ -1,19 +1,16 @@ + + 4.0.0 org.eclipse.jetty jetty-integrations 12.0.2-SNAPSHOT - 4.0.0 jetty-nosql Integrations :: NoSQL :: Sessions ${project.groupId}.nosql - - install - - org.eclipse.jetty @@ -35,4 +32,8 @@ slf4j-api + + install + + diff --git a/jetty-integrations/pom.xml b/jetty-integrations/pom.xml index afd63c657cee..77a331e2e1f3 100644 --- a/jetty-integrations/pom.xml +++ b/jetty-integrations/pom.xml @@ -1,15 +1,15 @@ + + 4.0.0 org.eclipse.jetty jetty-project 12.0.2-SNAPSHOT - - 4.0.0 jetty-integrations - Integrations pom + Integrations jetty-gcloud diff --git a/tests/jetty-home-tester/pom.xml b/tests/jetty-home-tester/pom.xml index 05fd2af17275..acf413757c3e 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 12.0.2-SNAPSHOT - - 4.0.0 jetty-home-tester - Tests :: Home Tester jar + Tests :: Home Tester ${project.groupId}.hometester diff --git a/tests/jetty-jmh/pom.xml b/tests/jetty-jmh/pom.xml index 0559795eb1e8..6746f15a9890 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 12.0.2-SNAPSHOT - - 4.0.0 jetty-jmh Tests :: JMH JMH Tests @@ -15,7 +16,67 @@ true + + + org.eclipse.jetty + jetty-util + + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-http + + + 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} + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + + + + Jetty Jmh Support Classes + + + + + + org.apache.felix @@ -30,10 +91,10 @@ maven-shade-plugin - package shade + package ${jmhjar.name} true @@ -58,65 +119,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.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/jetty-test-session-common/pom.xml b/tests/jetty-test-session-common/pom.xml index 3b1356b1d575..0a76661a949b 100644 --- a/tests/jetty-test-session-common/pom.xml +++ b/tests/jetty-test-session-common/pom.xml @@ -1,14 +1,15 @@ + + + 4.0.0 org.eclipse.jetty.tests tests 12.0.2-SNAPSHOT - - 4.0.0 jetty-test-session-common - Tests :: Session Test Tools jar + Tests :: Session Test Tools ${project.groupId}.session.test.tools @@ -37,14 +38,14 @@ org.testcontainers mongodb - true compile + true org.eclipse.jetty jetty-nosql - true compile + true org.mongodb @@ -55,39 +56,39 @@ org.eclipse.jetty.memcached jetty-memcached-sessions - true compile + true org.eclipse.jetty.toolchain jetty-test-helper - true compile + true org.hibernate hibernate-search-engine 5.10.7.Final - true compile + true org.slf4j jul-to-slf4j - true compile + true org.eclipse.jetty jetty-infinispan-common - true compile + true org.infinispan infinispan-core - true compile + true org.wildfly.common @@ -98,14 +99,14 @@ org.infinispan infinispan-client-hotrod - true compile + true org.eclipse.jetty jetty-hazelcast - true compile + true com.hazelcast @@ -116,20 +117,20 @@ com.hazelcast hazelcast - true compile + true org.testcontainers gcloud - true compile + true org.eclipse.jetty.gcloud jetty-gcloud-session-manager - true compile + true diff --git a/tests/pom.xml b/tests/pom.xml index 44fbe3ff7492..6b365a888a07 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -8,21 +8,21 @@ org.eclipse.jetty.tests tests - Tests pom - - true - true - true - true - + Tests jetty-home-tester jetty-jmh + jetty-test-session-common test-distribution test-integration - jetty-test-session-common + + true + true + true + true + diff --git a/tests/test-distribution/pom.xml b/tests/test-distribution/pom.xml index 4b26c7860a6c..c66c3c795121 100644 --- a/tests/test-distribution/pom.xml +++ b/tests/test-distribution/pom.xml @@ -1,14 +1,21 @@ + + + 4.0.0 org.eclipse.jetty.tests tests 12.0.2-SNAPSHOT - - 4.0.0 test-distribution - Tests :: Distribution pom + Tests :: Distribution + + + test-distribution-common + test-ee10-distribution + test-ee9-distribution + -1 @@ -16,12 +23,6 @@ INFO - - test-distribution-common - test-ee9-distribution - test-ee10-distribution - - @@ -39,7 +40,7 @@ jetty-slf4j-impl test - + org.eclipse.jetty.tests test-distribution-common ${project.version} diff --git a/tests/test-distribution/test-distribution-common/pom.xml b/tests/test-distribution/test-distribution-common/pom.xml index f650abee87d4..c4d838c552ac 100644 --- a/tests/test-distribution/test-distribution-common/pom.xml +++ b/tests/test-distribution/test-distribution-common/pom.xml @@ -1,19 +1,20 @@ + + + 4.0.0 org.eclipse.jetty.tests test-distribution 12.0.2-SNAPSHOT - - 4.0.0 test-distribution-common - Tests :: Distribution :: Common jar + Tests :: Distribution :: Common - - 2 ${project.groupId}.tests.distribution.common + + 2 @@ -182,17 +183,17 @@ - org.apache.maven.plugins - maven-jar-plugin - ${maven.jar.plugin.version} - - - - test-jar - - - - + org.apache.maven.plugins + maven-jar-plugin + ${maven.jar.plugin.version} + + + + test-jar + + + + diff --git a/tests/test-distribution/test-ee10-distribution/pom.xml b/tests/test-distribution/test-ee10-distribution/pom.xml index 3e0e2f6fc32f..daed56e04a3e 100644 --- a/tests/test-distribution/test-ee10-distribution/pom.xml +++ b/tests/test-distribution/test-ee10-distribution/pom.xml @@ -1,14 +1,15 @@ + + + 4.0.0 org.eclipse.jetty.tests test-distribution 12.0.2-SNAPSHOT - - 4.0.0 test-ee10-distribution - Tests :: Distribution :: EE10 jar + Tests :: Distribution :: EE10 ${project.groupId}.ee10.distribution @@ -19,13 +20,13 @@ - - - - - - - + + + + + + + diff --git a/tests/test-distribution/test-ee9-distribution/pom.xml b/tests/test-distribution/test-ee9-distribution/pom.xml index 4ff61d986deb..4aa21e8d64bf 100644 --- a/tests/test-distribution/test-ee9-distribution/pom.xml +++ b/tests/test-distribution/test-ee9-distribution/pom.xml @@ -1,31 +1,32 @@ + + + 4.0.0 org.eclipse.jetty.tests test-distribution 12.0.2-SNAPSHOT - - 4.0.0 test-ee9-distribution - Tests :: Distribution :: EE9 jar + Tests :: Distribution :: EE9 ${project.groupId}.ee9.distribution - + - - - - - - - + + + + + + + diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml index c367ea215ccb..b30eb8dc128d 100644 --- a/tests/test-integration/pom.xml +++ b/tests/test-integration/pom.xml @@ -1,11 +1,11 @@ + 4.0.0 org.eclipse.jetty.tests tests 12.0.2-SNAPSHOT - 4.0.0 test-integration jar Tests :: Integration