diff --git a/.mvn/maven-build-cache-config.xml b/.mvn/maven-build-cache-config.xml index d4814458646..34c6f62ed85 100644 --- a/.mvn/maven-build-cache-config.xml +++ b/.mvn/maven-build-cache-config.xml @@ -22,7 +22,11 @@ - *.{java,xml,properties,mod,adoc} + {*.java,*.xml,*.properties,*.mod,*.adoc} + + *Jenkinsfile* + ./idea/* + diff --git a/build/build-resources/pom.xml b/build/build-resources/pom.xml index 5815481b61a..f2f59e8873b 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,15 +28,55 @@ ${project.basedir}/src/main/resources + META-INF ${project.basedir}/../ LICENSE NOTICE.txt - META-INF + + com.diffplug.spotless + spotless-maven-plugin + 2.39.0 + + + + pom.xml + + + 2 + + recommended_2008_06 + + true + + true + + true + + scope,groupId,artifactId + + groupId,artifactId + + groupId,artifactId + + + + true + + + + + + check + + validate + + + org.apache.maven.plugins maven-remote-resources-plugin @@ -43,10 +84,10 @@ create-shared-resources - process-resources bundle + process-resources ${project.build.outputDirectory} diff --git a/build/pom.xml b/build/pom.xml index 2b3f7aba1c0..e9dfa274408 100644 --- a/build/pom.xml +++ b/build/pom.xml @@ -1,22 +1,22 @@ + + 4.0.0 org.eclipse.jetty jetty-project 12.0.3-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 99886d7ddc3..b283d296958 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.3-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 23549b55060..911c3173f8b 100644 --- a/documentation/jetty-documentation/pom.xml +++ b/documentation/jetty-documentation/pom.xml @@ -1,15 +1,15 @@ + + 4.0.0 org.eclipse.jetty.documentation documentation 12.0.3-SNAPSHOT - - 4.0.0 jetty-documentation - Documentation :: Guides pom + Documentation :: Guides ${project.groupId} @@ -18,6 +18,346 @@ true + + + + org.eclipse.jetty.ee10 + jetty-ee10-bom + ${project.version} + pom + import + + + + + + + org.eclipse.jetty + javadoc + ${project.version} + javadoc + jar + true + + + org.eclipse.jetty + jetty-alpn-server + + + org.eclipse.jetty + jetty-client + + + org.eclipse.jetty + jetty-home + ${project.version} + zip + true + + + org.eclipse.jetty + jetty-infinispan-embedded-query + + + org.eclipse.jetty + jetty-jmx + + + org.eclipse.jetty + jetty-nosql + + + org.eclipse.jetty + jetty-rewrite + + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-unixdomain-server + + + org.eclipse.jetty + jetty-util-ajax + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + + + org.eclipse.jetty.ee10 + jetty-ee10-servlets + + + org.eclipse.jetty.ee10 + jetty-ee10-webapp + + + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jakarta-server + + + org.eclipse.jetty.fcgi + jetty-fcgi-client + + + org.eclipse.jetty.gcloud + jetty-gcloud-session-manager + + + org.eclipse.jetty.http2 + jetty-http2-client-transport + + + org.eclipse.jetty.http2 + jetty-http2-server + + + org.eclipse.jetty.http3 + jetty-http3-client-transport + + + org.eclipse.jetty.http3 + jetty-http3-server + + + org.eclipse.jetty.memcached + jetty-memcached-sessions + + + org.eclipse.jetty.websocket + jetty-websocket-jetty-client + + + org.eclipse.jetty.websocket + jetty-websocket-jetty-server + + + org.eclipse.jetty + jetty-slf4j-impl + runtime + + + + + + + + ${project.build.directory}/html + ${project.basedir}/src/main/asciidoc + + *.css + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + ${asciidoctor.skip} + + src/main/assembly/html.xml + + + + + make-assembly + + single + + package + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-javadoc-jar + + copy-dependencies + + generate-resources + + org.eclipse.jetty + javadoc + javadoc + ${project.build.directory}/other-artifacts/ + + + + unpack-jetty-home + + unpack + + generate-resources + + + + org.eclipse.jetty + jetty-home + ${project.version} + zip + + + ${project.build.directory}/ + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + false + + + [21,) + [ERROR] OLD JDK [${java.version}] in use. Jetty documentation ${project.version} MUST use JDK 21 or newer + + + + + + 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.apache.httpcomponents + httpclient + ${apache.httpclient.version} + + + org.apache.httpcomponents + httpcore + ${apache.httpcore.version} + + + org.asciidoctor + asciidoctorj-diagram + ${asciidoctorj-diagram.version} + + + org.eclipse.jetty.documentation + jetty-asciidoctor-extensions + ${project.version} + + + jakarta.annotation + jakarta.annotation-api + + + + + + + contribution-guide + + process-asciidoc + + prepare-package + + ${basedir}/src/main/asciidoc/contribution-guide + index.adoc + ${project.build.directory}/html/contribution-guide + + + + index + + process-asciidoc + + prepare-package + + src/main/asciidoc + index.adoc + ${project.build.directory}/html + + + + old_docs + + process-asciidoc + + prepare-package + + ${basedir}/src/main/asciidoc/old_docs + index.adoc + ${project.build.directory}/html/old_docs + + + + operations-guide + + process-asciidoc + + prepare-package + + src/main/asciidoc/operations-guide + index.adoc + ${project.build.directory}/html/operations-guide + + + + programming-guide + + process-asciidoc + + prepare-package + + ${basedir}/src/main/asciidoc/programming-guide + index.adoc + ${project.build.directory}/html/programming-guide + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-javadoc + + attach-artifact + + package + + + + ${project.build.directory}/other-artifacts/javadoc-${project.version}-javadoc.jar + jar + javadoc + + + + + + + + + jdk17-18 @@ -75,344 +415,4 @@ - - - - - - ${project.basedir}/src/main/asciidoc - - *.css - - ${project.build.directory}/html - - - - - org.apache.maven.plugins - maven-enforcer-plugin - - false - - - [21,) - [ERROR] OLD JDK [${java.version}] in use. Jetty documentation ${project.version} MUST use JDK 21 or newer - - - - - - org.asciidoctor - asciidoctor-maven-plugin - - - org.asciidoctor - asciidoctorj-diagram - ${asciidoctorj-diagram.version} - - - org.eclipse.jetty.documentation - jetty-asciidoctor-extensions - ${project.version} - - - jakarta.annotation - jakarta.annotation-api - - - - - org.apache.httpcomponents - httpcore - ${apache.httpcore.version} - - - org.apache.httpcomponents - httpclient - ${apache.httpclient.version} - - - - html5 - - asciidoctor-diagram - - - ${project.basedir} - ${project.version} - ${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 - - process-asciidoc - - - src/main/asciidoc - index.adoc - ${project.build.directory}/html - - - - operations-guide - prepare-package - - process-asciidoc - - - src/main/asciidoc/operations-guide - index.adoc - ${project.build.directory}/html/operations-guide - - - - contribution-guide - prepare-package - - process-asciidoc - - - ${basedir}/src/main/asciidoc/contribution-guide - index.adoc - ${project.build.directory}/html/contribution-guide - - - - programming-guide - prepare-package - - process-asciidoc - - - ${basedir}/src/main/asciidoc/programming-guide - index.adoc - ${project.build.directory}/html/programming-guide - - - - old_docs - prepare-package - - process-asciidoc - - - ${basedir}/src/main/asciidoc/old_docs - index.adoc - ${project.build.directory}/html/old_docs - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack-jetty-home - generate-resources - - unpack - - - - - org.eclipse.jetty - jetty-home - ${project.version} - zip - - - ${project.build.directory}/ - - - - copy-javadoc-jar - generate-resources - - copy-dependencies - - - org.eclipse.jetty - javadoc - javadoc - ${project.build.directory}/other-artifacts/ - - - - - - org.apache.maven.plugins - maven-assembly-plugin - - - ${asciidoctor.skip} - - src/main/assembly/html.xml - - - - - make-assembly - package - - single - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-javadoc - package - - attach-artifact - - - - - ${project.build.directory}/other-artifacts/javadoc-${project.version}-javadoc.jar - jar - javadoc - - - - - - - - - - - - - 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 - javadoc - ${project.version} - javadoc - jar - true - - - org.eclipse.jetty - jetty-infinispan-embedded-query - - - org.eclipse.jetty.gcloud - jetty-gcloud-session-manager - - diff --git a/documentation/pom.xml b/documentation/pom.xml index e5a4a2d93fc..c8b9666dddc 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -1,16 +1,16 @@ + + 4.0.0 org.eclipse.jetty jetty-project 12.0.3-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 88eb5ae17a2..5d0cf8b6807 100644 --- a/javadoc/pom.xml +++ b/javadoc/pom.xml @@ -1,179 +1,46 @@ + + 4.0.0 org.eclipse.jetty jetty-project 12.0.3-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 - - - javadoc-build - 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 + + + + jakarta.mail + jakarta.mail-api + 2.1.2 + provided + org.eclipse.jetty @@ -215,21 +82,6 @@ jetty-deploy provided - - org.eclipse.jetty.fcgi - jetty-fcgi-client - provided - - - org.eclipse.jetty.fcgi - jetty-fcgi-proxy - provided - - - org.eclipse.jetty.fcgi - jetty-fcgi-server - provided - org.eclipse.jetty jetty-http @@ -240,36 +92,6 @@ jetty-http-spi provided - - org.eclipse.jetty.http2 - jetty-http2-client - provided - - - org.eclipse.jetty.http2 - jetty-http2-client-transport - provided - - - org.eclipse.jetty.http2 - jetty-http2-server - provided - - - org.eclipse.jetty.http3 - jetty-http3-client - provided - - - org.eclipse.jetty.http3 - jetty-http3-client-transport - provided - - - org.eclipse.jetty.http3 - jetty-http3-server - provided - org.eclipse.jetty jetty-jmx @@ -295,16 +117,6 @@ jetty-proxy provided - - org.eclipse.jetty.quic - jetty-quic-client - provided - - - org.eclipse.jetty.quic - jetty-quic-server - provided - org.eclipse.jetty jetty-rewrite @@ -345,31 +157,6 @@ jetty-util-ajax provided - - org.eclipse.jetty.websocket - jetty-websocket-core-client - provided - - - org.eclipse.jetty.websocket - jetty-websocket-core-server - provided - - - org.eclipse.jetty.websocket - jetty-websocket-jetty-api - provided - - - org.eclipse.jetty.websocket - jetty-websocket-jetty-client - provided - - - org.eclipse.jetty.websocket - jetty-websocket-jetty-server - provided - org.eclipse.jetty jetty-xml @@ -412,21 +199,6 @@ jetty-ee10-jndi provided - - org.eclipse.jetty.ee10.osgi - jetty-ee10-osgi-alpn - provided - - - org.eclipse.jetty.ee10.osgi - jetty-ee10-osgi-boot - provided - - - org.eclipse.jetty.ee10.osgi - jetty-ee10-osgi-boot-jsp - provided - org.eclipse.jetty.ee10 jetty-ee10-plus @@ -462,6 +234,21 @@ jetty-ee10-webapp provided + + org.eclipse.jetty.ee10.osgi + jetty-ee10-osgi-alpn + provided + + + org.eclipse.jetty.ee10.osgi + jetty-ee10-osgi-boot + provided + + + org.eclipse.jetty.ee10.osgi + jetty-ee10-osgi-boot-jsp + provided + org.eclipse.jetty.ee10.websocket jetty-ee10-websocket-jakarta-client @@ -482,13 +269,218 @@ jetty-ee10-websocket-servlet provided - - - jakarta.mail - jakarta.mail-api - 2.1.2 + org.eclipse.jetty.fcgi + jetty-fcgi-client + provided + + + org.eclipse.jetty.fcgi + jetty-fcgi-proxy + provided + + + org.eclipse.jetty.fcgi + jetty-fcgi-server + provided + + + org.eclipse.jetty.http2 + jetty-http2-client + provided + + + org.eclipse.jetty.http2 + jetty-http2-client-transport + provided + + + org.eclipse.jetty.http2 + jetty-http2-server + provided + + + org.eclipse.jetty.http3 + jetty-http3-client + provided + + + org.eclipse.jetty.http3 + jetty-http3-client-transport + provided + + + org.eclipse.jetty.http3 + jetty-http3-server + provided + + + org.eclipse.jetty.quic + jetty-quic-client + provided + + + org.eclipse.jetty.quic + jetty-quic-server + provided + + + org.eclipse.jetty.websocket + jetty-websocket-core-client + provided + + + org.eclipse.jetty.websocket + jetty-websocket-core-server + provided + + + org.eclipse.jetty.websocket + jetty-websocket-jetty-api + provided + + + org.eclipse.jetty.websocket + jetty-websocket-jetty-client + provided + + + org.eclipse.jetty.websocket + jetty-websocket-jetty-server provided + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + create-sources-dir + + run + + generate-sources + + + + + + + + delete-sources-dir + + run + + verify + + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack-sources + + unpack-dependencies + + prepare-package + + org.eclipse.jetty, + org.eclipse.jetty.fcgi, + org.eclipse.jetty.gcloud, + org.eclipse.jetty.http2, + org.eclipse.jetty.http3, + org.eclipse.jetty.memcached, + org.eclipse.jetty.osgi, + org.eclipse.jetty.quic, + org.eclipse.jetty.websocket + org.eclipse.jetty.toolchain, + org.eclipse.jetty.orbit + infinispan-embedded, + infinispan-remote, + jetty-test-helper, + jetty-maven-plugin, + jetty-jspc-maven-plugin, + 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-enforcer-plugin + + + enforce-java + + enforce + + + + + + com.google.code.findbugs:jsr305 + com.google.code.gson:gson + com.google.guava:guava + com.google.protobuf:protobuf-java + org.codehaus.plexus:plexus-interpolation + org.codehaus.plexus:plexus-utils + + + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + javadoc-build + + jar + + 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 d2dee0c2f10..1134f3daeac 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.3-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 6b44105c797..2bc7b1e0448 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.3-SNAPSHOT - - 4.0.0 jetty-alpn-conscrypt-client Core :: ALPN :: Conscrypt Client @@ -29,13 +29,13 @@ slf4j-api - org.eclipse.jetty.http2 - jetty-http2-client + org.eclipse.jetty + jetty-slf4j-impl test - org.eclipse.jetty - jetty-slf4j-impl + org.eclipse.jetty.http2 + jetty-http2-client test 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 f7322f090a6..3661b26a7d8 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.3-SNAPSHOT - - 4.0.0 jetty-alpn-conscrypt-server Core :: ALPN :: Conscrypt Server @@ -31,16 +31,6 @@ org.slf4j slf4j-api - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.http2 - jetty-http2-server - test - org.eclipse.jetty jetty-alpn-conscrypt-client @@ -51,6 +41,11 @@ jetty-client test + + org.eclipse.jetty + jetty-slf4j-impl + test + org.eclipse.jetty.http2 jetty-http2-client @@ -61,6 +56,11 @@ jetty-http2-client-transport test + + org.eclipse.jetty.http2 + jetty-http2-server + test + @@ -82,9 +82,7 @@ maven-surefire-plugin - - @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.alpn.conscrypt.server=org.eclipse.jetty.server - + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.alpn.conscrypt.server=org.eclipse.jetty.server diff --git a/jetty-core/jetty-alpn/jetty-alpn-java-client/pom.xml b/jetty-core/jetty-alpn/jetty-alpn-java-client/pom.xml index 5066dbbbcf8..73753e02054 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.3-SNAPSHOT - - 4.0.0 jetty-alpn-java-client Core :: ALPN :: Java Client @@ -15,6 +15,28 @@ ${project.groupId}.alpn.java.client + + + org.eclipse.jetty + jetty-alpn-client + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + + org.eclipse.jetty.http2 + jetty-http2-client + test + + + @@ -34,26 +56,4 @@ - - - org.eclipse.jetty - jetty-alpn-client - - - org.slf4j - slf4j-api - - - - org.eclipse.jetty.http2 - jetty-http2-client - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - 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 a309491de34..321f77bcc1e 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.3-SNAPSHOT - - 4.0.0 jetty-alpn-java-server Core :: ALPN :: Java Server @@ -14,40 +14,14 @@ ${project.groupId}.alpn.java.server - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.alpn.java.server=org.eclipse.jetty.server - - - - - org.apache.felix - maven-bundle-plugin - true - - - JDK9 Server ALPN - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.io.ssl.ALPNProcessor$Server - <_nouses>true - - - - - - org.eclipse.jetty - jetty-io + jetty-alpn-server org.eclipse.jetty - jetty-alpn-server + jetty-io org.slf4j @@ -70,4 +44,28 @@ + + + + org.apache.felix + maven-bundle-plugin + true + + + JDK9 Server ALPN + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional + osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.io.ssl.ALPNProcessor$Server + <_nouses>true + + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.alpn.java.server=org.eclipse.jetty.server + + + + + diff --git a/jetty-core/jetty-alpn/jetty-alpn-server/pom.xml b/jetty-core/jetty-alpn/jetty-alpn-server/pom.xml index 878129ea224..2bbc5ef74c0 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.3-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 f725b3fbe18..13b2fe6bdf7 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.3-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 b9ca06c31c0..56253ce0425 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 - - - - - @@ -134,6 +110,11 @@ jetty-rewrite 12.0.3-SNAPSHOT + + org.eclipse.jetty + jetty-security + 12.0.3-SNAPSHOT + org.eclipse.jetty jetty-server @@ -154,11 +135,6 @@ jetty-start 12.0.3-SNAPSHOT - - org.eclipse.jetty - jetty-security - 12.0.3-SNAPSHOT - org.eclipse.jetty jetty-unixdomain-server @@ -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 be5f5dc20d3..92d6c321af2 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.3-SNAPSHOT - - 4.0.0 jetty-client Core :: HTTP Client @@ -14,29 +15,78 @@ org.eclipse.jetty.client.* + + + org.eclipse.jetty + jetty-alpn-client + + + org.eclipse.jetty + jetty-http + + + org.eclipse.jetty + jetty-io + + + org.eclipse.jetty + jetty-jmx + true + + + org.slf4j + slf4j-api + + + + net.minidev + json-smart + test + + + org.apache.kerby + kerb-simplekdc + test + + + org.awaitility + awaitility + test + + + org.eclipse.jetty + jetty-security + test + + + org.eclipse.jetty + jetty-server + test + + + org.eclipse.jetty + jetty-session + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} - --add-modules java.security.jgss - --add-modules org.eclipse.jetty.jmx - --add-reads org.eclipse.jetty.client=org.eclipse.jetty.logging - - - org.apache.maven.plugins maven-dependency-plugin unpack - generate-test-resources unpack + generate-test-resources @@ -58,10 +108,10 @@ maven-shade-plugin - package shade + package false true @@ -91,66 +141,15 @@ + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} + --add-modules java.security.jgss + --add-modules org.eclipse.jetty.jmx + --add-reads org.eclipse.jetty.client=org.eclipse.jetty.logging + + - - - - org.eclipse.jetty - jetty-http - - - org.eclipse.jetty - jetty-io - - - org.eclipse.jetty - jetty-alpn-client - - - org.eclipse.jetty - jetty-jmx - true - - - org.eclipse.jetty - 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 d58de904da3..a9c7f20c68e 100644 --- a/jetty-core/jetty-demos/jetty-demo-handler/pom.xml +++ b/jetty-core/jetty-demos/jetty-demo-handler/pom.xml @@ -1,42 +1,30 @@ + 4.0.0 org.eclipse.jetty.demos jetty-demos 12.0.3-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 - slf4j-api + org.eclipse.jetty + jetty-jmx + true org.eclipse.jetty jetty-server - org.eclipse.jetty - jetty-jmx - true + org.slf4j + slf4j-api org.eclipse.jetty @@ -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 b1e1bfe4974..575609415f6 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.3-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 8fabf1761e8..3d96f5f1fd6 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.3-SNAPSHOT - - 4.0.0 jetty-deploy Core :: Deployers Jetty deployers @@ -15,23 +16,12 @@ 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 + jetty-jmx + true + org.eclipse.jetty jetty-server @@ -45,9 +35,9 @@ slf4j-api - org.eclipse.jetty - jetty-jmx - true + org.awaitility + awaitility + test org.eclipse.jetty @@ -59,10 +49,19 @@ jetty-test-helper test - - org.awaitility - awaitility - test - + + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} + --add-modules org.eclipse.jetty.jmx + --add-reads org.eclipse.jetty.deploy=org.eclipse.jetty.http + --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 5a6c97cde7b..afed8aea9fa 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.3-SNAPSHOT - - 4.0.0 jetty-fcgi-client Core :: FastCGI :: Client @@ -17,11 +17,7 @@ org.eclipse.jetty - jetty-util - - - org.eclipse.jetty - jetty-io + jetty-client org.eclipse.jetty @@ -29,7 +25,11 @@ org.eclipse.jetty - jetty-client + jetty-io + + + org.eclipse.jetty + jetty-util org.slf4j diff --git a/jetty-core/jetty-fcgi/jetty-fcgi-proxy/pom.xml b/jetty-core/jetty-fcgi/jetty-fcgi-proxy/pom.xml index dd3316a7718..22c175c4289 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.3-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 @@ -43,10 +27,9 @@ org.slf4j slf4j-api - - org.eclipse.jetty.fcgi - jetty-fcgi-server + org.eclipse.jetty + jetty-slf4j-impl test @@ -54,10 +37,25 @@ jetty-unixdomain-server test + - org.eclipse.jetty - jetty-slf4j-impl + org.eclipse.jetty.fcgi + jetty-fcgi-server 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 d198df5730f..59351a06048 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.3-SNAPSHOT - - 4.0.0 jetty-fcgi-server Core :: FastCGI :: Server @@ -14,41 +14,22 @@ ${project.groupId}.server - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} - --add-reads org.eclipse.jetty.fcgi.server=org.eclipse.jetty.logging - - - - - - - org.slf4j - slf4j-api + org.eclipse.jetty + jetty-server org.eclipse.jetty.fcgi jetty-fcgi-client - org.eclipse.jetty - jetty-server + org.slf4j + slf4j-api - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.http2 - jetty-http2-server + org.awaitility + awaitility test @@ -56,15 +37,32 @@ jetty-alpn-java-server test + + org.eclipse.jetty + jetty-slf4j-impl + test + org.eclipse.jetty jetty-unixdomain-server test - org.awaitility - awaitility + org.eclipse.jetty.http2 + jetty-http2-server test + + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} + --add-reads org.eclipse.jetty.fcgi.server=org.eclipse.jetty.logging + + + + diff --git a/jetty-core/jetty-fcgi/pom.xml b/jetty-core/jetty-fcgi/pom.xml index b3f390c585f..98b7de74e7a 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.3-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 ba9acc4c722..d0cd6f2c2cc 100644 --- a/jetty-core/jetty-http-spi/pom.xml +++ b/jetty-core/jetty-http-spi/pom.xml @@ -1,28 +1,19 @@ + + 4.0.0 org.eclipse.jetty jetty-core 12.0.3-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.* - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - org.eclipse.jetty - jetty-client - test - org.eclipse.jetty jetty-server @@ -34,8 +25,8 @@ provided - org.slf4j - jul-to-slf4j + org.eclipse.jetty + jetty-client test @@ -43,16 +34,19 @@ jetty-slf4j-impl test + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + org.slf4j + jul-to-slf4j + test + - - org.apache.maven.plugins - maven-surefire-plugin - - false - - org.apache.felix maven-bundle-plugin @@ -66,6 +60,13 @@ + + org.apache.maven.plugins + maven-surefire-plugin + + false + + diff --git a/jetty-core/jetty-http-tools/pom.xml b/jetty-core/jetty-http-tools/pom.xml index 9103673036d..5460a06ce5e 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.3-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 413f5230248..48e73443f6e 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.3-SNAPSHOT - - 4.0.0 jetty-http Core :: HTTP @@ -18,11 +18,11 @@ org.eclipse.jetty - jetty-util + jetty-io org.eclipse.jetty - jetty-io + jetty-util org.slf4j @@ -49,10 +49,8 @@ true - osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.http.HttpFieldPreEncoder)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.http.HttpFieldPreEncoder - + osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.http.HttpFieldPreEncoder)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.http.HttpFieldPreEncoder @@ -61,10 +59,10 @@ maven-shade-plugin - package shade + package ${jmhjar.name} true @@ -102,9 +100,7 @@ org.apache.maven.plugins maven-surefire-plugin - - @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.http=org.eclipse.jetty.logging - + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.http=org.eclipse.jetty.logging diff --git a/jetty-core/jetty-http2/jetty-http2-client-transport/pom.xml b/jetty-core/jetty-http2/jetty-http2-client-transport/pom.xml index f784d87f982..dbc26f3814f 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.3-SNAPSHOT - - 4.0.0 jetty-http2-client-transport Core :: HTTP2 :: Client Transport @@ -15,6 +15,10 @@ + + org.eclipse.jetty + jetty-alpn-java-client + org.eclipse.jetty jetty-client @@ -23,10 +27,6 @@ org.eclipse.jetty.http2 jetty-http2-client - - org.eclipse.jetty - jetty-alpn-java-client - org.slf4j slf4j-api diff --git a/jetty-core/jetty-http2/jetty-http2-client/pom.xml b/jetty-core/jetty-http2/jetty-http2-client/pom.xml index d9928bd96b1..5d90f1f3ba9 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.3-SNAPSHOT - - 4.0.0 jetty-http2-client Core :: HTTP2 :: Client @@ -14,33 +14,31 @@ ${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 - jetty-http2-common - org.eclipse.jetty jetty-alpn-client + + org.eclipse.jetty.http2 + jetty-http2-common + org.slf4j slf4j-api + + + + 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 f7ced365911..357626beef9 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.3-SNAPSHOT - - 4.0.0 jetty-http2-common Core :: HTTP2 :: Common @@ -15,6 +15,12 @@ + + + org.eclipse.jetty + jetty-jmx + true + org.eclipse.jetty.http2 jetty-http2-hpack @@ -23,12 +29,6 @@ org.slf4j slf4j-api - - - org.eclipse.jetty - jetty-jmx - true - org.eclipse.jetty jetty-slf4j-impl diff --git a/jetty-core/jetty-http2/jetty-http2-hpack/pom.xml b/jetty-core/jetty-http2/jetty-http2-hpack/pom.xml index 2becbf25f2a..3f08a849caa 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.3-SNAPSHOT - - 4.0.0 jetty-http2-hpack Core :: HTTP2 :: HPACK @@ -14,6 +14,46 @@ ${project.groupId}.hpack + + + org.eclipse.jetty + jetty-http + + + org.eclipse.jetty + jetty-io + + + org.eclipse.jetty + jetty-util + + + org.slf4j + slf4j-api + + + + org.eclipse.jetty + jetty-http-tools + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty + jetty-util-ajax + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + @@ -32,44 +72,4 @@ - - - org.eclipse.jetty - jetty-util - - - org.eclipse.jetty - jetty-http - - - org.eclipse.jetty - jetty-io - - - org.slf4j - slf4j-api - - - - org.eclipse.jetty - jetty-http-tools - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - org.eclipse.jetty - jetty-util-ajax - test - - - diff --git a/jetty-core/jetty-http2/jetty-http2-server/pom.xml b/jetty-core/jetty-http2/jetty-http2-server/pom.xml index 35c5a2c9430..22b5c501e5c 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.3-SNAPSHOT - - 4.0.0 jetty-http2-server Core :: HTTP2 :: Server @@ -16,14 +16,14 @@ - - org.eclipse.jetty.http2 - jetty-http2-common - org.eclipse.jetty jetty-server + + org.eclipse.jetty.http2 + jetty-http2-common + org.slf4j slf4j-api diff --git a/jetty-core/jetty-http2/jetty-http2-tests/pom.xml b/jetty-core/jetty-http2/jetty-http2-tests/pom.xml index b10576f55bb..b4706a92e27 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.3-SNAPSHOT - - 4.0.0 jetty-http2-tests Core :: HTTP2 :: Tests - true ${skipTests} + true + + + org.awaitility + awaitility + test + + + org.eclipse.jetty + jetty-alpn-java-server + test + + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty + jetty-proxy + test + + + org.eclipse.jetty + jetty-server + test + + + org.eclipse.jetty + jetty-slf4j-impl + 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 + + + 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 abd2c4605d4..76f36edee9a 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.3-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 25923c37b82..82cef33cb3e 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.3-SNAPSHOT - - 4.0.0 jetty-http3-client-transport Core :: HTTP3 :: HTTP Client Transport @@ -15,14 +15,14 @@ - - org.eclipse.jetty.http3 - jetty-http3-client - org.eclipse.jetty jetty-client + + org.eclipse.jetty.http3 + jetty-http3-client + org.eclipse.jetty.http3 diff --git a/jetty-core/jetty-http3/jetty-http3-client/pom.xml b/jetty-core/jetty-http3/jetty-http3-client/pom.xml index 778d1ff1633..91b3288b851 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.3-SNAPSHOT - - 4.0.0 jetty-http3-client Core :: HTTP3 :: Client @@ -15,14 +15,6 @@ - - org.eclipse.jetty.http3 - jetty-http3-common - - - org.eclipse.jetty.quic - jetty-quic-client - org.eclipse.jetty jetty-io @@ -31,6 +23,14 @@ org.eclipse.jetty jetty-util + + org.eclipse.jetty.http3 + jetty-http3-common + + + org.eclipse.jetty.quic + jetty-quic-client + diff --git a/jetty-core/jetty-http3/jetty-http3-common/pom.xml b/jetty-core/jetty-http3/jetty-http3-common/pom.xml index 55f0c99eb47..76ab7bfd0df 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.3-SNAPSHOT - - 4.0.0 jetty-http3-common Core :: HTTP3 :: Common @@ -16,8 +16,12 @@ - org.slf4j - slf4j-api + org.eclipse.jetty + jetty-io + + + org.eclipse.jetty + jetty-util org.eclipse.jetty.http3 @@ -28,12 +32,8 @@ jetty-quic-common - org.eclipse.jetty - jetty-io - - - org.eclipse.jetty - jetty-util + org.slf4j + slf4j-api org.eclipse.jetty diff --git a/jetty-core/jetty-http3/jetty-http3-qpack/pom.xml b/jetty-core/jetty-http3/jetty-http3-qpack/pom.xml index 51d5e1f9f56..2a7e57cf724 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.3-SNAPSHOT - - 4.0.0 jetty-http3-qpack Core :: HTTP3 :: QPACK @@ -14,6 +14,46 @@ ${project.groupId}.qpack + + + org.eclipse.jetty + jetty-http + + + org.eclipse.jetty + jetty-io + + + org.eclipse.jetty + jetty-util + + + org.slf4j + slf4j-api + + + + org.eclipse.jetty + jetty-http-tools + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty + jetty-util-ajax + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + @@ -32,44 +72,4 @@ - - - org.eclipse.jetty - jetty-util - - - org.eclipse.jetty - jetty-http - - - org.eclipse.jetty - jetty-io - - - org.slf4j - slf4j-api - - - - org.eclipse.jetty - jetty-http-tools - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - org.eclipse.jetty - jetty-util-ajax - test - - - diff --git a/jetty-core/jetty-http3/jetty-http3-server/pom.xml b/jetty-core/jetty-http3/jetty-http3-server/pom.xml index cb3fd0a957a..4e1f18edb2a 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.3-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 435563a682f..bcf50906bda 100644 --- a/jetty-core/jetty-http3/jetty-http3-tests/pom.xml +++ b/jetty-core/jetty-http3/jetty-http3-tests/pom.xml @@ -1,24 +1,49 @@ + + 4.0.0 org.eclipse.jetty.http3 jetty-http3 12.0.3-SNAPSHOT - - 4.0.0 jetty-http3-tests Core :: HTTP3 :: Tests + 2 false - 2 true true + + org.awaitility + awaitility + test + + + org.eclipse.jetty + jetty-alpn-java-server + test + + + org.eclipse.jetty + jetty-jmx + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.http2 + jetty-http2-server + test + org.eclipse.jetty.http3 jetty-http3-client @@ -39,31 +64,6 @@ jetty-quic-server test - - org.eclipse.jetty - jetty-alpn-java-server - test - - - org.eclipse.jetty - jetty-jmx - test - - - org.eclipse.jetty.http2 - jetty-http2-server - test - - - org.awaitility - awaitility - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - diff --git a/jetty-core/jetty-http3/pom.xml b/jetty-core/jetty-http3/pom.xml index 46725fd358a..578d5deea5b 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.3-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 f5e0437168c..ba8ad1f825d 100644 --- a/jetty-core/jetty-io/pom.xml +++ b/jetty-core/jetty-io/pom.xml @@ -1,43 +1,35 @@ + 4.0.0 org.eclipse.jetty jetty-core 12.0.3-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 - slf4j-api + org.eclipse.jetty + jetty-jmx + true org.eclipse.jetty jetty-util - org.eclipse.jetty - jetty-jmx - true + org.slf4j + slf4j-api + + + org.awaitility + awaitility + test org.eclipse.jetty @@ -49,10 +41,16 @@ jetty-test-helper test - - org.awaitility - awaitility - 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 2075162946c..f3880f88e2a 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.3-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 @@ -33,6 +22,11 @@ org.slf4j slf4j-api + + com.openpojo + openpojo + test + org.eclipse.jetty jetty-slf4j-impl @@ -43,11 +37,16 @@ jetty-test-helper test - - com.openpojo - openpojo - test - + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} --add-opens org.eclipse.jetty.jmx/org.eclipse.jetty.jmx=ALL-UNNAMED --add-opens org.eclipse.jetty.jmx/org.eclipse.jetty.logging.jmx=ALL-UNNAMED + + + + diff --git a/jetty-core/jetty-jndi/pom.xml b/jetty-core/jetty-jndi/pom.xml index 5a1e6eb4696..a62202028ab 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.3-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 @@ -39,6 +25,11 @@ org.slf4j slf4j-api + + org.eclipse.jetty + jetty-server + provided + org.eclipse.jetty jetty-slf4j-impl @@ -49,11 +40,6 @@ jetty-test-helper test - - org.eclipse.jetty - jetty-server - provided - + + + + + 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 3488b52c9d2..66ff969af74 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.3-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 @@ -36,10 +36,9 @@ org.eclipse.jetty jetty-util - org.eclipse.jetty - jetty-slf4j-impl + jetty-client test @@ -47,9 +46,10 @@ jetty-server test + org.eclipse.jetty - jetty-client + jetty-slf4j-impl test diff --git a/jetty-core/jetty-openid/pom.xml b/jetty-core/jetty-openid/pom.xml index d5aa9de2602..f3944f70b6b 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.3-SNAPSHOT - - 4.0.0 jetty-openid EE10 :: OpenID Jetty OpenID Connect Infrastructure @@ -15,33 +16,10 @@ 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 - jetty-server + jetty-client org.eclipse.jetty @@ -49,7 +27,7 @@ org.eclipse.jetty - jetty-client + jetty-server 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 e5ac3bf1d75..1f1fde96222 100644 --- a/jetty-core/jetty-osgi/pom.xml +++ b/jetty-core/jetty-osgi/pom.xml @@ -1,54 +1,30 @@ + + + 4.0.0 org.eclipse.jetty jetty-core 12.0.3-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 - jetty-server + jetty-deploy org.eclipse.jetty - jetty-deploy + jetty-server org.eclipse.platform @@ -74,15 +50,38 @@ org.slf4j slf4j-api - - org.eclipse.jetty.toolchain - jetty-test-helper - test - org.eclipse.jetty jetty-slf4j-impl test + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + + + + org.apache.felix + maven-bundle-plugin + true + + + org.eclipse.jetty.osgi.JettyBootstrapActivator + org.eclipse.jetty.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))" + <_nouses>true + + + + + 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 + + + + diff --git a/jetty-core/jetty-proxy/pom.xml b/jetty-core/jetty-proxy/pom.xml index be0db49cf2e..af68ac96187 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.3-SNAPSHOT - - 4.0.0 jetty-proxy jar Core :: Proxy @@ -16,33 +16,23 @@ ${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 - slf4j-api + org.eclipse.jetty + jetty-client org.eclipse.jetty jetty-server + + org.slf4j + slf4j-api + org.eclipse.jetty - jetty-client + jetty-alpn-java-server + test @@ -52,19 +42,27 @@ org.eclipse.jetty.http2 - jetty-http2-server - test - - - org.eclipse.jetty - jetty-alpn-java-server + jetty-http2-client-transport test org.eclipse.jetty.http2 - jetty-http2-client-transport + jetty-http2-server test + + + + 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 3dea38b4ac7..17f96824751 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.3-SNAPSHOT - - 4.0.0 jetty-quic-client Core :: QUIC :: Client @@ -15,10 +15,6 @@ - - org.slf4j - slf4j-api - org.eclipse.jetty.quic jetty-quic-common @@ -28,13 +24,12 @@ jetty-quic-quiche-jna - org.eclipse.jetty.quic - jetty-quic-server - test + org.slf4j + slf4j-api - org.eclipse.jetty.http2 - jetty-http2-server + org.eclipse.jetty + jetty-slf4j-impl test @@ -43,8 +38,13 @@ test - org.eclipse.jetty - jetty-slf4j-impl + org.eclipse.jetty.http2 + jetty-http2-server + test + + + org.eclipse.jetty.quic + jetty-quic-server test @@ -71,13 +71,11 @@ maven-surefire-plugin - - @{argLine} + @{argLine} ${jetty.surefire.argLine} --add-modules=jdk.incubator.foreign --add-opens jdk.incubator.foreign/jdk.incubator.foreign=ALL-UNNAMED - --enable-native-access ALL-UNNAMED - + --enable-native-access ALL-UNNAMED diff --git a/jetty-core/jetty-quic/jetty-quic-common/pom.xml b/jetty-core/jetty-quic/jetty-quic-common/pom.xml index 1cab0d45f10..7ec29bdcbc0 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.3-SNAPSHOT - - 4.0.0 jetty-quic-common Core :: QUIC :: Common @@ -15,18 +15,18 @@ + - org.slf4j - slf4j-api + org.eclipse.jetty + jetty-io org.eclipse.jetty.quic jetty-quic-quiche-common - - org.eclipse.jetty - jetty-io + org.slf4j + slf4j-api 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 863499bd342..4e00271c21b 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.3-SNAPSHOT - - 4.0.0 jetty-quic-quiche-common Core :: QUIC :: Quiche :: Common @@ -16,10 +16,6 @@ - - org.slf4j - slf4j-api - org.eclipse.jetty jetty-util @@ -28,6 +24,10 @@ org.mortbay.jetty.quiche jetty-quiche-native + + org.slf4j + slf4j-api + org.eclipse.jetty jetty-slf4j-impl diff --git a/jetty-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 6c6677971bb..e71e6506f6c 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.3-SNAPSHOT - - 4.0.0 jetty-quic-quiche-foreign-incubator Core :: QUIC :: Quiche :: Foreign (Java 17) @@ -15,6 +15,26 @@ true + + + org.eclipse.jetty + jetty-util + + + org.eclipse.jetty.quic + jetty-quic-quiche-common + + + org.slf4j + slf4j-api + + + 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 - - - - - org.apache.felix - maven-bundle-plugin - true - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - osgi.serviceloader;osgi.serviceloader=org.slf4j.spi.SLF4JServiceProvider - - + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.logging=java.management - - - - 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 c1616015ae0..35821214fb8 100644 --- a/jetty-core/jetty-start/pom.xml +++ b/jetty-core/jetty-start/pom.xml @@ -1,39 +1,65 @@ + + 4.0.0 org.eclipse.jetty jetty-core 12.0.3-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 - org.codehaus.mojo - buildnumber-maven-plugin + org.apache.maven.plugins + maven-dependency-plugin - create-buildnumber + unpack - create + unpack + process-test-resources - false - false - ${nonCanonicalRevision} + + + org.eclipse.jetty + jetty-util + jar + false + + + ${project.build.directory}/jetty-util + true @@ -53,10 +79,10 @@ maven-shade-plugin - package shade + package false true @@ -84,47 +110,22 @@ - org.apache.maven.plugins - maven-dependency-plugin + org.codehaus.mojo + buildnumber-maven-plugin - unpack - process-test-resources + create-buildnumber - unpack + create - - - org.eclipse.jetty - jetty-util - jar - false - - - ${project.build.directory}/jetty-util - true + false + false + ${nonCanonicalRevision} - - - 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 7f27ee95245..fd8bc1fe951 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.3-SNAPSHOT - - 4.0.0 jetty-test-client-transports Core :: Tests :: Client Transports @@ -22,6 +22,11 @@ awaitility test + + org.eclipse.jetty + jetty-alpn-java-server + test + org.eclipse.jetty jetty-proxy @@ -29,12 +34,12 @@ org.eclipse.jetty - jetty-unixdomain-server + jetty-slf4j-impl test org.eclipse.jetty - jetty-alpn-java-server + jetty-unixdomain-server test @@ -52,19 +57,14 @@ jetty-http2-server test - - org.eclipse.jetty.http3 - jetty-http3-server - test - org.eclipse.jetty.http3 jetty-http3-client-transport test - org.eclipse.jetty - jetty-slf4j-impl + org.eclipse.jetty.http3 + jetty-http3-server test @@ -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 54b480c2167..1f8551738cf 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.3-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 4e8f3ddf5f1..d30de4eb2e7 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.3-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 bff31fda19e..4cfe430c33e 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.3-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 762a2b847cb..3a6f617808e 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.3-SNAPSHOT - 4.0.0 jetty-util Core :: Utilities Utility classes for Jetty @@ -12,14 +13,66 @@ ${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 + jetty-slf4j-impl + test + + + org.eclipse.jetty.toolchain + jetty-perf-helper + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + - src/main/resources true + src/main/resources + + org.apache.felix + maven-bundle-plugin + true + + + osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.util.security.CredentialProvider)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + ${session.repositorySession.localRepository.basedir.absolutePath} + + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.util=org.eclipse.jetty.logging + + org.codehaus.mojo buildnumber-maven-plugin @@ -41,60 +94,6 @@ - - org.apache.felix - maven-bundle-plugin - true - - - osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.util.security.CredentialProvider)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - ${session.repositorySession.localRepository.basedir.absolutePath} - - - @{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 f519d973e17..fbc0db45338 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.3-SNAPSHOT - - 4.0.0 jetty-websocket-core-client Core :: Websocket :: Client @@ -15,10 +15,6 @@ - - org.eclipse.jetty.websocket - jetty-websocket-core-common - org.eclipse.jetty jetty-client @@ -28,6 +24,10 @@ jetty-xml true + + org.eclipse.jetty.websocket + jetty-websocket-core-common + 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 16ba1429247..9a3b4467dc7 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.3-SNAPSHOT - - 4.0.0 jetty-websocket-core-common Core :: Websocket :: Common @@ -17,11 +17,11 @@ org.eclipse.jetty - jetty-io + jetty-http org.eclipse.jetty - jetty-http + jetty-io org.slf4j @@ -39,12 +39,8 @@ Jetty Websocket Core Common * - - 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 a87e774b1a0..5a7c733d723 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.3-SNAPSHOT - - 4.0.0 jetty-websocket-core-server Core :: Websocket :: Server @@ -15,14 +15,14 @@ - - org.eclipse.jetty.websocket - jetty-websocket-core-common - org.eclipse.jetty jetty-server + + org.eclipse.jetty.websocket + jetty-websocket-core-common + 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 9385bdd779f..3ebfca0611a 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.3-SNAPSHOT - - 4.0.0 jetty-websocket-core-tests Core :: Websocket :: Tests - false ${project.groupId}.core.tests - true + false true + true @@ -22,27 +22,17 @@ org.eclipse.jetty.websocket jetty-websocket-core-client - - org.eclipse.jetty.websocket - jetty-websocket-core-server - org.eclipse.jetty.websocket jetty-websocket-core-common - org.eclipse.jetty - jetty-slf4j-impl - test + org.eclipse.jetty.websocket + jetty-websocket-core-server - org.testcontainers - testcontainers - test - - - org.testcontainers - junit-jupiter + com.googlecode.json-simple + json-simple test @@ -62,8 +52,18 @@ - com.googlecode.json-simple - json-simple + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.testcontainers + junit-jupiter + test + + + org.testcontainers + testcontainers test @@ -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 084b323c5a1..7cd6257c76f 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.3-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 9126268bcb4..2d438c3d285 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.3-SNAPSHOT - - 4.0.0 jetty-websocket-jetty-client Core :: Websocket :: Jetty Client @@ -16,20 +16,20 @@ - org.eclipse.jetty.websocket - jetty-websocket-jetty-api - - - org.eclipse.jetty.websocket - jetty-websocket-jetty-common + org.eclipse.jetty + jetty-client org.eclipse.jetty.websocket jetty-websocket-core-client - org.eclipse.jetty - jetty-client + org.eclipse.jetty.websocket + jetty-websocket-jetty-api + + + org.eclipse.jetty.websocket + jetty-websocket-jetty-common org.slf4j 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 edc2569a593..969c6e9d94e 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-jetty-common/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-jetty-common/pom.xml @@ -1,18 +1,33 @@ + + 4.0.0 org.eclipse.jetty.websocket jetty-websocket 12.0.3-SNAPSHOT - - 4.0.0 jetty-websocket-jetty-common Core :: Websocket :: Jetty Common ${project.groupId}.common + + + org.eclipse.jetty.websocket + jetty-websocket-core-common + + + org.eclipse.jetty.websocket + jetty-websocket-jetty-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + + @@ -22,30 +37,11 @@ true - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - - - osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.websocket.api.ExtensionConfig$Parser - + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.websocket.api.ExtensionConfig$Parser - - - org.eclipse.jetty.websocket - jetty-websocket-jetty-api - - - org.eclipse.jetty.websocket - jetty-websocket-core-common - - - org.eclipse.jetty - jetty-slf4j-impl - test - - 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 2b636eba952..a60f9c52228 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.3-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 54de7fb4111..02e86aa9f36 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.3-SNAPSHOT - - 4.0.0 jetty-websocket-jetty-tests Core :: Websocket :: Jetty Tests @@ -18,8 +18,38 @@ - org.slf4j - slf4j-api + org.eclipse.jetty + jetty-alpn-java-server + test + + + org.eclipse.jetty + jetty-alpn-server + test + + + org.eclipse.jetty + jetty-http-tools + test + + + org.eclipse.jetty + jetty-jmx + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.http2 + jetty-http2-client-transport + test + + + org.eclipse.jetty.http2 + jetty-http2-server test @@ -38,38 +68,8 @@ test - org.eclipse.jetty - jetty-http-tools - test - - - org.eclipse.jetty.http2 - jetty-http2-server - test - - - org.eclipse.jetty - jetty-alpn-server - test - - - org.eclipse.jetty - jetty-alpn-java-server - test - - - org.eclipse.jetty.http2 - jetty-http2-client-transport - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty - jetty-jmx + org.slf4j + slf4j-api test @@ -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 d8ce92f3486..20d3efc98d8 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.3-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 280226b59ee..609c4202b78 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.3-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 f9ce0b8b444..60c5efcd06e 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.3-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 d97bc63c238..b9abce0d24e 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.3-SNAPSHOT - - 4.0.0 jetty-ee10-annotations EE10 :: Servlet Annotations Annotation support for deploying servlets in jetty. @@ -14,37 +15,15 @@ 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 - - - - - - - + + jakarta.annotation + jakarta.annotation-api + + + jakarta.servlet + jakarta.servlet-api + org.eclipse.jetty.ee10 jetty-ee10-plus @@ -53,10 +32,6 @@ org.eclipse.jetty.ee10 jetty-ee10-webapp - - jakarta.annotation - jakarta.annotation-api - org.ow2.asm asm @@ -69,20 +44,11 @@ org.slf4j slf4j-api - - jakarta.servlet - jakarta.servlet-api - jakarta.transaction jakarta.transaction-api test - - org.eclipse.jetty.toolchain - jetty-test-helper - test - org.eclipse.jetty jetty-jndi @@ -93,5 +59,35 @@ jetty-slf4j-impl test + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + + + + org.apache.felix + maven-bundle-plugin + true + + + ${osgi.slf4j.import.packages},org.objectweb.asm;version="[$(version;==;${asm.version}),$(version;+;${asm.version}))",* + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)", osgi.serviceloader; filter:="(osgi.serviceloader=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 + + + + + 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 + + + + diff --git a/jetty-ee10/jetty-ee10-apache-jsp/pom.xml b/jetty-ee10/jetty-ee10-apache-jsp/pom.xml index 02a6886b78e..8ff93c3de1f 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.3-SNAPSHOT - - 4.0.0 jetty-ee10-apache-jsp EE10 :: Apache JSP @@ -14,6 +15,46 @@ true + + + jakarta.servlet + jakarta.servlet-api + + + org.eclipse.jetty + jetty-util + + + org.mortbay.jasper + apache-jsp + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-http-tools + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + + @@ -23,14 +64,9 @@ 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 - + 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 @@ -56,44 +92,4 @@ - - - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-util - - - org.mortbay.jasper - apache-jsp - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - test - - - jakarta.servlet - jakarta.servlet-api - - - org.eclipse.jetty - jetty-http-tools - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - - diff --git a/jetty-ee10/jetty-ee10-bom/pom.xml b/jetty-ee10/jetty-ee10-bom/pom.xml index 976cfeefa25..aacc5868c2b 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 259319c661b..6cc916dec16 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.3-SNAPSHOT - 4.0.0 jetty-ee10-cdi - EE10 :: CDI jar + EE10 :: CDI ${project.groupId}.cdi @@ -19,12 +20,12 @@ org.eclipse.jetty.ee10 - jetty-ee10-webapp + jetty-ee10-annotations compile org.eclipse.jetty.ee10 - jetty-ee10-annotations + jetty-ee10-webapp compile @@ -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 e2a6c6724a7..59934b061f8 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.3-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 68735b180d8..f342068e414 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.3-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 c2dd417e861..17a0379f457 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,20 +1,17 @@ + + + 4.0.0 org.eclipse.jetty.ee10.demos jetty-ee10-demo-async-rest 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-demo-async-rest-webapp war EE10 :: Demo :: Async Rest :: WebApp - - org.slf4j - slf4j-api - org.eclipse.jetty jetty-slf4j-impl @@ -24,6 +21,10 @@ org.eclipse.jetty.ee10.demos jetty-ee10-demo-async-rest-jar + + org.slf4j + slf4j-api + jakarta.servlet jakarta.servlet-api 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 06d83da355c..87c2f6391c9 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.3-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 9bf84ab9e7f..866bfba1c5b 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.3-SNAPSHOT - 4.0.0 jetty-ee10-demo-embedded EE10 :: Demo :: Embedded Jetty Embedded Jetty Demos @@ -13,53 +14,17 @@ - org.slf4j - slf4j-api + jakarta.transaction + jakarta.transaction-api + compile org.eclipse.jetty - jetty-slf4j-impl - runtime + jetty-alpn-conscrypt-server org.eclipse.jetty - jetty-util-ajax - - - org.eclipse.jetty.ee10 - jetty-ee10-webapp - - - org.eclipse.jetty.ee10 - jetty-ee10-servlets - - - org.eclipse.jetty - jetty-deploy - - - org.eclipse.jetty - jetty-rewrite - - - org.eclipse.jetty - jetty-jmx - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jakarta-server - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-servlet - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jetty-server - - - org.eclipse.jetty.http2 - jetty-http2-server + jetty-alpn-java-server org.eclipse.jetty @@ -68,31 +33,27 @@ org.eclipse.jetty - jetty-alpn-java-server + jetty-deploy org.eclipse.jetty - jetty-alpn-conscrypt-server + jetty-jmx - org.eclipse.jetty.ee10 - jetty-ee10-annotations - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-mock-resources - - - org.eclipse.jetty.ee10 - jetty-ee10-proxy + org.eclipse.jetty + jetty-rewrite org.eclipse.jetty jetty-security + + org.eclipse.jetty + jetty-util-ajax + org.eclipse.jetty.ee10 - jetty-ee10-plus + jetty-ee10-annotations org.eclipse.jetty.ee10 @@ -103,19 +64,26 @@ jetty-ee10-glassfish-jstl - jakarta.transaction - jakarta.transaction-api - compile + org.eclipse.jetty.ee10 + jetty-ee10-plus - org.eclipse.jetty.toolchain - jetty-test-helper - test + org.eclipse.jetty.ee10 + jetty-ee10-proxy - org.eclipse.jetty.websocket - jetty-websocket-jetty-client - test + org.eclipse.jetty.ee10 + jetty-ee10-servlets + + + org.eclipse.jetty.ee10 + jetty-ee10-webapp + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-async-rest-webapp + ${project.version} + war org.eclipse.jetty.ee10.demos @@ -129,6 +97,10 @@ ${project.version} war + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-mock-resources + org.eclipse.jetty.ee10.demos jetty-ee10-demo-simple-webapp @@ -142,10 +114,39 @@ war - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-async-rest-webapp - ${project.version} - war + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jakarta-server + + + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jetty-server + + + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-servlet + + + org.eclipse.jetty.http2 + jetty-http2-server + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + runtime + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + org.eclipse.jetty.websocket + jetty-websocket-jetty-client + test 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 415be50809b..811936bda49 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.3-SNAPSHOT jetty-ee10-demo-jaas-webapp - EE10 :: Demo :: JAAS WebApp war + EE10 :: Demo :: JAAS WebApp ${project.groupId}.jaas - maven-war-plugin @@ -85,116 +196,5 @@ - - - - org.eclipse.jetty - jetty-maven-plugin - ${project.version} - - - org.eclipse.jetty - jetty-client - ${project.version} - - - org.eclipse.jetty.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 - jetty-ee10-servlets - provided - - - jakarta.servlet - jakarta.servlet-api - provided - - - org.eclipse.jetty.ee10 - jetty-ee10-webapp - test - - - org.eclipse.jetty - jetty-jmx - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - org.eclipse.jetty - jetty-server - provided - - - jakarta.servlet.jsp - jakarta.servlet.jsp-api - provided - - - jakarta.servlet.jsp.jstl - jakarta.servlet.jsp.jstl-api - provided - - - jakarta.annotation - jakarta.annotation-api - provided - - - jakarta.websocket - jakarta.websocket-api - provided - - - jakarta.websocket - jakarta.websocket-client-api - provided - - - org.eclipse.jetty.websocket - jetty-websocket-jetty-api - provided - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jetty-server - provided - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jakarta-server - test - - 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 dbee8fcaece..e967b1fc54d 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,52 +7,29 @@ 12.0.3-SNAPSHOT jetty-ee10-demo-jndi-webapp - EE10 :: Demo :: JNDI WebApp war + EE10 :: Demo :: JNDI WebApp ${project.groupId}.jndi + + + jakarta.servlet + jakarta.servlet-api + provided + + + jakarta.transaction + jakarta.transaction-api + provided + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-mock-resources + provided + + - - - maven-antrun-plugin - - - generate-xml-files - process-resources - - - - - - - - - - - - run - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - package - - copy-dependencies - - - jakarta.transaction-api,ee10-demo-mock-resources - ${project.build.directory}/lib/jndi - - - - - @@ -77,22 +54,45 @@ + + + maven-antrun-plugin + + + generate-xml-files + + run + + process-resources + + + + + + + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + + copy-dependencies + + package + + jakarta.transaction-api,ee10-demo-mock-resources + ${project.build.directory}/lib/jndi + + + + + - - - 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 6dc9e8cb706..08d54891c6b 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.3-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 + + + @@ -34,24 +52,15 @@ - - - maven-war-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - maven-assembly-plugin web-bundle-assembly - package single + package src/main/assembly/web-bundle.xml @@ -63,32 +72,30 @@ + + + maven-war-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + - - - 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 + + org.apache.maven.plugins + maven-war-plugin + + ${basedir}/target/web.xml + + org.eclipse.jetty jetty-jspc-maven-plugin @@ -110,13 +117,6 @@ - - org.apache.maven.plugins - maven-war-plugin - - ${basedir}/target/web.xml - - 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 95b95c541e3..430d327de57 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,12 +6,29 @@ jetty-ee10-demos 12.0.3-SNAPSHOT - EE10 :: Demo :: Mock Resources jetty-ee10-demo-mock-resources jar + EE10 :: Demo :: Mock Resources ${project.groupId}.mocks + + + jakarta.mail + jakarta.mail-api + provided + + + jakarta.servlet + jakarta.servlet-api + provided + + + jakarta.transaction + jakarta.transaction-api + provided + + @@ -20,33 +38,12 @@ 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" - + org.example;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" + javax.sql, jakarta.transaction;version="2.0.0" <_nouses>true - - - jakarta.transaction - jakarta.transaction-api - provided - - - jakarta.servlet - jakarta.servlet-api - provided - - - jakarta.mail - jakarta.mail-api - provided - - 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 d9df25db1ca..7b1bac86f9a 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,17 +1,81 @@ + 4.0.0 org.eclipse.jetty.ee10.demos jetty-ee10-demos 12.0.3-SNAPSHOT - 4.0.0 jetty-ee10-demo-proxy-webapp - EE10 :: Demo :: Proxy WebApp war + EE10 :: Demo :: Proxy WebApp ${project.groupId}.proxy + + + org.eclipse.jetty + jetty-client + + + org.eclipse.jetty + jetty-slf4j-impl + compile + + + org.eclipse.jetty.ee10 + jetty-ee10-proxy + + + org.slf4j + slf4j-api + + + jakarta.servlet + jakarta.servlet-api + provided + + + jakarta.servlet.jsp + jakarta.servlet.jsp-api + provided + + + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + provided + + + org.eclipse.jetty + jetty-server + provided + + + org.eclipse.jetty + jetty-alpn-java-server + test + + + org.eclipse.jetty + jetty-jmx + test + + + org.eclipse.jetty.ee10 + jetty-ee10-annotations + test + + + org.eclipse.jetty.ee10 + jetty-ee10-webapp + test + + + org.eclipse.jetty.http2 + jetty-http2-server + test + + @@ -24,68 +88,4 @@ - - - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-slf4j-impl - compile - - - org.eclipse.jetty.ee10 - jetty-ee10-proxy - - - jakarta.servlet - jakarta.servlet-api - provided - - - org.eclipse.jetty.ee10 - jetty-ee10-webapp - test - - - org.eclipse.jetty - jetty-client - - - org.eclipse.jetty - jetty-jmx - test - - - org.eclipse.jetty - jetty-server - provided - - - org.eclipse.jetty.http2 - jetty-http2-server - test - - - org.eclipse.jetty - jetty-alpn-java-server - test - - - org.eclipse.jetty.ee10 - jetty-ee10-annotations - test - - - jakarta.servlet.jsp - jakarta.servlet.jsp-api - provided - - - jakarta.servlet.jsp.jstl - jakarta.servlet.jsp.jstl-api - provided - - 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 abfbe40009f..0aadc90c51b 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.3-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 3de439ac436..2c851f37229 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 aedcc125b3c..d1ddbf62348 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,186 +7,64 @@ 12.0.3-SNAPSHOT ../../pom.xml - EE10 :: Demo :: Servlet Spec :: WebApp jetty-ee10-demo-spec-webapp war + EE10 :: Demo :: Servlet Spec :: WebApp ${project.groupId}.spec.webapp + + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-container-initializer + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-web-fragment + + + jakarta.annotation + jakarta.annotation-api + provided + + + jakarta.servlet + jakarta.servlet-api + provided + + + jakarta.transaction + jakarta.transaction-api + provided + + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.ee10 + jetty-ee10-annotations + test + + + org.eclipse.jetty.ee10 + jetty-ee10-webapp + test + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-mock-resources + test + + - - - org.apache.maven.plugins - maven-assembly-plugin - - - web-bundle-assembly - package - - single - - - - src/main/assembly/web-bundle.xml - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - - - - maven-war-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - target - - plugin-context.xml - - META-INF - - - - - - - org.apache.felix - maven-bundle-plugin - true - - - war - - - 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 /> - org.example.test;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}";-noimport:=true - /ee10-demo-spec - .,WEB-INF/classes,WEB-INF/lib - META-INF/plugin-context.xml - ee10 - - - - - - maven-antrun-plugin - - - generate-xml-files - process-resources - - - - - - - - - - - - run - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - package - - copy - - - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-mock-resources - ${project.version} - jar - ** - true - ${project.build.directory}/lib/jndi - - - - - - unpack-jetty-ee10-demo-container-initializer - process-test-resources - - copy - - - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-container-initializer - jar - false - ${project.build.directory}/ - jetty-ee10-demo-container-initializer.jar - - - true - - - - unpack-jetty-ee10-demo-web-fragment - process-test-resources - - copy - - - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-web-fragment - jar - false - ${project.build.directory}/ - jetty-ee10-demo-web-fragment.jar - - - true - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-java - - enforce - - - - - - org.eclipse.jetty:jetty-util - - - - - - - - @@ -221,56 +99,176 @@ - + - - - 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.apache.felix + maven-bundle-plugin + true + + + war + + + 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> + org.example.test;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}";-noimport:=true + /ee10-demo-spec + .,WEB-INF/classes,WEB-INF/lib + META-INF/plugin-context.xml + ee10 + + + + + + maven-antrun-plugin + + + generate-xml-files + + run + + process-resources + + + + + + + + + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + web-bundle-assembly + + single + + package + + + src/main/assembly/web-bundle.xml + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack-jetty-ee10-demo-container-initializer + + copy + + process-test-resources + + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-container-initializer + jar + false + ${project.build.directory}/ + jetty-ee10-demo-container-initializer.jar + + + true + + + + unpack-jetty-ee10-demo-web-fragment + + copy + + process-test-resources + + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-web-fragment + jar + false + ${project.build.directory}/ + jetty-ee10-demo-web-fragment.jar + + + true + + + + + copy + + package + + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-mock-resources + ${project.version} + jar + ** + true + ${project.build.directory}/lib/jndi + + + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-java + + enforce + + + + + + org.eclipse.jetty:jetty-util + + + + + + + + + + maven-war-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + target + + plugin-context.xml + + META-INF + + + + + + 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 39fc3bc47ea..9e50ae48faf 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.3-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 c57b6f8d531..a1439757adf 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.3-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 d2a62638796..181935df6fe 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.3-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 d28208ae037..dbbeaf49e53 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.3-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 df7eaba3f6f..002970d2d30 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.3-SNAPSHOT - - 4.0.0 jetty-ee10-examples EE10 :: Examples @@ -17,11 +17,11 @@ org.eclipse.jetty - jetty-server + jetty-http org.eclipse.jetty - jetty-http + jetty-server org.eclipse.jetty.ee10 diff --git a/jetty-ee10/jetty-ee10-fcgi-proxy/pom.xml b/jetty-ee10/jetty-ee10-fcgi-proxy/pom.xml index a10a72aa0e2..221bee3f807 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.3-SNAPSHOT - - 4.0.0 jetty-ee10-fcgi-proxy EE10 :: FCGI Proxy @@ -15,11 +15,6 @@ - - jakarta.servlet - jakarta.servlet-api - provided - org.eclipse.jetty jetty-server @@ -32,17 +27,22 @@ org.eclipse.jetty.fcgi jetty-fcgi-client - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - test + jakarta.servlet + jakarta.servlet-api + provided org.eclipse.jetty jetty-slf4j-impl test + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + test + diff --git a/jetty-ee10/jetty-ee10-glassfish-jstl/pom.xml b/jetty-ee10/jetty-ee10-glassfish-jstl/pom.xml index 99f7fb878dc..42a0641f075 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.3-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 - - - - - @@ -33,20 +22,14 @@ jakarta.servlet.jsp.jstl-api - - org.glassfish.web - jakarta.servlet.jsp.jstl - - org.eclipse.jetty.ee10 jetty-ee10-apache-jsp - org.eclipse.jetty.toolchain - jetty-test-helper - test + org.glassfish.web + jakarta.servlet.jsp.jstl @@ -61,6 +44,12 @@ test + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + org.slf4j slf4j-simple @@ -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 315a51fd196..c487eda5e82 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.3-SNAPSHOT ../pom.xml - 4.0.0 jetty-ee10-home - EE10 :: Home Assembly pom + EE10 :: Home Assembly ${basedir}/target/jetty-ee10-home @@ -17,85 +17,368 @@ true + + + org.eclipse.jetty + jetty-openid + true + + + org.eclipse.jetty + jetty-security + true + + + org.eclipse.jetty.ee10 + jetty-ee10-annotations + + + org.eclipse.jetty.ee10 + jetty-ee10-apache-jsp + + + org.eclipse.jetty.ee10 + jetty-ee10-cdi + true + + + org.eclipse.jetty.ee10 + jetty-ee10-fcgi-proxy + true + + + org.eclipse.jetty.ee10 + jetty-ee10-glassfish-jstl + + + jakarta.el + jakarta.el-api + + + javax.el + el-api + + + + + org.eclipse.jetty.ee10 + jetty-ee10-jaspi + true + + + org.eclipse.jetty.ee10 + jetty-ee10-jndi + true + + + org.eclipse.jetty.ee10 + jetty-ee10-plus + + + org.eclipse.jetty.ee10 + jetty-ee10-proxy + + + + + 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.demos + jetty-ee10-demo-async-rest-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-jaas-webapp + ${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-jndi-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-jsp-webapp + ${project.version} + config + jar + true + + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-mock-resources + ${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-spec-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jakarta-server + + + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jetty-client-webapp + + + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jetty-server + + + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-servlet + + + org.ow2.asm + asm + + + org.ow2.asm + asm-analysis + + + org.ow2.asm + asm-commons + + + org.ow2.asm + asm-tree + + + + + org.apache.maven.plugins + maven-assembly-plugin + + posix + false + + + + binary + + single + + package + + + src/main/assembly/jetty-assembly.xml + + + + + sources + + single + + package + + + src/main/assembly/jetty-source-assembly.xml + + true + + + + org.apache.maven.plugins maven-dependency-plugin - unpack-config-deps - generate-resources - - unpack-dependencies - - - - org.eclipse.jetty.ee10, org.eclipse.jetty.ee10.demos - - - config - false - META-INF/**,webapps/**,start.d/**,start.ini - ${assembly-directory} - - - - copy-lib-core-websocket-deps - generate-resources + copy-ee10-annotations-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/ee10-annotations + + + + copy-ee10-annotations-src-deps + + copy-dependencies + + generate-resources + + jakarta.annotation,org.ow2.asm + jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis + jar + sources + ${source-assembly-directory}/lib/ee10-annotations + + + + + copy-ee10-deps + + copy-dependencies + + 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 - copy-lib-ee10-websocket-deps - generate-resources + copy-ee10-jaspi-deps copy-dependencies + generate-resources - org.eclipse.jetty.ee10.websocket + jakarta.authentication + jakarta.authentication-api jar - ${assembly-directory}/lib/ee10-websocket + ${assembly-directory}/lib/ee10-jaspi - copy-lib-core-websocket-src-deps - generate-resources + copy-ee10-jaspi-src-deps copy-dependencies + generate-resources - org.eclipse.jetty.websocket + jakarta.authentication + jakarta.authentication-api jar sources - ${source-assembly-directory}/lib + ${source-assembly-directory}/lib/ee10-jaspi - copy-lib-ee10-websocket-src-deps - generate-resources + copy-ee10-jsp-deps copy-dependencies + generate-resources - org.eclipse.jetty.ee10.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-apache-jsp + + + + copy-ee10-jsp-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 jar sources - ${source-assembly-directory}/lib/ee10-websocket + ${source-assembly-directory}/lib/ee10-apache-jsp + + + + copy-ee10-jstl-deps + + copy-dependencies + + 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 + + + + copy-ee10-jstl-src-deps + + copy-dependencies + + generate-resources + + 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-ee10-lib-jakarta-websocket-deps - generate-resources copy-dependencies + generate-resources jakarta.websocket jar @@ -104,10 +387,10 @@ copy-ee10-lib-jakarta-websocket-src-deps - generate-resources copy-dependencies + generate-resources jakarta.websocket jar @@ -116,11 +399,75 @@ - copy-lib-servlet-api-deps + copy-ee10-src-deps + + copy-dependencies + generate-resources + + org.eclipse.jetty.ee10 + jar + org.eclipse.jetty.ee10.demos,org.eclipse.jetty.ee10.websocket + sources + ${source-assembly-directory}/lib + + + + copy-lib-core-websocket-deps + + copy-dependencies + + generate-resources + + org.eclipse.jetty.websocket + jar + ${assembly-directory}/lib + + + + copy-lib-core-websocket-src-deps + + copy-dependencies + + generate-resources + + org.eclipse.jetty.websocket + jar + sources + ${source-assembly-directory}/lib + + + + copy-lib-ee10-websocket-deps + + copy-dependencies + + generate-resources + + org.eclipse.jetty.ee10.websocket + jar + ${assembly-directory}/lib/ee10-websocket + + + + copy-lib-ee10-websocket-src-deps + + copy-dependencies + + generate-resources + + org.eclipse.jetty.ee10.websocket + jar + sources + ${source-assembly-directory}/lib/ee10-websocket + + + + copy-lib-servlet-api-deps copy + generate-resources @@ -134,10 +481,10 @@ copy-lib-servlet-api-src-deps - generate-resources copy + generate-resources @@ -152,10 +499,10 @@ copy-lib-transaction-api-deps - generate-resources copy + generate-resources @@ -190,10 +537,10 @@ copy-lib-transaction-api-src-deps - generate-resources copy + generate-resources @@ -207,179 +554,18 @@ - copy-ee10-annotations-deps + unpack-config-deps + + unpack-dependencies + generate-resources - - copy-dependencies - - jakarta.annotation,org.ow2.asm - jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis - jar - ${assembly-directory}/lib/ee10-annotations - - - - copy-ee10-annotations-src-deps - generate-resources - - copy-dependencies - - - jakarta.annotation,org.ow2.asm - jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis - jar - sources - ${source-assembly-directory}/lib/ee10-annotations - - - - copy-ee10-jsp-src-deps - generate-resources - - copy-dependencies - - - 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-apache-jsp - - - - copy-ee10-jsp-deps - generate-resources - - copy-dependencies - - - 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-apache-jsp - - - - copy-ee10-jstl-src-deps - generate-resources - - copy-dependencies - - - 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-ee10-jstl-deps - generate-resources - - copy-dependencies - - - 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-ee10-jaspi-deps - generate-resources - - copy-dependencies - - - jakarta.authentication - jakarta.authentication-api - jar - ${assembly-directory}/lib/ee10-jaspi - - - - copy-ee10-jaspi-src-deps - generate-resources - - copy-dependencies - - - jakarta.authentication - jakarta.authentication-api - jar - sources - ${source-assembly-directory}/lib/ee10-jaspi - - - - - copy-ee10-deps - generate-resources - - copy-dependencies - - - 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 - - - - copy-ee10-src-deps - generate-resources - - copy-dependencies - - - org.eclipse.jetty.ee10 - jar - org.eclipse.jetty.ee10.demos,org.eclipse.jetty.ee10.websocket - sources - ${source-assembly-directory}/lib - - - - - - org.apache.maven.plugins - maven-assembly-plugin - - posix - false - - - - binary - package - - single - - - - src/main/assembly/jetty-assembly.xml - - - - - sources - package - - single - - - - src/main/assembly/jetty-source-assembly.xml - - true + org.eclipse.jetty.ee10, org.eclipse.jetty.ee10.demos + + config + false + META-INF/**,webapps/**,start.d/**,start.ini + ${assembly-directory} @@ -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 03563af3b66..995faeef92b 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.3-SNAPSHOT - - 4.0.0 jetty-ee10-jaspi EE10 :: JASPI Jetty security infrastructure @@ -15,6 +16,40 @@ org.eclipse.jetty.ee10.security.jaspi.* + + + jakarta.authentication + jakarta.authentication-api + + + jakarta.servlet + jakarta.servlet-api + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + + + org.slf4j + slf4j-api + + + jakarta.activation + jakarta.activation-api + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + @@ -37,38 +72,4 @@ - - - - jakarta.authentication - jakarta.authentication-api - - - jakarta.servlet - jakarta.servlet-api - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - - - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - jakarta.activation - jakarta.activation-api - test - - diff --git a/jetty-ee10/jetty-ee10-jndi/pom.xml b/jetty-ee10/jetty-ee10-jndi/pom.xml index 23464c15a9b..087ce74f4bd 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.3-SNAPSHOT - - 4.0.0 jetty-ee10-jndi EE10 :: JNDI EE10 JNDI factories @@ -15,26 +16,7 @@ org.eclipse.jetty.ee10.jndi.* - - - - org.apache.felix - maven-bundle-plugin - true - - - ${osgi.slf4j.import.packages},jakarta.mail.*;resolution:=optional,* - - - - - - - - org.eclipse.jetty - jetty-jndi - jakarta.activation jakarta.activation-api @@ -45,6 +27,10 @@ jakarta.mail-api true + + org.eclipse.jetty + jetty-jndi + org.slf4j slf4j-api @@ -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 b10048bad51..4e4c6f61771 100644 --- a/jetty-ee10/jetty-ee10-jspc-maven-plugin/pom.xml +++ b/jetty-ee10/jetty-ee10-jspc-maven-plugin/pom.xml @@ -1,11 +1,11 @@ + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.3-SNAPSHOT - 4.0.0 jetty-ee10-jspc-maven-plugin maven-plugin EE10 :: Jetty JSPC Maven Plugin @@ -13,51 +13,56 @@ ${project.groupId}.jspc.plugin 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.apache.ant + ant + + + org.apache.maven.plugin-tools + maven-plugin-tools-api + + + junit + junit + + + org.eclipse.jetty jetty-util + + org.eclipse.jetty.ee10 + jetty-ee10-apache-jsp + ${project.version} + + + org.eclipse.jetty.ee10 + jetty-ee10-glassfish-jstl + ${project.version} + + + org.apache.maven + maven-artifact + provided + + + org.apache.maven + maven-core + provided + + + javax.annotation + javax.annotation-api + + + + + org.apache.maven + maven-model + provided + org.apache.maven maven-plugin-api @@ -74,44 +79,45 @@ maven-plugin-annotations provided - - org.apache.maven - maven-core - provided - - - org.apache.maven - maven-model - provided - - - org.apache.maven - maven-artifact - provided - - - org.apache.maven.plugin-tools - maven-plugin-tools-api - - - junit - junit - - - - - org.eclipse.jetty.ee10 - jetty-ee10-apache-jsp - ${project.version} - - - org.eclipse.jetty.ee10 - jetty-ee10-glassfish-jstl - ${project.version} - - - org.apache.ant - ant - + + + + org.apache.maven.plugins + maven-invoker-plugin + + + ${maven.surefire.plugin.version} + + + clean + + + + + integration-test + + install + integration-test + verify + + + + + + org.apache.maven.plugins + maven-plugin-plugin + + + exec-plugin-doc + + descriptor + helpmojo + + process-classes + + + + + diff --git a/jetty-ee10/jetty-ee10-maven-plugin/pom.xml b/jetty-ee10/jetty-ee10-maven-plugin/pom.xml index 956ba6a836f..f74448bc13d 100644 --- a/jetty-ee10/jetty-ee10-maven-plugin/pom.xml +++ b/jetty-ee10/jetty-ee10-maven-plugin/pom.xml @@ -1,104 +1,219 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 12.0.3-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 + + + jakarta.transaction + jakarta.transaction-api + true + + + org.apache.maven.plugin-tools + maven-plugin-tools-api + + + org.apache.maven.shared + maven-artifact-transfer + ${maven-artifact-transfer.version} + + + org.codehaus.plexus + plexus-xml + + + javax.annotation + javax.annotation-api + + + org.apache.maven + maven-api-xml + + + org.apache.maven + maven-xml-impl + + + org.apache.maven + maven-xml-meta + + + + + org.eclipse.jetty + jetty-home + zip + + + * + * + + + + + org.eclipse.jetty + jetty-http + true + + + org.eclipse.jetty + jetty-io + true + + + org.eclipse.jetty + jetty-jmx + true + + + org.eclipse.jetty + jetty-jndi + true + + + org.eclipse.jetty + jetty-security + true + + + org.eclipse.jetty + jetty-server + true + + + org.eclipse.jetty + jetty-util + + + org.eclipse.jetty.ee10 + jetty-ee10-annotations + true + + + org.eclipse.jetty.ee10 + jetty-ee10-apache-jsp + true + + + org.eclipse.jetty.ee10 + jetty-ee10-glassfish-jstl + true + + + org.eclipse.jetty.ee10 + jetty-ee10-plus + true + + + org.eclipse.jetty.ee10 + jetty-ee10-quickstart + true + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + true + + + org.eclipse.jetty.ee10 + jetty-ee10-webapp + true + + + jakarta.servlet + servlet-api + + + + + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jakarta-server + true + + + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jetty-server + true + + + org.slf4j + slf4j-api + true + + + org.apache.maven + maven-artifact + provided + + + org.apache.maven + maven-core + provided + + + javax.annotation + javax.annotation-api + + + + + org.apache.maven + maven-model + provided + + + org.apache.maven + maven-plugin-api + provided + + + javax.annotation + javax.annotation-api + + + + + org.apache.maven.plugin-tools + maven-plugin-annotations + provided + + + org.awaitility + awaitility + test + + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + - - 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 - - - @@ -113,21 +228,19 @@ false true + + + copy + + copy + + package + + org.apache.maven.plugins maven-invoker-plugin - - - integration-test - integration-test - - install - integration-test - verify - - - org.eclipse.jetty:jetty-slf4j-impl:${project.version} @@ -161,192 +274,86 @@ clean + + + integration-test + + install + integration-test + verify + + integration-test + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + test-jar + + + + + + org.apache.maven.plugins + maven-plugin-plugin + + jetty + + + + exec-plugin-doc + + helpmojo + + generate-sources + + + + + org.apache.maven.plugins + maven-surefire-plugin + + -Dstop.port=@{test.stopPort} -Djetty.port=@{test.jettyPort} + + **/IntegrationTest*.java + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + test-reserve-ports + + reserve-network-port + + process-test-classes + + + test.stopPort + test.jettyPort + + + + + reserve-ports + + reserve-network-port + + pre-integration-test + + + jetty.stopPort + + + + - - - org.codehaus.plexus - plexus-xml - - - javax.annotation - javax.annotation-api - - - org.apache.maven - maven-xml-impl - - - org.apache.maven - maven-api-xml - - - org.apache.maven - maven-xml-meta - - - - - org.apache.maven.shared - maven-artifact-transfer - ${maven-artifact-transfer.version} - - - org.apache.maven - maven-plugin-api - provided - - - javax.annotation - javax.annotation-api - - - - - org.apache.maven - maven-artifact - provided - - - org.apache.maven - maven-core - provided - - - org.apache.maven - maven-model - provided - - - org.apache.maven.plugin-tools - maven-plugin-tools-api - - - org.apache.maven.plugin-tools - maven-plugin-annotations - provided - - - org.eclipse.jetty - jetty-home - zip - - - * - * - - - - - org.eclipse.jetty - jetty-util - - - org.eclipse.jetty.ee10 - jetty-ee10-webapp - true - - - jakarta.servlet - servlet-api - - - - - org.eclipse.jetty.ee10 - jetty-ee10-quickstart - true - - - org.eclipse.jetty - jetty-security - true - - - org.eclipse.jetty.ee10 - jetty-ee10-plus - true - - - org.eclipse.jetty - jetty-jndi - true - - - org.eclipse.jetty - jetty-server - true - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - true - - - org.eclipse.jetty - jetty-http - true - - - org.eclipse.jetty - jetty-io - true - - - org.eclipse.jetty - jetty-jmx - true - - - org.eclipse.jetty.ee10 - jetty-ee10-annotations - true - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jakarta-server - true - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jetty-server - true - - - org.eclipse.jetty.ee10 - jetty-ee10-apache-jsp - true - - - org.eclipse.jetty.ee10 - jetty-ee10-glassfish-jstl - true - - - org.slf4j - slf4j-api - true - - - jakarta.transaction - jakarta.transaction-api - true - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.awaitility - awaitility - test - - - org.eclipse.jetty - jetty-client - 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 a7874ee4f82..c7b7a41c571 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.3-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 a302589b4fd..b46ed721310 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.3-SNAPSHOT - 4.0.0 jetty-ee10-osgi-boot-jsp EE10 :: OSGi :: Boot JSP Jetty OSGi Boot JSP bundle @@ -13,14 +14,19 @@ org.eclipse.jetty.ee10.osgi.boot.jsp.* + + + jakarta.servlet + jakarta.servlet-api + org.eclipse.jetty jetty-deploy + - org.eclipse.jetty.ee10.osgi - jetty-ee10-osgi-boot - provided + org.eclipse.jetty.ee10 + jetty-ee10-apache-jsp org.eclipse.platform @@ -30,38 +36,15 @@ org.eclipse.platform org.eclipse.osgi.services - - jakarta.servlet - jakarta.servlet-api - - - - org.eclipse.jetty.ee10 - jetty-ee10-apache-jsp + org.eclipse.jetty.ee10.osgi + jetty-ee10-osgi-boot + provided - - - org.codehaus.mojo - build-helper-maven-plugin - - - set-jsp-api-version - validate - - parse-version - - - ${jsp.impl.version} - jspImpl - - - - org.apache.felix @@ -70,10 +53,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,15 +119,31 @@ javax.xml.*;resolution:=optional, org.w3c.dom;resolution:=optional, org.w3c.dom.ls;resolution:=optional, - javax.xml.parser;resolution:=optional - + javax.xml.parser;resolution:=optional org.eclipse.jetty.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}))" + + + org.codehaus.mojo + build-helper-maven-plugin + + + set-jsp-api-version + + parse-version + + validate + + ${jsp.impl.version} + jspImpl + + + + 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 a3f742e1cac..a0d0ec59f63 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.3-SNAPSHOT - 4.0.0 jetty-ee10-osgi-boot EE10 :: OSGi :: Boot Jetty OSGi Boot bundle @@ -14,20 +15,20 @@ - org.eclipse.jetty.ee10 - jetty-ee10-annotations - - - org.eclipse.jetty.ee10 - jetty-ee10-webapp + org.eclipse.jetty + jetty-jmx org.eclipse.jetty jetty-osgi - org.eclipse.jetty - jetty-jmx + org.eclipse.jetty.ee10 + jetty-ee10-annotations + + + org.eclipse.jetty.ee10 + jetty-ee10-webapp org.eclipse.platform @@ -58,27 +59,6 @@ - - maven-antrun-plugin - - - process-resources - - - - - - - - - - - - run - - - - org.apache.felix maven-bundle-plugin @@ -88,8 +68,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,18 +90,34 @@ 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 + + maven-antrun-plugin + + + + run + + process-resources + + + + + + + + + + + + + diff --git a/jetty-ee10/jetty-ee10-osgi/pom.xml b/jetty-ee10/jetty-ee10-osgi/pom.xml index 5efd7e819e4..22c32a2dc56 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.3-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 c308821bbd7..40f1da4316a 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.3-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 3701d94c3b5..5034fc1f983 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.3-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 49d23a95283..4af1944ccb3 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,42 +1,28 @@ + 4.0.0 org.eclipse.jetty.ee10.osgi jetty-ee10-osgi 12.0.3-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 + + - - org.apache.maven.plugins - maven-resources-plugin - - - copy-resources - validate - - copy-resources - - - ${basedir}/target/classes - - - src/main/resources - - - - - - org.apache.felix maven-bundle-plugin @@ -52,6 +38,27 @@ + + org.apache.maven.plugins + maven-resources-plugin + + + copy-resources + + copy-resources + + validate + + ${basedir}/target/classes + + + src/main/resources + + + + + + maven-war-plugin @@ -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 5612a85248c..98e59263057 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,99 +1,21 @@ + + 4.0.0 org.eclipse.jetty.ee10.osgi jetty-ee10-osgi 12.0.3-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 - - - org.ops4j.pax.exam - pax-exam - test - - - org.ops4j.pax.exam - pax-exam-inject - test - - - - org.ops4j.pax.exam - pax-exam-container-forked - test - - - biz.aQute.bnd - bndlib - - - org.ops4j.pax.tinybundles - tinybundles - - - - - org.ops4j.pax.tinybundles - tinybundles - - - org.ops4j.pax.swissbox - pax-swissbox-framework - test - - - org.ops4j.base - ops4j-base-monitors - - - - - org.ops4j.pax.swissbox - pax-swissbox-tracker - test - - - org.ops4j.pax.exam - pax-exam-junit4 - test - - - org.ops4j.pax.exam - pax-exam-link-mvn - test - - - org.ops4j.pax.url - pax-url-aether - test - - - javax.annotation - javax.annotation-api - - - - - org.ops4j.pax.url - pax-url-wrap - test - - - biz.aQute.bnd - bndlib - - - biz.aQute.bnd biz.aQute.bndlib @@ -105,51 +27,230 @@ - org.eclipse.platform - org.eclipse.osgi + jakarta.servlet + jakarta.servlet-api + + + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + + + jakarta.el + jakarta.el-api + + + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-mock-resources + ${project.version} + + + org.eclipse.jetty.http2 + jetty-http2-hpack + + + org.eclipse.jetty.http2 + jetty-http2-server + + + org.glassfish.web + jakarta.servlet.jsp.jstl + + + org.mortbay.jasper + apache-el + + + org.mortbay.jasper + apache-jsp + + + org.ops4j.pax.tinybundles + tinybundles + + + jakarta.websocket + jakarta.websocket-api + runtime + + + org.eclipse.jetty + jetty-client + runtime + + + org.eclipse.jetty + jetty-deploy + runtime + + + org.eclipse.jetty + jetty-jmx + runtime + + + org.eclipse.jetty + jetty-server + runtime + + + org.eclipse.jetty + jetty-util + runtime + + + org.eclipse.jetty + jetty-xml + runtime + + + org.eclipse.jetty.ee10 + jetty-ee10-annotations + runtime + + + + org.eclipse.jetty.ee10 + jetty-ee10-jndi + runtime + + + org.eclipse.jetty.ee10 + jetty-ee10-plus + runtime + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + runtime + + + org.eclipse.jetty.ee10 + jetty-ee10-servlets + runtime + + + org.eclipse.jetty.ee10 + jetty-ee10-webapp + runtime + + + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jakarta-client + runtime + + + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jakarta-server + runtime + + + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jetty-server + runtime + + + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-servlet + runtime + + + org.eclipse.jetty.websocket + jetty-websocket-jetty-api + runtime + + + org.eclipse.jetty.websocket + jetty-websocket-jetty-client + runtime + + + org.eclipse.jetty.websocket + jetty-websocket-jetty-common + runtime + + + org.eclipse.jetty.websocket + jetty-websocket-jetty-server + runtime + + + jakarta.activation + jakarta.activation-api test - org.eclipse.platform - org.eclipse.osgi.services + jakarta.el + jakarta.el-api test - org.eclipse.platform - org.eclipse.osgi.util + jakarta.enterprise + jakarta.enterprise.cdi-api test + + jakarta.inject + jakarta.inject-api + test + + + jakarta.interceptor + jakarta.interceptor-api + test + + + jakarta.transaction + jakarta.transaction-api + test + + + org.apache.aries.spifly + org.apache.aries.spifly.dynamic.bundle + test + + + org.apache.felix + org.apache.felix.framework + + + org.apache.geronimo.specs geronimo-atinject_1.0_spec test - org.osgi - org.osgi.util.promise + org.conscrypt + conscrypt-openjdk-uber test - org.osgi - org.osgi.util.measurement + org.eclipse.jetty + jetty-alpn-conscrypt-client test - org.osgi - org.osgi.util.position + org.eclipse.jetty + jetty-alpn-conscrypt-server test - org.osgi - org.osgi.util.xml + org.eclipse.jetty + jetty-alpn-java-client test - - org.slf4j - slf4j-api - test - + org.eclipse.jetty + jetty-alpn-java-server + test + + + org.eclipse.jetty + jetty-alpn-server + test + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-jsp-webapp + ${project.version} + webbundle + test + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-spec-webapp + ${project.version} + war + test + + + org.eclipse.jetty.ee10.osgi + jetty-ee10-osgi-alpn + ${project.version} + test + org.eclipse.jetty.ee10.osgi jetty-ee10-osgi-boot @@ -192,241 +335,6 @@ - - jakarta.servlet - jakarta.servlet-api - - - jakarta.inject - jakarta.inject-api - test - - - jakarta.transaction - jakarta.transaction-api - test - - - jakarta.interceptor - jakarta.interceptor-api - test - - - jakarta.enterprise - jakarta.enterprise.cdi-api - test - - - jakarta.el - jakarta.el-api - test - - - org.apache.aries.spifly - org.apache.aries.spifly.dynamic.bundle - test - - - org.apache.felix - org.apache.felix.framework - - - - - jakarta.activation - jakarta.activation-api - test - - - org.mortbay.jasper - apache-jsp - - - org.mortbay.jasper - apache-el - - - jakarta.servlet.jsp.jstl - jakarta.servlet.jsp.jstl-api - - - jakarta.el - jakarta.el-api - - - - - org.glassfish.web - jakarta.servlet.jsp.jstl - - - - org.eclipse.jetty.ee10 - jetty-ee10-jndi - runtime - - - org.eclipse.jetty.ee10 - jetty-ee10-annotations - runtime - - - org.eclipse.jetty.ee10 - jetty-ee10-webapp - runtime - - - org.eclipse.jetty - jetty-deploy - runtime - - - org.eclipse.jetty - jetty-server - runtime - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - runtime - - - org.eclipse.jetty.ee10 - jetty-ee10-servlets - runtime - - - org.eclipse.jetty - jetty-xml - runtime - - - org.eclipse.jetty - jetty-jmx - runtime - - - org.eclipse.jetty - jetty-util - runtime - - - org.eclipse.jetty - jetty-client - runtime - - - org.eclipse.jetty.websocket - jetty-websocket-jetty-api - runtime - - - org.eclipse.jetty.websocket - jetty-websocket-jetty-common - runtime - - - org.eclipse.jetty.websocket - jetty-websocket-jetty-client - runtime - - - org.eclipse.jetty.websocket - jetty-websocket-jetty-server - runtime - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jakarta-client - runtime - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-servlet - runtime - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jetty-server - runtime - - - jakarta.websocket - jakarta.websocket-api - runtime - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jakarta-server - runtime - - - org.eclipse.jetty.http2 - jetty-http2-server - - - org.eclipse.jetty.http2 - jetty-http2-hpack - - - org.eclipse.jetty - jetty-alpn-server - test - - - org.eclipse.jetty.ee10 - jetty-ee10-plus - runtime - - - org.eclipse.jetty.ee10.osgi - jetty-ee10-osgi-alpn - ${project.version} - test - - - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-jsp-webapp - ${project.version} - webbundle - test - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-jetty-webapp - ${project.version} - war - test - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-jetty-webapp - ${project.version} - webbundle - test - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-spec-webapp - ${project.version} - war - test - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-container-initializer - ${project.version} - test - - - org.eclipse.jetty.ee10.osgi - test-jetty-ee10-osgi-webapp-resources - ${project.version} - war - test - org.eclipse.jetty.ee10.osgi test-jetty-ee10-osgi-fragment @@ -440,20 +348,147 @@ test - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-mock-resources + org.eclipse.jetty.ee10.osgi + test-jetty-ee10-osgi-webapp-resources ${project.version} + war + test + + + org.eclipse.jetty.http2 + jetty-http2-client + test + + + org.eclipse.jetty.http2 + jetty-http2-client-transport + test org.eclipse.jetty.toolchain jetty-test-helper test + + org.eclipse.platform + org.eclipse.osgi + test + + + org.eclipse.platform + org.eclipse.osgi.services + test + + + org.eclipse.platform + org.eclipse.osgi.util + test + + + + org.ops4j.pax.exam + pax-exam + test + + + + org.ops4j.pax.exam + pax-exam-container-forked + test + + + biz.aQute.bnd + bndlib + + + org.ops4j.pax.tinybundles + tinybundles + + + + + org.ops4j.pax.exam + pax-exam-inject + test + + + org.ops4j.pax.exam + pax-exam-junit4 + test + + + org.ops4j.pax.exam + pax-exam-link-mvn + test + + + org.ops4j.pax.swissbox + pax-swissbox-framework + test + + + org.ops4j.base + ops4j-base-monitors + + + + + org.ops4j.pax.swissbox + pax-swissbox-tracker + test + + + org.ops4j.pax.url + pax-url-aether + test + + + javax.annotation + javax.annotation-api + + + + + org.ops4j.pax.url + pax-url-wrap + test + + + biz.aQute.bnd + bndlib + + + + + org.osgi + org.osgi.util.measurement + test + + + org.osgi + org.osgi.util.position + test + + + org.osgi + org.osgi.util.promise + test + + + org.osgi + org.osgi.util.xml + test + org.ow2.asm asm test + + org.ow2.asm + asm-analysis + test + org.ow2.asm asm-commons @@ -464,49 +499,15 @@ asm-tree test - - org.ow2.asm - asm-analysis - test - org.ow2.asm asm-util test + - org.eclipse.jetty.http2 - jetty-http2-client - test - - - org.eclipse.jetty.http2 - jetty-http2-client-transport - test - - - org.eclipse.jetty - jetty-alpn-conscrypt-server - test - - - org.eclipse.jetty - jetty-alpn-conscrypt-client - test - - - org.conscrypt - conscrypt-openjdk-uber - test - - - org.eclipse.jetty - jetty-alpn-java-server - test - - - org.eclipse.jetty - jetty-alpn-java-client + org.slf4j + slf4j-api test @@ -568,7 +569,7 @@ - + @@ -580,20 +581,20 @@ maven-dependency-plugin - - - copy - process-test-resources - - copy-dependencies - - - test-jetty-ee10-osgi-webapp-resources target true + + + copy + + copy-dependencies + + process-test-resources + + org.apache.servicemix.tooling diff --git a/jetty-ee10/jetty-ee10-plus/pom.xml b/jetty-ee10/jetty-ee10-plus/pom.xml index 6033b45be50..e083b3ffff2 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.3-SNAPSHOT - - 4.0.0 jetty-ee10-plus EE10 :: Plus Jetty JavaEE style services @@ -15,32 +16,23 @@ 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 jakarta.transaction-api + + org.eclipse.jetty + jetty-jndi + + + org.eclipse.jetty.ee10 + jetty-ee10-webapp + + + org.slf4j + slf4j-api + jakarta.enterprise jakarta.enterprise.cdi-api @@ -56,18 +48,6 @@ jakarta.interceptor-api provided - - org.eclipse.jetty - jetty-jndi - - - org.eclipse.jetty.ee10 - jetty-ee10-webapp - - - org.slf4j - slf4j-api - org.eclipse.jetty jetty-slf4j-impl @@ -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 95373dffe49..a83b35fbf7f 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.3-SNAPSHOT - - 4.0.0 jetty-ee10-proxy EE10 :: Proxy Jetty Proxy @@ -15,21 +16,15 @@ 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.eclipse.jetty + jetty-client + + + org.eclipse.jetty + jetty-util + org.slf4j slf4j-api @@ -46,20 +41,12 @@ org.eclipse.jetty - jetty-util - - - org.eclipse.jetty - jetty-client - - - org.eclipse.jetty - jetty-util-ajax + jetty-http-tools test org.eclipse.jetty - jetty-http-tools + jetty-rewrite test @@ -69,7 +56,7 @@ org.eclipse.jetty - jetty-rewrite + jetty-util-ajax test @@ -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 4c9c322b8f7..c08c8d44ebd 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.3-SNAPSHOT - - 4.0.0 jetty-ee10-quickstart EE10 :: Quick Start Jetty Quick Start @@ -14,30 +15,10 @@ ${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 - jetty-ee10-webapp + jetty-ee10-annotations org.eclipse.jetty.ee10 @@ -45,7 +26,7 @@ org.eclipse.jetty.ee10 - jetty-ee10-annotations + jetty-ee10-webapp org.slf4j @@ -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 82ecc311290..207062df2a5 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.3-SNAPSHOT - 4.0.0 jetty-ee10-runner EE10 :: Runner @@ -15,7 +16,84 @@ true + + + org.eclipse.jetty + jetty-jndi + + + org.eclipse.jetty + jetty-security + + + org.eclipse.jetty.ee10 + jetty-ee10-annotations + + + org.eclipse.jetty.ee10 + jetty-ee10-apache-jsp + + + org.eclipse.jetty.ee10 + jetty-ee10-glassfish-jstl + + + org.eclipse.jetty.ee10 + jetty-ee10-plus + + + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jetty-server + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + runtime + + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-simple-webapp + war + 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 fde865234e4..d9b0f9457ba 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.3-SNAPSHOT - - 4.0.0 jetty-ee10-servlet EE10 :: Servlet Jetty Servlet Container @@ -16,26 +16,20 @@ 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 jakarta.servlet-api + + org.eclipse.jetty + jetty-jmx + true + + + org.eclipse.jetty + jetty-security + org.eclipse.jetty jetty-server @@ -46,7 +40,8 @@ org.eclipse.jetty - jetty-security + jetty-util-ajax + true org.slf4j @@ -54,13 +49,13 @@ org.eclipse.jetty - jetty-util-ajax - true + jetty-client + test org.eclipse.jetty - jetty-jmx - true + jetty-http-tools + test @@ -73,16 +68,19 @@ jetty-test-helper test - - org.eclipse.jetty - jetty-http-tools - test - - - org.eclipse.jetty - jetty-client - test - + + + + 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 6cd3b81805e..1f5e1e424c0 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.3-SNAPSHOT - - 4.0.0 jetty-ee10-servlets EE10 :: Utility Servlets and Filters Utility Servlets from Jetty @@ -16,30 +16,28 @@ 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 jetty-http + + org.eclipse.jetty + jetty-io + + + org.eclipse.jetty + jetty-util + + + org.slf4j + slf4j-api + + + jakarta.servlet + jakarta.servlet-api + provided + org.eclipse.jetty.ee10 jetty-ee10-webapp @@ -47,25 +45,7 @@ org.eclipse.jetty - jetty-util - - - jakarta.servlet - jakarta.servlet-api - provided - - - org.eclipse.jetty - jetty-io - - - org.slf4j - slf4j-api - - - - org.eclipse.jetty - jetty-slf4j-impl + jetty-http-tools test @@ -73,9 +53,10 @@ jetty-jmx test + org.eclipse.jetty - jetty-http-tools + jetty-slf4j-impl test @@ -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 39a5e261f30..e8a1c7a3a79 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.3-SNAPSHOT - - 4.0.0 jetty-ee10-test-bad-websocket-webapp war @@ -14,6 +14,11 @@ Contains wrong websocket which should fail at deployment + + jakarta.servlet + jakarta.servlet-api + provided + jakarta.websocket jakarta.websocket-api @@ -24,11 +29,6 @@ jetty-ee10-websocket-jakarta-common provided - - jakarta.servlet - jakarta.servlet-api - provided - 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 cffd2add441..5a58f5d16ee 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,20 +1,42 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-tests 12.0.3-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 + + + + jakarta.enterprise + jakarta.enterprise.cdi-api + provided + + + + jakarta.inject + jakarta.inject-api + provided + + + + jakarta.servlet + jakarta.servlet-api + provided + + + + @@ -29,26 +51,4 @@ - - - - jakarta.servlet - jakarta.servlet-api - provided - - - - jakarta.inject - jakarta.inject-api - provided - - - - jakarta.enterprise - jakarta.enterprise.cdi-api - provided - - - - 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 68245e7077c..8c836043269 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.3-SNAPSHOT - - 4.0.0 jetty-ee10-test-cdi jar EE10 :: Tests :: CDI @@ -25,26 +25,18 @@ jetty-ee10-webapp compile + + org.eclipse.jetty.toolchain + jetty-test-helper + org.slf4j slf4j-api compile - org.slf4j - jul-to-slf4j - test - - - org.jboss.weld.servlet - weld-servlet-core - ${weld.version} - test - - - org.jboss.logging - jboss-logging - ${jboss.logging.version} + jakarta.servlet + jakarta.servlet-api test @@ -68,12 +60,20 @@ test - org.eclipse.jetty.toolchain - jetty-test-helper + org.jboss.logging + jboss-logging + ${jboss.logging.version} + test - jakarta.servlet - jakarta.servlet-api + org.jboss.weld.servlet + weld-servlet-core + ${weld.version} + test + + + org.slf4j + jul-to-slf4j test 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 eb286e40f4a..001bfeb8153 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.3-SNAPSHOT - - 4.0.0 jetty-ee10-test-client-transports jar EE10 :: Tests :: HTTP Client Transports @@ -17,54 +17,10 @@ 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 - slf4j-api - test + org.eclipse.jetty.toolchain + jetty-test-helper org.awaitility @@ -81,11 +37,26 @@ jetty-alpn-java-server test + + org.eclipse.jetty + jetty-client + test + org.eclipse.jetty jetty-jmx test + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty + jetty-unixdomain-server + test + org.eclipse.jetty.ee10 jetty-ee10-servlet @@ -97,13 +68,8 @@ test - org.eclipse.jetty - jetty-client - test - - - org.eclipse.jetty.http2 - jetty-http2-server + org.eclipse.jetty.fcgi + jetty-fcgi-server test @@ -112,8 +78,8 @@ test - org.eclipse.jetty.http3 - jetty-http3-server + org.eclipse.jetty.http2 + jetty-http2-server test @@ -122,24 +88,54 @@ test - org.eclipse.jetty - jetty-unixdomain-server + org.eclipse.jetty.http3 + jetty-http3-server test - org.eclipse.jetty.fcgi - jetty-fcgi-server + org.slf4j + slf4j-api test - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - + + + 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 15d881099f5..dd023f3c070 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.3-SNAPSHOT - - 4.0.0 jetty-ee10-test-felix-webapp - EE10 :: Tests :: Felix WebApp war + EE10 :: Tests :: Felix WebApp ${project.groupId}.felix + + + org.apache.felix + org.apache.felix.framework + 7.0.5 + + + jakarta.servlet + jakarta.servlet-api + provided + + + @@ -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 b2d72018c65..535bdbf6e5b 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,20 +1,67 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-tests 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-test-http2-webapp - EE10 :: Tests :: HTTP2 WebApp war + EE10 :: Tests :: HTTP2 WebApp ${project.groupId}.http2 + + + org.eclipse.jetty + jetty-alpn-java-client + + + org.eclipse.jetty.http2 + jetty-http2-client + + + jakarta.servlet + jakarta.servlet-api + provided + + + + org.eclipse.jetty + jetty-alpn-java-server + test + + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.ee10 + jetty-ee10-webapp + test + + + org.eclipse.jetty.http2 + jetty-http2-server + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + @@ -22,10 +69,10 @@ unpack-webapp - pre-integration-test unpack + pre-integration-test @@ -61,51 +108,4 @@ - - - - org.eclipse.jetty.http2 - jetty-http2-client - - - jakarta.servlet - jakarta.servlet-api - provided - - - org.eclipse.jetty - jetty-alpn-java-client - - - - org.eclipse.jetty - jetty-alpn-java-server - test - - - org.eclipse.jetty - jetty-client - test - - - org.eclipse.jetty.ee10 - jetty-ee10-webapp - test - - - org.eclipse.jetty.http2 - jetty-http2-server - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - 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 2a8f6a595ac..9eeeba72307 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,20 +1,114 @@ + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-tests 12.0.3-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.eclipse.jetty + jetty-client + + + org.eclipse.jetty + jetty-deploy + + + org.eclipse.jetty + jetty-rewrite + + + org.eclipse.jetty.ee10 + jetty-ee10-apache-jsp + + + org.eclipse.jetty.ee10 + jetty-ee10-webapp + + + org.eclipse.jetty.http2 + jetty-http2-server + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-alpn-server + test + + + + org.eclipse.jetty + jetty-http-tools + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.ee10 + jetty-ee10-annotations + test + + + org.eclipse.jetty.ee10 + jetty-ee10-servlets + test + + + org.eclipse.jetty.ee10 + jetty-ee10-test-webapp-rfc2616 + ${project.version} + war + test + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-jetty-webapp + war + test + + + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jakarta-server + test + + + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jetty-server + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + org.eclipse.jetty.websocket + jetty-websocket-jetty-client + test + + @@ -23,25 +117,25 @@ copy-wars-for-testing - process-test-resources 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 - + + 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 @@ -61,98 +155,4 @@ - - - org.eclipse.jetty.ee10 - jetty-ee10-webapp - - - org.eclipse.jetty - jetty-deploy - - - org.eclipse.jetty - jetty-rewrite - - - org.eclipse.jetty - jetty-client - - - org.slf4j - slf4j-api - - - - org.eclipse.jetty - jetty-http-tools - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - org.eclipse.jetty.ee10 - jetty-ee10-apache-jsp - - - org.eclipse.jetty.http2 - jetty-http2-server - - - org.eclipse.jetty.ee10 - jetty-ee10-annotations - test - - - org.eclipse.jetty.ee10 - jetty-ee10-servlets - test - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jetty-server - test - - - org.eclipse.jetty.websocket - jetty-websocket-jetty-client - test - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jakarta-server - test - - - org.eclipse.jetty.ee10 - jetty-ee10-test-webapp-rfc2616 - ${project.version} - war - test - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-jetty-webapp - war - test - - - org.eclipse.jetty - jetty-alpn-server - test - - 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 795204e0a97..d478a950fbe 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,29 +1,29 @@ + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-test-jmx 12.0.3-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 - - org.eclipse.jetty.ee10 - jetty-ee10-annotations - org.eclipse.jetty jetty-jmx + + org.eclipse.jetty.ee10 + jetty-ee10-annotations + org.eclipse.jetty.ee10 jetty-ee10-jmx-webapp @@ -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/jetty-ee10-jmx-webapp/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/jetty-ee10-jmx-webapp/pom.xml index 89a6fbd223e..0bb8ea098ae 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/jetty-ee10-jmx-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-jmx/jetty-ee10-jmx-webapp/pom.xml @@ -14,24 +14,24 @@ true - - jakarta.servlet - jakarta.servlet-api - provided - org.eclipse.jetty jetty-jmx - - org.slf4j - slf4j-api - org.eclipse.jetty jetty-slf4j-impl compile + + org.slf4j + slf4j-api + + + jakarta.servlet + jakarta.servlet-api + provided + jetty-ee10-jmx-webapp 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 3c4e4b6a8ac..5ae87b2056a 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.3-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 6f4e847e839..f03796d3d37 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.3-SNAPSHOT ../pom.xml - - 4.0.0 jetty-ee10-test-jndi jar EE10 :: Tests :: JNDI @@ -17,12 +17,6 @@ - - org.eclipse.jetty.ee10 - jetty-ee10-jndi - ${project.version} - test - org.eclipse.jetty.toolchain jetty-test-helper @@ -32,6 +26,12 @@ jakarta.mail test + + org.eclipse.jetty.ee10 + jetty-ee10-jndi + ${project.version} + test + 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 fe38a4a319a..8d7aaadc76e 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,48 +9,33 @@ jetty-ee10-test-loginservice EE10 :: Tests :: Login Service - false ${project.groupId}.loginservice + false - - org.eclipse.jetty - jetty-server - - - org.eclipse.jetty.ee10 - jetty-ee10-webapp - org.eclipse.jetty jetty-client - - org.eclipse.jetty.ee10 - jetty-ee10-plus - org.eclipse.jetty jetty-jndi - org.testcontainers - testcontainers - test + org.eclipse.jetty + jetty-server - org.testcontainers - mariadb - test + org.eclipse.jetty.ee10 + jetty-ee10-plus - org.testcontainers - junit-jupiter - test + org.eclipse.jetty.ee10 + jetty-ee10-webapp - org.slf4j - slf4j-simple + org.eclipse.jetty.toolchain + jetty-test-helper test @@ -60,8 +45,23 @@ test - org.eclipse.jetty.toolchain - jetty-test-helper + org.slf4j + slf4j-simple + test + + + org.testcontainers + junit-jupiter + test + + + org.testcontainers + mariadb + test + + + org.testcontainers + testcontainers test diff --git a/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 f8505eec02d..7abf8cf1e9a 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,27 +1,27 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-tests 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-test-openid-webapp war EE10 :: Tests :: OpenID WebApp - - org.slf4j - slf4j-api - org.eclipse.jetty jetty-slf4j-impl compile + + org.slf4j + slf4j-api + jakarta.servlet jakarta.servlet-api 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 173960ff8e1..40da1909540 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,41 +1,23 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-tests 12.0.3-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 - - - - jakarta.servlet - jakarta.servlet-api - provided - - - - org.eclipse.jetty.ee10 - jetty-ee10-test-cdi-common-webapp - ${project.version} - war - runtime - - + + + 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 d947ca5b289..434fba92239 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.3-SNAPSHOT - 4.0.0 jetty-ee10-test-quickstart EE10 :: Tests :: Quick Start Jetty Quick Start Test @@ -14,13 +14,8 @@ - org.eclipse.jetty.ee10 - jetty-ee10-quickstart - test - - - org.eclipse.jetty.ee10 - jetty-ee10-webapp + jakarta.transaction + jakarta.transaction-api test @@ -28,6 +23,26 @@ jetty-jmx test + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.ee10 + jetty-ee10-annotations + test + + + org.eclipse.jetty.ee10 + jetty-ee10-apache-jsp + test + + + org.eclipse.jetty.ee10 + jetty-ee10-glassfish-jstl + test + org.eclipse.jetty.ee10 jetty-ee10-plus @@ -35,17 +50,7 @@ org.eclipse.jetty.ee10 - jetty-ee10-annotations - test - - - jakarta.transaction - jakarta.transaction-api - test - - - org.eclipse.jetty.ee10.demos - jetty-ee10-demo-mock-resources + jetty-ee10-quickstart test @@ -53,6 +58,17 @@ jetty-ee10-servlets test + + org.eclipse.jetty.ee10 + jetty-ee10-webapp + test + + + org.eclipse.jetty.ee10.demos + jetty-ee10-demo-jetty-webapp + war + test + org.eclipse.jetty.ee10.demos jetty-ee10-demo-jndi-webapp @@ -61,13 +77,12 @@ org.eclipse.jetty.ee10.demos - jetty-ee10-demo-spec-webapp - war + jetty-ee10-demo-mock-resources test org.eclipse.jetty.ee10.demos - jetty-ee10-demo-jetty-webapp + jetty-ee10-demo-spec-webapp war test @@ -81,16 +96,6 @@ jetty-ee10-websocket-jetty-server test - - org.eclipse.jetty.ee10 - jetty-ee10-apache-jsp - test - - - org.eclipse.jetty.ee10 - jetty-ee10-glassfish-jstl - test - org.eclipse.jetty.toolchain jetty-test-helper @@ -101,11 +106,6 @@ slf4j-api test - - org.eclipse.jetty - jetty-slf4j-impl - 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 be9a9eac873..e569345d858 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,11 @@ jakarta.servlet jakarta.servlet-api - + + + org.eclipse.jetty + jetty-client + org.eclipse.jetty jetty-session @@ -25,29 +29,24 @@ jetty-ee10-webapp - org.eclipse.jetty - jetty-client - - - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty - jetty-session - test-jar - test + org.eclipse.jetty.tests + jetty-test-session-common + + + org.hamcrest + hamcrest-core + + org.eclipse.jetty.toolchain jetty-test-helper compile + + org.hamcrest + hamcrest + org.junit.jupiter junit-jupiter @@ -58,14 +57,25 @@ junit-jupiter-api compile + + org.slf4j + slf4j-api + org.awaitility awaitility test - org.eclipse.jetty.tests - jetty-test-session-common + org.eclipse.jetty + jetty-session + test-jar + test + + + org.eclipse.jetty + jetty-slf4j-impl + test diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-file/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-file/pom.xml index cca6e9b18b2..ad9e209bb2e 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-file/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-file/pom.xml @@ -12,6 +12,11 @@ ${project.groupId}.sessions.file + + org.eclipse.jetty + jetty-client + test + org.eclipse.jetty jetty-session @@ -23,14 +28,9 @@ test-jar test - - org.eclipse.jetty.ee10 - jetty-ee10-webapp - test - org.eclipse.jetty - jetty-client + jetty-slf4j-impl test @@ -39,13 +39,8 @@ test - org.slf4j - slf4j-api - test - - - org.eclipse.jetty - jetty-slf4j-impl + org.eclipse.jetty.ee10 + jetty-ee10-webapp test @@ -53,5 +48,10 @@ jetty-test-helper test + + org.slf4j + slf4j-api + test + 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 3a9ea8e912f..b7eebf32332 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 @@ -12,45 +12,55 @@ ${project.groupId}.sessions.gcloud - - org.eclipse.jetty - jetty-session - test - - - org.eclipse.jetty - jetty-session - test - test-jar - - - org.eclipse.jetty.ee10 - jetty-ee10-webapp - test - org.eclipse.jetty jetty-client test + + org.eclipse.jetty + jetty-session + test + + + org.eclipse.jetty + jetty-session + test-jar + test + org.eclipse.jetty.ee10 jetty-ee10-test-sessions-common test + + org.eclipse.jetty.ee10 + jetty-ee10-webapp + test + org.eclipse.jetty.gcloud jetty-gcloud-session-manager test + + org.eclipse.jetty.tests + jetty-test-session-common + test + org.eclipse.jetty.toolchain jetty-test-helper test + + org.slf4j + slf4j-simple + test + org.testcontainers - testcontainers + gcloud test @@ -60,17 +70,7 @@ org.testcontainers - gcloud - test - - - org.slf4j - slf4j-simple - test - - - org.eclipse.jetty.tests - jetty-test-session-common + testcontainers test 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 777bc56791f..a4d27d22fb9 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,47 +11,16 @@ ${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 - jetty-session - test - - - org.eclipse.jetty - jetty-session - test-jar - test - - - org.eclipse.jetty.ee10 - jetty-ee10-webapp - test + com.hazelcast + hazelcast org.eclipse.jetty jetty-client test - - org.eclipse.jetty.ee10 - jetty-ee10-test-sessions-common - test - org.eclipse.jetty jetty-hazelcast @@ -64,13 +33,40 @@ - com.hazelcast - hazelcast + org.eclipse.jetty + jetty-jmx + test + true org.eclipse.jetty - jetty-jmx - true + jetty-session + test + + + org.eclipse.jetty + jetty-session + test-jar + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.ee10 + jetty-ee10-test-sessions-common + test + + + org.eclipse.jetty.ee10 + jetty-ee10-webapp + test + + + org.eclipse.jetty.tests + jetty-test-session-common test @@ -78,26 +74,30 @@ jetty-test-helper test - - org.slf4j - slf4j-api - test - org.slf4j jul-to-slf4j test - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.tests - jetty-test-session-common + org.slf4j + slf4j-api 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 2698484dfca..353b999a12f 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,25 +13,34 @@ 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} - - - - - + + com.google.code.gson + gson + ${gson.version} + test + + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty + jetty-infinispan-embedded-query + test + + + org.eclipse.jetty + jetty-infinispan-remote-query + test + + + org.eclipse.jetty + jetty-jmx + test + true + org.eclipse.jetty jetty-session @@ -43,35 +52,19 @@ test-jar test - - org.eclipse.jetty.ee10 - jetty-ee10-webapp - test - - - org.eclipse.jetty - jetty-client - test - org.eclipse.jetty.ee10 jetty-ee10-test-sessions-common test - org.eclipse.jetty - jetty-infinispan-remote-query + org.eclipse.jetty.ee10 + jetty-ee10-webapp test - org.eclipse.jetty - jetty-infinispan-embedded-query - test - - - org.eclipse.jetty - jetty-jmx - true + org.eclipse.jetty.tests + jetty-test-session-common test @@ -79,6 +72,11 @@ jetty-test-helper test + + org.infinispan + infinispan-client-hotrod + test + org.infinispan infinispan-core @@ -95,11 +93,6 @@ infinispan-query test - - org.infinispan - infinispan-client-hotrod - test - org.infinispan infinispan-remote-query-client @@ -111,9 +104,8 @@ test - com.google.code.gson - gson - ${gson.version} + org.slf4j + jul-to-slf4j test @@ -121,32 +113,40 @@ slf4j-api test - - org.slf4j - jul-to-slf4j - test - org.slf4j slf4j-simple test - - org.testcontainers - testcontainers - test - org.testcontainers junit-jupiter test - org.eclipse.jetty.tests - jetty-test-session-common + org.testcontainers + testcontainers test + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/*.java + + --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED + + ${infinispan.docker.image.version} + ${infinispan.docker.image.name} + + + + + 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 da3a0ea48ed..280e1a28fbb 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,20 +11,12 @@ ${project.groupId}.sessions.jdbc - - - - org.apache.maven.plugins - maven-surefire-plugin - - - ${mariadb.docker.version} - - - - - + + org.eclipse.jetty + jetty-client + test + org.eclipse.jetty jetty-server @@ -41,14 +33,9 @@ test-jar test - - org.eclipse.jetty.ee10 - jetty-ee10-webapp - test - org.eclipse.jetty - jetty-client + jetty-slf4j-impl test @@ -56,6 +43,26 @@ jetty-ee10-test-sessions-common test + + org.eclipse.jetty.ee10 + jetty-ee10-webapp + test + + + org.eclipse.jetty.tests + jetty-test-session-common + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + org.mariadb.jdbc + mariadb-java-client + test + org.slf4j slf4j-api @@ -63,17 +70,7 @@ org.testcontainers - testcontainers - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.toolchain - jetty-test-helper + junit-jupiter test @@ -83,18 +80,21 @@ org.testcontainers - junit-jupiter - test - - - org.mariadb.jdbc - mariadb-java-client - test - - - org.eclipse.jetty.tests - jetty-test-session-common + testcontainers 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-memcached/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-memcached/pom.xml index eb40a31ed12..538e00c53d1 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-memcached/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-memcached/pom.xml @@ -12,34 +12,14 @@ ${project.groupId}.sessions.memcached - - org.eclipse.jetty - jetty-session - test - - - org.eclipse.jetty.ee10 - jetty-ee10-webapp - test - org.eclipse.jetty jetty-client test - org.eclipse.jetty.ee10 - jetty-ee10-test-sessions-common - test - - - org.eclipse.jetty.memcached - jetty-memcached-sessions - test - - - org.eclipse.jetty.toolchain - jetty-test-helper + org.eclipse.jetty + jetty-session test @@ -48,8 +28,28 @@ test - org.testcontainers - testcontainers + org.eclipse.jetty.ee10 + jetty-ee10-test-sessions-common + test + + + org.eclipse.jetty.ee10 + jetty-ee10-webapp + test + + + org.eclipse.jetty.memcached + jetty-memcached-sessions + test + + + org.eclipse.jetty.tests + jetty-test-session-common + test + + + org.eclipse.jetty.toolchain + jetty-test-helper test @@ -58,8 +58,8 @@ test - org.eclipse.jetty.tests - jetty-test-session-common + org.testcontainers + testcontainers test 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 7af35af25d4..673e249033e 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,20 +11,23 @@ ${project.groupId}.sessions.mongo - - - - org.apache.maven.plugins - maven-surefire-plugin - - - ${mongo.docker.version} - - - - - + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty + jetty-jmx + test + true + + + org.eclipse.jetty + jetty-nosql + test + org.eclipse.jetty jetty-session @@ -36,14 +39,9 @@ test-jar test - - org.eclipse.jetty.ee10 - jetty-ee10-webapp - test - org.eclipse.jetty - jetty-client + jetty-slf4j-impl test @@ -52,24 +50,13 @@ test - org.eclipse.jetty - jetty-nosql + org.eclipse.jetty.ee10 + jetty-ee10-webapp test - org.eclipse.jetty - jetty-jmx - true - test - - - org.slf4j - slf4j-api - test - - - org.eclipse.jetty - jetty-slf4j-impl + org.eclipse.jetty.tests + jetty-test-session-common test @@ -78,8 +65,13 @@ test - org.testcontainers - testcontainers + org.slf4j + slf4j-api + test + + + org.slf4j + slf4j-simple test @@ -93,14 +85,22 @@ test - org.slf4j - slf4j-simple - test - - - org.eclipse.jetty.tests - jetty-test-session-common + org.testcontainers + testcontainers 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 0ee4263dedf..603c51752d8 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,36 +7,36 @@ 12.0.3-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 + - - org.eclipse.jetty.ee10 - jetty-ee10-test-sessions-common - ${project.version} - org.eclipse.jetty jetty-session ${project.version} test-jar + + org.eclipse.jetty.ee10 + jetty-ee10-test-sessions-common + ${project.version} + 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 33dce3bc4e3..250c3d9f9cd 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,30 +7,13 @@ 12.0.3-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-maven-plugin - ${project.version} - - 8087 - foo - 1 - - 222 - - - - - org.eclipse.jetty.ee10 @@ -42,4 +25,21 @@ provided + + + + org.eclipse.jetty.ee10 + jetty-ee10-maven-plugin + ${project.version} + + 8087 + foo + 1 + + 222 + + + + + 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 e47ec525e56..d8f2a40fbee 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,27 +1,27 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-tests 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-test-websocket-client-provided-webapp war EE10 :: Tests :: Websocket Simple WebApp with WebSocketClient Provided - - org.slf4j - slf4j-api - org.eclipse.jetty jetty-slf4j-impl compile + + org.slf4j + slf4j-api + jakarta.servlet jakarta.servlet-api 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 c91dc9da70b..c89afc99600 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,27 +1,31 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-tests 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-test-websocket-client-webapp war EE10 :: Tests :: Websocket Simple WebApp with WebSocketClient - - org.slf4j - slf4j-api - org.eclipse.jetty jetty-slf4j-impl compile + + org.eclipse.jetty.websocket + jetty-websocket-jetty-client + + + org.slf4j + slf4j-api + jakarta.servlet jakarta.servlet-api @@ -37,9 +41,5 @@ jakarta.websocket-client-api provided - - org.eclipse.jetty.websocket - jetty-websocket-jetty-client - 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 66d53cf4484..09c22a4998b 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,26 +1,31 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-tests 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee10-test-websocket-webapp war EE10 :: Tests :: Websocket Simple WebApp + + org.eclipse.jetty + jetty-slf4j-impl + compile + org.slf4j slf4j-api - org.eclipse.jetty - jetty-slf4j-impl - compile + jakarta.servlet + jakarta.servlet-api + provided jakarta.websocket @@ -32,11 +37,6 @@ jetty-ee10-websocket-jakarta-common provided - - jakarta.servlet - jakarta.servlet-api - provided - 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 de2d5f6074d..46c30ab8038 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,32 +1,25 @@ + + 4.0.0 org.eclipse.jetty.ee10 jetty-ee10-tests 12.0.3-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 - - - - org.eclipse.jetty.ee10 - jetty-ee10-test-cdi-common-webapp - ${project.version} - war - runtime + org.jboss.logging + jboss-logging + ${jboss.logging.version} @@ -35,10 +28,17 @@ weld-servlet-core ${weld.version} + - org.jboss.logging - jboss-logging - ${jboss.logging.version} + org.eclipse.jetty.ee10 + jetty-ee10-test-cdi-common-webapp + ${project.version} + war + runtime + + + 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 e271148bd01..812b83bab4b 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.3-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-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-cdi-common-webapp - jetty-ee10-test-felix-webapp - jetty-ee10-test-openid-webapp - jetty-ee10-test-owb-cdi-webapp - jetty-ee10-test-simple-session-webapp - jetty-ee10-test-webapp-rfc2616 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 fd16eb64126..e9107f45fa6 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.3-SNAPSHOT - - 4.0.0 jetty-ee10-webapp EE10 :: WebApp Jetty web application support @@ -15,62 +16,7 @@ org.eclipse.jetty.ee10.webapp.* - - - - src/main/resources - - - src/main/config/etc - org/eclipse/jetty/ee10/webapp - false - - webdefault-ee10.xml - - - - - - - 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 - - false - - ${basedir}/src/test/resources/mods/foo-bar-janb.jar - - - org.eclipse.jetty.ee10.webapp.WebAppClassLoaderUrlStreamTest - - - - - org.apache.felix - maven-bundle-plugin - true - - - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)", osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.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 @@ -79,13 +25,17 @@ org.eclipse.jetty jetty-xml + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + org.slf4j slf4j-api org.eclipse.jetty - jetty-slf4j-impl + jetty-client test @@ -93,15 +43,60 @@ jetty-http-tools test + + org.eclipse.jetty + jetty-slf4j-impl + test + org.eclipse.jetty.toolchain jetty-test-helper test - - org.eclipse.jetty - jetty-client - test - + + + + + src/main/resources + + + org/eclipse/jetty/ee10/webapp + false + src/main/config/etc + + webdefault-ee10.xml + + + + + + + org.apache.felix + maven-bundle-plugin + 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 + + + + + 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 + false + + ${basedir}/src/test/resources/mods/foo-bar-janb.jar + + + org.eclipse.jetty.ee10.webapp.WebAppClassLoaderUrlStreamTest + + + + + 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 13cbba5c15f..ab81c560093 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.3-SNAPSHOT - - 4.0.0 jetty-ee10-websocket-jakarta-client-webapp EE10 :: Websocket :: Jakarta Client WebApp @@ -15,14 +15,14 @@ - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jakarta-client - jakarta.servlet jakarta.servlet-api + + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jakarta-client + @@ -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 19e8f7bb605..41306616d4f 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.3-SNAPSHOT - - 4.0.0 jetty-ee10-websocket-jakarta-client EE10 :: Websocket :: Jakarta Client @@ -17,11 +17,15 @@ jakarta.websocket - jakarta.websocket-client-api + jakarta.websocket-api jakarta.websocket - jakarta.websocket-api + jakarta.websocket-client-api + + + org.eclipse.jetty + jetty-client org.eclipse.jetty.ee10.websocket @@ -31,20 +35,11 @@ org.eclipse.jetty.websocket jetty-websocket-core-client - - org.eclipse.jetty - jetty-client - jakarta.servlet jakarta.servlet-api test - - org.eclipse.jetty - jetty-xml - test - org.eclipse.jetty jetty-jmx @@ -55,6 +50,11 @@ jetty-slf4j-impl test + + org.eclipse.jetty + jetty-xml + test + @@ -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 b4ab7c3a7e1..ba18dea079b 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.3-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 @@ -56,16 +31,39 @@ org.slf4j slf4j-api + + org.awaitility + awaitility + test + org.eclipse.jetty jetty-slf4j-impl test - - org.awaitility - awaitility - 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 8771ed30022..f3c01a08800 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.3-SNAPSHOT - - 4.0.0 jetty-ee10-websocket-jakarta-server EE10 :: Websocket :: Jakarta Server @@ -16,20 +16,20 @@ - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jakarta-client - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-servlet + jakarta.websocket + jakarta.websocket-api org.eclipse.jetty.ee10 jetty-ee10-annotations - jakarta.websocket - jakarta.websocket-api + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jakarta-client + + + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-servlet org.slf4j @@ -44,14 +44,6 @@ - - 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 - - - org.apache.felix maven-bundle-plugin @@ -64,18 +56,20 @@ 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 + + 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 + + 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 5e2a020a7e9..d6132dad893 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.3-SNAPSHOT - - 4.0.0 jetty-ee10-websocket-jakarta-tests EE10 :: Websocket :: Jakarta Tests @@ -18,8 +18,12 @@ - org.slf4j - slf4j-api + jakarta.websocket + jakarta.websocket-api + + + org.eclipse.jetty + jetty-http-tools org.eclipse.jetty.ee10.websocket @@ -30,17 +34,16 @@ jetty-ee10-websocket-jakarta-server - org.eclipse.jetty - jetty-http-tools + org.eclipse.jetty.toolchain + jetty-test-helper - jakarta.websocket - jakarta.websocket-api + org.junit.jupiter + junit-jupiter - org.eclipse.jetty - jetty-util-ajax - test + org.slf4j + slf4j-api org.eclipse.jetty @@ -48,12 +51,9 @@ test - org.eclipse.jetty.toolchain - jetty-test-helper - - - org.junit.jupiter - junit-jupiter + org.eclipse.jetty + jetty-util-ajax + test @@ -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 b1b64e8a93e..086e75f4161 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.3-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.ee10 + jetty-ee10-webapp + + + org.eclipse.jetty.websocket + jetty-websocket-jetty-client + + + @@ -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 a89db268c34..7223f2de223 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.3-SNAPSHOT - - 4.0.0 jetty-ee10-websocket-jetty-server EE10 :: Websocket :: Jetty Server @@ -15,34 +15,34 @@ - - org.eclipse.jetty.websocket - jetty-websocket-jetty-api - - - org.eclipse.jetty.websocket - jetty-websocket-jetty-common - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-servlet - jakarta.servlet jakarta.servlet-api - org.eclipse.jetty.ee10 - jetty-ee10-servlet + org.eclipse.jetty + jetty-jmx + true org.eclipse.jetty.ee10 jetty-ee10-annotations - org.eclipse.jetty - jetty-jmx - true + org.eclipse.jetty.ee10 + jetty-ee10-servlet + + + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-servlet + + + org.eclipse.jetty.websocket + jetty-websocket-jetty-api + + + org.eclipse.jetty.websocket + jetty-websocket-jetty-common org.slf4j @@ -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 6d2bb69fb50..b9d458ae3bb 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.3-SNAPSHOT - - 4.0.0 jetty-ee10-websocket-jetty-tests EE10 :: Websocket :: Jetty Tests @@ -32,6 +32,26 @@ jetty-client test + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty + jetty-xml + test + + + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jetty-client-webapp + test + + + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jetty-server + test + org.eclipse.jetty.http2 jetty-http2-client-transport @@ -42,11 +62,6 @@ jetty-http2-server test - - org.eclipse.jetty - jetty-slf4j-impl - test - org.eclipse.jetty.websocket jetty-websocket-jetty-api @@ -62,22 +77,6 @@ jetty-websocket-jetty-server test - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jetty-client-webapp - test - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jetty-server - test - - - org.eclipse.jetty - jetty-xml - test - - 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 d7f539a8292..624359b14bb 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.3-SNAPSHOT - - 4.0.0 jetty-ee10-websocket-servlet EE10 :: Websocket :: Servlet @@ -15,14 +15,14 @@ - - org.eclipse.jetty.websocket - jetty-websocket-core-server - org.eclipse.jetty.ee10 jetty-ee10-servlet + + org.eclipse.jetty.websocket + jetty-websocket-core-server + org.slf4j slf4j-api diff --git a/jetty-ee10/jetty-ee10-websocket/pom.xml b/jetty-ee10/jetty-ee10-websocket/pom.xml index d3746bcb384..0b80c0e680d 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.3-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 7f1aa34eed4..6a70c6ccb43 100644 --- a/jetty-ee10/pom.xml +++ b/jetty-ee10/pom.xml @@ -1,52 +1,27 @@ + + 4.0.0 org.eclipse.jetty jetty-project 12.0.3-SNAPSHOT - - 4.0.0 org.eclipse.jetty.ee10 jetty-ee10 - EE10 pom - - - 2.1.2 - 2.1.1 - 3.0.0 - 5.0.1 - 4.0.1 - 4.0.1 - 2.0.1 - 2.1.0 - 2.1.2 - 2.0.1 - 6.0.0 - 3.1.1 - 3.0.0 - 3.0.1 - 3.1.0 - 4.0.0 - 4.0.1 - 4.0.0 - 4.0.0 - 2.1.1 - - 10.1.7 - 2.0.1 - 5.1.1.Final - - true - + EE10 - jetty-ee10-demos - jetty-ee10-apache-jsp - jetty-ee10-glassfish-jstl 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 @@ -58,17 +33,162 @@ jetty-ee10-runner jetty-ee10-servlet jetty-ee10-servlets + jetty-ee10-tests jetty-ee10-webapp jetty-ee10-websocket - jetty-ee10-tests - jetty-ee10-examples - jetty-ee10-bom - jetty-ee10-home - jetty-ee10-fcgi-proxy + + 2.1.2 + 2.1.1 + 3.0.0 + 5.0.1 + 4.0.1 + 4.0.1 + 2.0.1 + 2.1.0 + 2.1.2 + 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 + + 10.1.7 + 2.0.1 + + true + 5.1.1.Final + + + + com.sun.mail + jakarta.mail + ${mail.impl.version} + + + com.sun.xml.ws + jaxws-rt + ${jakarta.xml.jaxws.impl.version} + + + jakarta.activation + jakarta.activation-api + ${jakarta.activation.api.version} + + + jakarta.annotation + jakarta.annotation-api + ${jakarta.annotation.api.version} + + + jakarta.authentication + jakarta.authentication-api + ${jakarta.authentication.api.version} + + + jakarta.el + jakarta.el-api + ${jakarta.el.api.version} + + + jakarta.enterprise + jakarta.enterprise.cdi-api + ${jakarta.enterprise.cdi.api.version} + + + jakarta.enterprise + jakarta.enterprise.lang-model + ${jakarta.enterprise.lang.model.version} + + + jakarta.inject + jakarta.inject-api + ${jakarta.inject.api.version} + + + jakarta.interceptor + jakarta.interceptor-api + ${jakarta.interceptor.api.version} + + + jakarta.mail + jakarta.mail-api + ${jakarta.mail.api.version} + + + jakarta.servlet + jakarta.servlet-api + ${jakarta.servlet.api.version} + + + jakarta.servlet.jsp + jakarta.servlet.jsp-api + ${jakarta.servlet.jsp.api.version} + + + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + ${jakarta.servlet.jsp.jstl.api.version} + + + jakarta.el + jakarta.el-api + + + jakarta.servlet + jakarta.servlet-api + + + + + jakarta.transaction + jakarta.transaction-api + ${jakarta.transaction-api.version} + + + jakarta.websocket + jakarta.websocket-api + ${jakarta.websocket.api.version} + + + jakarta.websocket + jakarta.websocket-client-api + ${jakarta.websocket.api.version} + + + jakarta.ws.rs + jakarta.ws.rs-api + ${jakarta.ws.rs.api.version} + + + jakarta.xml.bind + jakarta.xml.bind-api + ${jakarta.xml.bind.api.version} + + + jakarta.xml.ws + jakarta.xml.ws-api + ${jakarta.xml.ws.api.version} + + + org.eclipse.jetty + jetty-openid + ${project.version} + + + org.eclipse.jetty + jetty-security + ${project.version} + org.eclipse.jetty.ee10 @@ -95,11 +215,6 @@ jetty-ee10-glassfish-jstl ${project.version} - - org.eclipse.jetty - jetty-security - ${project.version} - org.eclipse.jetty.ee10 jetty-ee10-jaspi @@ -120,11 +235,6 @@ jetty-ee10-maven-plugin ${project.version} - - org.eclipse.jetty - jetty-openid - ${project.version} - org.eclipse.jetty.ee10 jetty-ee10-plus @@ -155,41 +265,6 @@ jetty-ee10-webapp ${project.version} - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jakarta-client - ${project.version} - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jakarta-client-webapp - ${project.version} - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jakarta-common - ${project.version} - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jakarta-server - ${project.version} - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jetty-client-webapp - ${project.version} - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jetty-server - ${project.version} - - - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-servlet - ${project.version} - org.eclipse.jetty.ee10.demos jetty-ee10-demo-async-rest-jar @@ -242,13 +317,13 @@ org.eclipse.jetty.ee10.demos - jetty-ee10-demo-spec-webapp + jetty-ee10-demo-simple-webapp ${project.version} war org.eclipse.jetty.ee10.demos - jetty-ee10-demo-simple-webapp + jetty-ee10-demo-spec-webapp ${project.version} war @@ -257,126 +332,40 @@ jetty-ee10-demo-web-fragment ${project.version} - - org.mortbay.jasper - apache-jsp - ${jsp.impl.version} + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jakarta-client + ${project.version} - org.mortbay.jasper - apache-el - ${jsp.impl.version} + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jakarta-client-webapp + ${project.version} - com.sun.xml.ws - jaxws-rt - ${jakarta.xml.jaxws.impl.version} + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jakarta-common + ${project.version} - com.sun.mail - jakarta.mail - ${mail.impl.version} + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jakarta-server + ${project.version} - jakarta.el - jakarta.el-api - ${jakarta.el.api.version} + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jetty-client-webapp + ${project.version} - jakarta.enterprise - jakarta.enterprise.cdi-api - ${jakarta.enterprise.cdi.api.version} + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jetty-server + ${project.version} - jakarta.enterprise - jakarta.enterprise.lang-model - ${jakarta.enterprise.lang.model.version} - - - jakarta.activation - jakarta.activation-api - ${jakarta.activation.api.version} - - - jakarta.annotation - jakarta.annotation-api - ${jakarta.annotation.api.version} - - - jakarta.authentication - jakarta.authentication-api - ${jakarta.authentication.api.version} - - - jakarta.interceptor - jakarta.interceptor-api - ${jakarta.interceptor.api.version} - - - jakarta.inject - jakarta.inject-api - ${jakarta.inject.api.version} - - - jakarta.mail - jakarta.mail-api - ${jakarta.mail.api.version} - - - jakarta.servlet - jakarta.servlet-api - ${jakarta.servlet.api.version} - - - jakarta.servlet.jsp - jakarta.servlet.jsp-api - ${jakarta.servlet.jsp.api.version} - - - jakarta.servlet.jsp.jstl - jakarta.servlet.jsp.jstl-api - ${jakarta.servlet.jsp.jstl.api.version} - - - jakarta.servlet - jakarta.servlet-api - - - jakarta.el - jakarta.el-api - - - - - jakarta.transaction - jakarta.transaction-api - ${jakarta.transaction-api.version} - - - jakarta.ws.rs - jakarta.ws.rs-api - ${jakarta.ws.rs.api.version} - - - jakarta.xml.bind - jakarta.xml.bind-api - ${jakarta.xml.bind.api.version} - - - jakarta.xml.ws - jakarta.xml.ws-api - ${jakarta.xml.ws.api.version} - - - jakarta.websocket - jakarta.websocket-client-api - ${jakarta.websocket.api.version} - - - jakarta.websocket - jakarta.websocket-api - ${jakarta.websocket.api.version} + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-servlet + ${project.version} org.glassfish.jaxb @@ -388,6 +377,17 @@ jakarta.servlet.jsp.jstl ${jakarta.servlet.jsp.jstl.impl.version} + + org.mortbay.jasper + apache-el + ${jsp.impl.version} + + + + org.mortbay.jasper + apache-jsp + ${jsp.impl.version} + @@ -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 ca8c82a060e..cb5757bffc3 100644 --- a/jetty-ee8/jetty-ee8-annotations/pom.xml +++ b/jetty-ee8/jetty-ee8-annotations/pom.xml @@ -1,77 +1,26 @@ + + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.3-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 - - - - - - - + + jakarta.annotation + jakarta.annotation-api + org.eclipse.jetty.ee8 jetty-ee8-plus @@ -81,8 +30,8 @@ jetty-ee8-webapp - jakarta.annotation - jakarta.annotation-api + org.eclipse.jetty.toolchain + jetty-servlet-api org.ow2.asm @@ -96,20 +45,11 @@ org.slf4j slf4j-api - - org.eclipse.jetty.toolchain - jetty-servlet-api - jakarta.transaction jakarta.transaction-api test - - org.eclipse.jetty.toolchain - jetty-test-helper - test - org.eclipse.jetty jetty-jndi @@ -120,5 +60,61 @@ jetty-slf4j-impl test + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + + + + jar + src/test/jar + + + + + 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.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 + + + + + + + + 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 + + + + diff --git a/jetty-ee8/jetty-ee8-apache-jsp/pom.xml b/jetty-ee8/jetty-ee8-apache-jsp/pom.xml index 8d1b48ab9a6..02aec5d5ae2 100644 --- a/jetty-ee8/jetty-ee8-apache-jsp/pom.xml +++ b/jetty-ee8/jetty-ee8-apache-jsp/pom.xml @@ -1,20 +1,61 @@ + + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.3-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.eclipse.jetty + jetty-util + + + org.eclipse.jetty.toolchain + jetty-servlet-api + + + org.mortbay.jasper + apache-jsp + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-http-tools + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.ee8 + jetty-ee8-servlet + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + + @@ -24,14 +65,9 @@ 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 - + 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 @@ -57,44 +93,4 @@ - - - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-util - - - org.mortbay.jasper - apache-jsp - - - org.eclipse.jetty.ee8 - jetty-ee8-servlet - test - - - org.eclipse.jetty.toolchain - jetty-servlet-api - - - org.eclipse.jetty - jetty-http-tools - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - - diff --git a/jetty-ee8/jetty-ee8-bom/pom.xml b/jetty-ee8/jetty-ee8-bom/pom.xml index a259f29bd0b..5918261813e 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 904319779c3..aa2af8f53d0 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.3-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 d8ba53fca9d..6854a23329e 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.3-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 96435bcedd9..d9b085c926b 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.3-SNAPSHOT - - 4.0.0 jetty-ee8-demo-async-rest-webapp war EE8 :: Demo :: Async Rest :: WebApp @@ -15,10 +16,6 @@ - - org.slf4j - slf4j-api - org.eclipse.jetty jetty-slf4j-impl @@ -28,6 +25,10 @@ org.eclipse.jetty.ee8.demos jetty-ee8-demo-async-rest-jar + + org.slf4j + slf4j-api + org.eclipse.jetty.toolchain jetty-servlet-api 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 d8b25175bd1..26e699de473 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.3-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 5af6cd8111b..76223a9d85a 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.3-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 maven-war-plugin @@ -85,111 +191,5 @@ - - - - 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 - jetty-ee8-servlets - provided - - - org.eclipse.jetty.toolchain - jetty-servlet-api - provided - - - org.eclipse.jetty.ee8 - jetty-ee8-webapp - test - - - org.eclipse.jetty - jetty-jmx - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - org.eclipse.jetty - jetty-server - provided - - - jakarta.servlet.jsp - jakarta.servlet.jsp-api - provided - - - jakarta.servlet.jsp.jstl - jakarta.servlet.jsp.jstl-api - provided - - - jakarta.annotation - jakarta.annotation-api - provided - - - org.eclipse.jetty.toolchain - jetty-javax-websocket-api - provided - - - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-jetty-api - provided - - - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-jetty-server - provided - - - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-javax-server - test - - 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 a976e2dd945..1a599f03fa6 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,78 +7,35 @@ 12.0.3-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 + + + jakarta.transaction + jakarta.transaction-api + provided + + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-mock-resources + provided + + + org.eclipse.jetty.orbit + javax.mail.glassfish + provided + + + org.eclipse.jetty.toolchain + jetty-servlet-api + provided + + - - - org.apache.maven.plugins - maven-resources-plugin - - - copy-templates-resources - generate-resources - - copy-resources - - - - ee9-to-ee8 - - ${project.build.directory}/templates - - - true - ${ee9.module.path}/src/main/templates - - - - - - - - maven-antrun-plugin - - - generate-xml-files - process-resources - - - - - - - - - - - - run - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - package - - copy-dependencies - - - jakarta.transaction-api,ee8-demo-mock-resources - ${project.build.directory}/lib/jndi - - - - - @@ -103,27 +60,70 @@ + + + maven-antrun-plugin + + + generate-xml-files + + run + + process-resources + + + + + + + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + + copy-dependencies + + package + + jakarta.transaction-api,ee8-demo-mock-resources + ${project.build.directory}/lib/jndi + + + + + + org.apache.maven.plugins + maven-resources-plugin + + + copy-templates-resources + + copy-resources + + generate-resources + + + ee9-to-ee8 + + ${project.build.directory}/templates + + + true + ${ee9.module.path}/src/main/templates + + + + + + + - - - 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 28699f31c95..8c1e5a7f139 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.3-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 + + + jakarta.servlet.jsp + jakarta.servlet.jsp-api + provided + + + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + provided + + + org.eclipse.jetty.toolchain + jetty-servlet-api + provided + + + @@ -34,24 +52,15 @@ - - - maven-war-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - maven-assembly-plugin web-bundle-assembly - package single + package src/main/assembly/web-bundle.xml @@ -63,32 +72,30 @@ + + + maven-war-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + - - - org.eclipse.jetty.toolchain - jetty-servlet-api - provided - - - jakarta.servlet.jsp - jakarta.servlet.jsp-api - provided - - - jakarta.servlet.jsp.jstl - jakarta.servlet.jsp.jstl-api - provided - - - precompile-jsp + + org.apache.maven.plugins + maven-war-plugin + + ${basedir}/target/web.xml + + org.eclipse.jetty jetty-jspc-maven-plugin @@ -110,13 +117,6 @@ - - org.apache.maven.plugins - maven-war-plugin - - ${basedir}/target/web.xml - - 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 beffcc38967..b9024dd7f75 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.3-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.orbit + javax.mail.glassfish + provided + + + org.eclipse.jetty.toolchain + jetty-servlet-api + 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 fe9df35b4fd..8c400285ec9 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,18 +1,82 @@ + 4.0.0 org.eclipse.jetty.ee8.demos jetty-ee8-demos 12.0.3-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 + + + org.eclipse.jetty + jetty-client + + + org.eclipse.jetty + jetty-slf4j-impl + compile + + + org.eclipse.jetty.ee8 + jetty-ee8-proxy + + + org.slf4j + slf4j-api + + + jakarta.servlet.jsp + jakarta.servlet.jsp-api + provided + + + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + provided + + + org.eclipse.jetty + jetty-server + provided + + + org.eclipse.jetty.toolchain + jetty-servlet-api + provided + + + org.eclipse.jetty + jetty-alpn-java-server + test + + + org.eclipse.jetty + jetty-jmx + test + + + org.eclipse.jetty.ee8 + jetty-ee8-annotations + test + + + org.eclipse.jetty.ee8 + jetty-ee8-webapp + test + + + org.eclipse.jetty.http2 + jetty-http2-server + test + + @@ -27,68 +91,4 @@ - - - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-slf4j-impl - compile - - - org.eclipse.jetty.ee8 - jetty-ee8-proxy - - - org.eclipse.jetty.toolchain - jetty-servlet-api - provided - - - org.eclipse.jetty.ee8 - jetty-ee8-webapp - test - - - org.eclipse.jetty - jetty-client - - - org.eclipse.jetty - jetty-jmx - test - - - org.eclipse.jetty - jetty-server - provided - - - org.eclipse.jetty.http2 - jetty-http2-server - test - - - org.eclipse.jetty - jetty-alpn-java-server - test - - - org.eclipse.jetty.ee8 - jetty-ee8-annotations - test - - - jakarta.servlet.jsp - jakarta.servlet.jsp-api - provided - - - jakarta.servlet.jsp.jstl - jakarta.servlet.jsp.jstl-api - provided - - 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 3dad68c56a9..8a0eaeef67a 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.3-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 49ba1412a37..3291d033660 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 d21eeab4e10..355cffc6370 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,54 +6,90 @@ jetty-ee8-demo-spec 12.0.3-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 + + + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-container-initializer + + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-web-fragment + + + jakarta.annotation + jakarta.annotation-api + provided + + + jakarta.transaction + jakarta.transaction-api + provided + + + org.eclipse.jetty.toolchain + jetty-servlet-api + provided + + + + + + + + + org.eclipse.jetty.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 - maven-assembly-plugin - - - web-bundle-assembly - package - - single - - - - src/main/assembly/web-bundle.xml - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - - - - maven-war-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - target - - plugin-context.xml - - META-INF - - - - org.apache.felix @@ -66,10 +102,8 @@ Test Webapp for Servlet 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 @@ -78,64 +112,45 @@ - org.apache.maven.plugins - maven-resources-plugin + maven-antrun-plugin - copy-templates-resources - generate-resources + generate-xml-files - copy-resources + run + process-resources - - ee9-to-ee8 - - ${project.build.directory}/templates - - - true - ${ee9.module.path}/src/main/templates - - - - - - copy-realm - generate-resources - - copy-resources - - - ${project.build.directory}/realm - - - ${ee9.module.path}/src/etc - - + + + + + + + + - maven-antrun-plugin + org.apache.maven.plugins + maven-assembly-plugin - generate-xml-files - process-resources - - - - - - - - - - + web-bundle-assembly - run + single + package + + + src/main/assembly/web-bundle.xml + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + @@ -144,10 +159,10 @@ maven-dependency-plugin - package copy + package @@ -185,81 +200,64 @@ + + org.apache.maven.plugins + maven-resources-plugin + + + copy-realm + + copy-resources + + generate-resources + + ${project.build.directory}/realm + + + ${ee9.module.path}/src/etc + + + + + + copy-templates-resources + + copy-resources + + generate-resources + + + ee9-to-ee8 + + ${project.build.directory}/templates + + + true + ${ee9.module.path}/src/main/templates + + + + + + + + + maven-war-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + target + + plugin-context.xml + + META-INF + + + + - - - - 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 4c8a7ffe84b..b20ea295093 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.3-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 210b2f3fac1..ca95ce75a39 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.3-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 281d469cd9e..8e211a37d69 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.3-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 aab1712c8ff..d7c625fca83 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.3-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 - - - - - - @@ -48,19 +34,19 @@ javax.servlet.jsp.jstl - javax.servlet.jsp + javax.servlet * - javax.servlet + javax.servlet.jsp * - org.eclipse.jetty.toolchain - jetty-test-helper + org.eclipse.jetty.ee8 + jetty-ee8-annotations test @@ -72,13 +58,13 @@ org.eclipse.jetty.ee8 - jetty-ee8-annotations + jetty-ee8-webapp test - org.eclipse.jetty.ee8 - jetty-ee8-webapp + org.eclipse.jetty.toolchain + jetty-test-helper test @@ -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 891c35b0546..78160444e8f 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.3-SNAPSHOT - 4.0.0 jetty-ee8-home - EE8 :: Home Assembly pom + EE8 :: Home Assembly ${basedir}/target/jetty-ee8-home @@ -16,348 +16,60 @@ true - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack-config-deps - generate-resources - - unpack-dependencies - - - - org.eclipse.jetty.ee8, org.eclipse.jetty.ee8.demos - - - config - false - META-INF/**,webapps/**,start.d/**,start.ini - ${assembly-directory} - - - - copy-lib-core-websocket-deps - generate-resources - - copy-dependencies - - - org.eclipse.jetty.websocket - jetty-schemas,jetty-servlet-api,jetty-test-helper,jetty-websocket-core* - jar - ${assembly-directory}/lib - - - - copy-lib-ee8-websocket-deps - generate-resources - - copy-dependencies - - - org.eclipse.jetty.toolchain,org.eclipse.jetty.ee8.websocket - jetty-schemas,jetty-servlet-api,jetty-test-helper,jetty-websocket-core* - jar - ${assembly-directory}/lib/ee8-websocket - - - - copy-lib-core-websocket-src-deps - generate-resources - - copy-dependencies - - - org.eclipse.jetty.websocket - jar - sources - ${source-assembly-directory}/lib - - - - copy-lib-ee8-websocket-src-deps - generate-resources - - copy-dependencies - - - org.eclipse.jetty.ee8.websocket - jar - sources - ${source-assembly-directory}/lib/ee8-websocket - - - - copy-lib-servlet-api-deps - generate-resources - - copy - - - - - org.eclipse.jetty.toolchain - jetty-servlet-api - ${jetty.servlet.api.version} - - - ${assembly-directory}/lib - - - - copy-lib-transaction-api-deps - generate-resources - - copy - - - - - jakarta.transaction - jakarta.transaction-api - ${jakarta.transaction-api.version} - - - ${assembly-directory}/lib - - - - copy-lib-servlet-api-src-deps - generate-resources - - copy - - - - - org.eclipse.jetty.toolchain - jetty-servlet-api - ${jetty.servlet.api.version} - sources - - - ${source-assembly-directory}/lib - - - - copy-lib-transaction-api-src-deps - generate-resources - - copy - - - - - jakarta.transaction - jakarta.transaction-api - ${jakarta.transaction-api.version} - sources - - - ${source-assembly-directory}/lib - - - - copy-ee8-annotations-deps - generate-resources - - copy-dependencies - - - jakarta.annotation,org.ow2.asm - jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis - jar - ${assembly-directory}/lib/ee8-annotations - - - - copy-ee8-annotations-src-deps - generate-resources - - copy-dependencies - - - jakarta.annotation,org.ow2.asm - jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis - jar - sources - ${source-assembly-directory}/lib/ee8-annotations - - - - copy-ee8-jsp-src-deps - generate-resources - - copy-dependencies - - - true - org.mortbay.jasper,org.eclipse.jdt - apache-jsp,apache-el,ecj - jar - sources - ${source-assembly-directory}/lib/ee8-apache-jsp - - - - copy-ee8-jsp-deps - generate-resources - - copy-dependencies - - - true - org.mortbay.jasper,org.eclipse.jdt - apache-jsp,apache-el,ecj - jar - ${assembly-directory}/lib/ee8-apache-jsp - - - - copy-ee8-jstl-src-deps - generate-resources - - copy-dependencies - - - 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-ee8-jstl-deps - generate-resources - - copy-dependencies - - - 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-ee8-deps - generate-resources - - copy-dependencies - - - 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 - - - - copy-ee8-src-deps - generate-resources - - copy-dependencies - - - org.eclipse.jetty.ee8 - jar - org.eclipse.jetty.ee8.demos,org.eclipse.jetty.ee8.websocket - sources - ${source-assembly-directory}/lib - - - - - - org.apache.maven.plugins - maven-assembly-plugin - - posix - false - - - - binary - package - - single - - - - src/main/assembly/jetty-assembly.xml - - - - - sources - package - - single - - - - src/main/assembly/jetty-source-assembly.xml - - true - - - - - - - + + + + + - org.ow2.asm - asm + org.eclipse.jetty.ee8 + jetty-ee8-annotations - org.ow2.asm - asm-commons + org.eclipse.jetty.ee8 + jetty-ee8-apache-jsp - org.ow2.asm - asm-tree + org.eclipse.jetty.ee8 + jetty-ee8-glassfish-jstl + + + jakarta.el + jakarta.el-api + + + javax.el + el-api + + + xalan + xalan + + + + + + + + + + org.eclipse.jetty.ee8 + jetty-ee8-jndi + true - org.ow2.asm - asm-analysis + org.eclipse.jetty.ee8 + jetty-ee8-openid + true + + + org.eclipse.jetty.ee8 + jetty-ee8-plus + + + org.eclipse.jetty.ee8 + jetty-ee8-proxy @@ -373,87 +85,16 @@ 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 + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-async-rest-webapp + ${project.version} + config + jar true - - - - - - - org.eclipse.jetty.ee8 - jetty-ee8-jndi - true - - org.eclipse.jetty.ee8.demos - jetty-ee8-demo-mock-resources + jetty-ee8-demo-jaas-webapp ${project.version} config jar @@ -473,14 +114,6 @@ - - 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 @@ -491,15 +124,16 @@ org.eclipse.jetty.ee8.demos - jetty-ee8-demo-spec-webapp + jetty-ee8-demo-jsp-webapp ${project.version} config jar true + org.eclipse.jetty.ee8.demos - jetty-ee8-demo-async-rest-webapp + jetty-ee8-demo-mock-resources ${project.version} config jar @@ -523,12 +157,376 @@ org.eclipse.jetty.ee8.demos - jetty-ee8-demo-jsp-webapp + jetty-ee8-demo-spec-webapp ${project.version} config jar true + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-javax-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-jetty-server + + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-servlet + + + org.ow2.asm + asm + + + org.ow2.asm + asm-analysis + + + org.ow2.asm + asm-commons + + + org.ow2.asm + asm-tree + + + xalan + xalan + + + + + org.apache.maven.plugins + maven-assembly-plugin + + posix + false + + + + binary + + single + + package + + + src/main/assembly/jetty-assembly.xml + + + + + sources + + single + + package + + + src/main/assembly/jetty-source-assembly.xml + + true + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-ee8-annotations-deps + + copy-dependencies + + generate-resources + + jakarta.annotation,org.ow2.asm + jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis + jar + ${assembly-directory}/lib/ee8-annotations + + + + copy-ee8-annotations-src-deps + + copy-dependencies + + generate-resources + + jakarta.annotation,org.ow2.asm + jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis + jar + sources + ${source-assembly-directory}/lib/ee8-annotations + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + copy-ee8-deps + + copy-dependencies + + 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 + + + + copy-ee8-jsp-deps + + copy-dependencies + + generate-resources + + true + org.mortbay.jasper,org.eclipse.jdt + apache-jsp,apache-el,ecj + jar + ${assembly-directory}/lib/ee8-apache-jsp + + + + copy-ee8-jsp-src-deps + + copy-dependencies + + generate-resources + + true + org.mortbay.jasper,org.eclipse.jdt + apache-jsp,apache-el,ecj + jar + sources + ${source-assembly-directory}/lib/ee8-apache-jsp + + + + copy-ee8-jstl-deps + + copy-dependencies + + 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 + + + + copy-ee8-jstl-src-deps + + copy-dependencies + + 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 + + + + copy-ee8-src-deps + + copy-dependencies + + generate-resources + + org.eclipse.jetty.ee8 + jar + org.eclipse.jetty.ee8.demos,org.eclipse.jetty.ee8.websocket + sources + ${source-assembly-directory}/lib + + + + copy-lib-core-websocket-deps + + copy-dependencies + + generate-resources + + org.eclipse.jetty.websocket + jetty-schemas,jetty-servlet-api,jetty-test-helper,jetty-websocket-core* + jar + ${assembly-directory}/lib + + + + copy-lib-core-websocket-src-deps + + copy-dependencies + + generate-resources + + org.eclipse.jetty.websocket + jar + sources + ${source-assembly-directory}/lib + + + + copy-lib-ee8-websocket-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* + jar + ${assembly-directory}/lib/ee8-websocket + + + + copy-lib-ee8-websocket-src-deps + + copy-dependencies + + generate-resources + + org.eclipse.jetty.ee8.websocket + jar + sources + ${source-assembly-directory}/lib/ee8-websocket + + + + copy-lib-servlet-api-deps + + copy + + generate-resources + + + + org.eclipse.jetty.toolchain + jetty-servlet-api + ${jetty.servlet.api.version} + + + ${assembly-directory}/lib + + + + copy-lib-servlet-api-src-deps + + copy + + generate-resources + + + + org.eclipse.jetty.toolchain + jetty-servlet-api + ${jetty.servlet.api.version} + sources + + + ${source-assembly-directory}/lib + + + + copy-lib-transaction-api-deps + + copy + + generate-resources + + + + jakarta.transaction + jakarta.transaction-api + ${jakarta.transaction-api.version} + + + ${assembly-directory}/lib + + + + copy-lib-transaction-api-src-deps + + copy + + generate-resources + + + + jakarta.transaction + jakarta.transaction-api + ${jakarta.transaction-api.version} + sources + + + ${source-assembly-directory}/lib + + + + unpack-config-deps + + unpack-dependencies + + generate-resources + + org.eclipse.jetty.ee8, org.eclipse.jetty.ee8.demos + + config + false + META-INF/**,webapps/**,start.d/**,start.ini + ${assembly-directory} + + + + + + + diff --git a/jetty-ee8/jetty-ee8-jaspi/pom.xml b/jetty-ee8/jetty-ee8-jaspi/pom.xml index ade86a2d471..f6b7fdd4720 100644 --- a/jetty-ee8/jetty-ee8-jaspi/pom.xml +++ b/jetty-ee8/jetty-ee8-jaspi/pom.xml @@ -1,21 +1,58 @@ + + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.3-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.* + + + jakarta.security.auth.message + jakarta.security.auth.message-api + 1.1.3 + + + org.eclipse.jetty.ee8 + jetty-ee8-security + + + org.eclipse.jetty.toolchain + jetty-servlet-api + + + org.slf4j + slf4j-api + + + jakarta.activation + jakarta.activation-api + 1.2.2 + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + @@ -33,58 +70,22 @@ maven-antrun-plugin + + run + process-resources - - + + - - run - - - - - jakarta.security.auth.message - jakarta.security.auth.message-api - 1.1.3 - - - org.eclipse.jetty.toolchain - jetty-servlet-api - - - org.eclipse.jetty.ee8 - jetty-ee8-security - - - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - jakarta.activation - jakarta.activation-api - test - 1.2.2 - - diff --git a/jetty-ee8/jetty-ee8-jndi/pom.xml b/jetty-ee8/jetty-ee8-jndi/pom.xml index 2bcb1b48e46..9911bb7cb94 100644 --- a/jetty-ee8/jetty-ee8-jndi/pom.xml +++ b/jetty-ee8/jetty-ee8-jndi/pom.xml @@ -1,21 +1,54 @@ + + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.3-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.eclipse.jetty + jetty-jndi + + + org.slf4j + slf4j-api + + + org.eclipse.jetty.orbit + javax.mail.glassfish + provided + + + org.eclipse.jetty.orbit + javax.activation + + + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + @@ -30,36 +63,4 @@ - - - - org.eclipse.jetty - jetty-jndi - - - org.eclipse.jetty.orbit - javax.mail.glassfish - provided - - - org.eclipse.jetty.orbit - javax.activation - - - - - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - diff --git a/jetty-ee8/jetty-ee8-jspc-maven-plugin/pom.xml b/jetty-ee8/jetty-ee8-jspc-maven-plugin/pom.xml index 4bbcfbb5551..367f2aba051 100644 --- a/jetty-ee8/jetty-ee8-jspc-maven-plugin/pom.xml +++ b/jetty-ee8/jetty-ee8-jspc-maven-plugin/pom.xml @@ -1,11 +1,11 @@ + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.3-SNAPSHOT - 4.0.0 jetty-ee8-jspc-maven-plugin maven-plugin EE8 :: Jetty JSPC Maven Plugin @@ -14,51 +14,56 @@ jetty-ee9-jspc-maven-plugin 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.apache.ant + ant + + + org.apache.maven.plugin-tools + maven-plugin-tools-api + + + junit + junit + + + org.eclipse.jetty jetty-util + + org.eclipse.jetty.ee8 + jetty-ee8-apache-jsp + ${project.version} + + + org.eclipse.jetty.ee8 + jetty-ee8-glassfish-jstl + ${project.version} + + + org.apache.maven + maven-artifact + provided + + + org.apache.maven + maven-core + provided + + + javax.annotation + javax.annotation-api + + + + + org.apache.maven + maven-model + provided + org.apache.maven maven-plugin-api @@ -75,44 +80,45 @@ maven-plugin-annotations provided - - org.apache.maven - maven-artifact - provided - - - org.apache.maven - maven-core - provided - - - org.apache.maven - maven-model - provided - - - org.apache.maven.plugin-tools - maven-plugin-tools-api - - - junit - junit - - - - - org.eclipse.jetty.ee8 - jetty-ee8-apache-jsp - ${project.version} - - - org.eclipse.jetty.ee8 - jetty-ee8-glassfish-jstl - ${project.version} - - - org.apache.ant - ant - + + + + org.apache.maven.plugins + maven-invoker-plugin + + + ${maven.surefire.plugin.version} + + + clean + + + + + integration-test + + install + integration-test + verify + + + + + + org.apache.maven.plugins + maven-plugin-plugin + + + exec-plugin-doc + + descriptor + helpmojo + + process-classes + + + + + diff --git a/jetty-ee8/jetty-ee8-maven-plugin/pom.xml b/jetty-ee8/jetty-ee8-maven-plugin/pom.xml index c05fc8aab59..7847a0e0718 100644 --- a/jetty-ee8/jetty-ee8-maven-plugin/pom.xml +++ b/jetty-ee8/jetty-ee8-maven-plugin/pom.xml @@ -1,129 +1,38 @@ + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.3-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 - - - - - + + jakarta.transaction + jakarta.transaction-api + true + + + org.apache.maven.plugin-tools + maven-plugin-tools-api + + + org.apache.maven.shared + maven-artifact-transfer + ${maven-artifact-transfer.version} + org.codehaus.plexus plexus-xml @@ -134,11 +43,11 @@ org.apache.maven - maven-xml-impl + maven-api-xml org.apache.maven - maven-api-xml + maven-xml-impl org.apache.maven @@ -147,44 +56,9 @@ - org.apache.maven.shared - maven-artifact-transfer - ${maven-artifact-transfer.version} - - - org.apache.maven - maven-plugin-api - provided - - - javax.annotation - javax.annotation-api - - - - - org.apache.maven - maven-artifact - provided - - - org.apache.maven - maven-core - provided - - - org.apache.maven - maven-model - provided - - - org.apache.maven.plugin-tools - maven-plugin-tools-api - - - org.apache.maven.plugin-tools - maven-plugin-annotations - provided + org.eclipse.jetty + jetty-client + true org.eclipse.jetty @@ -197,51 +71,6 @@ - - org.eclipse.jetty - jetty-util - - - org.eclipse.jetty.ee8 - jetty-ee8-webapp - - - jakarta.servlet - servlet-api - - - true - - - org.eclipse.jetty.ee8 - jetty-ee8-quickstart - true - - - org.eclipse.jetty.ee8 - jetty-ee8-plus - true - - - org.eclipse.jetty - jetty-jndi - true - - - org.eclipse.jetty - jetty-server - true - - - org.eclipse.jetty.ee8 - jetty-ee8-servlet - true - - - org.eclipse.jetty - jetty-client - true - org.eclipse.jetty jetty-http @@ -257,21 +86,25 @@ jetty-jmx true + + org.eclipse.jetty + jetty-jndi + true + + + org.eclipse.jetty + jetty-server + true + + + org.eclipse.jetty + jetty-util + org.eclipse.jetty.ee8 jetty-ee8-annotations true - - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-javax-server - true - - - org.eclipse.jetty.ee8.websocket - jetty-ee8-websocket-jetty-server - true - org.eclipse.jetty.ee8 jetty-ee8-apache-jsp @@ -282,15 +115,88 @@ jetty-ee8-glassfish-jstl true + + org.eclipse.jetty.ee8 + jetty-ee8-plus + true + + + org.eclipse.jetty.ee8 + jetty-ee8-quickstart + true + + + org.eclipse.jetty.ee8 + jetty-ee8-servlet + true + + + org.eclipse.jetty.ee8 + jetty-ee8-webapp + true + + + jakarta.servlet + servlet-api + + + + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-javax-server + true + + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-jetty-server + true + org.slf4j slf4j-api true - jakarta.transaction - jakarta.transaction-api - true + org.apache.maven + maven-artifact + provided + + + org.apache.maven + maven-core + provided + + + javax.annotation + javax.annotation-api + + + + + org.apache.maven + maven-model + provided + + + org.apache.maven + maven-plugin-api + provided + + + javax.annotation + javax.annotation-api + + + + + org.apache.maven.plugin-tools + maven-plugin-annotations + provided + + + org.awaitility + awaitility + test org.eclipse.jetty @@ -302,10 +208,111 @@ jetty-test-helper test - - org.awaitility - awaitility - test - + + + + 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 + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + test-jar + + + + + + org.apache.maven.plugins + maven-plugin-plugin + + jetty + + + + exec-plugin-doc + + helpmojo + + generate-sources + + + + + maven-surefire-plugin + + -Dstop.port=@{test.stopPort} -Djetty.port=@{test.jettyPort} + + **/IntegrationTest*.java + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + test-reserve-ports + + reserve-network-port + + process-test-classes + + + test.stopPort + test.jettyPort + + + + + reserve-ports + + reserve-network-port + + pre-integration-test + + + jetty.stopPort + + + + + + + diff --git a/jetty-ee8/jetty-ee8-nested/pom.xml b/jetty-ee8/jetty-ee8-nested/pom.xml index c42a8323199..65bdf8a9c24 100644 --- a/jetty-ee8/jetty-ee8-nested/pom.xml +++ b/jetty-ee8/jetty-ee8-nested/pom.xml @@ -1,44 +1,32 @@ + + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.3-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 - jetty-servlet-api - org.eclipse.jetty jetty-http + + org.eclipse.jetty + jetty-jmx + true + org.eclipse.jetty jetty-security @@ -49,13 +37,32 @@ org.eclipse.jetty - jetty-jmx - true + jetty-session + compile + + + org.eclipse.jetty.toolchain + jetty-servlet-api org.slf4j slf4j-api + + org.eclipse.jetty + jetty-http-tools + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty + jetty-util-ajax + test + org.eclipse.jetty jetty-xml @@ -66,26 +73,18 @@ jetty-test-helper test - - org.eclipse.jetty - jetty-http-tools - test - - - org.eclipse.jetty - jetty-util-ajax - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty - jetty-session - compile - + + + + 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 323171fd2a2..28d51ff9e6d 100644 --- a/jetty-ee8/jetty-ee8-openid/pom.xml +++ b/jetty-ee8/jetty-ee8-openid/pom.xml @@ -1,41 +1,26 @@ + + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.3-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 - jetty-server + jetty-client org.eclipse.jetty @@ -43,16 +28,16 @@ org.eclipse.jetty - jetty-client - - - org.eclipse.jetty.ee8 - jetty-ee8-security + jetty-server org.eclipse.jetty jetty-util-ajax + + org.eclipse.jetty.ee8 + jetty-ee8-security + org.slf4j slf4j-api @@ -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 4e7b5911fb9..21e145bfb2d 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.3-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 4d024766f3d..db03534477f 100644 --- a/jetty-ee8/jetty-ee8-proxy/pom.xml +++ b/jetty-ee8/jetty-ee8-proxy/pom.xml @@ -1,65 +1,54 @@ + + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.3-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.eclipse.jetty + jetty-client + + + org.eclipse.jetty + jetty-util + org.slf4j slf4j-api - - org.eclipse.jetty.toolchain - jetty-servlet-api - provided - org.eclipse.jetty.ee8 jetty-ee8-servlet provided - org.eclipse.jetty - jetty-util - - - org.eclipse.jetty - jetty-client - - - org.eclipse.jetty - jetty-util-ajax - test + org.eclipse.jetty.toolchain + jetty-servlet-api + provided org.eclipse.jetty jetty-http-tools test + + org.eclipse.jetty + jetty-rewrite + test + org.eclipse.jetty jetty-slf4j-impl @@ -67,7 +56,7 @@ org.eclipse.jetty - jetty-rewrite + jetty-util-ajax test @@ -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 1a590fe4728..459358d1f6c 100644 --- a/jetty-ee8/jetty-ee8-quickstart/pom.xml +++ b/jetty-ee8/jetty-ee8-quickstart/pom.xml @@ -1,44 +1,25 @@ + + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.3-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 - jetty-ee8-webapp + jetty-ee8-annotations org.eclipse.jetty.ee8 @@ -46,7 +27,7 @@ org.eclipse.jetty.ee8 - jetty-ee8-annotations + jetty-ee8-webapp org.slf4j @@ -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 33ea8024012..8dc8b85e51d 100644 --- a/jetty-ee8/jetty-ee8-security/pom.xml +++ b/jetty-ee8/jetty-ee8-security/pom.xml @@ -1,21 +1,49 @@ + + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.3-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.eclipse.jetty.ee8 + jetty-ee8-nested + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-http-tools + test + + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + @@ -31,31 +59,4 @@ - - - org.eclipse.jetty.ee8 - jetty-ee8-nested - - - 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 - - - diff --git a/jetty-ee8/jetty-ee8-servlet/pom.xml b/jetty-ee8/jetty-ee8-servlet/pom.xml index 44ce98dc8e3..bd12d0f8fe7 100644 --- a/jetty-ee8/jetty-ee8-servlet/pom.xml +++ b/jetty-ee8/jetty-ee8-servlet/pom.xml @@ -1,39 +1,33 @@ + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.3-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 + jetty-jmx + true + + + org.eclipse.jetty + jetty-util-ajax + true + org.eclipse.jetty.ee8 jetty-ee8-nested @@ -48,13 +42,13 @@ org.eclipse.jetty - jetty-util-ajax - true + jetty-client + test org.eclipse.jetty - jetty-jmx - true + jetty-http-tools + test @@ -67,15 +61,19 @@ jetty-test-helper test - - org.eclipse.jetty - jetty-http-tools - test - - - org.eclipse.jetty - jetty-client - 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 26b4c2f8190..fbd91e1c1a5 100644 --- a/jetty-ee8/jetty-ee8-servlets/pom.xml +++ b/jetty-ee8/jetty-ee8-servlets/pom.xml @@ -1,49 +1,39 @@ + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.3-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 jetty-http + + org.eclipse.jetty + jetty-io + + + org.eclipse.jetty + jetty-util + + + org.slf4j + slf4j-api + org.eclipse.jetty.ee8 jetty-ee8-nested @@ -54,10 +44,6 @@ jetty-ee8-webapp provided - - org.eclipse.jetty - jetty-util - org.eclipse.jetty.toolchain jetty-servlet-api @@ -65,15 +51,7 @@ org.eclipse.jetty - jetty-io - - - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-slf4j-impl + jetty-http-tools test @@ -83,7 +61,7 @@ org.eclipse.jetty - jetty-http-tools + jetty-slf4j-impl test @@ -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 95be0e8df41..0d68781bf6d 100644 --- a/jetty-ee8/jetty-ee8-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-webapp/pom.xml @@ -1,23 +1,70 @@ + + + 4.0.0 org.eclipse.jetty.ee8 jetty-ee8 12.0.3-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 + jetty-xml + + + org.eclipse.jetty.ee8 + jetty-ee8-servlet + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty + jetty-http-tools + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + + + org.apache.felix + maven-bundle-plugin + 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 + + + org.apache.maven.plugins @@ -25,10 +72,10 @@ copy-ee8-resources - generate-resources copy-resources + generate-resources ${project.build.outputDirectory} @@ -48,10 +95,10 @@ copy-ee8-test-resources - generate-test-resources copy-resources + generate-test-resources ${project.build.testOutputDirectory} @@ -75,9 +122,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 @@ -87,56 +132,6 @@ - - org.apache.felix - maven-bundle-plugin - 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 - - - - - - - - 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 bbd1924ac14..cca4c4959bb 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.3-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 f69c3860f46..3ecf5e49987 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,48 +1,38 @@ + + 4.0.0 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket 12.0.3-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 - org.eclipse.jetty.toolchain - jetty-javax-websocket-api + org.eclipse.jetty + jetty-client org.eclipse.jetty.ee8.websocket jetty-ee8-websocket-javax-common + + org.eclipse.jetty.toolchain + jetty-javax-websocket-api + org.eclipse.jetty.websocket jetty-websocket-core-client - - org.eclipse.jetty - jetty-client - - - org.eclipse.jetty.toolchain - jetty-servlet-api - test - - - org.eclipse.jetty - jetty-xml - test - org.eclipse.jetty jetty-jmx @@ -53,6 +43,16 @@ jetty-slf4j-impl test + + org.eclipse.jetty + jetty-xml + test + + + org.eclipse.jetty.toolchain + jetty-servlet-api + test + @@ -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 47808afffb5..ac3d91ebbf7 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.3-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 @@ -47,16 +29,32 @@ org.slf4j slf4j-api + + org.awaitility + awaitility + test + org.eclipse.jetty jetty-slf4j-impl test - - org.awaitility - awaitility - 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 469428e5a22..fc64f08362f 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,21 +1,25 @@ + + 4.0.0 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket 12.0.3-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 + + org.eclipse.jetty.ee8 + jetty-ee8-annotations + org.eclipse.jetty.ee8.websocket jetty-ee8-websocket-javax-client @@ -24,10 +28,6 @@ org.eclipse.jetty.ee8.websocket jetty-ee8-websocket-servlet - - org.eclipse.jetty.ee8 - jetty-ee8-annotations - org.eclipse.jetty.toolchain jetty-javax-websocket-api @@ -45,14 +45,6 @@ - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} - - - org.apache.felix maven-bundle-plugin @@ -60,16 +52,18 @@ javax.websocket.server Implementation - - org.eclipse.jetty.websocket.javax.server.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - + org.eclipse.jetty.websocket.javax.server.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - - osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.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 + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} + + 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 976608facbb..7a5ee7cfdda 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,27 +1,27 @@ + + 4.0.0 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket 12.0.3-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 - org.slf4j - slf4j-api + org.eclipse.jetty + jetty-http-tools org.eclipse.jetty.ee8.websocket @@ -31,24 +31,10 @@ org.eclipse.jetty.ee8.websocket jetty-ee8-websocket-javax-server - - org.eclipse.jetty - jetty-http-tools - org.eclipse.jetty.toolchain jetty-javax-websocket-api - - org.eclipse.jetty - jetty-util-ajax - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - org.eclipse.jetty.toolchain jetty-test-helper @@ -57,6 +43,20 @@ org.junit.jupiter junit-jupiter + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty + jetty-util-ajax + test + @@ -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 301465e9650..b7946191cd9 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.3-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 cf9e1843552..36db467217e 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.3-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 + jetty-ee8-webapp + + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-jetty-client + + + @@ -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 b847c88e54b..dfe24e93f09 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,41 +1,25 @@ + + 4.0.0 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket 12.0.3-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 + jetty-client + org.eclipse.jetty.ee8.websocket jetty-ee8-websocket-jetty-api @@ -48,24 +32,36 @@ org.eclipse.jetty.websocket jetty-websocket-core-client - - org.eclipse.jetty - jetty-client - org.slf4j slf4j-api - - org.eclipse.jetty.ee8 - jetty-ee8-webapp - test - org.eclipse.jetty jetty-slf4j-impl test + + org.eclipse.jetty.ee8 + jetty-ee8-webapp + test + + + + + 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 b0b74e91dfd..9652470344f 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.3-SNAPSHOT - - 4.0.0 jetty-ee8-websocket-jetty-common EE8 :: Websocket :: Jetty Common @@ -14,34 +14,6 @@ ${project.groupId}.common jetty-ee9-websocket/jetty-ee9-websocket-jetty-common - - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.ee8.websocket.jetty.common=org.eclipse.jetty.io - - - - - org.apache.felix - maven-bundle-plugin - true - - - - 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 @@ -57,4 +29,26 @@ test + + + + + org.apache.felix + maven-bundle-plugin + true + + + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee8.websocket.api.ExtensionConfig$Parser + + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.ee8.websocket.jetty.common=org.eclipse.jetty.io + + + + 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 572da497761..adb5bd0dad1 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,21 +1,34 @@ + + 4.0.0 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket 12.0.3-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 + + org.eclipse.jetty + jetty-jmx + true + + + org.eclipse.jetty.ee8 + jetty-ee8-annotations + + + org.eclipse.jetty.ee8 + jetty-ee8-servlet + org.eclipse.jetty.ee8.websocket jetty-ee8-websocket-jetty-api @@ -32,19 +45,6 @@ org.eclipse.jetty.toolchain jetty-servlet-api - - org.eclipse.jetty.ee8 - jetty-ee8-servlet - - - org.eclipse.jetty.ee8 - jetty-ee8-annotations - - - org.eclipse.jetty - jetty-jmx - true - org.slf4j slf4j-api @@ -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 391a221b332..1595894ff8c 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,26 +1,46 @@ + + 4.0.0 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket 12.0.3-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 - org.slf4j - slf4j-api + org.eclipse.jetty + jetty-alpn-java-server + test + + + org.eclipse.jetty + jetty-alpn-server + test + + + org.eclipse.jetty + jetty-http-tools + test + + + org.eclipse.jetty + jetty-jmx + test + + + org.eclipse.jetty + jetty-slf4j-impl test @@ -39,8 +59,8 @@ test - org.eclipse.jetty - jetty-http-tools + org.eclipse.jetty.http2 + jetty-http2-client-transport test @@ -49,28 +69,8 @@ test - org.eclipse.jetty - jetty-alpn-server - test - - - org.eclipse.jetty - jetty-alpn-java-server - test - - - org.eclipse.jetty.http2 - jetty-http2-client-transport - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty - jetty-jmx + org.slf4j + slf4j-api test @@ -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 4d66a02f618..f8f1030971f 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,29 +1,29 @@ + + 4.0.0 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket 12.0.3-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 - - org.eclipse.jetty.websocket - jetty-websocket-core-server - org.eclipse.jetty.ee8 jetty-ee8-servlet + + org.eclipse.jetty.websocket + jetty-websocket-core-server + org.slf4j slf4j-api diff --git a/jetty-ee8/jetty-ee8-websocket/pom.xml b/jetty-ee8/jetty-ee8-websocket/pom.xml index 91d15e6b6ba..15fc60849f7 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.3-SNAPSHOT ../pom.xml - - 4.0.0 org.eclipse.jetty.ee8.websocket jetty-ee8-websocket - EE8 :: Websocket pom + EE8 :: Websocket + + + jetty-ee8-websocket-javax-client + jetty-ee8-websocket-javax-client-webapp + 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-jetty-tests + jetty-ee8-websocket-servlet + true - - - 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-server - jetty-ee8-websocket-jetty-client - jetty-ee8-websocket-jetty-client-webapp - jetty-ee8-websocket-jetty-server - jetty-ee8-websocket-javax-tests - jetty-ee8-websocket-jetty-tests - diff --git a/jetty-ee8/pom.xml b/jetty-ee8/pom.xml index aae28ab0bc1..4c26fba3c5e 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.3-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 + + + + + + + + jakarta.activation + jakarta.activation-api + 1.2.2 + + + jakarta.annotation + jakarta.annotation-api + ${jakarta.annotation.api.version} + + + jakarta.servlet.jsp + jakarta.servlet.jsp-api + 2.3.6 + + + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + 1.2.7 + + + jakarta.transaction + jakarta.transaction-api + ${jakarta.transaction-api.version} + + + org.eclipse.jetty.ee8 + jetty-ee8-annotations + ${project.version} + + + org.eclipse.jetty.ee8 + jetty-ee8-apache-jsp + ${project.version} + + + org.eclipse.jetty.ee8 + jetty-ee8-glassfish-jstl + ${project.version} + + + org.eclipse.jetty.ee8 + jetty-ee8-jndi + ${project.version} + + + org.eclipse.jetty.ee8 + jetty-ee8-nested + ${project.version} + + + org.eclipse.jetty.ee8 + jetty-ee8-openid + ${project.version} + + + org.eclipse.jetty.ee8 + jetty-ee8-plus + ${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-security + ${project.version} + + + org.eclipse.jetty.ee8 + jetty-ee8-servlet + ${project.version} + + + org.eclipse.jetty.ee8 + jetty-ee8-servlets + ${project.version} + + + org.eclipse.jetty.ee8 + jetty-ee8-webapp + ${project.version} + + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-container-initializer + ${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.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-javax-common + ${project.version} + + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-javax-server + ${project.version} + + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-jetty-api + ${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-common + ${project.version} + + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-jetty-server + ${project.version} + + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-servlet + ${project.version} + + + org.eclipse.jetty.orbit + javax.mail.glassfish + ${javax.mail.glassfish.version} + + + org.eclipse.jetty.orbit + javax.security.auth.message + 1.0.0.v201108011116 + + + org.eclipse.jetty.toolchain + jetty-javax-websocket-api + ${jakarta.websocket.api.version} + + + org.eclipse.jetty.toolchain + jetty-servlet-api + ${jetty.servlet.api.version} + + + org.glassfish.web + javax.servlet.jsp.jstl + 1.2.5 + + + org.mortbay.jasper + apache-jsp + ${jsp.impl.version} + + + xalan + xalan + 2.7.3 + + + + - ${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-sources-ee9-to-ee8 - - - true - ${ee9.module.path}/src/test/java - ${project.build.testSourceDirectory} - - modify-services-loader-ee9-to-ee8 + + modify-service-loader-files-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} - - - - maven-war-plugin @@ -85,122 +202,5 @@ - - - - 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 - jetty-ee9-servlets - provided - - - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api - provided - - - jakarta.servlet - jakarta.servlet-api - - - - - org.eclipse.jetty.ee9 - jetty-ee9-webapp - test - - - org.eclipse.jetty - jetty-jmx - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - org.eclipse.jetty - jetty-server - provided - - - jakarta.servlet.jsp - jakarta.servlet.jsp-api - provided - - - jakarta.servlet.jsp.jstl - jakarta.servlet.jsp.jstl-api - provided - - - jakarta.annotation - jakarta.annotation-api - provided - - - org.eclipse.jetty.toolchain - jetty-jakarta-websocket-api - provided - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-api - provided - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-server - provided - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jakarta-server - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - - 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 cf8ef310a6e..fc5dc241c8b 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,52 +7,34 @@ 12.0.3-SNAPSHOT jetty-ee9-demo-jndi-webapp - EE9 :: Demo :: JNDI WebApp war + EE9 :: Demo :: JNDI WebApp ${project.groupId}.jndi + + + jakarta.transaction + jakarta.transaction-api + provided + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-mock-resources + provided + + + org.eclipse.jetty.orbit + javax.mail.glassfish + provided + + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + provided + + - - - maven-antrun-plugin - - - generate-xml-files - process-resources - - - - - - - - - - - - run - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - package - - copy-dependencies - - - jakarta.transaction-api,ee9-demo-mock-resources - ${project.build.directory}/lib/jndi - - - - - @@ -77,27 +59,45 @@ + + + maven-antrun-plugin + + + generate-xml-files + + run + + process-resources + + + + + + + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + + copy-dependencies + + package + + jakarta.transaction-api,ee9-demo-mock-resources + ${project.build.directory}/lib/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 - - 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 785302e4b16..4f67d7893f0 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.3-SNAPSHOT - - 4.0.0 jetty-ee9-demo-jsp-webapp - EE9 :: Demo :: JSP WebApp war + EE9 :: Demo :: JSP WebApp ${project.groupId}.jsp + + + jakarta.servlet.jsp + jakarta.servlet.jsp-api + provided + + + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + provided + + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + provided + + + @@ -34,24 +52,15 @@ - - - maven-war-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - maven-assembly-plugin web-bundle-assembly - package single + package src/main/assembly/web-bundle.xml @@ -63,32 +72,30 @@ + + + maven-war-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + - - - 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 + + org.apache.maven.plugins + maven-war-plugin + + ${basedir}/target/web.xml + + org.eclipse.jetty jetty-jspc-maven-plugin @@ -110,13 +117,6 @@ - - org.apache.maven.plugins - maven-war-plugin - - ${basedir}/target/web.xml - - 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 f4ee0ad83bc..372ff183832 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.3-SNAPSHOT - EE9 :: Demo :: Mock Resources jetty-ee9-demo-mock-resources jar + EE9 :: Demo :: Mock Resources ${project.groupId}.mocks + + + jakarta.mail + jakarta.mail-api + provided + + + jakarta.transaction + jakarta.transaction-api + provided + + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-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 a049b605bd1..10a96928db9 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,17 +1,76 @@ + 4.0.0 org.eclipse.jetty.ee9.demos jetty-ee9-demos 12.0.3-SNAPSHOT - 4.0.0 jetty-ee9-demo-proxy-webapp - EE9 :: Demo :: Proxy WebApp war + EE9 :: Demo :: Proxy WebApp ${project.groupId}.proxy + + + org.eclipse.jetty + jetty-client + + + org.eclipse.jetty.ee9 + jetty-ee9-proxy + + + org.slf4j + slf4j-simple + + + jakarta.servlet.jsp + jakarta.servlet.jsp-api + provided + + + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + provided + + + org.eclipse.jetty + jetty-server + provided + + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + provided + + + org.eclipse.jetty + jetty-alpn-java-server + test + + + org.eclipse.jetty + jetty-jmx + test + + + org.eclipse.jetty.ee9 + jetty-ee9-annotations + test + + + org.eclipse.jetty.ee9 + jetty-ee9-webapp + test + + + org.eclipse.jetty.http2 + jetty-http2-server + test + + @@ -24,63 +83,4 @@ - - - org.slf4j - slf4j-simple - - - org.eclipse.jetty.ee9 - jetty-ee9-proxy - - - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api - provided - - - org.eclipse.jetty.ee9 - jetty-ee9-webapp - test - - - org.eclipse.jetty - jetty-client - - - org.eclipse.jetty - jetty-jmx - test - - - org.eclipse.jetty - jetty-server - provided - - - org.eclipse.jetty.http2 - jetty-http2-server - test - - - org.eclipse.jetty - jetty-alpn-java-server - test - - - org.eclipse.jetty.ee9 - jetty-ee9-annotations - test - - - jakarta.servlet.jsp - jakarta.servlet.jsp-api - provided - - - jakarta.servlet.jsp.jstl - jakarta.servlet.jsp.jstl-api - provided - - 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 9e73f3659f3..9cd6a649639 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.3-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 ef34d634fc6..346321af1ec 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 79e2adf7207..81b3a34f19d 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,53 +7,89 @@ 12.0.3-SNAPSHOT ../../pom.xml - EE9 :: Demo :: Servlet Spec :: WebApp jetty-ee9-demo-spec-webapp war + EE9 :: Demo :: Servlet Spec :: WebApp ${project.groupId}.spec.webapp + + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-container-initializer + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-web-fragment + + + jakarta.annotation + jakarta.annotation-api + provided + + + jakarta.transaction + jakarta.transaction-api + provided + + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + provided + + + + + + + + + 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 - maven-assembly-plugin - - - web-bundle-assembly - package - - single - - - - src/main/assembly/web-bundle.xml - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - - - - maven-war-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - target - - plugin-context.xml - - META-INF - - - - org.apache.felix @@ -66,10 +102,8 @@ Test Webapp for Servlet 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 +118,41 @@ generate-xml-files + + run + process-resources - + - + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + web-bundle-assembly - run + single + package + + + src/main/assembly/web-bundle.xml + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + @@ -106,10 +161,10 @@ maven-dependency-plugin - package copy + package @@ -147,81 +202,24 @@ + + + maven-war-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + target + + plugin-context.xml + + META-INF + + + + - - - - 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 8474f10717a..b5a65d09e28 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.3-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 48dcf2d4dd1..60161925a08 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.3-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 88714baa287..151431cd94f 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.3-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 c9cc3379355..1395aae6ddb 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.3-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 f1cccff7f05..8f592892a57 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.3-SNAPSHOT - - 4.0.0 jetty-ee9-fcgi-proxy EE9 :: FCGI Proxy @@ -15,11 +15,6 @@ - - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api - provided - org.eclipse.jetty jetty-server @@ -32,17 +27,22 @@ org.eclipse.jetty.fcgi jetty-fcgi-client - - org.eclipse.jetty.ee9 - jetty-ee9-servlet - test + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + provided org.eclipse.jetty jetty-slf4j-impl test + + + org.eclipse.jetty.ee9 + jetty-ee9-servlet + test + diff --git a/jetty-ee9/jetty-ee9-glassfish-jstl/pom.xml b/jetty-ee9/jetty-ee9-glassfish-jstl/pom.xml index 0fac6191c47..9ebefffa67d 100644 --- a/jetty-ee9/jetty-ee9-glassfish-jstl/pom.xml +++ b/jetty-ee9/jetty-ee9-glassfish-jstl/pom.xml @@ -1,19 +1,64 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.3-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 + + + + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + + + + org.glassfish.web + jakarta.servlet.jsp.jstl + + + + org.eclipse.jetty.ee9 + jetty-ee9-annotations + test + + + + org.eclipse.jetty.ee9 + jetty-ee9-apache-jsp + test + + + + org.eclipse.jetty.ee9 + jetty-ee9-webapp + test + + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + + org.slf4j + slf4j-simple + test + + + + @@ -29,48 +74,4 @@ - - - - jakarta.servlet.jsp.jstl - jakarta.servlet.jsp.jstl-api - - - - org.glassfish.web - jakarta.servlet.jsp.jstl - - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - - org.eclipse.jetty.ee9 - jetty-ee9-apache-jsp - test - - - - org.eclipse.jetty.ee9 - jetty-ee9-annotations - test - - - - org.eclipse.jetty.ee9 - jetty-ee9-webapp - test - - - - org.slf4j - slf4j-simple - test - - - - diff --git a/jetty-ee9/jetty-ee9-home/pom.xml b/jetty-ee9/jetty-ee9-home/pom.xml index 1250447ba64..e9c8997a266 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.3-SNAPSHOT - 4.0.0 jetty-ee9-home - EE9 :: Home Assembly pom + EE9 :: Home Assembly ${basedir}/target/jetty-ee9-home @@ -16,85 +16,366 @@ true + + + org.eclipse.jetty.ee9 + jetty-ee9-annotations + + + org.eclipse.jetty.ee9 + jetty-ee9-apache-jsp + + + org.eclipse.jetty.ee9 + jetty-ee9-cdi + true + + + org.eclipse.jetty.ee9 + jetty-ee9-fcgi-proxy + true + + + org.eclipse.jetty.ee9 + jetty-ee9-glassfish-jstl + + + jakarta.el + jakarta.el-api + + + javax.el + el-api + + + + + org.eclipse.jetty.ee9 + jetty-ee9-jaspi + true + + + org.eclipse.jetty.ee9 + jetty-ee9-jndi + true + + + org.eclipse.jetty.ee9 + jetty-ee9-openid + true + + + org.eclipse.jetty.ee9 + jetty-ee9-plus + + + org.eclipse.jetty.ee9 + jetty-ee9-proxy + + + + 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.demos + jetty-ee9-demo-async-rest-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-jaas-webapp + ${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-jndi-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-jsp-webapp + ${project.version} + config + jar + true + + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-mock-resources + ${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-spec-webapp + ${project.version} + config + jar + true + + + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jakarta-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-jetty-server + + + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-servlet + + + org.ow2.asm + asm + + + org.ow2.asm + asm-analysis + + + org.ow2.asm + asm-commons + + + org.ow2.asm + asm-tree + + + + + org.apache.maven.plugins + maven-assembly-plugin + + posix + false + + + + binary + + single + + package + + + src/main/assembly/jetty-assembly.xml + + + + + sources + + single + + package + + + src/main/assembly/jetty-source-assembly.xml + + true + + + + org.apache.maven.plugins maven-dependency-plugin - unpack-config-deps - generate-resources - - unpack-dependencies - - - - org.eclipse.jetty.ee9, org.eclipse.jetty.ee9.demos - - - config - false - META-INF/**,webapps/**,start.d/**,start.ini - ${assembly-directory} - - - - copy-lib-core-websocket-deps - generate-resources + copy-ee9-annotations-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/ee9-annotations + + + + copy-ee9-annotations-src-deps + + copy-dependencies + + generate-resources + + jakarta.annotation,org.ow2.asm + jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis + jar + sources + ${source-assembly-directory}/lib/ee9-annotations + + + + + copy-ee9-deps + + copy-dependencies + + 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 - copy-lib-ee9-websocket-deps - generate-resources + copy-ee9-jaspi-deps copy-dependencies + generate-resources - org.eclipse.jetty.ee9.websocket + jakarta.authentication + jakarta.authentication-api jar - ${assembly-directory}/lib/ee9-websocket + ${assembly-directory}/lib/ee9-jaspi - copy-lib-core-websocket-src-deps - generate-resources + copy-ee9-jaspi-src-deps copy-dependencies + generate-resources - org.eclipse.jetty.websocket + jakarta.authentication + jakarta.authentication-api jar sources - ${source-assembly-directory}/lib + ${source-assembly-directory}/lib/ee9-jaspi - copy-lib-ee9-websocket-src-deps - generate-resources + copy-ee9-jsp-deps copy-dependencies + generate-resources - org.eclipse.jetty.ee9.websocket + true + org.mortbay.jasper,org.eclipse.jdt + apache-jsp,apache-el,ecj + jar + ${assembly-directory}/lib/ee9-apache-jsp + + + + copy-ee9-jsp-src-deps + + copy-dependencies + + generate-resources + + true + org.mortbay.jasper,org.eclipse.jdt + apache-jsp,apache-el,ecj jar sources - ${source-assembly-directory}/lib/ee9-websocket + ${source-assembly-directory}/lib/ee9-apache-jsp + + + + copy-ee9-jstl-deps + + copy-dependencies + + 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 + + + + copy-ee9-jstl-src-deps + + copy-dependencies + + generate-resources + + 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-ee9-lib-jakarta-websocket-deps - generate-resources copy + generate-resources @@ -108,10 +389,10 @@ copy-ee9-lib-jakarta-websocket-src-deps - generate-resources copy + generate-resources @@ -125,11 +406,75 @@ - copy-lib-servlet-api-deps + copy-ee9-src-deps + + copy-dependencies + generate-resources + + org.eclipse.jetty.ee9 + jar + org.eclipse.jetty.ee9.demos,org.eclipse.jetty.ee9.websocket + sources + ${source-assembly-directory}/lib + + + + copy-lib-core-websocket-deps + + copy-dependencies + + generate-resources + + org.eclipse.jetty.websocket + jar + ${assembly-directory}/lib + + + + copy-lib-core-websocket-src-deps + + copy-dependencies + + generate-resources + + org.eclipse.jetty.websocket + jar + sources + ${source-assembly-directory}/lib + + + + copy-lib-ee9-websocket-deps + + copy-dependencies + + generate-resources + + org.eclipse.jetty.ee9.websocket + jar + ${assembly-directory}/lib/ee9-websocket + + + + copy-lib-ee9-websocket-src-deps + + copy-dependencies + + generate-resources + + org.eclipse.jetty.ee9.websocket + jar + sources + ${source-assembly-directory}/lib/ee9-websocket + + + + copy-lib-servlet-api-deps copy + generate-resources @@ -143,10 +488,10 @@ copy-lib-servlet-api-src-deps - generate-resources copy + generate-resources @@ -161,10 +506,10 @@ copy-lib-transaction-api-deps - generate-resources copy + generate-resources @@ -194,10 +539,10 @@ copy-lib-transaction-api-src-deps - generate-resources copy + generate-resources @@ -211,179 +556,18 @@ - copy-ee9-annotations-deps + unpack-config-deps + + unpack-dependencies + generate-resources - - copy-dependencies - - jakarta.annotation,org.ow2.asm - jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis - jar - ${assembly-directory}/lib/ee9-annotations - - - - copy-ee9-annotations-src-deps - generate-resources - - copy-dependencies - - - jakarta.annotation,org.ow2.asm - jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis - jar - sources - ${source-assembly-directory}/lib/ee9-annotations - - - - copy-ee9-jsp-src-deps - generate-resources - - copy-dependencies - - - true - org.mortbay.jasper,org.eclipse.jdt - apache-jsp,apache-el,ecj - jar - sources - ${source-assembly-directory}/lib/ee9-apache-jsp - - - - copy-ee9-jsp-deps - generate-resources - - copy-dependencies - - - true - org.mortbay.jasper,org.eclipse.jdt - apache-jsp,apache-el,ecj - jar - ${assembly-directory}/lib/ee9-apache-jsp - - - - copy-ee9-jstl-src-deps - generate-resources - - copy-dependencies - - - 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-ee9-jstl-deps - generate-resources - - copy-dependencies - - - 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-ee9-jaspi-deps - generate-resources - - copy-dependencies - - - jakarta.authentication - jakarta.authentication-api - jar - ${assembly-directory}/lib/ee9-jaspi - - - - copy-ee9-jaspi-src-deps - generate-resources - - copy-dependencies - - - jakarta.authentication - jakarta.authentication-api - jar - sources - ${source-assembly-directory}/lib/ee9-jaspi - - - - - copy-ee9-deps - generate-resources - - copy-dependencies - - - 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 - - - - copy-ee9-src-deps - generate-resources - - copy-dependencies - - - org.eclipse.jetty.ee9 - jar - org.eclipse.jetty.ee9.demos,org.eclipse.jetty.ee9.websocket - sources - ${source-assembly-directory}/lib - - - - - - org.apache.maven.plugins - maven-assembly-plugin - - posix - false - - - - binary - package - - single - - - - src/main/assembly/jetty-assembly.xml - - - - - sources - package - - single - - - - src/main/assembly/jetty-source-assembly.xml - - true + org.eclipse.jetty.ee9, org.eclipse.jetty.ee9.demos + + config + false + META-INF/**,webapps/**,start.d/**,start.ini + ${assembly-directory} @@ -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 08305370fc1..60a26014912 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.3-SNAPSHOT - - 4.0.0 jetty-ee9-jaspi EE9 :: JASPI Jetty security infrastructure @@ -15,6 +16,40 @@ org.eclipse.jetty.ee9.security.jaspi.* + + + jakarta.authentication + jakarta.authentication-api + + + org.eclipse.jetty.ee9 + jetty-ee9-security + + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + + + org.slf4j + slf4j-api + + + jakarta.activation + jakarta.activation-api + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + @@ -30,38 +65,4 @@ - - - - jakarta.authentication - jakarta.authentication-api - - - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api - - - org.eclipse.jetty.ee9 - jetty-ee9-security - - - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - jakarta.activation - jakarta.activation-api - test - - diff --git a/jetty-ee9/jetty-ee9-jndi/pom.xml b/jetty-ee9/jetty-ee9-jndi/pom.xml index b12437507b8..aeaf573afe1 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.3-SNAPSHOT - - 4.0.0 jetty-ee9-jndi EE9 :: JNDI EE9 JNDI factories @@ -15,26 +16,7 @@ org.eclipse.jetty.ee9.jndi.* - - - - org.apache.felix - maven-bundle-plugin - true - - - ${osgi.slf4j.import.packages},jakarta.mail.*;resolution:=optional,* - - - - - - - - org.eclipse.jetty - jetty-jndi - jakarta.activation jakarta.activation-api @@ -45,6 +27,10 @@ jakarta.mail-api true + + org.eclipse.jetty + jetty-jndi + org.slf4j slf4j-api @@ -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 103e3d104bc..62f7cc38e07 100644 --- a/jetty-ee9/jetty-ee9-jspc-maven-plugin/pom.xml +++ b/jetty-ee9/jetty-ee9-jspc-maven-plugin/pom.xml @@ -1,11 +1,11 @@ + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.3-SNAPSHOT - 4.0.0 jetty-ee9-jspc-maven-plugin maven-plugin EE9 :: Jetty JSPC Maven Plugin @@ -13,51 +13,56 @@ ${project.groupId}.jspc.plugin 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.apache.ant + ant + + + org.apache.maven.plugin-tools + maven-plugin-tools-api + + + junit + junit + + + org.eclipse.jetty jetty-util + + org.eclipse.jetty.ee9 + jetty-ee9-apache-jsp + ${project.version} + + + org.eclipse.jetty.ee9 + jetty-ee9-glassfish-jstl + ${project.version} + + + org.apache.maven + maven-artifact + provided + + + org.apache.maven + maven-core + provided + + + javax.annotation + javax.annotation-api + + + + + org.apache.maven + maven-model + provided + org.apache.maven maven-plugin-api @@ -69,49 +74,50 @@ - - org.apache.maven - maven-core - provided - - - org.apache.maven - maven-model - provided - org.apache.maven.plugin-tools maven-plugin-annotations provided - - org.apache.maven - maven-artifact - provided - - - org.apache.maven.plugin-tools - maven-plugin-tools-api - - - junit - junit - - - - - org.eclipse.jetty.ee9 - jetty-ee9-apache-jsp - ${project.version} - - - org.eclipse.jetty.ee9 - jetty-ee9-glassfish-jstl - ${project.version} - - - org.apache.ant - ant - + + + + org.apache.maven.plugins + maven-invoker-plugin + + + ${maven.surefire.plugin.version} + + + clean + + + + + integration-test + + install + integration-test + verify + + + + + + org.apache.maven.plugins + maven-plugin-plugin + + + exec-plugin-doc + + descriptor + helpmojo + + process-classes + + + + + diff --git a/jetty-ee9/jetty-ee9-maven-plugin/pom.xml b/jetty-ee9/jetty-ee9-maven-plugin/pom.xml index 313a188cde0..a2f770cf539 100644 --- a/jetty-ee9/jetty-ee9-maven-plugin/pom.xml +++ b/jetty-ee9/jetty-ee9-maven-plugin/pom.xml @@ -1,92 +1,214 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 12.0.3-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 + + + jakarta.transaction + jakarta.transaction-api + true + + + org.apache.maven.plugin-tools + maven-plugin-tools-api + + + org.apache.maven.shared + maven-artifact-transfer + ${maven-artifact-transfer.version} + + + org.codehaus.plexus + plexus-xml + + + org.apache.maven + maven-api-xml + + + org.apache.maven + maven-xml-impl + + + org.apache.maven + maven-xml-meta + + + + + org.eclipse.jetty + jetty-client + true + + + org.eclipse.jetty + jetty-home + zip + + + * + * + + + + + org.eclipse.jetty + jetty-http + true + + + org.eclipse.jetty + jetty-io + true + + + org.eclipse.jetty + jetty-jmx + true + + + org.eclipse.jetty + jetty-jndi + true + + + org.eclipse.jetty + jetty-server + true + + + org.eclipse.jetty + jetty-util + + + org.eclipse.jetty.ee9 + jetty-ee9-annotations + true + + + org.eclipse.jetty.ee9 + jetty-ee9-apache-jsp + true + + + org.eclipse.jetty.ee9 + jetty-ee9-glassfish-jstl + true + + + org.eclipse.jetty.ee9 + jetty-ee9-plus + true + + + org.eclipse.jetty.ee9 + jetty-ee9-quickstart + true + + + org.eclipse.jetty.ee9 + jetty-ee9-servlet + true + + + org.eclipse.jetty.ee9 + jetty-ee9-webapp + true + + + jakarta.servlet + servlet-api + + + + + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jakarta-server + true + + + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-server + true + + + org.slf4j + slf4j-api + true + + + org.apache.maven + maven-artifact + provided + + + org.apache.maven + maven-core + provided + + + javax.annotation + javax.annotation-api + + + + + org.apache.maven + maven-model + provided + + + org.apache.maven + maven-plugin-api + provided + + + javax.annotation + javax.annotation-api + + + + + org.apache.maven.plugin-tools + maven-plugin-annotations + provided + + + org.awaitility + awaitility + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + - - 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 - - - @@ -101,32 +223,19 @@ false true - - - org.apache.maven.plugins - maven-jar-plugin + copy - test-jar + copy + package org.apache.maven.plugins maven-invoker-plugin - - - integration-test - integration-test - - install - integration-test - verify - - - org.eclipse.jetty.maven.its.ee9 @@ -157,188 +266,86 @@ clean + + + integration-test + + install + integration-test + verify + + integration-test + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + test-jar + + + + + + org.apache.maven.plugins + maven-plugin-plugin + + jetty + + + + exec-plugin-doc + + helpmojo + + generate-sources + + + + + org.apache.maven.plugins + maven-surefire-plugin + + -Dstop.port=@{test.stopPort} -Djetty.port=@{test.jettyPort} + + **/IntegrationTest*.java + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + test-reserve-ports + + reserve-network-port + + process-test-classes + + + test.stopPort + test.jettyPort + + + + + reserve-ports + + reserve-network-port + + pre-integration-test + + + jetty.stopPort + + + + - - - org.apache.maven.shared - maven-artifact-transfer - ${maven-artifact-transfer.version} - - - org.apache.maven - maven-plugin-api - provided - - - javax.annotation - javax.annotation-api - - - - - org.apache.maven - maven-artifact - provided - - - org.apache.maven - maven-core - provided - - - org.apache.maven - maven-model - provided - - - org.codehaus.plexus - plexus-xml - - - org.apache.maven - maven-xml-impl - - - org.apache.maven - maven-api-xml - - - org.apache.maven - maven-xml-meta - - - - - org.apache.maven.plugin-tools - maven-plugin-tools-api - - - org.apache.maven.plugin-tools - maven-plugin-annotations - provided - - - org.eclipse.jetty - jetty-home - zip - - - * - * - - - - - org.eclipse.jetty - jetty-util - - - org.eclipse.jetty.ee9 - jetty-ee9-webapp - - - jakarta.servlet - servlet-api - - - true - - - org.eclipse.jetty.ee9 - jetty-ee9-quickstart - true - - - org.eclipse.jetty.ee9 - jetty-ee9-plus - true - - - org.eclipse.jetty - jetty-jndi - true - - - org.eclipse.jetty - jetty-server - true - - - org.eclipse.jetty.ee9 - jetty-ee9-servlet - true - - - org.eclipse.jetty - jetty-client - true - - - org.eclipse.jetty - jetty-http - true - - - org.eclipse.jetty - jetty-io - true - - - org.eclipse.jetty - jetty-jmx - true - - - org.eclipse.jetty.ee9 - jetty-ee9-annotations - true - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jakarta-server - true - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-server - true - - - org.eclipse.jetty.ee9 - jetty-ee9-apache-jsp - true - - - org.eclipse.jetty.ee9 - jetty-ee9-glassfish-jstl - true - - - org.slf4j - slf4j-api - true - - - jakarta.transaction - jakarta.transaction-api - true - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - org.awaitility - awaitility - test - - diff --git a/jetty-ee9/jetty-ee9-nested/pom.xml b/jetty-ee9/jetty-ee9-nested/pom.xml index 32b37ccffea..e0d501193ba 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.3-SNAPSHOT - - 4.0.0 jetty-ee9-nested EE9 :: Nested The jetty core handler adapted to legacy ee9 handler. @@ -15,31 +16,16 @@ 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 - jetty-jakarta-servlet-api - org.eclipse.jetty jetty-http + + org.eclipse.jetty + jetty-jmx + true + org.eclipse.jetty jetty-security @@ -50,13 +36,32 @@ org.eclipse.jetty - jetty-jmx - true + jetty-session + compile + + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api org.slf4j slf4j-api + + org.eclipse.jetty + jetty-http-tools + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty + jetty-util-ajax + test + org.eclipse.jetty jetty-xml @@ -67,26 +72,20 @@ jetty-test-helper test - - org.eclipse.jetty - jetty-http-tools - test - - - org.eclipse.jetty - jetty-util-ajax - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty - jetty-session - compile - + + + + 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 4b9cd993093..4820c24fbc0 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.3-SNAPSHOT - - 4.0.0 jetty-ee9-openid EE9 :: OpenID Jetty OpenID Connect infrastructure @@ -15,30 +16,10 @@ 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 - jetty-server - - - org.eclipse.jetty - jetty-security + jetty-client org.eclipse.jetty @@ -46,16 +27,20 @@ org.eclipse.jetty - jetty-client + jetty-security - org.eclipse.jetty.ee9 - jetty-ee9-security + org.eclipse.jetty + jetty-server org.eclipse.jetty jetty-util-ajax + + org.eclipse.jetty.ee9 + jetty-ee9-security + org.slf4j slf4j-api @@ -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 14e4144a6e2..c3d62d816ff 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.3-SNAPSHOT - 4.0.0 jetty-ee9-osgi-boot-jsp EE9 :: OSGi :: Boot JSP Jetty OSGi Boot JSP bundle @@ -17,10 +18,15 @@ org.eclipse.jetty jetty-deploy + - org.eclipse.jetty.ee9.osgi - jetty-ee9-osgi-boot - provided + org.eclipse.jetty.ee9 + jetty-ee9-apache-jsp + + + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api org.eclipse.platform @@ -30,38 +36,15 @@ org.eclipse.platform org.eclipse.osgi.services - - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api - - - - org.eclipse.jetty.ee9 - jetty-ee9-apache-jsp + org.eclipse.jetty.ee9.osgi + jetty-ee9-osgi-boot + provided - - - org.codehaus.mojo - build-helper-maven-plugin - - - set-jsp-api-version - validate - - parse-version - - - ${jsp.impl.version} - jspImpl - - - - org.apache.felix @@ -70,11 +53,10 @@ Jetty-OSGi-Jasper Integration - + org.eclipse.jetty.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,15 +119,31 @@ javax.xml.*;resolution:=optional, org.w3c.dom;resolution:=optional, org.w3c.dom.ls;resolution:=optional, - javax.xml.parser;resolution:=optional - + javax.xml.parser;resolution:=optional org.eclipse.jetty.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}))" + + + org.codehaus.mojo + build-helper-maven-plugin + + + set-jsp-api-version + + parse-version + + validate + + ${jsp.impl.version} + jspImpl + + + + 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 765220c6ffe..83dc884bcc8 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.3-SNAPSHOT - 4.0.0 jetty-ee9-osgi-boot EE9 :: OSGi :: Boot Jetty OSGi Boot bundle @@ -14,20 +15,20 @@ - org.eclipse.jetty.ee9 - jetty-ee9-annotations - - - org.eclipse.jetty.ee9 - jetty-ee9-webapp + org.eclipse.jetty + jetty-jmx org.eclipse.jetty jetty-osgi - org.eclipse.jetty - jetty-jmx + org.eclipse.jetty.ee9 + jetty-ee9-annotations + + + org.eclipse.jetty.ee9 + jetty-ee9-webapp org.eclipse.platform @@ -58,27 +59,6 @@ - - maven-antrun-plugin - - - process-resources - - - - - - - - - - - - run - - - - org.apache.felix maven-bundle-plugin @@ -88,8 +68,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,18 +90,34 @@ 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 + + maven-antrun-plugin + + + + run + + process-resources + + + + + + + + + + + + + diff --git a/jetty-ee9/jetty-ee9-osgi/pom.xml b/jetty-ee9/jetty-ee9-osgi/pom.xml index 1caa6b10895..20893666a3e 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.3-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 9cceab83832..f48874c36b7 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.3-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 2fb39532639..1ceff8d55d2 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.3-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 ede854c0511..d74f364646e 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,42 +1,28 @@ + 4.0.0 org.eclipse.jetty.ee9.osgi jetty-ee9-osgi 12.0.3-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 + + - - org.apache.maven.plugins - maven-resources-plugin - - - copy-resources - validate - - copy-resources - - - ${basedir}/target/classes - - - src/main/resources - - - - - - org.apache.felix maven-bundle-plugin @@ -52,6 +38,27 @@ + + org.apache.maven.plugins + maven-resources-plugin + + + copy-resources + + copy-resources + + validate + + ${basedir}/target/classes + + + src/main/resources + + + + + + maven-war-plugin @@ -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 45bc5ff6767..99d3f046f89 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,106 +1,28 @@ + + 4.0.0 org.eclipse.jetty.ee9.osgi jetty-ee9-osgi 12.0.3-SNAPSHOT - 4.0.0 test-jetty-ee9-osgi EE9 :: OSGi :: Test Jetty OSGi Integration test - ${project.groupId}.boot.test.osgi - https://download.eclipse.org/jetty/orbit/ target/distribution + ${project.groupId}.boot.test.osgi + 1.2 + https://download.eclipse.org/jetty/orbit/ + true + true 4.13.5 2.6.14 + 1.3.6 1.8.3 3.0.0 - 1.3.6 - 1.2 - true - true - - - org.ops4j.pax.exam - pax-exam - test - - - org.ops4j.pax.exam - pax-exam-inject - test - - - - org.ops4j.pax.exam - pax-exam-container-forked - test - - - biz.aQute.bnd - bndlib - - - org.ops4j.pax.tinybundles - tinybundles - - - - - org.ops4j.pax.tinybundles - tinybundles - - - org.ops4j.pax.swissbox - pax-swissbox-framework - test - - - org.ops4j.base - ops4j-base-monitors - - - - - org.ops4j.pax.swissbox - pax-swissbox-tracker - test - - - org.ops4j.pax.exam - pax-exam-junit4 - test - - - org.ops4j.pax.exam - pax-exam-link-mvn - test - - - org.ops4j.pax.url - pax-url-aether - test - - - javax.annotation - javax.annotation-api - - - - - org.ops4j.pax.url - pax-url-wrap - test - - - biz.aQute.bnd - bndlib - - - biz.aQute.bnd biz.aQute.bndlib @@ -112,51 +34,231 @@ - org.eclipse.platform - org.eclipse.osgi + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + + + jakarta.el + jakarta.el-api + + + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-mock-resources + ${project.version} + + + org.eclipse.jetty.http2 + jetty-http2-hpack + + + org.eclipse.jetty.http2 + jetty-http2-server + + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + + + org.glassfish.web + jakarta.servlet.jsp.jstl + + + org.mortbay.jasper + apache-el + + + org.mortbay.jasper + apache-jsp + + + org.ops4j.pax.tinybundles + tinybundles + + + org.eclipse.jetty + jetty-client + runtime + + + org.eclipse.jetty + jetty-deploy + runtime + + + org.eclipse.jetty + jetty-jmx + runtime + + + org.eclipse.jetty + jetty-server + runtime + + + org.eclipse.jetty + jetty-util + runtime + + + org.eclipse.jetty + jetty-xml + runtime + + + org.eclipse.jetty.ee9 + jetty-ee9-annotations + runtime + + + + org.eclipse.jetty.ee9 + jetty-ee9-jndi + runtime + + + org.eclipse.jetty.ee9 + jetty-ee9-plus + runtime + + + org.eclipse.jetty.ee9 + jetty-ee9-security + runtime + + + org.eclipse.jetty.ee9 + jetty-ee9-servlet + runtime + + + org.eclipse.jetty.ee9 + jetty-ee9-servlets + runtime + + + org.eclipse.jetty.ee9 + jetty-ee9-webapp + runtime + + + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jakarta-client + runtime + + + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jakarta-server + runtime + + + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-api + runtime + + + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-client + runtime + + + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-common + runtime + + + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-server + runtime + + + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-servlet + runtime + + + org.eclipse.jetty.toolchain + jetty-jakarta-websocket-api + runtime + + + jakarta.activation + jakarta.activation-api test - org.eclipse.platform - org.eclipse.osgi.services + jakarta.el + jakarta.el-api test - org.eclipse.platform - org.eclipse.osgi.util + jakarta.enterprise + jakarta.enterprise.cdi-api test + + jakarta.inject + jakarta.inject-api + test + + + jakarta.interceptor + jakarta.interceptor-api + test + + + jakarta.transaction + jakarta.transaction-api + test + + + org.apache.aries.spifly + org.apache.aries.spifly.dynamic.bundle + test + + + org.apache.felix + org.apache.felix.framework + + + org.apache.geronimo.specs geronimo-atinject_1.0_spec test - org.osgi - org.osgi.util.promise + org.conscrypt + conscrypt-openjdk-uber test - org.osgi - org.osgi.util.measurement + org.eclipse.jetty + jetty-alpn-conscrypt-client test - org.osgi - org.osgi.util.position + org.eclipse.jetty + jetty-alpn-conscrypt-server test - org.osgi - org.osgi.util.xml + org.eclipse.jetty + jetty-alpn-java-client test - - org.slf4j - slf4j-api - test - + org.eclipse.jetty + jetty-alpn-java-server + test + + + org.eclipse.jetty + jetty-alpn-server + ${project.version} + test + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-jsp-webapp + ${project.version} + webbundle + test + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-spec-webapp + ${project.version} + war + test + org.eclipse.jetty.ee9.osgi jetty-ee9-osgi-boot @@ -199,236 +337,6 @@ - - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api - - - jakarta.inject - jakarta.inject-api - test - - - jakarta.transaction - jakarta.transaction-api - test - - - jakarta.interceptor - jakarta.interceptor-api - test - - - jakarta.enterprise - jakarta.enterprise.cdi-api - test - - - jakarta.el - jakarta.el-api - test - - - org.apache.aries.spifly - org.apache.aries.spifly.dynamic.bundle - test - - - org.apache.felix - org.apache.felix.framework - - - - - jakarta.activation - jakarta.activation-api - test - - - org.mortbay.jasper - apache-jsp - - - org.mortbay.jasper - apache-el - - - jakarta.servlet.jsp.jstl - jakarta.servlet.jsp.jstl-api - - - jakarta.el - jakarta.el-api - - - - - org.glassfish.web - jakarta.servlet.jsp.jstl - - - - org.eclipse.jetty.ee9 - jetty-ee9-jndi - runtime - - - org.eclipse.jetty.ee9 - jetty-ee9-annotations - runtime - - - org.eclipse.jetty.ee9 - jetty-ee9-webapp - runtime - - - org.eclipse.jetty - jetty-deploy - runtime - - - org.eclipse.jetty - jetty-server - runtime - - - org.eclipse.jetty.ee9 - jetty-ee9-servlet - runtime - - - org.eclipse.jetty.ee9 - jetty-ee9-servlets - runtime - - - org.eclipse.jetty.ee9 - jetty-ee9-security - runtime - - - org.eclipse.jetty - jetty-xml - runtime - - - org.eclipse.jetty - jetty-jmx - runtime - - - org.eclipse.jetty - jetty-util - runtime - - - org.eclipse.jetty - jetty-client - runtime - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-api - runtime - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-common - runtime - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-client - runtime - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jakarta-client - runtime - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-servlet - runtime - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-server - runtime - - - org.eclipse.jetty.toolchain - jetty-jakarta-websocket-api - runtime - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jakarta-server - runtime - - - org.eclipse.jetty.http2 - jetty-http2-server - - - org.eclipse.jetty.http2 - jetty-http2-hpack - - - org.eclipse.jetty - jetty-alpn-server - ${project.version} - test - - - org.eclipse.jetty.ee9 - jetty-ee9-plus - runtime - - - - - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-jsp-webapp - ${project.version} - webbundle - test - - - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-jetty-webapp - ${project.version} - war - test - - - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-jetty-webapp - ${project.version} - webbundle - test - - - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-spec-webapp - ${project.version} - war - test - - - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-container-initializer - ${project.version} - test - - - org.eclipse.jetty.ee9.osgi - test-jetty-ee9-osgi-webapp-resources - ${project.version} - war - test - org.eclipse.jetty.ee9.osgi test-jetty-ee9-osgi-fragment @@ -442,20 +350,147 @@ test - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-mock-resources + org.eclipse.jetty.ee9.osgi + test-jetty-ee9-osgi-webapp-resources ${project.version} + war + test + + + org.eclipse.jetty.http2 + jetty-http2-client + test + + + org.eclipse.jetty.http2 + jetty-http2-client-transport + test org.eclipse.jetty.toolchain jetty-test-helper test + + org.eclipse.platform + org.eclipse.osgi + test + + + org.eclipse.platform + org.eclipse.osgi.services + test + + + org.eclipse.platform + org.eclipse.osgi.util + test + + + + org.ops4j.pax.exam + pax-exam + test + + + + org.ops4j.pax.exam + pax-exam-container-forked + test + + + biz.aQute.bnd + bndlib + + + org.ops4j.pax.tinybundles + tinybundles + + + + + org.ops4j.pax.exam + pax-exam-inject + test + + + org.ops4j.pax.exam + pax-exam-junit4 + test + + + org.ops4j.pax.exam + pax-exam-link-mvn + test + + + org.ops4j.pax.swissbox + pax-swissbox-framework + test + + + org.ops4j.base + ops4j-base-monitors + + + + + org.ops4j.pax.swissbox + pax-swissbox-tracker + test + + + org.ops4j.pax.url + pax-url-aether + test + + + javax.annotation + javax.annotation-api + + + + + org.ops4j.pax.url + pax-url-wrap + test + + + biz.aQute.bnd + bndlib + + + + + org.osgi + org.osgi.util.measurement + test + + + org.osgi + org.osgi.util.position + test + + + org.osgi + org.osgi.util.promise + test + + + org.osgi + org.osgi.util.xml + test + org.ow2.asm asm test + + org.ow2.asm + asm-analysis + test + org.ow2.asm asm-commons @@ -466,49 +501,15 @@ asm-tree test - - org.ow2.asm - asm-analysis - test - org.ow2.asm asm-util test + - org.eclipse.jetty.http2 - jetty-http2-client - test - - - org.eclipse.jetty.http2 - jetty-http2-client-transport - test - - - org.eclipse.jetty - jetty-alpn-conscrypt-server - test - - - org.eclipse.jetty - jetty-alpn-conscrypt-client - test - - - org.conscrypt - conscrypt-openjdk-uber - test - - - org.eclipse.jetty - jetty-alpn-java-server - test - - - org.eclipse.jetty - jetty-alpn-java-client + org.slf4j + slf4j-api test @@ -569,7 +570,7 @@ - + @@ -581,20 +582,20 @@ maven-dependency-plugin - - - copy - process-test-resources - - copy-dependencies - - - test-jetty-ee9-osgi-webapp-resources target true + + + copy + + copy-dependencies + + process-test-resources + + org.apache.servicemix.tooling diff --git a/jetty-ee9/jetty-ee9-plus/pom.xml b/jetty-ee9/jetty-ee9-plus/pom.xml index ba7a1ca2366..86f41de9bb7 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.3-SNAPSHOT - - 4.0.0 jetty-ee9-plus EE9 :: Plus Jetty JavaEE style services @@ -15,36 +16,15 @@ 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 - jakarta.transaction-api - jakarta.enterprise jakarta.enterprise.cdi-api + + jakarta.transaction + jakarta.transaction-api + org.eclipse.jetty jetty-jndi @@ -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 77ec0681f08..0d35590c9c6 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.3-SNAPSHOT - - 4.0.0 jetty-ee9-proxy EE9 :: Proxy Jetty Proxy @@ -14,52 +15,39 @@ ${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.eclipse.jetty + jetty-client + + + org.eclipse.jetty + jetty-util + org.slf4j slf4j-api - - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api - provided - org.eclipse.jetty.ee9 jetty-ee9-servlet provided - org.eclipse.jetty - jetty-util - - - org.eclipse.jetty - jetty-client - - - org.eclipse.jetty - jetty-util-ajax - test + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + provided org.eclipse.jetty jetty-http-tools test + + org.eclipse.jetty + jetty-rewrite + test + org.eclipse.jetty jetty-slf4j-impl @@ -67,7 +55,7 @@ org.eclipse.jetty - jetty-rewrite + jetty-util-ajax test @@ -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 20e02edaf00..575897a030f 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.3-SNAPSHOT - - 4.0.0 jetty-ee9-quickstart EE9 :: Quick Start Jetty Quick Start @@ -14,30 +15,10 @@ ${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 - jetty-ee9-webapp + jetty-ee9-annotations org.eclipse.jetty.ee9 @@ -45,7 +26,7 @@ org.eclipse.jetty.ee9 - jetty-ee9-annotations + jetty-ee9-webapp org.slf4j @@ -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 9be1dd09699..761fc2ba981 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.3-SNAPSHOT - 4.0.0 jetty-ee9-runner EE9 :: Runner @@ -15,7 +16,80 @@ true + + + org.eclipse.jetty + jetty-jndi + + + org.eclipse.jetty.ee9 + jetty-ee9-annotations + + + org.eclipse.jetty.ee9 + jetty-ee9-apache-jsp + + + org.eclipse.jetty.ee9 + jetty-ee9-glassfish-jstl + + + org.eclipse.jetty.ee9 + jetty-ee9-plus + + + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-server + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + runtime + + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-simple-webapp + war + 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 2ef2f204f4c..9b926424fdc 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.3-SNAPSHOT - - 4.0.0 jetty-ee9-security EE9 :: Security Jetty security infrastructure @@ -15,6 +16,37 @@ org.eclipse.jetty.ee9.security.* + + + org.eclipse.jetty + jetty-security + + + org.eclipse.jetty.ee9 + jetty-ee9-nested + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-http-tools + test + + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + @@ -30,35 +62,4 @@ - - - org.eclipse.jetty.ee9 - jetty-ee9-nested - - - org.eclipse.jetty - jetty-security - - - 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 - - - diff --git a/jetty-ee9/jetty-ee9-servlet/pom.xml b/jetty-ee9/jetty-ee9-servlet/pom.xml index f36fcc01dc6..4ffb71f6768 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.3-SNAPSHOT - - 4.0.0 jetty-ee9-servlet EE9 :: Servlet Jetty Servlet Container @@ -16,22 +16,17 @@ 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 + jetty-jmx + true + + + org.eclipse.jetty + jetty-util-ajax + true + org.eclipse.jetty.ee9 jetty-ee9-nested @@ -46,13 +41,13 @@ org.eclipse.jetty - jetty-util-ajax - true + jetty-client + test org.eclipse.jetty - jetty-jmx - true + jetty-http-tools + test @@ -65,15 +60,18 @@ jetty-test-helper test - - org.eclipse.jetty - jetty-http-tools - test - - - org.eclipse.jetty - jetty-client - 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 326afcb94d6..fc5e3353d67 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.3-SNAPSHOT - - 4.0.0 jetty-ee9-servlets EE9 :: Utility Servlets and Filters Jetty Utility Servlets @@ -16,33 +16,23 @@ 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 jetty-http + + org.eclipse.jetty + jetty-io + + + org.eclipse.jetty + jetty-util + + + org.slf4j + slf4j-api + org.eclipse.jetty.ee9 jetty-ee9-nested @@ -53,10 +43,6 @@ jetty-ee9-webapp provided - - org.eclipse.jetty - jetty-util - org.eclipse.jetty.toolchain jetty-jakarta-servlet-api @@ -64,16 +50,7 @@ org.eclipse.jetty - jetty-io - - - org.slf4j - slf4j-api - - - - org.eclipse.jetty - jetty-slf4j-impl + jetty-http-tools test @@ -81,9 +58,10 @@ jetty-jmx test + org.eclipse.jetty - jetty-http-tools + jetty-slf4j-impl test @@ -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 582f6711036..c1b0f31d667 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.3-SNAPSHOT - - 4.0.0 jetty-ee9-test-bad-websocket-webapp war @@ -14,11 +14,6 @@ Contains wrong websocket which should fail at deployment - - org.eclipse.jetty.toolchain - jetty-jakarta-websocket-api - provided - org.eclipse.jetty.ee9.websocket jetty-ee9-websocket-jakarta-common @@ -29,6 +24,11 @@ jetty-jakarta-servlet-api provided + + org.eclipse.jetty.toolchain + jetty-jakarta-websocket-api + provided + 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 13e6ecc9cea..05e5caa76ee 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,20 +1,42 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9-tests 12.0.3-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 + + + + jakarta.enterprise + jakarta.enterprise.cdi-api + provided + + + + jakarta.inject + jakarta.inject-api + provided + + + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + provided + + + + @@ -29,26 +51,4 @@ - - - - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api - provided - - - - jakarta.inject - jakarta.inject-api - provided - - - - jakarta.enterprise - jakarta.enterprise.cdi-api - provided - - - - 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 bccb5438146..7d1c277ebb7 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.3-SNAPSHOT - - 4.0.0 jetty-ee9-test-cdi jar EE9 :: Tests :: CDI @@ -25,14 +25,44 @@ jetty-ee9-webapp compile + + org.eclipse.jetty.toolchain + jetty-test-helper + org.slf4j slf4j-api compile - org.slf4j - jul-to-slf4j + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jakarta-server + test + + + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-client + test + + + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-server + test + + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + test + + + org.jboss.logging + jboss-logging + ${jboss.logging.version} test @@ -52,38 +82,8 @@ - org.jboss.logging - jboss-logging - ${jboss.logging.version} - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jakarta-server - test - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-server - test - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-client - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - - - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api + org.slf4j + jul-to-slf4j test 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 87bad34df7e..32e1e26e008 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.3-SNAPSHOT - - 4.0.0 jetty-ee9-test-client-transports jar EE9 :: Tests :: HTTP Client Transports @@ -17,54 +17,10 @@ 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 - slf4j-api - test + org.eclipse.jetty.toolchain + jetty-test-helper org.awaitility @@ -81,11 +37,26 @@ jetty-alpn-java-server test + + org.eclipse.jetty + jetty-client + test + org.eclipse.jetty jetty-jmx test + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty + jetty-unixdomain-server + test + org.eclipse.jetty.ee9 jetty-ee9-servlet @@ -97,13 +68,8 @@ test - org.eclipse.jetty - jetty-client - test - - - org.eclipse.jetty.http2 - jetty-http2-server + org.eclipse.jetty.fcgi + jetty-fcgi-server test @@ -112,8 +78,8 @@ test - org.eclipse.jetty.http3 - jetty-http3-server + org.eclipse.jetty.http2 + jetty-http2-server test @@ -122,24 +88,54 @@ test - org.eclipse.jetty - jetty-unixdomain-server + org.eclipse.jetty.http3 + jetty-http3-server test - org.eclipse.jetty.fcgi - jetty-fcgi-server + org.slf4j + slf4j-api test - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - + + + 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 27f22158f62..73a7dca1698 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.3-SNAPSHOT - - 4.0.0 jetty-ee9-test-felix-webapp - EE9 :: Tests :: Felix WebApp war + EE9 :: Tests :: Felix WebApp ${project.groupId}.felix + + + org.apache.felix + org.apache.felix.framework + 7.0.5 + + + jakarta.servlet + jakarta.servlet-api + provided + + + @@ -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 46e465b35b2..21844e7df54 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,20 +1,66 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9-tests 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-test-http2-webapp - EE9 :: Tests :: HTTP2 WebApp war + EE9 :: Tests :: HTTP2 WebApp ${project.groupId}.http2 + + + org.eclipse.jetty + jetty-alpn-java-client + + + org.eclipse.jetty.http2 + jetty-http2-client + + + org.eclipse.jetty.toolchain + jetty-test-helper + + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + provided + + + + org.eclipse.jetty + jetty-alpn-java-server + test + + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.ee9 + jetty-ee9-webapp + test + + + org.eclipse.jetty.http2 + jetty-http2-server + test + + + @@ -22,10 +68,10 @@ unpack-webapp - pre-integration-test unpack + pre-integration-test @@ -61,50 +107,4 @@ - - - - org.eclipse.jetty.http2 - jetty-http2-client - - - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api - provided - - - org.eclipse.jetty - jetty-alpn-java-client - - - - org.eclipse.jetty - jetty-alpn-java-server - test - - - org.eclipse.jetty - jetty-client - test - - - org.eclipse.jetty.ee9 - jetty-ee9-webapp - test - - - org.eclipse.jetty.http2 - jetty-http2-server - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - - - org.eclipse.jetty - jetty-slf4j-impl - test - - 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 2e94568cb5e..a32f48203ba 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,20 +1,108 @@ + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9-tests 12.0.3-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.eclipse.jetty + jetty-client + + + org.eclipse.jetty + jetty-deploy + + + org.eclipse.jetty + jetty-rewrite + + + org.eclipse.jetty.ee9 + jetty-ee9-apache-jsp + + + org.eclipse.jetty.ee9 + jetty-ee9-webapp + + + org.eclipse.jetty.http2 + jetty-http2-server + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-alpn-server + test + + + org.eclipse.jetty + jetty-http-tools + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.ee9 + jetty-ee9-annotations + test + + + org.eclipse.jetty.ee9 + jetty-ee9-servlets + test + + + org.eclipse.jetty.ee9 + jetty-ee9-test-webapp-rfc2616 + ${project.version} + war + test + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-jetty-webapp + war + test + + + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jakarta-server + test + + + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-client + test + + + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-server + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + @@ -23,25 +111,25 @@ copy-wars-for-testing - process-test-resources 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 - + + 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 @@ -61,92 +149,4 @@ - - - org.eclipse.jetty.ee9 - jetty-ee9-webapp - - - org.eclipse.jetty - jetty-deploy - - - org.eclipse.jetty - jetty-rewrite - - - org.eclipse.jetty - jetty-client - - - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-http-tools - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - org.eclipse.jetty.ee9 - jetty-ee9-apache-jsp - - - org.eclipse.jetty.http2 - jetty-http2-server - - - org.eclipse.jetty.ee9 - jetty-ee9-annotations - test - - - org.eclipse.jetty.ee9 - jetty-ee9-servlets - test - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-server - test - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-client - test - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jakarta-server - test - - - org.eclipse.jetty.ee9 - jetty-ee9-test-webapp-rfc2616 - ${project.version} - war - test - - - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-jetty-webapp - war - test - - - org.eclipse.jetty - jetty-alpn-server - test - - 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 f5dae81a4e2..d16b9ce7cf1 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,29 +1,29 @@ + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9-test-jmx 12.0.3-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 - - org.eclipse.jetty.ee9 - jetty-ee9-annotations - org.eclipse.jetty jetty-jmx + + org.eclipse.jetty.ee9 + jetty-ee9-annotations + org.eclipse.jetty.ee9 jetty-ee9-jmx-webapp @@ -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/jetty-ee9-jmx-webapp/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/jetty-ee9-jmx-webapp/pom.xml index d1e9a20afdb..e7db51e48fa 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/jetty-ee9-jmx-webapp/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-jmx/jetty-ee9-jmx-webapp/pom.xml @@ -14,11 +14,6 @@ true - - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api - provided - org.eclipse.jetty jetty-jmx @@ -27,6 +22,11 @@ org.slf4j slf4j-api + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + provided + jetty-ee9-jmx-webapp 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 41c7590080a..64114f6f2f5 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.3-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 33d25ed4425..02325db60f0 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.3-SNAPSHOT - - 4.0.0 jetty-ee9-test-jndi jar EE9 :: Tests :: JNDI @@ -16,12 +16,6 @@ - - org.eclipse.jetty.ee9 - jetty-ee9-jndi - ${project.version} - test - org.eclipse.jetty.toolchain jetty-test-helper @@ -31,6 +25,12 @@ jakarta.mail test + + org.eclipse.jetty.ee9 + jetty-ee9-jndi + ${project.version} + test + 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 697c8c0708d..7921d43e0e6 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,21 +9,25 @@ jetty-ee9-test-loginservice EE9 :: Tests :: Login Service - false ${project.groupId}.loginservice + false + + org.eclipse.jetty + jetty-client + + + org.eclipse.jetty + jetty-jndi + org.eclipse.jetty jetty-server org.eclipse.jetty.ee9 - jetty-ee9-webapp - - - org.eclipse.jetty - jetty-client + jetty-ee9-plus org.eclipse.jetty.ee9 @@ -31,21 +35,7 @@ org.eclipse.jetty.ee9 - jetty-ee9-plus - - - org.eclipse.jetty - jetty-jndi - - - org.testcontainers - testcontainers - test - - - org.testcontainers - mariadb - test + jetty-ee9-webapp net.java.dev.jna @@ -53,13 +43,8 @@ test - org.testcontainers - junit-jupiter - test - - - org.slf4j - slf4j-simple + org.eclipse.jetty.toolchain + jetty-test-helper test @@ -69,8 +54,23 @@ test - org.eclipse.jetty.toolchain - jetty-test-helper + org.slf4j + slf4j-simple + test + + + org.testcontainers + junit-jupiter + test + + + org.testcontainers + mariadb + test + + + org.testcontainers + testcontainers test diff --git a/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 675c7a8fae1..39e7f20af97 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.3-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 c09250d7242..97884e139fc 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,41 +1,23 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9-tests 12.0.3-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 - - - - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api - provided - - - - org.eclipse.jetty.ee9 - jetty-ee9-test-cdi-common-webapp - ${project.version} - war - runtime - - jakarta.annotation @@ -55,13 +37,31 @@ org.apache.openwebbeans - openwebbeans-web + openwebbeans-jetty9 ${openwebbeans.version} org.apache.openwebbeans - openwebbeans-jetty9 + openwebbeans-web ${openwebbeans.version} + + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + provided + + + + org.eclipse.jetty.ee9 + jetty-ee9-test-cdi-common-webapp + ${project.version} + war + runtime + + + + 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 8add51195b4..5654ef8a751 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.3-SNAPSHOT - 4.0.0 jetty-ee9-test-quickstart EE9 :: Tests :: Quick Start Jetty Quick Start Test @@ -14,13 +14,8 @@ - org.eclipse.jetty.ee9 - jetty-ee9-quickstart - test - - - org.eclipse.jetty.ee9 - jetty-ee9-webapp + jakarta.transaction + jakarta.transaction-api test @@ -28,6 +23,26 @@ jetty-jmx test + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.ee9 + jetty-ee9-annotations + test + + + org.eclipse.jetty.ee9 + jetty-ee9-apache-jsp + test + + + org.eclipse.jetty.ee9 + jetty-ee9-glassfish-jstl + test + org.eclipse.jetty.ee9 jetty-ee9-plus @@ -35,17 +50,7 @@ org.eclipse.jetty.ee9 - jetty-ee9-annotations - test - - - jakarta.transaction - jakarta.transaction-api - test - - - org.eclipse.jetty.ee9.demos - jetty-ee9-demo-mock-resources + jetty-ee9-quickstart test @@ -53,6 +58,17 @@ jetty-ee9-servlets test + + org.eclipse.jetty.ee9 + jetty-ee9-webapp + test + + + org.eclipse.jetty.ee9.demos + jetty-ee9-demo-jetty-webapp + war + test + org.eclipse.jetty.ee9.demos jetty-ee9-demo-jndi-webapp @@ -61,13 +77,12 @@ org.eclipse.jetty.ee9.demos - jetty-ee9-demo-spec-webapp - war + jetty-ee9-demo-mock-resources test org.eclipse.jetty.ee9.demos - jetty-ee9-demo-jetty-webapp + jetty-ee9-demo-spec-webapp war test @@ -81,16 +96,6 @@ jetty-ee9-websocket-jetty-server test - - org.eclipse.jetty.ee9 - jetty-ee9-apache-jsp - test - - - org.eclipse.jetty.ee9 - jetty-ee9-glassfish-jstl - test - org.eclipse.jetty.toolchain jetty-test-helper @@ -101,11 +106,6 @@ slf4j-api test - - org.eclipse.jetty - jetty-slf4j-impl - 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 d1b04f26c92..9391a5f021a 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 @@ -13,9 +13,9 @@ - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api - + org.eclipse.jetty + jetty-client + org.eclipse.jetty jetty-session @@ -25,23 +25,18 @@ jetty-ee9-webapp - org.eclipse.jetty - jetty-client + org.eclipse.jetty.tests + jetty-test-session-common + + + org.hamcrest + hamcrest-core + + - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty - jetty-session - test-jar - test + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api org.eclipse.jetty.toolchain @@ -58,14 +53,25 @@ junit-jupiter-api compile + + org.slf4j + slf4j-api + org.awaitility awaitility test - org.eclipse.jetty.tests - jetty-test-session-common + org.eclipse.jetty + jetty-session + test-jar + test + + + org.eclipse.jetty + jetty-slf4j-impl + test diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-file/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-file/pom.xml index 7264097c87f..7d6fea99c74 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-file/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-file/pom.xml @@ -12,6 +12,11 @@ ${project.groupId}.sessions.file + + org.eclipse.jetty + jetty-client + test + org.eclipse.jetty jetty-session @@ -23,14 +28,9 @@ test-jar test - - org.eclipse.jetty.ee9 - jetty-ee9-webapp - test - org.eclipse.jetty - jetty-client + jetty-slf4j-impl test @@ -39,13 +39,8 @@ test - org.slf4j - slf4j-api - test - - - org.eclipse.jetty - jetty-slf4j-impl + org.eclipse.jetty.ee9 + jetty-ee9-webapp test @@ -53,5 +48,10 @@ jetty-test-helper test + + org.slf4j + slf4j-api + test + 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 e5625745152..ec5aae99795 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 @@ -12,45 +12,55 @@ ${project.groupId}.sessions.gcloud - - org.eclipse.jetty - jetty-session - test - - - org.eclipse.jetty - jetty-session - test - test-jar - - - org.eclipse.jetty.ee9 - jetty-ee9-webapp - test - org.eclipse.jetty jetty-client test + + org.eclipse.jetty + jetty-session + test + + + org.eclipse.jetty + jetty-session + test-jar + test + org.eclipse.jetty.ee9 jetty-ee9-test-sessions-common test + + org.eclipse.jetty.ee9 + jetty-ee9-webapp + test + org.eclipse.jetty.gcloud jetty-gcloud-session-manager test + + org.eclipse.jetty.tests + jetty-test-session-common + test + org.eclipse.jetty.toolchain jetty-test-helper test + + org.slf4j + slf4j-simple + test + org.testcontainers - testcontainers + gcloud test @@ -60,17 +70,7 @@ org.testcontainers - gcloud - test - - - org.slf4j - slf4j-simple - test - - - org.eclipse.jetty.tests - jetty-test-session-common + testcontainers test 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 bc2a24678c3..8e3190a4837 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,28 +11,27 @@ ${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 - - - - + + com.hazelcast + hazelcast + + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty + jetty-hazelcast + test + + + org.eclipse.jetty + jetty-jmx + test + true + org.eclipse.jetty jetty-session @@ -44,14 +43,9 @@ test-jar test - - org.eclipse.jetty.ee9 - jetty-ee9-webapp - test - org.eclipse.jetty - jetty-client + jetty-slf4j-impl test @@ -60,18 +54,13 @@ test - org.eclipse.jetty - jetty-hazelcast + org.eclipse.jetty.ee9 + jetty-ee9-webapp test - com.hazelcast - hazelcast - - - org.eclipse.jetty - jetty-jmx - true + org.eclipse.jetty.tests + jetty-test-session-common test @@ -79,26 +68,35 @@ jetty-test-helper test - - org.slf4j - slf4j-api - test - org.slf4j jul-to-slf4j test - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.tests - jetty-test-session-common + org.slf4j + slf4j-api 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 e375be80570..2ae04752196 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,51 +14,34 @@ 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} - - - - - - - - + + com.google.code.gson + gson + ${gson.version} + test + + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty + jetty-infinispan-embedded-query + test + + + org.eclipse.jetty + jetty-infinispan-remote-query + test + + + org.eclipse.jetty + jetty-jmx + test + true + org.eclipse.jetty jetty-session @@ -70,35 +53,19 @@ test-jar test - - org.eclipse.jetty.ee9 - jetty-ee9-webapp - test - - - org.eclipse.jetty - jetty-client - test - org.eclipse.jetty.ee9 jetty-ee9-test-sessions-common test - org.eclipse.jetty - jetty-infinispan-remote-query + org.eclipse.jetty.ee9 + jetty-ee9-webapp test - org.eclipse.jetty - jetty-infinispan-embedded-query - test - - - org.eclipse.jetty - jetty-jmx - true + org.eclipse.jetty.tests + jetty-test-session-common test @@ -106,6 +73,11 @@ jetty-test-helper test + + org.infinispan + infinispan-client-hotrod + test + org.infinispan infinispan-core @@ -122,11 +94,6 @@ infinispan-query test - - org.infinispan - infinispan-client-hotrod - test - org.infinispan infinispan-remote-query-client @@ -138,9 +105,8 @@ test - com.google.code.gson - gson - ${gson.version} + org.slf4j + jul-to-slf4j test @@ -148,32 +114,66 @@ slf4j-api test - - org.slf4j - jul-to-slf4j - test - org.slf4j slf4j-simple test - - org.testcontainers - testcontainers - test - org.testcontainers junit-jupiter test - org.eclipse.jetty.tests - jetty-test-session-common + org.testcontainers + testcontainers test + + + + 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} + + + + + + + + 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-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 1bd25f268a0..1d1c7109763 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,20 +11,12 @@ ${project.groupId}.sessions.jdbc - - - - org.apache.maven.plugins - maven-surefire-plugin - - - ${mariadb.docker.version} - - - - - + + org.eclipse.jetty + jetty-client + test + org.eclipse.jetty jetty-server @@ -41,14 +33,9 @@ test-jar test - - org.eclipse.jetty.ee9 - jetty-ee9-webapp - test - org.eclipse.jetty - jetty-client + jetty-slf4j-impl test @@ -56,6 +43,21 @@ jetty-ee9-test-sessions-common test + + org.eclipse.jetty.ee9 + jetty-ee9-webapp + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + org.mariadb.jdbc + mariadb-java-client + test + org.slf4j slf4j-api @@ -63,17 +65,7 @@ org.testcontainers - testcontainers - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.toolchain - jetty-test-helper + junit-jupiter test @@ -83,13 +75,21 @@ org.testcontainers - junit-jupiter - test - - - org.mariadb.jdbc - mariadb-java-client + testcontainers 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-memcached/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-memcached/pom.xml index 04de285071a..a62ae5c6263 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-memcached/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-memcached/pom.xml @@ -12,34 +12,14 @@ ${project.groupId}.sessions.memcached - - org.eclipse.jetty - jetty-session - test - - - org.eclipse.jetty.ee9 - jetty-ee9-webapp - test - org.eclipse.jetty jetty-client test - org.eclipse.jetty.ee9 - jetty-ee9-test-sessions-common - test - - - org.eclipse.jetty.memcached - jetty-memcached-sessions - test - - - org.eclipse.jetty.toolchain - jetty-test-helper + org.eclipse.jetty + jetty-session test @@ -48,8 +28,28 @@ test - org.testcontainers - testcontainers + org.eclipse.jetty.ee9 + jetty-ee9-test-sessions-common + test + + + org.eclipse.jetty.ee9 + jetty-ee9-webapp + test + + + org.eclipse.jetty.memcached + jetty-memcached-sessions + test + + + org.eclipse.jetty.tests + jetty-test-session-common + test + + + org.eclipse.jetty.toolchain + jetty-test-helper test @@ -58,8 +58,8 @@ test - org.eclipse.jetty.tests - jetty-test-session-common + org.testcontainers + testcontainers test 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 542530a1212..181945c8921 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,20 +11,23 @@ ${project.groupId}.sessions.mongo - - - - org.apache.maven.plugins - maven-surefire-plugin - - - ${mongo.docker.version} - - - - - + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty + jetty-jmx + test + true + + + org.eclipse.jetty + jetty-nosql + test + org.eclipse.jetty jetty-session @@ -36,14 +39,9 @@ test-jar test - - org.eclipse.jetty.ee9 - jetty-ee9-webapp - test - org.eclipse.jetty - jetty-client + jetty-slf4j-impl test @@ -52,24 +50,13 @@ test - org.eclipse.jetty - jetty-nosql + org.eclipse.jetty.ee9 + jetty-ee9-webapp test - org.eclipse.jetty - jetty-jmx - true - test - - - org.slf4j - slf4j-api - test - - - org.eclipse.jetty - jetty-slf4j-impl + org.eclipse.jetty.tests + jetty-test-session-common test @@ -78,8 +65,13 @@ test - org.testcontainers - testcontainers + org.slf4j + slf4j-api + test + + + org.slf4j + slf4j-simple test @@ -93,14 +85,22 @@ test - org.slf4j - slf4j-simple - test - - - org.eclipse.jetty.tests - jetty-test-session-common + org.testcontainers + testcontainers 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 ae6c46d3d6f..330c82dc7f9 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,36 +7,36 @@ 12.0.3-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 + - - org.eclipse.jetty.ee9 - jetty-ee9-test-sessions-common - ${project.version} - org.eclipse.jetty jetty-session ${project.version} test-jar + + org.eclipse.jetty.ee9 + jetty-ee9-test-sessions-common + ${project.version} + 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 74fdb2629b9..8c0625669c2 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,29 +7,12 @@ 12.0.3-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-maven-plugin - ${project.version} - - 8087 - foo - 1 - - 222 - - - - - org.eclipse.jetty.ee9 @@ -41,4 +24,21 @@ provided + + + + org.eclipse.jetty.ee9 + jetty-ee9-maven-plugin + ${project.version} + + 8087 + foo + 1 + + 222 + + + + + 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 4330a877f06..e59484dd728 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.3-SNAPSHOT - - 4.0.0 jetty-ee9-test-websocket-client-provided-webapp war @@ -17,6 +17,11 @@ org.slf4j slf4j-simple + + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-client + provided + org.eclipse.jetty.toolchain jetty-jakarta-servlet-api @@ -27,10 +32,5 @@ jetty-jakarta-websocket-api provided - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-client - provided - 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 bc7a1bb6f70..678cca75399 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,18 +1,22 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9-tests 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-test-websocket-client-webapp war EE9 :: Tests :: WebSocket Simple WebApp with WebSocketClient + + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-client + org.slf4j slf4j-simple @@ -27,9 +31,5 @@ jetty-jakarta-websocket-api provided - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-client - 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 cdee008ecd5..d935f28bc28 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.3-SNAPSHOT - - 4.0.0 jetty-ee9-test-websocket-webapp war @@ -21,11 +21,6 @@ org.slf4j slf4j-simple - - org.eclipse.jetty.toolchain - jetty-jakarta-websocket-api - provided - org.eclipse.jetty.ee9.websocket jetty-ee9-websocket-jakarta-common @@ -36,6 +31,11 @@ jetty-jakarta-servlet-api provided + + org.eclipse.jetty.toolchain + jetty-jakarta-websocket-api + provided + 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 c6909aec611..a47b7c5675c 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,32 +1,25 @@ + + 4.0.0 org.eclipse.jetty.ee9 jetty-ee9-tests 12.0.3-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 - - - - org.eclipse.jetty.ee9 - jetty-ee9-test-cdi-common-webapp - ${project.version} - war - runtime + org.jboss.logging + jboss-logging + ${jboss.logging.version} @@ -35,10 +28,17 @@ weld-servlet-core ${weld.version} + - org.jboss.logging - jboss-logging - ${jboss.logging.version} + org.eclipse.jetty.ee9 + jetty-ee9-test-cdi-common-webapp + ${project.version} + war + runtime + + + 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 17089fa3946..11e5479914c 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.3-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-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-cdi-common-webapp - jetty-ee9-test-felix-webapp - jetty-ee9-test-openid-webapp - jetty-ee9-test-owb-cdi-webapp - jetty-ee9-test-simple-session-webapp - jetty-ee9-test-webapp-rfc2616 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 db656d45663..c64dc3e5b8d 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.3-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 + jetty-xml + + + org.eclipse.jetty.ee9 + jetty-ee9-servlet + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty + jetty-http-tools + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + src/main/resources - src/main/config/etc org/eclipse/jetty/ee9/webapp false + src/main/config/etc webdefault-ee9.xml @@ -34,29 +70,38 @@ 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 + + org.apache.felix + maven-bundle-plugin + 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 + + + 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 @@ -66,56 +111,6 @@ - - org.apache.felix - maven-bundle-plugin - 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 - - - - - - - - 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 f30fa845b24..64cf8c3442b 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.3-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 5d1c24c25d3..be4f71998a7 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.3-SNAPSHOT ../pom.xml - - 4.0.0 jetty-ee9-websocket-jakarta-client EE9 :: Websocket :: Jakarta Client @@ -17,31 +17,21 @@ - org.eclipse.jetty.toolchain - jetty-jakarta-websocket-api + org.eclipse.jetty + jetty-client org.eclipse.jetty.ee9.websocket jetty-ee9-websocket-jakarta-common + + org.eclipse.jetty.toolchain + jetty-jakarta-websocket-api + org.eclipse.jetty.websocket jetty-websocket-core-client - - org.eclipse.jetty - jetty-client - - - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api - test - - - org.eclipse.jetty - jetty-xml - test - org.eclipse.jetty jetty-jmx @@ -52,6 +42,16 @@ jetty-slf4j-impl test + + org.eclipse.jetty + jetty-xml + test + + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + test + @@ -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 a6632f89b39..7973fc006e6 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.3-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 @@ -46,16 +28,32 @@ org.slf4j slf4j-api + + org.awaitility + awaitility + test + org.eclipse.jetty jetty-slf4j-impl test - - org.awaitility - awaitility - 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 3f37c774236..6fe347a28f2 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.3-SNAPSHOT - - 4.0.0 jetty-ee9-websocket-jakarta-server EE9 :: Websocket :: Jakarta Server @@ -15,6 +15,10 @@ + + org.eclipse.jetty.ee9 + jetty-ee9-annotations + org.eclipse.jetty.ee9.websocket jetty-ee9-websocket-jakarta-client @@ -23,10 +27,6 @@ org.eclipse.jetty.ee9.websocket jetty-ee9-websocket-servlet - - org.eclipse.jetty.ee9 - jetty-ee9-annotations - org.eclipse.jetty.toolchain jetty-jakarta-websocket-api @@ -44,14 +44,6 @@ - - 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 - - - org.apache.felix maven-bundle-plugin @@ -59,16 +51,18 @@ 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 + + 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 + + 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 2350b4383b9..8090f8338bf 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,26 +1,26 @@ + + 4.0.0 org.eclipse.jetty.ee9.websocket jetty-ee9-websocket 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-websocket-jakarta-tests EE9 :: Websocket :: Jakarta Tests - false ${project.groupId}.jakarta.tests + false true true - org.slf4j - slf4j-api + org.eclipse.jetty + jetty-http-tools org.eclipse.jetty.ee9.websocket @@ -30,24 +30,10 @@ org.eclipse.jetty.ee9.websocket jetty-ee9-websocket-jakarta-server - - org.eclipse.jetty - jetty-http-tools - org.eclipse.jetty.toolchain jetty-jakarta-websocket-api - - org.eclipse.jetty - jetty-util-ajax - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - org.eclipse.jetty.toolchain jetty-test-helper @@ -56,6 +42,20 @@ org.junit.jupiter junit-jupiter + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty + jetty-util-ajax + test + @@ -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 725a278473f..579d638a039 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.3-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 410b53ae585..ff79ecab2f8 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.3-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 + jetty-ee9-webapp + + + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-client + + + @@ -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 1107e2920b6..b1b6a7e566d 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.3-SNAPSHOT - - 4.0.0 jetty-ee9-websocket-jetty-client EE9 :: Websocket :: Jetty Client @@ -15,6 +15,10 @@ + + org.eclipse.jetty + jetty-client + org.eclipse.jetty.ee9.websocket jetty-ee9-websocket-jetty-api @@ -27,24 +31,20 @@ org.eclipse.jetty.websocket jetty-websocket-core-client - - org.eclipse.jetty - jetty-client - org.slf4j slf4j-api - - org.eclipse.jetty.ee9 - jetty-ee9-webapp - test - org.eclipse.jetty jetty-slf4j-impl test + + org.eclipse.jetty.ee9 + jetty-ee9-webapp + test + 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 e09ce502980..b0206232dc2 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,46 +1,18 @@ + + 4.0.0 org.eclipse.jetty.ee9.websocket jetty-ee9-websocket 12.0.3-SNAPSHOT - - 4.0.0 jetty-ee9-websocket-jetty-common EE9 :: Websocket :: Jetty Common ${project.groupId}.common - - - - - maven-surefire-plugin - - - @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.ee9.websocket.jetty.common=org.eclipse.jetty.io - - - - - org.apache.felix - maven-bundle-plugin - true - - - - 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 @@ -56,4 +28,26 @@ test + + + + + org.apache.felix + maven-bundle-plugin + true + + + osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" + osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee9.websocket.api.ExtensionConfig$Parser + + + + + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.ee9.websocket.jetty.common=org.eclipse.jetty.io + + + + 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 a0b7d56be02..3f92c27242d 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.3-SNAPSHOT - - 4.0.0 jetty-ee9-websocket-jetty-server EE9 :: Websocket :: Jetty Server @@ -15,6 +15,19 @@ + + org.eclipse.jetty + jetty-jmx + true + + + org.eclipse.jetty.ee9 + jetty-ee9-servlet + + + org.eclipse.jetty.ee9 + jetty-ee9-webapp + org.eclipse.jetty.ee9.websocket jetty-ee9-websocket-jetty-api @@ -31,19 +44,6 @@ org.eclipse.jetty.toolchain jetty-jakarta-servlet-api - - org.eclipse.jetty.ee9 - jetty-ee9-servlet - - - org.eclipse.jetty.ee9 - jetty-ee9-webapp - - - org.eclipse.jetty - jetty-jmx - true - org.slf4j slf4j-api @@ -64,13 +64,9 @@ Jetty Websocket Server - - osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - - - osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.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 767fbd35505..91b8c84a0d1 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.3-SNAPSHOT - - 4.0.0 jetty-ee9-websocket-jetty-tests EE9 :: Websocket :: Jetty Tests @@ -18,8 +18,33 @@ - org.slf4j - slf4j-api + org.eclipse.jetty + jetty-alpn-java-server + test + + + org.eclipse.jetty + jetty-alpn-server + test + + + org.eclipse.jetty + jetty-http-tools + test + + + org.eclipse.jetty + jetty-jmx + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.ee9 + jetty-ee9-annotations test @@ -38,8 +63,8 @@ test - org.eclipse.jetty - jetty-http-tools + org.eclipse.jetty.http2 + jetty-http2-client-transport test @@ -48,33 +73,8 @@ test - org.eclipse.jetty - jetty-alpn-server - test - - - org.eclipse.jetty - jetty-alpn-java-server - test - - - org.eclipse.jetty.http2 - jetty-http2-client-transport - test - - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty - jetty-jmx - test - - - org.eclipse.jetty.ee9 - jetty-ee9-annotations + org.slf4j + slf4j-api test @@ -88,13 +88,10 @@ jetty.websocket Integration Tests - - org.eclipse.jetty.websocket.jetty.tests.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - + org.eclipse.jetty.websocket.jetty.tests.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-servlet/pom.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-servlet/pom.xml index 7305bf4d1e9..616602548ed 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.3-SNAPSHOT - - 4.0.0 jetty-ee9-websocket-servlet EE9 :: Websocket :: Servlet @@ -15,14 +15,14 @@ - - org.eclipse.jetty.websocket - jetty-websocket-core-server - org.eclipse.jetty.ee9 jetty-ee9-servlet + + org.eclipse.jetty.websocket + jetty-websocket-core-server + org.slf4j slf4j-api diff --git a/jetty-ee9/jetty-ee9-websocket/pom.xml b/jetty-ee9/jetty-ee9-websocket/pom.xml index b42b32bfc00..38a5ad08a78 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.3-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 5795a4baf99..f4698eb4d27 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.3-SNAPSHOT - - 4.0.0 org.eclipse.jetty.ee9 jetty-ee9 - EE9 pom + EE9 + + + 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 + - - 5.0.2 - - - 1.1.0.v201105071233 - 1.4.1.v201005082020 2.0.1 2.0.0 @@ -28,54 +50,128 @@ 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 - - + + com.sun.mail + jakarta.mail + ${jakarta.mail.api.version} + + + com.sun.xml.ws + jaxws-rt + ${jakarta.xml.jaxws.impl.version} + + + jakarta.activation + jakarta.activation-api + ${jakarta.activation.api.version} + + + jakarta.annotation + jakarta.annotation-api + ${jakarta.annotation.api.version} + + + jakarta.authentication + jakarta.authentication-api + ${jakarta.authentication.api.version} + + + jakarta.el + jakarta.el-api + ${jakarta.el.api.version} + + + jakarta.enterprise + jakarta.enterprise.cdi-api + ${jakarta.enterprise.cdi.api.version} + + + jakarta.inject + jakarta.inject-api + ${jakarta.inject.api.version} + + + jakarta.interceptor + jakarta.interceptor-api + ${jakarta.interceptor.api.version} + + + jakarta.mail + jakarta.mail-api + ${jakarta.mail.api.version} + + + jakarta.servlet + jakarta.servlet-api + ${jakarta.servlet.api.version} + + + jakarta.servlet.jsp + jakarta.servlet.jsp-api + ${jakarta.servlet.jsp.api.version} + + + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + ${jakarta.servlet.jsp.jstl.api.version} + + + jakarta.el + jakarta.el-api + + + jakarta.servlet + jakarta.servlet-api + + + + + jakarta.transaction + jakarta.transaction-api + ${jakarta.transaction-api.version} + + + jakarta.ws.rs + jakarta.ws.rs-api + ${jakarta.ws.rs.api.version} + + + jakarta.xml.bind + jakarta.xml.bind-api + ${jakarta.xml.bind.api.version} + + + jakarta.xml.ws + jakarta.xml.ws-api + ${jakarta.xml.ws.api.version} + @@ -103,11 +199,6 @@ jetty-ee9-glassfish-jstl ${project.version} - - org.eclipse.jetty.ee9 - jetty-ee9-nested - ${project.version} - org.eclipse.jetty.ee9 jetty-ee9-jaspi @@ -128,6 +219,11 @@ jetty-ee9-maven-plugin ${project.version} + + org.eclipse.jetty.ee9 + jetty-ee9-nested + ${project.version} + org.eclipse.jetty.ee9 jetty-ee9-openid @@ -168,56 +264,6 @@ jetty-ee9-webapp ${project.version} - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jakarta-client - ${project.version} - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jakarta-client-webapp - ${project.version} - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jakarta-common - ${project.version} - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jakarta-server - ${project.version} - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-api - ${project.version} - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-client - ${project.version} - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-client-webapp - ${project.version} - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-common - ${project.version} - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-jetty-server - ${project.version} - - - org.eclipse.jetty.ee9.websocket - jetty-ee9-websocket-servlet - ${project.version} - org.eclipse.jetty.ee9.demos jetty-ee9-demo-async-rest-jar @@ -270,13 +316,13 @@ org.eclipse.jetty.ee9.demos - jetty-ee9-demo-spec-webapp + jetty-ee9-demo-simple-webapp ${project.version} war org.eclipse.jetty.ee9.demos - jetty-ee9-demo-simple-webapp + jetty-ee9-demo-spec-webapp ${project.version} war @@ -285,116 +331,65 @@ jetty-ee9-demo-web-fragment ${project.version} - - - org.mortbay.jasper - apache-jsp - ${jsp.impl.version} + + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jakarta-client + ${project.version} - org.mortbay.jasper - apache-el - ${jsp.impl.version} + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jakarta-client-webapp + ${project.version} - org.eclipse.jetty.toolchain - jetty-jakarta-servlet-api - ${jetty.servlet.api.version} + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jakarta-common + ${project.version} - com.sun.xml.ws - jaxws-rt - ${jakarta.xml.jaxws.impl.version} + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jakarta-server + ${project.version} - com.sun.mail - jakarta.mail - ${jakarta.mail.api.version} + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-api + ${project.version} - jakarta.el - jakarta.el-api - ${jakarta.el.api.version} + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-client + ${project.version} - jakarta.enterprise - jakarta.enterprise.cdi-api - ${jakarta.enterprise.cdi.api.version} + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-client-webapp + ${project.version} - jakarta.activation - jakarta.activation-api - ${jakarta.activation.api.version} + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-common + ${project.version} - jakarta.annotation - jakarta.annotation-api - ${jakarta.annotation.api.version} + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-jetty-server + ${project.version} - jakarta.authentication - jakarta.authentication-api - ${jakarta.authentication.api.version} + org.eclipse.jetty.ee9.websocket + jetty-ee9-websocket-servlet + ${project.version} - jakarta.interceptor - jakarta.interceptor-api - ${jakarta.interceptor.api.version} + org.eclipse.jetty.orbit + javax.activation + ${javax.activation.impl.version} - jakarta.inject - jakarta.inject-api - ${jakarta.inject.api.version} - - - jakarta.mail - jakarta.mail-api - ${jakarta.mail.api.version} - - - jakarta.servlet - jakarta.servlet-api - ${jakarta.servlet.api.version} - - - jakarta.servlet.jsp - jakarta.servlet.jsp-api - ${jakarta.servlet.jsp.api.version} - - - jakarta.servlet.jsp.jstl - jakarta.servlet.jsp.jstl-api - ${jakarta.servlet.jsp.jstl.api.version} - - - jakarta.servlet - jakarta.servlet-api - - - jakarta.el - jakarta.el-api - - - - - jakarta.transaction - jakarta.transaction-api - ${jakarta.transaction-api.version} - - - jakarta.ws.rs - jakarta.ws.rs-api - ${jakarta.ws.rs.api.version} - - - jakarta.xml.bind - jakarta.xml.bind-api - ${jakarta.xml.bind.api.version} - - - jakarta.xml.ws - jakarta.xml.ws-api - ${jakarta.xml.ws.api.version} + org.eclipse.jetty.orbit + javax.mail.glassfish + ${javax.mail.glassfish.version} org.eclipse.jetty.orbit @@ -411,6 +406,11 @@ + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + ${jetty.servlet.api.version} + org.eclipse.jetty.toolchain jetty-jakarta-websocket-api @@ -427,14 +427,15 @@ ${jakarta.servlet.jsp.jstl.impl.version} - org.eclipse.jetty.orbit - javax.mail.glassfish - ${javax.mail.glassfish.version} + org.mortbay.jasper + apache-el + ${jsp.impl.version} + - org.eclipse.jetty.orbit - javax.activation - ${javax.activation.impl.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 450eea5b8dd..97e1c28f2ad 100644 --- a/jetty-home/pom.xml +++ b/jetty-home/pom.xml @@ -1,50 +1,285 @@ + 4.0.0 - jetty-project org.eclipse.jetty + jetty-project 12.0.3-SNAPSHOT ../pom.xml - 4.0.0 jetty-home - Home pom + Home ${basedir}/target/jetty-home - ${basedir}/target/jetty-home-sources 2.0.2 + ${basedir}/target/jetty-home-sources true + + + org.eclipse.jetty + jetty-alpn-conscrypt-server + + + org.eclipse.jetty + jetty-alpn-java-server + + + org.eclipse.jetty + jetty-alpn-server + + + org.eclipse.jetty + jetty-client + + + org.eclipse.jetty + jetty-deploy + + + org.eclipse.jetty + jetty-hazelcast + true + + + + 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-jmx + + + org.eclipse.jetty + jetty-keystore + true + + + org.eclipse.jetty + jetty-nosql + true + + + org.eclipse.jetty + jetty-openid + + + org.eclipse.jetty + jetty-rewrite + + + org.eclipse.jetty + jetty-security + + + org.eclipse.jetty + jetty-start + ${project.version} + shaded + + + org.eclipse.jetty + jetty-unixdomain-server + true + + + org.eclipse.jetty + jetty-util-ajax + + + org.eclipse.jetty.demos + jetty-demo-handler + ${project.version} + true + + + org.eclipse.jetty.ee10 + jetty-ee10-home + ${project.version} + zip + + + org.eclipse.jetty.ee8 + jetty-ee8-home + ${project.version} + zip + + + org.eclipse.jetty.ee9 + jetty-ee9-home + ${project.version} + zip + + + org.eclipse.jetty.fcgi + jetty-fcgi-proxy + true + + + org.eclipse.jetty.fcgi + jetty-fcgi-server + true + + + org.eclipse.jetty.gcloud + jetty-gcloud-session-manager + true + + + org.eclipse.jetty.http2 + jetty-http2-server + + + org.eclipse.jetty.http3 + jetty-http3-server + + + org.eclipse.jetty.memcached + jetty-memcached-sessions + true + + + org.eclipse.jetty.toolchain.setuid + jetty-setuid-jna + ${jetty-setuid-version} + + + org.eclipse.jetty.websocket + jetty-websocket-jetty-client + + + org.eclipse.jetty.websocket + jetty-websocket-jetty-server + + + org.jboss.logging + jboss-logging + true + + + + + + + + + + + + + + + + + + + + org.ow2.asm + asm + + + org.ow2.asm + asm-analysis + + + org.ow2.asm + asm-commons + + + org.ow2.asm + asm-tree + + + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.apache.maven.plugins - maven-resources-plugin + maven-antrun-plugin - copy-base-assembly-tree - generate-resources + set jetty.sh - copy-resources + run + process-resources - false - true - ${assembly-directory} - UTF-8 - false - - @ - - - - ${basedir}/src/main/resources - true - - + + + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + posix + false + + + + binary + + single + + package + + 0 + 0 + + src/main/assembly/jetty-assembly.xml + + + + + sources + + single + + package + + + src/main/assembly/jetty-source-assembly.xml + + true @@ -55,10 +290,10 @@ copy - generate-resources copy + generate-resources @@ -87,74 +322,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 +389,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 +403,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 +416,10 @@ copy-lib-http3-src-deps - generate-resources copy-dependencies + generate-resources org.eclipse.jetty.http3 jetty-http3-server @@ -204,36 +429,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-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 - generate-resources unpack + generate-resources @@ -258,30 +501,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 @@ -305,61 +530,6 @@ - - org.apache.maven.plugins - maven-antrun-plugin - - - set jetty.sh - process-resources - - run - - - - - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - - posix - false - - - - binary - package - - single - - - 0 - 0 - - src/main/assembly/jetty-assembly.xml - - - - - sources - package - - single - - - - src/main/assembly/jetty-source-assembly.xml - - true - - - - org.apache.maven.plugins maven-enforcer-plugin @@ -398,215 +568,35 @@ + + org.apache.maven.plugins + maven-resources-plugin + + + copy-base-assembly-tree + + copy-resources + + generate-resources + + false + true + ${assembly-directory} + UTF-8 + false + + @ + + + + ${basedir}/src/main/resources + true + + + + + + - - - - - - - - - - - - - - - - - - - - - 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 6e4c3a4bddd..8bb35a1e666 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.3-SNAPSHOT - - 4.0.0 jetty-gcloud-session-manager Integrations :: GCloud :: Sessions @@ -15,14 +15,6 @@ - - org.eclipse.jetty - jetty-session - - - org.slf4j - slf4j-api - com.google.cloud google-cloud-datastore @@ -30,11 +22,11 @@ jakarta.servlet - servlet-api + jakarta.servlet-api jakarta.servlet - jakarta.servlet-api + servlet-api javax.annotation @@ -47,6 +39,14 @@ protobuf-java 3.22.2 + + org.eclipse.jetty + jetty-session + + + org.slf4j + slf4j-api + @@ -57,22 +57,54 @@ true - - org.eclipse.jetty.gcloud.session.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - + org.eclipse.jetty.gcloud.session.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" + + org.apache.maven.plugins + maven-antrun-plugin + + + process-deps + + run + + process-resources + + + + + + + + + process-mod + + run + + process-resources + + + + + + + + + + + org.apache.maven.plugins maven-dependency-plugin build-deps-file - generate-resources list + generate-resources false ${project.build.directory}/deps.txt @@ -84,40 +116,6 @@ - - org.apache.maven.plugins - maven-antrun-plugin - - - process-deps - process-resources - - run - - - - - - - - - - process-mod - process-resources - - run - - - - - - - - - - - - diff --git a/jetty-integrations/jetty-gcloud/pom.xml b/jetty-integrations/jetty-gcloud/pom.xml index d911da0ea49..1a6093d0431 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.3-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 8330db1983c..00d71e07bd2 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.3-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 02f46aff0b3..398be650215 100644 --- a/jetty-integrations/jetty-infinispan/jetty-infinispan-common/pom.xml +++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-common/pom.xml @@ -1,39 +1,21 @@ + + 4.0.0 org.eclipse.jetty jetty-infinispan 12.0.3-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.eclipse.jetty + jetty-session + org.infinispan infinispan-core @@ -45,25 +27,10 @@ - - org.infinispan.protostream - protostream - true - provided - - - org.eclipse.jetty - jetty-session - org.slf4j slf4j-api - - org.eclipse.jetty - jetty-slf4j-impl - test - org.infinispan infinispan-client-hotrod @@ -74,5 +41,39 @@ infinispan-remote-query-client provided + + org.infinispan.protostream + protostream + provided + true + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + + 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 9fe2b9c3fdb..21d06fe2e7f 100644 --- a/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/pom.xml +++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/pom.xml @@ -1,28 +1,93 @@ + + 4.0.0 org.eclipse.jetty jetty-infinispan 12.0.3-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-commons + + + org.infinispan + infinispan-core + + + + + org.infinispan + infinispan-query + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + install + + org.apache.maven.plugins + maven-antrun-plugin + + + process-deps + + run + + process-resources + + + + + + + + + process-mod + + run + + process-resources + + + + + + + + + + + org.apache.maven.plugins maven-dependency-plugin build-deps-file - generate-resources list + generate-resources false ${project.build.directory}/deps.txt @@ -34,70 +99,6 @@ - - org.apache.maven.plugins - maven-antrun-plugin - - - process-deps - process-resources - - run - - - - - - - - - - process-mod - process-resources - - run - - - - - - - - - - - - - - - org.eclipse.jetty - 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 9ab9ec7086c..ade768d1ada 100644 --- a/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/pom.xml +++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/pom.xml @@ -1,77 +1,17 @@ + + 4.0.0 org.eclipse.jetty jetty-infinispan 12.0.3-SNAPSHOT - 4.0.0 jetty-infinispan-embedded pom Integrations :: Infinispan :: Embedded ${project.groupId}.infinispan.embedded - - install - - - org.apache.maven.plugins - maven-dependency-plugin - - - build-deps-file - generate-resources - - list - - - false - ${project.build.directory}/deps.txt - true - org.eclipse.jetty,jakarta.servlet,org.slf4j - true - runtime - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - process-deps - process-resources - - run - - - - - - - - - - process-mod - process-resources - - run - - - - - - - - - - - - - - - org.eclipse.jetty @@ -88,4 +28,65 @@ + + install + + + org.apache.maven.plugins + maven-antrun-plugin + + + process-deps + + run + + process-resources + + + + + + + + + process-mod + + run + + process-resources + + + + + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + build-deps-file + + list + + generate-resources + + false + ${project.build.directory}/deps.txt + true + org.eclipse.jetty,jakarta.servlet,org.slf4j + true + runtime + + + + + + + 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 0f4b361f2f2..8d0c7f54911 100644 --- a/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/pom.xml +++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/pom.xml @@ -1,27 +1,110 @@ + + 4.0.0 org.eclipse.jetty jetty-infinispan 12.0.3-SNAPSHOT - 4.0.0 jetty-infinispan-remote-query Integrations :: Infinispan :: Remote with Querying ${project.groupId}.infinispan.remote.query + + + com.google.code.gson + gson + + + org.eclipse.jetty + jetty-infinispan-common + + + org.infinispan + infinispan-commons + + + org.infinispan + infinispan-core + + + + + org.infinispan + infinispan-client-hotrod + + + org.infinispan + infinispan-query + + + org.infinispan + infinispan-remote-query-client + + + org.slf4j + slf4j-simple + test + + + org.testcontainers + junit-jupiter + test + + + org.testcontainers + testcontainers + test + + + + org.apache.maven.plugins + maven-antrun-plugin + + + process-deps + + run + + process-resources + + + + + + + + + + process-mod + + run + + process-resources + + + + + + + + + + + org.apache.maven.plugins maven-dependency-plugin build-deps-file - generate-resources list + generate-resources false ${project.build.directory}/deps.txt @@ -33,41 +116,6 @@ - - org.apache.maven.plugins - maven-antrun-plugin - - - process-deps - process-resources - - run - - - - - - - - - - - process-mod - process-resources - - run - - - - - - - - - - - - org.apache.maven.plugins maven-surefire-plugin @@ -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 a79af41fa1b..e2000faa453 100644 --- a/jetty-integrations/jetty-infinispan/jetty-infinispan-remote/pom.xml +++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote/pom.xml @@ -1,77 +1,17 @@ + + 4.0.0 org.eclipse.jetty jetty-infinispan 12.0.3-SNAPSHOT - 4.0.0 jetty-infinispan-remote pom Integrations :: Infinispan :: Remote ${project.groupId}.infinispan.remote - - install - - - org.apache.maven.plugins - maven-dependency-plugin - - - build-deps-file - generate-resources - - list - - - false - ${project.build.directory}/deps.txt - true - org.eclipse.jetty,jakarta.servlet - true - provided - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - process-deps - process-resources - - run - - - - - - - - - - - process-mod - process-resources - - run - - - - - - - - - - - - - - org.eclipse.jetty @@ -93,4 +33,65 @@ provided + + install + + + org.apache.maven.plugins + maven-antrun-plugin + + + process-deps + + run + + process-resources + + + + + + + + + + process-mod + + run + + process-resources + + + + + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + build-deps-file + + list + + generate-resources + + false + ${project.build.directory}/deps.txt + true + org.eclipse.jetty,jakarta.servlet + true + provided + + + + + + diff --git a/jetty-integrations/jetty-infinispan/pom.xml b/jetty-integrations/jetty-infinispan/pom.xml index a9f807c774d..1982ab78f82 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.3-SNAPSHOT - - 4.0.0 jetty-infinispan pom Integrations :: Infinispan + + jetty-infinispan-common + jetty-infinispan-embedded + jetty-infinispan-embedded-query + jetty-infinispan-remote + jetty-infinispan-remote-query + ${project.groupId}.infinispan - - jetty-infinispan-common - jetty-infinispan-embedded - jetty-infinispan-remote - jetty-infinispan-embedded-query - jetty-infinispan-remote-query - diff --git a/jetty-integrations/jetty-memcached/jetty-memcached-sessions/pom.xml b/jetty-integrations/jetty-memcached/jetty-memcached-sessions/pom.xml index 2bb909fd59e..d883d060b30 100644 --- a/jetty-integrations/jetty-memcached/jetty-memcached-sessions/pom.xml +++ b/jetty-integrations/jetty-memcached/jetty-memcached-sessions/pom.xml @@ -1,29 +1,29 @@ + + 4.0.0 org.eclipse.jetty.memcached jetty-memcached 12.0.3-SNAPSHOT - - 4.0.0 jetty-memcached-sessions Integrations :: Memcached :: Sessions - - - org.eclipse.jetty - jetty-session - - - com.googlecode.xmemcached - xmemcached - ${xmemcached.version} - - - ${project.groupId}.session + + + com.googlecode.xmemcached + xmemcached + ${xmemcached.version} + + + org.eclipse.jetty + jetty-session + + + diff --git a/jetty-integrations/jetty-memcached/pom.xml b/jetty-integrations/jetty-memcached/pom.xml index 0af19eb0d91..d90540e35ac 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.3-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 c160d81702f..33fdd25a7cd 100644 --- a/jetty-integrations/jetty-nosql/pom.xml +++ b/jetty-integrations/jetty-nosql/pom.xml @@ -1,29 +1,26 @@ + + 4.0.0 org.eclipse.jetty jetty-integrations 12.0.3-SNAPSHOT - 4.0.0 jetty-nosql Integrations :: NoSQL :: Sessions ${project.groupId}.nosql - - install - - - - org.eclipse.jetty - jetty-session - org.eclipse.jetty jetty-jmx true + + org.eclipse.jetty + jetty-session + org.mongodb mongo-java-driver @@ -35,4 +32,8 @@ slf4j-api + + install + + diff --git a/jetty-integrations/pom.xml b/jetty-integrations/pom.xml index b04f3c472af..55f3b958751 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.3-SNAPSHOT - - 4.0.0 jetty-integrations - Integrations pom + Integrations jetty-gcloud diff --git a/pom.xml b/pom.xml index 6a47fc22629..ae80e43340b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,211 +5,16 @@ org.eclipse.jetty jetty-project 12.0.3-SNAPSHOT + pom Jetty :: Project The Eclipse Jetty Project - pom https://eclipse.dev/jetty 1995 - - - 17 - 17 - 17 - false - https://eclipse.dev/jetty/ - benchmarks - org.slf4j;version="[1.7,3.0)", org.slf4j.event;version="[1.7,3.0)", org.slf4j.helpers;version="[1.7,3.0)", org.slf4j.spi;version="[1.7,3.0)" - UTF-8 - false - - - true - same_thread - concurrent - fixed - 2 - false - - - 2.0.10 - 1.10.14 - 1.11.3 - 4.5.14 - 4.4.16 - 2.2.13 - 2.5.10 - 2.2.3 - 9.6 - 4.2.0 - 6.4.1 - 1.5 - 10.6.0 - 1.16.0 - 1.24.0 - 2.14.0 - 3.13.0 - 2.5.2 - 3.4.2 - 7.0.5 - 3.0.2 - 2.20.0 - 1.56.1 - 2.10.1 - 32.1.2-jre - 7.0.0 - 2.2 - 5.3.2 - 4.6.5.Final - 11.0.17.Final - 2.15.2 - 2.0.1 - 2.1.1 - 4.0.0 - 3.0.0 - 2.0.1 - 2.0.0 - 2.0.1 - 5.0.0 - 3.1.1 - 2.0.0 - 2.0.0 - 2.0.1 - 2.0.0 - 3.1.0 - 3.0.1 - 3.0.2 - 3.0.2 - 3.0.1 - 1.1.0.v201105071233 - 2.0 - 1.4.1.v201005082020 - 2.2.1.Final - 2.2.1.Final - 3.5.3.Final - 3.0.2.Final - 3.5.1.Final - 1.1 - 1.0.7 - 0.18.0 - 1.2 - 6.1 - 1.1 - 1.37 - 5.13.0 - 1.1.1 - 2.5.0 - 5.10.0 - 10.0.14 - 2.0.3 - 2.20.0 - 1.4.11 - 3.2.0 - 10.3.6 - 3.9.4 - 1.0.1 - 0.13.1 - 1.9.16 - 3.9.0 - 3.12.11 - 4.1.97.Final - 0.9.1 - 8.1.0 - 8.0.0 - 1.2.0 - 1.3.0 - - 3.18.500 - - 3.11.100 - 1.6.1 - 1.5.1 - 1.4.1 - 3.7.200 - 1.2.0 - 1.0.2 - 1.0.1 - 1.5.4 - 1.0.2 - 1.0.0-v20070606 - 4.13.5 - 2.6.14 - 1.8.3 - 3.0.0 - 1.2 - - 2.1.1 - 4.0.0 - 4.0.2 - 2.0.9 - 1.3.6 - 1.2.5 - 1.2.5 - 1.19.0 - 1.6.0.Final - 2.2.2.Final - 2.4.7 - - - 2.2.4 - 3.3.0 - 3.2.0 - 1.5.0 - 1.3.0 - 4.0.6 - 1.0.10 - 0.8.10 - 2.7 - 4.1 - 3.1.0 - 3.6.0 - 5.1.9 - 3.3.1 - 3.3.0 - 3.11.0 - 3.6.0 - 3.1.1 - 3.4.1 - 3.1.0 - 3.1.0 - 3.1.1 - 3.6.0 - 4.0.6 - 3.3.0 - 3.6.0 - 3.9.0 - 3.9.0 - 3.0.1 - 3.1.0 - 3.3.1 - 3.5.1 - 3.1.2 - 3.3.0 - 3.4.0 - 4.7.3.5 - 2.14.2 - - - false - false - ${project.build.directory}/local-repo - jetty-home.zip - ${project.build.directory}/${jettyHomeZipFileName} - -Dfile.encoding=UTF-8 -Duser.language=en -Duser.region=US -Djava.io.tmpdir=${project.build.directory} -showversion -Xmx6g -Xms4g -Xlog:gc:stderr:time,level,tags - true - /tmp - - 3.2.20 - src/it/settings.xml - 0 - - - 11.0.14.Final - false - 2023-06-05T23:12:49Z - false - + + Webtide + https://webtide.com + @@ -222,335 +27,1261 @@ + + + gregw + Greg Wilkins + gregw@webtide.com + Webtide, LLC + https://webtide.com + 10 + + + janb + Jan Bartel + janb@webtide.com + Webtide, LLC + https://webtide.com + 10 + + + jesse + Jesse McConnell + jesse.mcconnell@gmail.com + Webtide, LLC + https://webtide.com + -6 + + + joakime + Joakim Erdfelt + joakim.erdfelt@gmail.com + Webtide, LLC + https://webtide.com + -6 + + + sbordet + Simone Bordet + simone.bordet@gmail.com + Webtide, LLC + https://webtide.com + 1 + + + djencks + David Jencks + david.a.jencks@gmail.com + IBM + -8 + + + olamy + Olivier Lamy + oliver.lamy@gmail.com + Webtide, LLC + https://webtide.com + Australia/Brisbane + + + lorban + Ludovic Orban + lorban@bitronix.be + Webtide, LLC + https://webtide.com + 1 + + + + + + Jetty Developer Mailing List + https://accounts.eclipse.org/mailing-list/jetty-dev + https://www.eclipse.org/lists/jetty-dev/ + + + Jetty Users Mailing List + https://accounts.eclipse.org/mailing-list/jetty-users + https://www.eclipse.org/lists/jetty-users/ + + + Jetty Announce Mailing List + https://accounts.eclipse.org/mailing-list/jetty-announce + https://www.eclipse.org/lists/jetty-announce/ + + + + + build + + jetty-core + jetty-ee10 + jetty-ee9 + jetty-ee8 + jetty-home + jetty-integrations + tests + javadoc + documentation + + scm:git:https://github.com/eclipse/jetty.project.git scm:git:git@github.com:eclipse/jetty.project.git https://github.com/eclipse/jetty.project - - build - jetty-core - jetty-integrations - jetty-ee10 - jetty-ee9 - jetty-ee8 - jetty-home - tests - - documentation - javadoc - + + github + https://github.com/eclipse/jetty.project/issues + + + + + oss.sonatype.org + Jetty Staging Repository + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + oss.sonatype.org + Jetty Snapshot Repository + https://oss.sonatype.org/content/repositories/jetty-snapshots/ + + + + + + + 2.0.10 + 1.10.14 + 1.11.3 + 4.5.14 + 4.4.16 + + + 2.2.4 + false + 2.2.13 + 2.5.10 + 9.6 + 4.2.0 + 6.4.1 + 3.3.0 + 1.5 + 3.2.0 + 10.6.0 + 1.16.0 + 3.13.0 + 1.24.0 + 2.14.0 + 17 + + 17 + 17 + 2.5.2 + 1.5.0 + 3.4.2 + 1.0.0-v20070606 + 7.0.5 + 3.0.2 + 1.3.0 + 2.20.0 + 4.0.6 + 4.0.6 + 1.56.1 + 2.10.1 + 32.1.2-jre + 7.0.0 + 1.0.10 + 2.2 + 5.3.2 + + + 11.0.14.Final + 4.6.5.Final + 11.0.17.Final + 1.2 + + + false + false + 2.15.2 + 0.8.10 + 2.0.1 + 2.1.1 + 4.0.0 + 3.0.0 + 2.0.1 + 2.0.0 + 2.0.1 + 5.0.0 + 3.1.1 + 2.0.0 + 2.0.0 + + 2.0.1 + 2.0.0 + 3.1.0 + 3.0.1 + 3.0.2 + 3.0.2 + 3.0.1 + false + 1.1.0.v201105071233 + + 2.0 + + 1.4.1.v201005082020 + 3.0.2.Final + 3.5.1.Final + + 2.2.1.Final + 2.2.1.Final + 3.5.3.Final + 1.1 + 0.18.0 + 1.2 + 2.7 + 1.0.7 + -Dfile.encoding=UTF-8 -Duser.language=en -Duser.region=US -Djava.io.tmpdir=${project.build.directory} -showversion -Xmx6g -Xms4g -Xlog:gc:stderr:time,level,tags + 6.1 + true + /tmp + https://eclipse.dev/jetty/ + 1.1 + ${project.build.directory}/${jettyHomeZipFileName} + jetty-home.zip + 1.37 + benchmarks + 5.13.0 + 1.1.1 + 2.5.0 + 10.0.14 + 2 + fixed + + + true + concurrent + same_thread + false + 5.10.0 + 2.0.3 + 4.1 + ${project.build.directory}/local-repo + 2.20.0 + 1.4.11 + 10.3.6 + 3.2.0 + 0.13.1 + 1.0.1 + 3.9.0 + 3.1.0 + 3.6.0 + 5.1.9 + 3.3.0 + 3.3.1 + false + 3.11.0 + 3.6.0 + 3.1.1 + 3.9.4 + 3.4.1 + 3.1.0 + 3.1.0 + 3.1.1 + 3.6.0 + 3.3.0 + 3.6.0 + 3.9.0 + 3.0.1 + 3.1.0 + 1.9.16 + 3.3.1 + 3.5.1 + 3.3.0 + 3.1.2 + 3.9.0 + 3.4.0 + 2.2.3 + + 3.2.20 + 3.12.11 + 4.1.97.Final + 0.9.1 + 8.1.0 + 8.0.0 + 1.2.0 + 1.3.0 + 1.6.1 + 1.5.1 + 1.4.1 + + 3.11.100 + 1.2.0 + 1.0.2 + 1.0.1 + 1.5.4 + 3.7.200 + 1.0.2 + + 3.18.500 + org.slf4j;version="[1.7,3.0)", org.slf4j.event;version="[1.7,3.0)", org.slf4j.helpers;version="[1.7,3.0)", org.slf4j.spi;version="[1.7,3.0)" + 4.13.5 + 2.6.14 + + 2.1.1 + 4.0.0 + 4.0.2 + 2023-06-05T23:12:49Z + UTF-8 + src/it/settings.xml + 2.0.9 + 1.3.6 + 4.7.3.5 + false + 0 + 1.8.3 + 1.2.5 + 1.2.5 + 1.19.0 + 3.0.0 + 2.14.2 + 1.6.0.Final + 2.2.2.Final + 2.4.7 + + + + + + com.fasterxml.jackson + jackson-bom + ${jackson.version} + pom + import + + + org.infinispan + infinispan-bom + ${infinispan.version} + pom + import + + + org.junit + junit-bom + ${junit.version} + pom + import + + + org.ow2.asm + asm-bom + ${asm.version} + pom + import + + + org.testcontainers + testcontainers-bom + ${testcontainers.version} + pom + import + + + biz.aQute.bnd + biz.aQute.bndlib + ${bndlib.version} + + + ch.qos.logback + logback-core + ${logback.version} + + + com.google.code.findbugs + jsr305 + ${findbugs.jsr305.version} + + + com.google.code.gson + gson + ${gson.version} + + + com.google.errorprone + error_prone_annotations + ${google.errorprone.version} + + + com.google.guava + guava + ${guava.version} + + + com.google.inject + guice + ${guice.version} + + + com.googlecode.json-simple + json-simple + ${json-simple.version} + + + com.hazelcast + hazelcast + ${hazelcast.version} + + + com.openpojo + openpojo + ${openpojo.version} + + + commons-codec + commons-codec + ${commons-codec.version} + + + io.grpc + grpc-core + ${grpc.version} + + + io.netty + netty-handler + ${netty.version} + + + net.java.dev.jna + jna + ${jna.version} + + + net.java.dev.jna + jna-jpms + ${jna.version} + + + net.minidev + json-smart + ${json-smart.version} + + + org.apache.ant + ant + ${ant.version} + + + org.apache.ant + ant-launcher + ${ant.version} + + + org.apache.aries.spifly + org.apache.aries.spifly.dynamic.bundle + ${spifly.version} + + + org.apache.avro + avro + ${apache.avro.version} + + + org.apache.commons + commons-compress + ${commons.compress.version} + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + + + org.apache.felix + org.apache.felix.framework + ${felix.version} + + + org.apache.geronimo.specs + geronimo-atinject_1.0_spec + ${injection.bundle.version} + + + org.apache.kerby + kerb-simplekdc + ${kerb-simplekdc.version} + + + org.apache.logging.log4j + log4j-api + ${log4j2.version} + + + org.apache.maven + maven-artifact + ${maven.deps.version} + + + org.apache.maven + maven-core + ${maven.deps.version} + + + com.google.code.findbugs + jsr305 + + + javax.inject + javax.inject + + + + + org.apache.maven + maven-model + ${maven.deps.version} + + + org.apache.maven + maven-plugin-api + ${maven.deps.version} + + + javax.enterprise + cdi-api + + + + + org.apache.maven + maven-resolver-provider + ${maven.deps.version} + + + javax.inject + javax.inject + + + + + org.apache.maven + maven-settings + ${maven.deps.version} + + + org.apache.maven.plugin-tools + maven-plugin-tools-api + ${maven.plugin-tools.version} + + + org.asciidoctor + asciidoctor-maven-plugin + ${asciidoctor.maven.plugin.version} + + + org.asciidoctor + asciidoctorj + ${asciidoctorj.version} + + + org.awaitility + awaitility + ${awaitility.version} + + + org.codehaus.plexus + plexus-component-annotations + ${plexus-component-annotations.version} + + + org.codehaus.plexus + plexus-utils + ${plexus-utils.version} + + + org.codehaus.plexus + plexus-xml + ${plexus-xml.version} + + + org.conscrypt + conscrypt-openjdk-uber + ${conscrypt.version} + + + org.eclipse.equinox.http + servlet + ${equinox-http-servlet-version} + + + org.eclipse.jetty + jetty-alpn-client + ${project.version} + + + org.eclipse.jetty + jetty-alpn-conscrypt-client + ${project.version} + + + org.eclipse.jetty + jetty-alpn-conscrypt-server + ${project.version} + + + org.eclipse.jetty + jetty-alpn-java-client + ${project.version} + + + org.eclipse.jetty + jetty-alpn-java-server + ${project.version} + + + org.eclipse.jetty + jetty-alpn-server + ${project.version} + + + org.eclipse.jetty + jetty-client + ${project.version} + + + org.eclipse.jetty + jetty-deploy + ${project.version} + + + org.eclipse.jetty + jetty-ee + ${project.version} + + + org.eclipse.jetty + jetty-hazelcast + ${project.version} + + + org.eclipse.jetty + jetty-home + ${project.version} + zip + + + org.eclipse.jetty + jetty-http + ${project.version} + + + org.eclipse.jetty + jetty-http-spi + ${project.version} + + + org.eclipse.jetty + jetty-http-tools + ${project.version} + + + org.eclipse.jetty + jetty-infinispan-common + ${project.version} + + + org.eclipse.jetty + jetty-infinispan-embedded + ${project.version} + config + + + org.eclipse.jetty + jetty-infinispan-embedded-query + ${project.version} + + + org.eclipse.jetty + jetty-infinispan-remote + ${project.version} + config + + + org.eclipse.jetty + jetty-infinispan-remote-query + ${project.version} + + + org.eclipse.jetty + jetty-io + ${project.version} + + + org.eclipse.jetty + jetty-jmx + ${project.version} + + + org.eclipse.jetty + jetty-jndi + ${project.version} + + + org.eclipse.jetty + jetty-keystore + ${project.version} + + + org.eclipse.jetty + jetty-nosql + ${project.version} + + + org.eclipse.jetty + jetty-openid + ${project.version} + + + org.eclipse.jetty + jetty-osgi + ${project.version} + + + org.eclipse.jetty + jetty-proxy + ${project.version} + + + org.eclipse.jetty + jetty-rewrite + ${project.version} + + + org.eclipse.jetty + jetty-security + ${project.version} + + + org.eclipse.jetty + jetty-server + ${project.version} + + + org.eclipse.jetty + jetty-session + ${project.version} + + + org.eclipse.jetty + jetty-slf4j-impl + ${project.version} + + + org.eclipse.jetty + jetty-start + ${project.version} + + + org.eclipse.jetty + jetty-unixdomain-server + ${project.version} + + + org.eclipse.jetty + jetty-util + ${project.version} + + + org.eclipse.jetty + jetty-util-ajax + ${project.version} + + + org.eclipse.jetty + jetty-xml + ${project.version} + + + org.eclipse.jetty.fcgi + jetty-fcgi-client + ${project.version} + + + org.eclipse.jetty.fcgi + jetty-fcgi-proxy + ${project.version} + + + org.eclipse.jetty.fcgi + jetty-fcgi-server + ${project.version} + + + org.eclipse.jetty.gcloud + jetty-gcloud-session-manager + ${project.version} + + + org.eclipse.jetty.http2 + jetty-http2-client + ${project.version} + + + org.eclipse.jetty.http2 + jetty-http2-client-transport + ${project.version} + + + org.eclipse.jetty.http2 + jetty-http2-common + ${project.version} + + + org.eclipse.jetty.http2 + jetty-http2-hpack + ${project.version} + + + org.eclipse.jetty.http2 + jetty-http2-server + ${project.version} + + + org.eclipse.jetty.http3 + jetty-http3-client + ${project.version} + + + org.eclipse.jetty.http3 + jetty-http3-client-transport + ${project.version} + + + org.eclipse.jetty.http3 + jetty-http3-common + ${project.version} + + + org.eclipse.jetty.http3 + jetty-http3-qpack + ${project.version} + + + org.eclipse.jetty.http3 + jetty-http3-server + ${project.version} + + + org.eclipse.jetty.memcached + jetty-memcached-sessions + ${project.version} + + + org.eclipse.jetty.osgi + jetty-httpservice + ${project.version} + + + org.eclipse.jetty.osgi + jetty-osgi-alpn + ${project.version} + + + org.eclipse.jetty.osgi + jetty-osgi-boot + ${project.version} + + + org.eclipse.jetty.osgi + jetty-osgi-boot-jsp + ${project.version} + + + org.eclipse.jetty.osgi + jetty-osgi-boot-warurl + ${project.version} + + + + org.eclipse.jetty.quic + jetty-quic-client + ${project.version} + + + org.eclipse.jetty.quic + jetty-quic-common + ${project.version} + + + org.eclipse.jetty.quic + jetty-quic-quiche-common + ${project.version} + + + org.eclipse.jetty.quic + jetty-quic-quiche-foreign-incubator + ${project.version} + + + org.eclipse.jetty.quic + jetty-quic-quiche-jna + ${project.version} + + + org.eclipse.jetty.quic + jetty-quic-server + ${project.version} + + + org.eclipse.jetty.tests + jetty-home-tester + ${project.version} + + + org.eclipse.jetty.tests + jetty-test-session-common + ${project.version} + + + org.eclipse.jetty.tests + test-distribution-common + ${project.version} + + + org.eclipse.jetty.toolchain + jetty-perf-helper + ${jetty.perf-helper.version} + + + org.eclipse.jetty.toolchain + jetty-test-helper + ${jetty.test.version} + + + org.eclipse.jetty.websocket + jetty-websocket-core-client + ${project.version} + + + org.eclipse.jetty.websocket + jetty-websocket-core-common + ${project.version} + + + org.eclipse.jetty.websocket + jetty-websocket-core-server + ${project.version} + + + org.eclipse.jetty.websocket + jetty-websocket-jetty-api + ${project.version} + + + org.eclipse.jetty.websocket + jetty-websocket-jetty-client + ${project.version} + + + org.eclipse.jetty.websocket + jetty-websocket-jetty-common + ${project.version} + + + org.eclipse.jetty.websocket + jetty-websocket-jetty-server + ${project.version} + + + + org.eclipse.platform + org.eclipse.osgi + ${osgi-version} + + + org.eclipse.platform + org.eclipse.osgi.services + ${osgi-services-version} + + + + jakarta.servlet + servlet-api + + + + org.apache.felix + org.osgi.foundation + + + + + org.eclipse.platform + org.eclipse.osgi.util + ${osgi-util-version} + + + org.hamcrest + hamcrest + ${hamcrest.version} + + + org.infinispan.protostream + protostream + ${infinispan.protostream.version} + + + org.infinispan.protostream + protostream-processor + ${infinispan.protostream.version} + + + org.jboss.logging + jboss-logging + ${jboss.logging.version} + + + org.jboss.logging + jboss-logging-annotations + ${jboss.logging.annotations.version} + + + org.jboss.logging + jboss-logging-processor + ${jboss.logging.processor.version} + + + org.jboss.logmanager + jboss-logmanager + ${jboss-logmanager.version} + + + org.jboss.threads + jboss-threads + ${jboss-threads.version} + + + org.mariadb.jdbc + mariadb-java-client + ${mariadb.version} + + + org.mortbay.jetty.quiche + jetty-quiche-native + ${jetty-quiche-native.version} + + + + + org.ops4j.pax.exam + pax-exam + ${pax.exam.version} + + + org.ops4j.pax.exam + pax-exam-container-forked + ${pax.exam.version} + + + org.ops4j.pax.exam + pax-exam-inject + ${pax.exam.version} + + + org.ops4j.pax.exam + pax-exam-junit4 + ${pax.exam.version} + + + org.ops4j.pax.exam + pax-exam-link-mvn + ${pax.exam.version} + + + org.ops4j.pax.swissbox + pax-swissbox-framework + ${swissbox.version} + + + org.ops4j.pax.swissbox + pax-swissbox-tracker + ${swissbox.version} + + + org.ops4j.pax.tinybundles + tinybundles + ${tinybundles.version} + + + org.ops4j.pax.url + pax-url-aether + ${pax.url.version} + + + org.ops4j.pax.url + pax-url-wrap + ${pax.url.version} + + + + org.osgi + + org.osgi.core + ${org.osgi.core.version} + + + org.osgi + org.osgi.service.cm + ${osgi-service-cm-version} + + + org.osgi + org.osgi.service.component + ${osgi-service-component-version} + + + org.osgi + org.osgi.service.event + ${osgi-service-event-version} + + + org.osgi + org.osgi.util.function + ${org.osgi.util.function.version} + + + org.osgi + org.osgi.util.promise + ${org.osgi.util.promise.version} + + + org.osgi + org.osgi.util.tracker + ${osgi-util-tracker-version} + + + org.osgi + osgi.annotation + ${org.osgi.annotation.version} + + + org.osgi + + osgi.core + ${org.osgi.core.version} + + + org.slf4j + jcl104-over-slf4j + ${slf4j.version} + + + org.slf4j + jul-to-slf4j + ${slf4j.version} + + + org.slf4j + log4j-over-slf4j + ${slf4j.version} + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.slf4j + slf4j-simple + ${slf4j.version} + + + org.wildfly.security + wildfly-elytron + ${wildfly.elytron.version} + + + org.apache.maven.plugin-tools + maven-plugin-annotations + ${maven.plugin-tools.version} + provided + + + org.eclipse.jetty.toolchain + jetty-xhtml-schemas + ${jetty.xhtml.schemas-version} + test + + + org.osgi + org.osgi.util.measurement + ${osgi-util-measurement-version} + test + + + org.osgi + org.osgi.util.position + ${osgi-util-position-version} + test + + + org.osgi + org.osgi.util.xml + ${osgi-util-xml-version} + test + + + + + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + org.junit.jupiter + junit-jupiter + test + + - - - org.apache.maven.extensions - maven-build-cache-extension - ${maven-build-cache.version} - - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - ban-javax-servlet-api - - enforce - - validate - - - - - javax.servlet:* - servletapi - org.eclipse.jetty.orbit:javax.servlet - *:javax.servlet - org.mortbay.jetty:servlet-api - jetty:servlet-api - jetty-servlet-api - javax.websocket - javax.el:* - javax.annotation:javax.annotation-api - - true - - - - - - enforce-java - - enforce - - validate - - - - [3.9.2,) - [ERROR] OLD MAVEN [${maven.version}] in use, Jetty ${project.version} requires Maven 3.9.2 or newer - - - [17,) - [ERROR] OLD JDK [${java.version}] in use. Jetty ${project.version} requires JDK 17 or newer - - - - - - - - - - - - - org.eclipse.jetty.toolchain - jetty-build-support - ${build-support.version} - - - - - org.apache.maven.plugins - maven-source-plugin - true - - - attach-sources - package - - jar-no-fork - - - - - - org.jacoco - jacoco-maven-plugin - - - - **/org/eclipse/jetty/ant/** - - **/org/eclipse/jetty/embedded/** - **/org/eclipse/jetty/asyncrest/** - **/org/eclipse/jetty/demo/** - - **/org/eclipse/jetty/gcloud/** - **/org/eclipse/jetty/infinispan/** - **/org/eclipse/jetty/osgi/** - **/org/eclipse/jetty/spring/** - **/org/eclipse/jetty/http/spi/** - - **/org/eclipse/jetty/tests/** - **/org/eclipse/jetty/test/** - - - - - jacoco-initialize - initialize - - prepare-agent - - - - jacoco-setup-m-invoker-p - initialize - - - invoker.mavenOpts - - - prepare-agent - - - - jacoco-site - package - - report - - - - - **/org/eclipse/jetty/** - - - - - - - org.apache.maven.plugins - maven-release-plugin - - true - false - deploy - -Peclipse-release - clean install - forked-path - - - - org.apache.maven.plugins - maven-remote-resources-plugin - - - copy-shared-resources - generate-resources - - process - - - - org.eclipse.jetty:build-resources:${project.version} - - - - - - - com.mycila - license-maven-plugin - false - - true - true - true - - - - check-java-headers - verify - - check - - -
header-template.txt
- - DOUBLESLASH_STYLE - DOUBLESLASH_STYLE - - - **/*.java - **/*.adoc - - - - jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/AntWebAppContext.java - jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/types/Connectors.java - jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/types/ContextHandlers.java - jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/types/FileMatchingConfiguration.java - jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/types/LoginServices.java - jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/types/SystemProperties.java - jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/utils/ServerProxy.java - jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/utils/TaskLog.java - jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/AntWebXmlConfiguration.java - jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/JettyRunTask.java - jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/ServerProxyImpl.java - - jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/security/UnixCrypt.java - - jetty-home/src/main/resources/README.adoc - - - - - - - org.apache.felix - maven-bundle-plugin - - - process-classes - - manifest - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - set-osgi-version - validate - - parse-version - - - - - - org.eclipse.jetty.toolchain - jetty-version-maven-plugin - - - attach-version - process-resources - - attach-version-text - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - ${maven.checkstyle.plugin.version} - - jetty-checkstyle.xml - true - warning - true - - - ${project.build.sourceDirectory} - - - ${project.build.testSourceDirectory} - - - - - org.eclipse.jetty - build-resources - ${project.version} - - - com.puppycrawl.tools - checkstyle - ${checkstyle.version} - - - - - checkstyle-check - validate - - check - - - - - + + com.mycila + license-maven-plugin + ${license.maven.plugin.version} + + + org.apache.felix + maven-bundle-plugin + ${maven.bundle.plugin.version} + + + jar + maven-plugin + + + ${bundle-symbolic-name} + Jetty module for ${project.name} + ${jetty.url} + Eclipse Jetty Project + . + Copyright (c) 1995 Mort Bay Consulting Pty Ltd and others. + ${osgi.slf4j.import.packages}, + * + <_provider-policy>]]> + <_consumer-policy>]]> + + + org.apache.maven.plugins maven-antrun-plugin @@ -621,6 +1352,11 @@ false + + org.apache.maven.plugins + maven-install-plugin + ${maven.install.plugin.version} + org.apache.maven.plugins maven-invoker-plugin @@ -650,11 +1386,6 @@ - - org.apache.maven.plugins - maven-install-plugin - ${maven.install.plugin.version} - org.apache.maven.plugins maven-jar-plugin @@ -757,12 +1488,11 @@ false ${surefire.rerunFailingTestsCount} 3600 - - @{argLine} ${jetty.surefire.argLine} - + @{argLine} ${jetty.surefire.argLine} false 1 - true + true + alphabetical @@ -774,14 +1504,12 @@ en_US.UTF-8 - - junit.jupiter.execution.parallel.enabled=${junit.jupiter.execution.parallel.enabled} + junit.jupiter.execution.parallel.enabled=${junit.jupiter.execution.parallel.enabled} junit.jupiter.execution.parallel.mode.default=${junit.jupiter.execution.parallel.mode.default} junit.jupiter.execution.parallel.mode.classes.default=${junit.jupiter.execution.parallel.mode.classes.default} junit.jupiter.execution.parallel.config.strategy=${junit.jupiter.execution.parallel.config.strategy} junit.jupiter.execution.parallel.config.fixed.parallelism=${junit.jupiter.execution.parallel.config.fixed.parallelism} - junit.jupiter.extensions.autodetection.enabled=${junit.jupiter.extensions.autodetection.enabled} - + junit.jupiter.extensions.autodetection.enabled=${junit.jupiter.extensions.autodetection.enabled} @@ -797,62 +1525,6 @@ maven-war-plugin ${maven.war.plugin.version} - - org.codehaus.mojo - flatten-maven-plugin - ${flatten.maven.plugin.version} - - ${project.build.directory} - flattened-pom.xml - bom - true - - remove - remove - remove - - - - - org.eclipse.jetty.toolchain - jetty-version-maven-plugin - ${jetty-version.maven.plugin.version} - - - org.jacoco - jacoco-maven-plugin - ${jacoco.maven.plugin.version} - - - com.mycila - license-maven-plugin - ${license.maven.plugin.version} - - - org.apache.felix - maven-bundle-plugin - ${maven.bundle.plugin.version} - - - jar - maven-plugin - - - ${bundle-symbolic-name} - Jetty module for ${project.name} - ${jetty.url} - Eclipse Jetty Project - . - Copyright (c) 1995 Mort Bay Consulting Pty Ltd and others. - - ${osgi.slf4j.import.packages}, - * - - <_provider-policy>]]> - <_consumer-policy>]]> - - - org.apache.servicemix.tooling depends-maven-plugin @@ -862,13 +1534,6 @@ org.asciidoctor asciidoctor-maven-plugin ${asciidoctor.maven.plugin.version} - - - org.asciidoctor - asciidoctorj-diagram - ${asciidoctorj-diagram.version} - - html5 @@ -886,13 +1551,20 @@ font + + + org.asciidoctor + asciidoctorj-diagram + ${asciidoctorj-diagram.version} + + index - generate-resources process-asciidoc + generate-resources src/main/asciidoc index.adoc @@ -917,9 +1589,20 @@ ${maven.exec.plugin.version} - org.mortbay.jetty - h2spec-maven-plugin - ${h2spec.maven.plugin.version} + org.codehaus.mojo + flatten-maven-plugin + ${flatten.maven.plugin.version} + + ${project.build.directory} + flattened-pom.xml + bom + true + + remove + remove + remove + + org.codehaus.mojo @@ -932,906 +1615,369 @@ true + + org.eclipse.jetty.toolchain + jetty-version-maven-plugin + ${jetty-version.maven.plugin.version} + + + org.jacoco + jacoco-maven-plugin + ${jacoco.maven.plugin.version} + + + org.mortbay.jetty + h2spec-maven-plugin + ${h2spec.maven.plugin.version} + - - - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - - - org.junit.jupiter - junit-jupiter - test - - - - - - - biz.aQute.bnd - biz.aQute.bndlib - ${bndlib.version} - - - ch.qos.logback - logback-core - ${logback.version} - - - com.google.code.findbugs - jsr305 - ${findbugs.jsr305.version} - - - com.google.errorprone - error_prone_annotations - ${google.errorprone.version} - - - com.google.code.gson - gson - ${gson.version} - - - com.google.guava - guava - ${guava.version} - - - com.google.inject - guice - ${guice.version} - - - com.googlecode.json-simple - json-simple - ${json-simple.version} - - - com.hazelcast - hazelcast - ${hazelcast.version} - - - com.openpojo - openpojo - ${openpojo.version} - - - commons-codec - commons-codec - ${commons-codec.version} - - - org.apache.commons - commons-compress - ${commons.compress.version} - - - org.apache.avro - avro - ${apache.avro.version} - - - io.grpc - grpc-core - ${grpc.version} - - - net.java.dev.jna - jna-jpms - ${jna.version} - - - net.java.dev.jna - jna - ${jna.version} - - - net.minidev - json-smart - ${json-smart.version} - - - org.apache.ant - ant - ${ant.version} - - - org.apache.ant - ant-launcher - ${ant.version} - - - org.apache.aries.spifly - org.apache.aries.spifly.dynamic.bundle - ${spifly.version} - - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - - + + + com.diffplug.spotless + spotless-maven-plugin + 2.39.0 + + + + pom.xml + + + 2 + + recommended_2008_06 + + true + + + + true + + scope,groupId,artifactId + + groupId,artifactId + + groupId,artifactId + + + + true + + + + + + check + + validate + + + + + com.mycila + license-maven-plugin + false + + true + true + true + + + + check-java-headers + + check + + verify + +
header-template.txt
+ + DOUBLESLASH_STYLE + DOUBLESLASH_STYLE + + + **/*.java + **/*.adoc + + + + jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/AntWebAppContext.java + jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/types/Connectors.java + jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/types/ContextHandlers.java + jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/types/FileMatchingConfiguration.java + jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/types/LoginServices.java + jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/types/SystemProperties.java + jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/utils/ServerProxy.java + jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/utils/TaskLog.java + jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/AntWebXmlConfiguration.java + jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/JettyRunTask.java + jetty-ee*/jetty-ee*-ant/src/main/java/org/eclipse/jetty/ee*/ant/ServerProxyImpl.java + + jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/security/UnixCrypt.java + + jetty-home/src/main/resources/README.adoc + + + + + + org.apache.felix - org.apache.felix.framework - ${felix.version} - - - org.apache.geronimo.specs - geronimo-atinject_1.0_spec - ${injection.bundle.version} - - - org.apache.kerby - kerb-simplekdc - ${kerb-simplekdc.version} - - - org.apache.logging.log4j - log4j-api - ${log4j2.version} - - - org.apache.maven - maven-artifact - ${maven.deps.version} - - - org.apache.maven - maven-core - ${maven.deps.version} - - - javax.inject - javax.inject - - - com.google.code.findbugs - jsr305 - - - - - org.apache.maven - maven-model - ${maven.deps.version} - - - org.apache.maven - maven-plugin-api - ${maven.deps.version} - - - javax.enterprise - cdi-api - - - - - org.apache.maven - maven-resolver-provider - ${maven.deps.version} - - - javax.inject - javax.inject - - - - - org.apache.maven - maven-settings - ${maven.deps.version} - - - org.apache.maven.plugin-tools - maven-plugin-annotations - ${maven.plugin-tools.version} - provided - - - org.apache.maven.plugin-tools - maven-plugin-tools-api - ${maven.plugin-tools.version} - - - io.netty - netty-handler - ${netty.version} - - - org.awaitility - awaitility - ${awaitility.version} - - - org.asciidoctor - asciidoctorj - ${asciidoctorj.version} - - - org.asciidoctor - asciidoctor-maven-plugin - ${asciidoctor.maven.plugin.version} - - - org.conscrypt - conscrypt-openjdk-uber - ${conscrypt.version} - - - org.codehaus.plexus - plexus-component-annotations - ${plexus-component-annotations.version} - - - org.codehaus.plexus - plexus-utils - ${plexus-utils.version} - - - org.codehaus.plexus - plexus-xml - ${plexus-xml.version} - - - org.eclipse.jetty - jetty-alpn-client - ${project.version} - - - org.eclipse.jetty - jetty-alpn-conscrypt-client - ${project.version} - - - org.eclipse.jetty - jetty-alpn-conscrypt-server - ${project.version} - - - org.eclipse.jetty - jetty-alpn-java-server - ${project.version} - - - org.eclipse.jetty - jetty-alpn-java-client - ${project.version} - - - org.eclipse.jetty - jetty-alpn-server - ${project.version} - - - org.eclipse.jetty - jetty-client - ${project.version} - - - org.eclipse.jetty - jetty-deploy - ${project.version} - - - org.eclipse.jetty - jetty-ee - ${project.version} - - - org.eclipse.jetty - jetty-hazelcast - ${project.version} - - - org.eclipse.jetty - jetty-home - ${project.version} - zip - - - org.eclipse.jetty.tests - jetty-home-tester - ${project.version} - - - org.eclipse.jetty - jetty-http - ${project.version} - - - org.eclipse.jetty - jetty-http-spi - ${project.version} - - - org.eclipse.jetty - jetty-infinispan-common - ${project.version} - - - org.eclipse.jetty - jetty-infinispan-embedded - config - ${project.version} - - - org.eclipse.jetty - jetty-infinispan-embedded-query - ${project.version} - - - org.eclipse.jetty - jetty-infinispan-remote - config - ${project.version} - - - org.eclipse.jetty - jetty-infinispan-remote-query - ${project.version} - - - org.eclipse.jetty - jetty-io - ${project.version} - - - org.eclipse.jetty - jetty-jmx - ${project.version} - - - org.eclipse.jetty - jetty-jndi - ${project.version} - - - org.eclipse.jetty - jetty-keystore - ${project.version} - - - org.eclipse.jetty - jetty-nosql - ${project.version} - - - org.eclipse.jetty - jetty-openid - ${project.version} - - - org.eclipse.jetty - jetty-osgi - ${project.version} - - - org.eclipse.jetty - jetty-proxy - ${project.version} - - - org.eclipse.jetty - jetty-rewrite - ${project.version} - - - org.eclipse.jetty - jetty-security - ${project.version} - - - org.eclipse.jetty - jetty-session - ${project.version} - - - org.eclipse.jetty - jetty-server - ${project.version} - - - org.eclipse.jetty - jetty-slf4j-impl - ${project.version} - - - org.eclipse.jetty - jetty-start - ${project.version} - - - org.eclipse.jetty - jetty-unixdomain-server - ${project.version} - - - org.eclipse.jetty - jetty-util - ${project.version} - - - org.eclipse.jetty - jetty-util-ajax - ${project.version} - - - org.eclipse.jetty - jetty-xml - ${project.version} - - - org.eclipse.jetty.fcgi - jetty-fcgi-client - ${project.version} - - - org.eclipse.jetty.fcgi - jetty-fcgi-server - ${project.version} - - - org.eclipse.jetty.fcgi - jetty-fcgi-proxy - ${project.version} - - - org.eclipse.jetty.gcloud - jetty-gcloud-session-manager - ${project.version} - - - org.eclipse.jetty.http2 - jetty-http2-client - ${project.version} - - - org.eclipse.jetty.http2 - jetty-http2-common - ${project.version} - - - org.eclipse.jetty.http2 - jetty-http2-hpack - ${project.version} - - - org.eclipse.jetty.http2 - jetty-http2-client-transport - ${project.version} - - - org.eclipse.jetty.http2 - jetty-http2-server - ${project.version} - - - org.eclipse.jetty.http3 - jetty-http3-client - ${project.version} - - - org.eclipse.jetty.http3 - jetty-http3-common - ${project.version} - - - org.eclipse.jetty.http3 - jetty-http3-qpack - ${project.version} - - - org.eclipse.jetty.http3 - jetty-http3-client-transport - ${project.version} - - - org.eclipse.jetty.http3 - jetty-http3-server - ${project.version} - - - org.eclipse.jetty.memcached - jetty-memcached-sessions - ${project.version} - - - org.eclipse.jetty.osgi - jetty-osgi-alpn - ${project.version} - - - org.eclipse.jetty.osgi - jetty-osgi-boot - ${project.version} - - - org.eclipse.jetty.osgi - jetty-osgi-boot-jsp - ${project.version} - - - org.eclipse.jetty.osgi - jetty-osgi-boot-warurl - ${project.version} - - - org.eclipse.jetty.osgi - jetty-httpservice - ${project.version} - - - - org.eclipse.jetty.quic - jetty-quic-client - ${project.version} - - - org.eclipse.jetty.quic - jetty-quic-common - ${project.version} - - - org.eclipse.jetty.quic - jetty-quic-quiche-common - ${project.version} - - - org.eclipse.jetty.quic - jetty-quic-quiche-jna - ${project.version} - - - org.eclipse.jetty.quic - jetty-quic-quiche-foreign-incubator - ${project.version} - - - org.eclipse.jetty.quic - jetty-quic-server - ${project.version} - - - org.eclipse.jetty - jetty-http-tools - ${project.version} - - - org.eclipse.jetty.tests - jetty-test-session-common - ${project.version} - - - org.eclipse.jetty.tests - test-distribution-common - ${project.version} - - - org.eclipse.jetty.websocket - jetty-websocket-core-client - ${project.version} - - - org.eclipse.jetty.websocket - jetty-websocket-core-common - ${project.version} - - - org.eclipse.jetty.websocket - jetty-websocket-core-server - ${project.version} - - - org.eclipse.jetty.websocket - jetty-websocket-jetty-api - ${project.version} - - - org.eclipse.jetty.websocket - jetty-websocket-jetty-common - ${project.version} - - - org.eclipse.jetty.websocket - jetty-websocket-jetty-client - ${project.version} - - - org.eclipse.jetty.websocket - jetty-websocket-jetty-server - ${project.version} - - + maven-bundle-plugin + + + + manifest + + process-classes + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + ${maven.checkstyle.plugin.version} + + jetty-checkstyle.xml + true + warning + true + + + ${project.build.sourceDirectory} + + + ${project.build.testSourceDirectory} + + + + + com.puppycrawl.tools + checkstyle + ${checkstyle.version} + + + org.eclipse.jetty + build-resources + ${project.version} + + + + + checkstyle-check + + check + + validate + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + org.eclipse.jetty.toolchain + jetty-build-support + ${build-support.version} + + + + + ban-javax-servlet-api + + enforce + + validate + + + + + javax.servlet:* + servletapi + org.eclipse.jetty.orbit:javax.servlet + *:javax.servlet + org.mortbay.jetty:servlet-api + jetty:servlet-api + jetty-servlet-api + javax.websocket + javax.el:* + javax.annotation:javax.annotation-api + + true + + + + + + enforce-java + + enforce + + validate + + + + [3.9.2,) + [ERROR] OLD MAVEN [${maven.version}] in use, Jetty ${project.version} requires Maven 3.9.2 or newer + + + [17,) + [ERROR] OLD JDK [${java.version}] in use. Jetty ${project.version} requires JDK 17 or newer + + + + + + + + + + + + + org.apache.maven.plugins + maven-release-plugin + + true + false + deploy + -Peclipse-release + clean install + forked-path + + + + org.apache.maven.plugins + maven-remote-resources-plugin + + + copy-shared-resources + + process + + generate-resources + + + org.eclipse.jetty:build-resources:${project.version} + + + + + + + org.apache.maven.plugins + maven-source-plugin + true + + + attach-sources + + jar-no-fork + + package + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + set-osgi-version + + parse-version + + validate + + + + org.eclipse.jetty.toolchain - jetty-perf-helper - ${jetty.perf-helper.version} - - - org.eclipse.jetty.toolchain - jetty-test-helper - ${jetty.test.version} - - - org.eclipse.jetty.toolchain - jetty-xhtml-schemas - ${jetty.xhtml.schemas-version} - test - - - org.eclipse.platform - org.eclipse.osgi.services - ${osgi-services-version} - - - - jakarta.servlet - servlet-api - - - - org.apache.felix - org.osgi.foundation - - - - - - org.eclipse.platform - org.eclipse.osgi - ${osgi-version} - - - org.eclipse.platform - org.eclipse.osgi.util - ${osgi-util-version} - - - org.osgi - org.osgi.service.cm - ${osgi-service-cm-version} - - - org.osgi - org.osgi.service.component - ${osgi-service-component-version} - - - org.osgi - org.osgi.service.event - ${osgi-service-event-version} - - - org.osgi - org.osgi.util.tracker - ${osgi-util-tracker-version} - - - org.osgi - org.osgi.util.measurement - ${osgi-util-measurement-version} - test - - - org.osgi - org.osgi.util.position - ${osgi-util-position-version} - test - - - org.osgi - org.osgi.util.xml - ${osgi-util-xml-version} - test - - - org.eclipse.equinox.http - servlet - ${equinox-http-servlet-version} - - - org.hamcrest - hamcrest - ${hamcrest.version} - - - org.infinispan - infinispan-bom - ${infinispan.version} - pom - import - - - org.infinispan.protostream - protostream - ${infinispan.protostream.version} - - - org.infinispan.protostream - protostream-processor - ${infinispan.protostream.version} - - - com.fasterxml.jackson - jackson-bom - ${jackson.version} - pom - import - - - org.jboss.logging - jboss-logging - ${jboss.logging.version} - - - org.jboss.logging - jboss-logging-annotations - ${jboss.logging.annotations.version} - - - org.jboss.logging - jboss-logging-processor - ${jboss.logging.processor.version} - - - org.jboss.logmanager - jboss-logmanager - ${jboss-logmanager.version} - - - org.jboss.threads - jboss-threads - ${jboss-threads.version} - - - org.wildfly.security - wildfly-elytron - ${wildfly.elytron.version} - - - org.junit - junit-bom - ${junit.version} - pom - import - - - org.mariadb.jdbc - mariadb-java-client - ${mariadb.version} - - - org.mortbay.jetty.quiche - jetty-quiche-native - ${jetty-quiche-native.version} - - - - - org.ops4j.pax.exam - pax-exam - ${pax.exam.version} - - - org.ops4j.pax.exam - pax-exam-inject - ${pax.exam.version} - - - org.ops4j.pax.exam - pax-exam-container-forked - ${pax.exam.version} - - - org.ops4j.pax.tinybundles - tinybundles - ${tinybundles.version} - - - org.ops4j.pax.swissbox - pax-swissbox-framework - ${swissbox.version} - - - org.ops4j.pax.swissbox - pax-swissbox-tracker - ${swissbox.version} - - - org.ops4j.pax.exam - pax-exam-junit4 - ${pax.exam.version} - - - org.ops4j.pax.exam - pax-exam-link-mvn - ${pax.exam.version} - - - org.ops4j.pax.url - pax-url-aether - ${pax.url.version} - - - org.ops4j.pax.url - pax-url-wrap - ${pax.url.version} - - - - org.osgi - - org.osgi.core - ${org.osgi.core.version} - - - org.osgi - - osgi.core - ${org.osgi.core.version} - - - org.osgi - osgi.annotation - ${org.osgi.annotation.version} - - - org.osgi - org.osgi.util.function - ${org.osgi.util.function.version} - - - org.osgi - org.osgi.util.promise - ${org.osgi.util.promise.version} - - - org.ow2.asm - asm-bom - ${asm.version} - pom - import - - - org.slf4j - jcl104-over-slf4j - ${slf4j.version} - - - org.slf4j - jul-to-slf4j - ${slf4j.version} - - - org.slf4j - log4j-over-slf4j - ${slf4j.version} - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - slf4j-simple - ${slf4j.version} - - - org.testcontainers - testcontainers-bom - ${testcontainers.version} - pom - import - - - + jetty-version-maven-plugin + + + attach-version + + attach-version-text + + process-resources + + + + + org.jacoco + jacoco-maven-plugin + + + + **/org/eclipse/jetty/ant/** + + **/org/eclipse/jetty/embedded/** + **/org/eclipse/jetty/asyncrest/** + **/org/eclipse/jetty/demo/** + + **/org/eclipse/jetty/gcloud/** + **/org/eclipse/jetty/infinispan/** + **/org/eclipse/jetty/osgi/** + **/org/eclipse/jetty/spring/** + **/org/eclipse/jetty/http/spi/** + + **/org/eclipse/jetty/tests/** + **/org/eclipse/jetty/test/** + + + + + jacoco-initialize + + prepare-agent + + initialize + + + jacoco-setup-m-invoker-p + + prepare-agent + + initialize + + + invoker.mavenOpts + + + + jacoco-site + + report + + package + + + + **/org/eclipse/jetty/** + + + + + + + + + org.apache.maven.extensions + maven-build-cache-extension + ${maven-build-cache.version} + + + @@ -1883,16 +2029,34 @@ + + org.apache.maven.plugins + maven-assembly-plugin + + + config-assembly + + single + + package + + + config + + + + + org.apache.maven.plugins maven-resources-plugin copy-resources - process-resources copy-resources + process-resources UTF-8 false @@ -1913,24 +2077,6 @@ - - org.apache.maven.plugins - maven-assembly-plugin - - - config-assembly - package - - single - - - - config - - - - - @@ -1943,16 +2089,33 @@ + + org.apache.maven.plugins + maven-assembly-plugin + + + + single + + package + + + src/main/assembly/config.xml + + + + + org.apache.maven.plugins maven-resources-plugin copy-resources - process-resources copy-resources + process-resources UTF-8 false @@ -1973,23 +2136,6 @@ - - org.apache.maven.plugins - maven-assembly-plugin - - - package - - single - - - - src/main/assembly/config.xml - - - - - @@ -2009,6 +2155,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + true + + true + + maven-enforcer-plugin @@ -2029,9 +2183,23 @@ - true + org.apache.maven.plugins + maven-gpg-plugin + ${maven.gpg.plugin.version} + + + sign-artifacts + + sign + + verify + + + + org.apache.maven.plugins maven-javadoc-plugin + true attach-javadoc-jar @@ -2041,39 +2209,17 @@ - - true - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-gpg-plugin - ${maven.gpg.plugin.version} - - - sign-artifacts - verify - - sign - - - - org.codehaus.mojo exec-maven-plugin - false validate-dot exec validate + false dot @@ -2089,17 +2235,17 @@ ci - 0 - false - - Medium - - Default - false - org.eclipse.jetty.* + 120 https://repo.maven.apache.org/maven2/ - 120 + + Default + false + org.eclipse.jetty.* + false + + Medium + 0 @@ -2125,18 +2271,6 @@ - - org.apache.maven.plugins - maven-javadoc-plugin - - - package - - javadoc-no-fork - - - - com.github.spotbugs spotbugs-maven-plugin @@ -2158,6 +2292,18 @@ + + org.apache.maven.plugins + maven-javadoc-plugin + + + + javadoc-no-fork + + package + + + @@ -2171,11 +2317,11 @@ gen-versiontxt - generate-resources update-version-text tag + generate-resources true true @@ -2216,10 +2362,10 @@ root-report - validate dependency-updates-aggregate-report + validate html @@ -2280,6 +2426,15 @@ 1.4.2 + + + + false + + cbi-releases + https://repo.eclipse.org/content/repositories/cbi-releases/ + + @@ -2290,24 +2445,15 @@ sign - package sign + package - - - cbi-releases - https://repo.eclipse.org/content/repositories/cbi-releases/ - - false - - - snapshot-repositories @@ -2316,147 +2462,40 @@ + + false + + + true + jetty-snapshots jetty-snapshots https://oss.sonatype.org/content/repositories/jetty-snapshots - - true - + + false - - + + true + oss.snapshots OSS Snapshots https://oss.sonatype.org/content/repositories/snapshots - - false - - - true - fast - true true true true true + true true - - github - https://github.com/eclipse/jetty.project/issues - - - - - Jetty Developer Mailing List - https://www.eclipse.org/lists/jetty-dev/ - https://accounts.eclipse.org/mailing-list/jetty-dev - - - Jetty Users Mailing List - https://www.eclipse.org/lists/jetty-users/ - https://accounts.eclipse.org/mailing-list/jetty-users - - - Jetty Announce Mailing List - https://www.eclipse.org/lists/jetty-announce/ - https://accounts.eclipse.org/mailing-list/jetty-announce - - - - - - gregw - Greg Wilkins - gregw@webtide.com - Webtide, LLC - https://webtide.com - 10 - - - janb - Jan Bartel - janb@webtide.com - Webtide, LLC - https://webtide.com - 10 - - - jesse - Jesse McConnell - jesse.mcconnell@gmail.com - Webtide, LLC - https://webtide.com - -6 - - - joakime - Joakim Erdfelt - joakim.erdfelt@gmail.com - Webtide, LLC - https://webtide.com - -6 - - - sbordet - Simone Bordet - simone.bordet@gmail.com - Webtide, LLC - https://webtide.com - 1 - - - djencks - David Jencks - david.a.jencks@gmail.com - IBM - -8 - - - olamy - Olivier Lamy - oliver.lamy@gmail.com - Webtide, LLC - https://webtide.com - Australia/Brisbane - - - lorban - Ludovic Orban - lorban@bitronix.be - Webtide, LLC - https://webtide.com - 1 - - - - - Webtide - https://webtide.com - - - - - oss.sonatype.org - Jetty Staging Repository - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - oss.sonatype.org - Jetty Snapshot Repository - https://oss.sonatype.org/content/repositories/jetty-snapshots/ - - - diff --git a/tests/jetty-home-tester/pom.xml b/tests/jetty-home-tester/pom.xml index 35bdcf1e272..116f7934dca 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.3-SNAPSHOT - - 4.0.0 jetty-home-tester - Tests :: Home Tester jar + Tests :: Home Tester ${project.groupId}.hometester @@ -16,8 +17,9 @@ - org.slf4j - slf4j-api + jakarta.inject + jakarta.inject-api + 1.0.5 org.apache.maven @@ -28,20 +30,6 @@ org.apache.maven maven-resolver-provider - - jakarta.inject - jakarta.inject-api - 1.0.5 - - - org.apache.maven.resolver - maven-resolver-util - ${maven.resolver.version} - - - org.awaitility - awaitility - org.apache.maven.resolver maven-resolver-api @@ -49,12 +37,7 @@ org.apache.maven.resolver - maven-resolver-spi - ${maven.resolver.version} - - - org.apache.maven.resolver - maven-resolver-supplier + maven-resolver-connector-basic ${maven.resolver.version} @@ -71,7 +54,12 @@ org.apache.maven.resolver - maven-resolver-connector-basic + maven-resolver-spi + ${maven.resolver.version} + + + org.apache.maven.resolver + maven-resolver-supplier ${maven.resolver.version} @@ -85,15 +73,28 @@ ${maven.resolver.version} - org.junit.jupiter - junit-jupiter - compile + org.apache.maven.resolver + maven-resolver-util + ${maven.resolver.version} + + + org.awaitility + awaitility org.eclipse.jetty.toolchain jetty-test-helper compile + + org.junit.jupiter + junit-jupiter + compile + + + org.slf4j + slf4j-api + diff --git a/tests/jetty-jmh/pom.xml b/tests/jetty-jmh/pom.xml index f05747b00c7..3018962be1a 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.3-SNAPSHOT - - 4.0.0 jetty-jmh Tests :: JMH JMH Tests @@ -15,7 +16,67 @@ true + + + org.eclipse.jetty + jetty-client + + + org.eclipse.jetty + jetty-http + + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-util + + + org.eclipse.jetty.toolchain + jetty-test-helper + + + org.openjdk.jmh + jmh-core + ${jmh.version} + + + org.openjdk.jmh + jmh-generator-annprocess + ${jmh.version} + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + + + + Jetty Jmh Support Classes + + + + + + org.apache.felix @@ -30,10 +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 cbfb60586b9..98ac8692c18 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.3-SNAPSHOT - - 4.0.0 jetty-test-session-common - Tests :: Session Test Tools jar + Tests :: Session Test Tools ${project.groupId}.session.test.tools @@ -16,34 +17,81 @@ - org.slf4j - slf4j-api - - - org.junit.jupiter - junit-jupiter + com.hazelcast + hazelcast compile - - - org.testcontainers - testcontainers - compile - - - org.testcontainers - junit-jupiter - compile - - - org.testcontainers - mongodb true + + + org.eclipse.jetty + jetty-hazelcast compile + true + + + com.hazelcast + hazelcast + + + + + org.eclipse.jetty + jetty-infinispan-common + compile + true org.eclipse.jetty jetty-nosql + compile true + + + org.eclipse.jetty.gcloud + jetty-gcloud-session-manager + compile + true + + + org.eclipse.jetty.memcached + jetty-memcached-sessions + compile + true + + + org.eclipse.jetty.toolchain + jetty-test-helper + compile + true + + + org.hibernate + hibernate-search-engine + 5.10.7.Final + compile + true + + + org.infinispan + infinispan-client-hotrod + compile + true + + + org.infinispan + infinispan-core + compile + true + + + org.wildfly.common + wildfly-common + + + + + org.junit.jupiter + junit-jupiter compile @@ -53,82 +101,35 @@ compile - org.eclipse.jetty.memcached - jetty-memcached-sessions - true + org.slf4j + jul-to-slf4j compile - - - org.eclipse.jetty.toolchain - jetty-test-helper true - compile - - - org.hibernate - hibernate-search-engine - 5.10.7.Final - true - compile org.slf4j - jul-to-slf4j - true - compile - - - org.eclipse.jetty - jetty-infinispan-common - true - compile - - - org.infinispan - infinispan-core - true - compile - - - org.wildfly.common - wildfly-common - - - - - org.infinispan - infinispan-client-hotrod - true - compile - - - org.eclipse.jetty - jetty-hazelcast - true - compile - - - com.hazelcast - hazelcast - - - - - com.hazelcast - hazelcast - true - compile + slf4j-api org.testcontainers gcloud + compile true + + + org.testcontainers + junit-jupiter compile - org.eclipse.jetty.gcloud - jetty-gcloud-session-manager + org.testcontainers + mongodb + compile true + + + org.testcontainers + testcontainers compile diff --git a/tests/pom.xml b/tests/pom.xml index 6ba3a4ff033..2fcc6a904a4 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 158412b237f..3ddff1e54f0 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.3-SNAPSHOT - - 4.0.0 test-distribution - Tests :: Distribution pom + Tests :: Distribution + + + test-distribution-common + test-ee10-distribution + test-ee9-distribution + -1 @@ -16,49 +23,21 @@ INFO - - test-distribution-common - test-ee9-distribution - test-ee10-distribution - - - - org.eclipse.jetty.tests - jetty-home-tester - test - jakarta.inject jakarta.inject-api 1.0.5 - - org.eclipse.jetty - jetty-slf4j-impl - test - - - org.eclipse.jetty.tests - test-distribution-common - ${project.version} - - - org.eclipse.jetty.tests - test-distribution-common - ${project.version} - test-jar - test - org.apache.maven.resolver - maven-resolver-util + maven-resolver-api ${maven.resolver.version} org.apache.maven.resolver - maven-resolver-api + maven-resolver-connector-basic ${maven.resolver.version} @@ -77,11 +56,6 @@ maven-resolver-spi ${maven.resolver.version} - - org.apache.maven.resolver - maven-resolver-connector-basic - ${maven.resolver.version} - org.apache.maven.resolver maven-resolver-transport-file @@ -92,6 +66,33 @@ maven-resolver-transport-http ${maven.resolver.version} + + org.apache.maven.resolver + maven-resolver-util + ${maven.resolver.version} + + + org.eclipse.jetty.tests + test-distribution-common + ${project.version} + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.tests + jetty-home-tester + test + + + org.eclipse.jetty.tests + test-distribution-common + ${project.version} + test-jar + test + diff --git a/tests/test-distribution/test-distribution-common/pom.xml b/tests/test-distribution/test-distribution-common/pom.xml index 0f126c1e46f..2dcf49d3c5a 100644 --- a/tests/test-distribution/test-distribution-common/pom.xml +++ b/tests/test-distribution/test-distribution-common/pom.xml @@ -1,46 +1,23 @@ + + + 4.0.0 org.eclipse.jetty.tests test-distribution 12.0.3-SNAPSHOT - - 4.0.0 test-distribution-common - Tests :: Distribution :: Common jar + Tests :: Distribution :: Common - - 2 ${project.groupId}.tests.distribution.common + + 2 - - org.codehaus.plexus - plexus-xml - - - javax.annotation - javax.annotation-api - - - - - org.eclipse.jetty.tests - jetty-home-tester - ${project.version} - compile - - - org.eclipse.jetty - jetty-util - - - org.slf4j - slf4j-api - org.apache.maven maven-artifact @@ -51,11 +28,11 @@ org.apache.maven.resolver - maven-resolver-util + maven-resolver-api org.apache.maven.resolver - maven-resolver-api + maven-resolver-connector-basic org.apache.maven.resolver @@ -65,10 +42,6 @@ org.apache.maven.resolver maven-resolver-spi - - org.apache.maven.resolver - maven-resolver-connector-basic - org.apache.maven.resolver maven-resolver-transport-file @@ -77,9 +50,71 @@ org.apache.maven.resolver maven-resolver-transport-http + + org.apache.maven.resolver + maven-resolver-util + + + org.codehaus.plexus + plexus-xml + + + javax.annotation + javax.annotation-api + + + org.eclipse.jetty - jetty-util-ajax + jetty-util + + + org.eclipse.jetty.ee10 + jetty-ee10-test-badinit-webapp + ${project.version} + war + + + org.eclipse.jetty.ee9 + jetty-ee9-test-badinit-webapp + ${project.version} + war + + + org.eclipse.jetty.tests + jetty-home-tester + ${project.version} + compile + + + org.eclipse.jetty.toolchain + jetty-test-helper + + + org.eclipse.jetty.websocket + jetty-websocket-core-client + + + org.junit.jupiter + junit-jupiter + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty + jetty-infinispan-common + test + + + org.eclipse.jetty + jetty-infinispan-remote-query test @@ -90,7 +125,7 @@ org.eclipse.jetty - jetty-client + jetty-util-ajax test @@ -114,35 +149,8 @@ test - org.eclipse.jetty - jetty-infinispan-common - test - - - org.eclipse.jetty - jetty-infinispan-remote-query - test - - - org.eclipse.jetty.websocket - jetty-websocket-core-client - - - org.eclipse.jetty.toolchain - jetty-test-helper - - - org.junit.jupiter - junit-jupiter - - - org.testcontainers - testcontainers - test - - - org.testcontainers - mariadb + org.mariadb.jdbc + mariadb-java-client test @@ -150,6 +158,16 @@ gcloud test + + org.testcontainers + junit-jupiter + test + + + org.testcontainers + mariadb + test + org.testcontainers mongodb @@ -157,42 +175,25 @@ org.testcontainers - junit-jupiter + testcontainers test - - org.mariadb.jdbc - mariadb-java-client - test - - - org.eclipse.jetty.ee9 - jetty-ee9-test-badinit-webapp - ${project.version} - war - - - org.eclipse.jetty.ee10 - jetty-ee10-test-badinit-webapp - ${project.version} - war - - 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 c680c06e05f..a4c96fecbac 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.3-SNAPSHOT - - 4.0.0 test-ee10-distribution - Tests :: Distribution :: EE10 jar + Tests :: Distribution :: EE10 ${project.groupId}.ee10.distribution @@ -19,13 +20,13 @@ - - - - - - - + + + + + + + @@ -35,16 +36,29 @@ test-distribution-common - org.eclipse.jetty.tests - test-distribution-common - test-jar - test + org.eclipse.jetty.toolchain + jetty-test-helper + + + org.junit.jupiter + junit-jupiter org.slf4j slf4j-api + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty + jetty-openid + ${project.version} + test + org.eclipse.jetty @@ -52,31 +66,12 @@ ${project.version} test - - org.eclipse.jetty - jetty-client - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - - - org.junit.jupiter - junit-jupiter - org.eclipse.jetty.ee10 jetty-ee10-servlet ${project.version} test - - org.eclipse.jetty - jetty-openid - ${project.version} - test - org.eclipse.jetty.ee10 jetty-ee10-test-openid-webapp @@ -84,6 +79,12 @@ war test + + org.eclipse.jetty.tests + test-distribution-common + test-jar + test + diff --git a/tests/test-distribution/test-ee9-distribution/pom.xml b/tests/test-distribution/test-ee9-distribution/pom.xml index fc878234024..675e7f49c04 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.3-SNAPSHOT - - 4.0.0 test-ee9-distribution - Tests :: Distribution :: EE9 jar + Tests :: Distribution :: EE9 ${project.groupId}.ee9.distribution - + - - - - - - - + + + + + + + @@ -34,27 +35,6 @@ org.eclipse.jetty.tests test-distribution-common - - org.eclipse.jetty.tests - test-distribution-common - test-jar - test - - - org.slf4j - slf4j-api - - - org.eclipse.jetty - jetty-slf4j-impl - ${project.version} - test - - - org.eclipse.jetty - jetty-client - test - org.eclipse.jetty.toolchain jetty-test-helper @@ -64,8 +44,17 @@ junit-jupiter - org.eclipse.jetty.ee9 - jetty-ee9-servlet + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty + jetty-slf4j-impl ${project.version} test @@ -75,6 +64,12 @@ ${project.version} test + + org.eclipse.jetty.ee9 + jetty-ee9-servlet + ${project.version} + test + org.eclipse.jetty.ee9 jetty-ee9-test-openid-webapp @@ -82,6 +77,12 @@ war test + + org.eclipse.jetty.tests + test-distribution-common + test-jar + test + diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml index 43e0c298629..c03572783a4 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.3-SNAPSHOT - 4.0.0 test-integration jar Tests :: Integration @@ -16,11 +16,11 @@ org.eclipse.jetty - jetty-server + jetty-client org.eclipse.jetty - jetty-client + jetty-server org.slf4j