diff --git a/.gitignore b/.gitignore index 2a736b504b..7a9fffacc5 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,4 @@ bin *~ */.DS_Store /.DS_Store -.resolved_pom.xml \ No newline at end of file +.resolved-pom.xml \ No newline at end of file diff --git a/pax-web-features/pom.xml b/pax-web-features/pom.xml index 565056dc38..b6dfce271f 100644 --- a/pax-web-features/pom.xml +++ b/pax-web-features/pom.xml @@ -30,6 +30,7 @@ org.ops4j.pax.web pax-web-features pom + ${revision} OPS4J Pax Web - Features @@ -38,6 +39,9 @@ To use this feature enter the following in your Karaf shell - feature:install mvn:org.ops4j.pax.web/features/${upstream.version}/xml/features + + ${pax.web.features.tesb.version} + diff --git a/pax-web-features/src/main/resources/features.xml b/pax-web-features/src/main/resources/features.xml index c621b6bdea..276c47dc61 100644 --- a/pax-web-features/src/main/resources/features.xml +++ b/pax-web-features/src/main/resources/features.xml @@ -64,53 +64,53 @@ possible to install respective "pax-web-*-websockets" features to provide WebSockets (JSR 356) support --> - + mvn:jakarta.servlet/jakarta.servlet-api/${dependency.jakarta.servlet-api} mvn:org.ops4j.pax.web/pax-web-compatibility-servlet31/${upstream.version} - mvn:org.eclipse.jetty/jetty-client/${dependency.org.eclipse.jetty} - mvn:org.eclipse.jetty/jetty-util/${dependency.org.eclipse.jetty} - mvn:org.eclipse.jetty/jetty-util-ajax/${dependency.org.eclipse.jetty} - mvn:org.eclipse.jetty/jetty-io/${dependency.org.eclipse.jetty} - mvn:org.eclipse.jetty/jetty-http/${dependency.org.eclipse.jetty} - mvn:org.eclipse.jetty/jetty-xml/${dependency.org.eclipse.jetty} - mvn:org.eclipse.jetty/jetty-server/${dependency.org.eclipse.jetty} - mvn:org.eclipse.jetty/jetty-servlet/${dependency.org.eclipse.jetty} - mvn:org.eclipse.jetty/jetty-servlets/${dependency.org.eclipse.jetty} - mvn:org.eclipse.jetty/jetty-security/${dependency.org.eclipse.jetty} - mvn:org.eclipse.jetty/jetty-continuation/${dependency.org.eclipse.jetty} - mvn:org.eclipse.jetty/jetty-jmx/${dependency.org.eclipse.jetty} - mvn:org.eclipse.jetty/jetty-jaas/${dependency.org.eclipse.jetty} + mvn:org.eclipse.jetty/jetty-client/${dependency.jetty.tesb.version} + mvn:org.eclipse.jetty/jetty-util/${dependency.jetty.tesb.version} + mvn:org.eclipse.jetty/jetty-util-ajax/${dependency.jetty.tesb.version} + mvn:org.eclipse.jetty/jetty-io/${dependency.jetty.tesb.version} + mvn:org.eclipse.jetty/jetty-http/${dependency.jetty.tesb.version} + mvn:org.eclipse.jetty/jetty-xml/${dependency.jetty.tesb.version} + mvn:org.eclipse.jetty/jetty-server/${dependency.jetty.tesb.version} + mvn:org.eclipse.jetty/jetty-servlet/${dependency.jetty.tesb.version} + mvn:org.eclipse.jetty/jetty-servlets/${dependency.jetty.tesb.version} + mvn:org.eclipse.jetty/jetty-security/${dependency.jetty.tesb.version} + mvn:org.eclipse.jetty/jetty-continuation/${dependency.jetty.tesb.version} + mvn:org.eclipse.jetty/jetty-jmx/${dependency.jetty.tesb.version} + mvn:org.eclipse.jetty/jetty-jaas/${dependency.jetty.tesb.version} - + pax-web-jetty spifly - mvn:org.eclipse.jetty/jetty-rewrite/${dependency.org.eclipse.jetty} - - - mvn:org.eclipse.jetty/jetty-openid/${dependency.org.eclipse.jetty} - mvn:org.eclipse.jetty/jetty-proxy/${dependency.org.eclipse.jetty} + mvn:org.eclipse.jetty/jetty-rewrite/${dependency.jetty.tesb.version} + + + mvn:org.eclipse.jetty/jetty-openid/${dependency.jetty.tesb.version} + mvn:org.eclipse.jetty/jetty-proxy/${dependency.jetty.tesb.version} - + pax-web-websockets pax-web-jetty - mvn:org.eclipse.jetty/jetty-client/${dependency.org.eclipse.jetty} - mvn:org.eclipse.jetty.websocket/javax-websocket-client-impl/${dependency.org.eclipse.jetty} - mvn:org.eclipse.jetty.websocket/javax-websocket-server-impl/${dependency.org.eclipse.jetty} - mvn:org.eclipse.jetty.websocket/websocket-api/${dependency.org.eclipse.jetty} - mvn:org.eclipse.jetty.websocket/websocket-common/${dependency.org.eclipse.jetty} - mvn:org.eclipse.jetty.websocket/websocket-client/${dependency.org.eclipse.jetty} - mvn:org.eclipse.jetty.websocket/websocket-server/${dependency.org.eclipse.jetty} - mvn:org.eclipse.jetty.websocket/websocket-servlet/${dependency.org.eclipse.jetty} + mvn:org.eclipse.jetty/jetty-client/${dependency.jetty.tesb.version} + mvn:org.eclipse.jetty.websocket/javax-websocket-client-impl/${dependency.jetty.tesb.version} + mvn:org.eclipse.jetty.websocket/javax-websocket-server-impl/${dependency.jetty.tesb.version} + mvn:org.eclipse.jetty.websocket/websocket-api/${dependency.jetty.tesb.version} + mvn:org.eclipse.jetty.websocket/websocket-common/${dependency.jetty.tesb.version} + mvn:org.eclipse.jetty.websocket/websocket-client/${dependency.jetty.tesb.version} + mvn:org.eclipse.jetty.websocket/websocket-server/${dependency.jetty.tesb.version} + mvn:org.eclipse.jetty.websocket/websocket-servlet/${dependency.jetty.tesb.version} - +
Before JDK 8u252 org.eclipse.jetty.alpn.ALPN from org.eclipse.jetty.alpn:alpn-api:1.1.3.v20160715 had to be present on boot classpath. It's no longer needed and on newer JDK 8 versions it's enough to @@ -123,39 +123,39 @@
pax-web-jetty - mvn:org.eclipse.jetty.http2/http2-hpack/${dependency.org.eclipse.jetty} - mvn:org.eclipse.jetty.http2/http2-common/${dependency.org.eclipse.jetty} - mvn:org.eclipse.jetty.http2/http2-server/${dependency.org.eclipse.jetty} + mvn:org.eclipse.jetty.http2/http2-hpack/${dependency.jetty.tesb.version} + mvn:org.eclipse.jetty.http2/http2-common/${dependency.jetty.tesb.version} + mvn:org.eclipse.jetty.http2/http2-server/${dependency.jetty.tesb.version}
- + pax-web-jetty - mvn:org.eclipse.jetty/jetty-alpn-client/${dependency.org.eclipse.jetty} - mvn:org.eclipse.jetty.http2/http2-hpack/${dependency.org.eclipse.jetty} - mvn:org.eclipse.jetty.http2/http2-common/${dependency.org.eclipse.jetty} - mvn:org.eclipse.jetty.http2/http2-client/${dependency.org.eclipse.jetty} - mvn:org.eclipse.jetty.http2/http2-http-client-transport/${dependency.org.eclipse.jetty} + mvn:org.eclipse.jetty/jetty-alpn-client/${dependency.jetty.tesb.version} + mvn:org.eclipse.jetty.http2/http2-hpack/${dependency.jetty.tesb.version} + mvn:org.eclipse.jetty.http2/http2-common/${dependency.jetty.tesb.version} + mvn:org.eclipse.jetty.http2/http2-client/${dependency.jetty.tesb.version} + mvn:org.eclipse.jetty.http2/http2-http-client-transport/${dependency.jetty.tesb.version} - + pax-web-jetty - mvn:org.eclipse.jetty.alpn/alpn-api/${dependency.org.eclipse.jetty.alpn} - mvn:org.eclipse.jetty/jetty-alpn-client/${dependency.org.eclipse.jetty} - mvn:org.eclipse.jetty/jetty-alpn-server/${dependency.org.eclipse.jetty} - mvn:org.eclipse.jetty/jetty-alpn-openjdk8-client/${dependency.org.eclipse.jetty} - mvn:org.eclipse.jetty/jetty-alpn-openjdk8-server/${dependency.org.eclipse.jetty} + mvn:org.eclipse.jetty.alpn/alpn-api/${dependency.jetty.tesb.version.alpn} + mvn:org.eclipse.jetty/jetty-alpn-client/${dependency.jetty.tesb.version} + mvn:org.eclipse.jetty/jetty-alpn-server/${dependency.jetty.tesb.version} + mvn:org.eclipse.jetty/jetty-alpn-openjdk8-client/${dependency.jetty.tesb.version} + mvn:org.eclipse.jetty/jetty-alpn-openjdk8-server/${dependency.jetty.tesb.version} - + pax-web-jetty - mvn:org.eclipse.jetty.alpn/alpn-api/${dependency.org.eclipse.jetty.alpn} - mvn:org.eclipse.jetty/jetty-alpn-client/${dependency.org.eclipse.jetty} - mvn:org.eclipse.jetty/jetty-alpn-server/${dependency.org.eclipse.jetty} - mvn:org.eclipse.jetty/jetty-alpn-java-client/${dependency.org.eclipse.jetty} - mvn:org.eclipse.jetty/jetty-alpn-java-server/${dependency.org.eclipse.jetty} + mvn:org.eclipse.jetty.alpn/alpn-api/${dependency.jetty.tesb.version.alpn} + mvn:org.eclipse.jetty/jetty-alpn-client/${dependency.jetty.tesb.version} + mvn:org.eclipse.jetty/jetty-alpn-server/${dependency.jetty.tesb.version} + mvn:org.eclipse.jetty/jetty-alpn-java-client/${dependency.jetty.tesb.version} + mvn:org.eclipse.jetty/jetty-alpn-java-server/${dependency.jetty.tesb.version} diff --git a/pom.xml b/pom.xml index c51f1175a2..5ac2d7352a 100644 --- a/pom.xml +++ b/pom.xml @@ -101,6 +101,7 @@ 8.0.22 8.0.22.20231013 + 9.4.53.v20231009 UTF-8 UTF-8 @@ -166,6 +167,8 @@ + ${jetty.tesb.version} + 6.4.1 1.9.4