This is an automated email from the ASF dual-hosted git repository. paulrutter pushed a commit to branch feature/FELIX-6750-Jetty-12.1.0-tryout in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit dc8282d0a32848ab3aea329f62c6c0affac8529c Author: Paul Rütter <[email protected]> AuthorDate: Mon Jan 20 13:58:18 2025 +0100 FELIX-6750 Try out Jetty 12.1.0 in Felix HTTP - 1.1.0-SNAPSHOT - Use jetty 12.1.0-alpha1 - Add `org.eclipse.jetty.compression.*` to exports - Add dependency on jetty-compression-gzip (not sure if this is required, maybe only for the client) and jetty-compression-common --- http/jetty12/pom.xml | 17 +++++++++++++++-- .../felix/http/jetty/it/JakartaSpecificWebsocketIT.java | 2 ++ .../felix/http/jetty/it/JettySpecificWebsocketIT.java | 2 ++ .../http/jetty/it/JettyUriComplianceModeDefaultIT.java | 4 +++- .../felix/http/jetty/it/JettyVirtualThreadsIT.java | 4 +++- 5 files changed, 25 insertions(+), 4 deletions(-) diff --git a/http/jetty12/pom.xml b/http/jetty12/pom.xml index 756c339c91..5060e35327 100644 --- a/http/jetty12/pom.xml +++ b/http/jetty12/pom.xml @@ -30,7 +30,7 @@ <description>This is an implementation of the R8.1 OSGi Servlet Service, the R7 OSGi Http Service and the R7 OSGi Http Whiteboard Specification</description> <artifactId>org.apache.felix.http.jetty12</artifactId> - <version>1.0.20-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <packaging>bundle</packaging> <scm> @@ -42,7 +42,7 @@ <properties> <felix.java.version>17</felix.java.version> - <jetty.version>12.0.16</jetty.version> + <jetty.version>12.1.0.alpha1</jetty.version> <baseline.skip>true</baseline.skip> <org.ops4j.pax.exam.version>4.13.3</org.ops4j.pax.exam.version> <!-- To debug the pax process, override this with -D --> @@ -186,6 +186,7 @@ org.eclipse.jetty.ee.*, !org.eclipse.jetty.ee10.websocket.*, org.eclipse.jetty.ee10.servlet.*, + org.eclipse.jetty.compression.*, org.apache.felix.http.jetty, org.apache.felix.http.jakartawrappers, org.apache.felix.http.javaxwrappers @@ -377,6 +378,7 @@ !org.eclipse.jetty.ee10.websocket.jakarta.*, org.eclipse.jetty.ee10.websocket.*, org.eclipse.jetty.websocket.*, + org.eclipse.jetty.compression.*, org.apache.felix.http.jetty, org.apache.felix.http.jakartawrappers, org.apache.felix.http.javaxwrappers @@ -485,6 +487,7 @@ org.eclipse.jetty.ee10.websocket.jakarta.*, org.eclipse.jetty.ee10.servlet.*, org.eclipse.jetty.websocket.*, + org.eclipse.jetty.compression.*, org.apache.felix.http.jetty, org.apache.felix.http.jakartawrappers, org.apache.felix.http.javaxwrappers @@ -703,6 +706,16 @@ <artifactId>jetty-session</artifactId> <version>${jetty.version}</version> </dependency> + <dependency> + <groupId>org.eclipse.jetty.compression</groupId> + <artifactId>jetty-compression-gzip</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.compression</groupId> + <artifactId>jetty-compression-common</artifactId> + <version>${jetty.version}</version> + </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.service.servlet</artifactId> diff --git a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JakartaSpecificWebsocketIT.java b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JakartaSpecificWebsocketIT.java index 1c2ec9e613..bbb501577a 100644 --- a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JakartaSpecificWebsocketIT.java +++ b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JakartaSpecificWebsocketIT.java @@ -77,6 +77,8 @@ public class JakartaSpecificWebsocketIT extends AbstractJettyTestSupport { mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-client").version(jettyVersion), mavenBundle().groupId("org.eclipse.jetty.ee10").artifactId("jetty-ee10-webapp").version(jettyVersion), mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-ee").version(jettyVersion), + mavenBundle().groupId("org.eclipse.jetty.compression").artifactId("jetty-compression-gzip").version(jettyVersion), + mavenBundle().groupId("org.eclipse.jetty.compression").artifactId("jetty-compression-common").version(jettyVersion), mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("jetty-websocket-core-client").version(jettyVersion), mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("jetty-websocket-core-common").version(jettyVersion), mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("jetty-websocket-core-server").version(jettyVersion), diff --git a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettySpecificWebsocketIT.java b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettySpecificWebsocketIT.java index 63503f6e2b..eaeeab94bc 100644 --- a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettySpecificWebsocketIT.java +++ b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettySpecificWebsocketIT.java @@ -83,10 +83,12 @@ public class JettySpecificWebsocketIT extends AbstractJettyTestSupport { mavenBundle().groupId("org.eclipse.jetty.ee10.websocket").artifactId("jetty-ee10-websocket-jetty-server").version(jettyVersion), mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-xml").version(jettyVersion), mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-ee").version(jettyVersion), + mavenBundle().groupId("org.eclipse.jetty.compression").artifactId("jetty-compression-common").version(jettyVersion), // additional bundles for the client side mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-alpn-client").version(jettyVersion), mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-client").version(jettyVersion), + mavenBundle().groupId("org.eclipse.jetty.compression").artifactId("jetty-compression-gzip").version(jettyVersion), mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("jetty-websocket-core-client").version(jettyVersion), mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("jetty-websocket-jetty-client").version(jettyVersion) }; diff --git a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettyUriComplianceModeDefaultIT.java b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettyUriComplianceModeDefaultIT.java index b6595191e1..4e4ef4c847 100644 --- a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettyUriComplianceModeDefaultIT.java +++ b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettyUriComplianceModeDefaultIT.java @@ -63,10 +63,12 @@ public class JettyUriComplianceModeDefaultIT extends AbstractJettyTestSupport { mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-ee").version(jettyVersion), mavenBundle().groupId("org.eclipse.jetty.ee10").artifactId("jetty-ee10-servlet").version(jettyVersion), mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-xml").version(jettyVersion), + mavenBundle().groupId("org.eclipse.jetty.compression").artifactId("jetty-compression-common").version(jettyVersion), // additional bundles for the client side mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-alpn-client").version(jettyVersion), - mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-client").version(jettyVersion) + mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-client").version(jettyVersion), + mavenBundle().groupId("org.eclipse.jetty.compression").artifactId("jetty-compression-gzip").version(jettyVersion) }; } diff --git a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettyVirtualThreadsIT.java b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettyVirtualThreadsIT.java index e121116be3..65d664d242 100644 --- a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettyVirtualThreadsIT.java +++ b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettyVirtualThreadsIT.java @@ -64,10 +64,12 @@ public class JettyVirtualThreadsIT extends AbstractJettyTestSupport { mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-ee").version(jettyVersion), mavenBundle().groupId("org.eclipse.jetty.ee10").artifactId("jetty-ee10-servlet").version(jettyVersion), mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-xml").version(jettyVersion), + mavenBundle().groupId("org.eclipse.jetty.compression").artifactId("jetty-compression-common").version(jettyVersion), // additional bundles for the client side mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-alpn-client").version(jettyVersion), - mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-client").version(jettyVersion) + mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-client").version(jettyVersion), + mavenBundle().groupId("org.eclipse.jetty.compression").artifactId("jetty-compression-gzip").version(jettyVersion) }; }
