Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jetty-12.0.x' into fix/12.0.x/addserverclasses-ee9-gw

This commit is contained in:
gregw 2024-04-03 23:51:51 +02:00
parent 9e1b251372 ecb610aa5d
commit 627aaa3830
352 changed files with 1655 additions and 579 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.github/dependabot.yml vendored
View File

@ -204,6 +204,9 @@ updates:
patterns:
- "*"
ignore:
# Do not upgrade major versions of dependencies
- dependency-name: "*"
update-types: [ "version-update:semver-major" ]
# Restrict updates in this branch to jetty in the 9.4.x space
- dependency-name: "org.infinispan:*"
versions: [ ">=12" ]
@ -213,8 +216,16 @@ updates:
versions: [ ">=4" ]
- dependency-name: "org.jboss.weld.servlet:*"
versions: [ ">=4" ]
- dependency-name: "org.jboss.threads:jboss-threads"
versions: [ ">=3.6" ]
- dependency-name: "ch.qos.logback:*"
versions: [ ">=1.3" ]
- dependency-name: "org.asciidoctor:asciidoctor-maven-plugin"
versions: [ ">=3" ]
- dependency-name: "org.wildfly.common:*"
versions: [ ">=1.6" ]
- dependency-name: "org.wildfly.security:*"
versions: [ ">=2.3" ]
- dependency-name: "org.eclipse.platform:org.eclipse.osgi.services"
versions: [ ">=3.12" ]

31
VERSION.txt
View File

@ -1,4 +1,31 @@
jetty-12.0.8-SNAPSHOT
jetty-12.0.8 - 29 March 2024
+ 5857 Deprecate AbstractConnectionPool "callback" methods
+ 7647 Document org.eclipse.jetty.client.Socks4Proxy "secure" parameter
+ 10387 Fix or suppress javadoc warnings
+ 10805 Jetty response with an invalid HTTP2 packet if the client set the
hpack table size as 0
+ 11263 Using `jetty.version` override from jetty-start does not use version
for various environment libs.
+ 11411 Allow non existant resources to be obtained from Resource.resolve()
+ 11482 The StatisticsHandler doesn't count 2xx codes
+ 11495 Add UriCompliance rules that follow the HTTP / URI / Servlet specs for
illegal & suspicious characters
+ 11510 Occasional NPE in ClassMatcher.match() from
WebAppClassLoader.loadClass() usage
+ 11513 Perf regression in the HTTP parser caused by long look-ahead
+ 11527 Reduce ByteBuffer churning in HttpOutput
+ 11539 `Resource.copyTo(Resource)` has different behavior from Jetty 9/10/11
+ 11548 java.nio.file.ClosedFileSystemException on hot redeploy
+ 11553 Restore startWebapp() to WebAppContext
+ 11558 New tmp directory should be created on every `WebAppContext` start, if
not explicitly configured
+ 11563 HttpClient InputStream.read() hangs intermittently before end of
response
+ 11567 DefaultServlet should resolve its resourceBase relative to the
ServletContextHandler resourceBase
+ 11572 Deploy behaves differently when both WAR and XML exist in
${jetty.base}/webapps/ and you update the XML vs updating the WAR.
+ 11574 shibboleth idp webapp under jetty 12.0.7
jetty-12.0.7 - 29 February 2024
+ 6140 Report total number of keys in SelectorManager
@ -29,7 +56,7 @@ jetty-12.0.7 - 29 February 2024
+ 11410 PathMappingsHandler does not start ResourceHandler properly
+ 11414 When producing URI/URL strings follow spec and produce lowercase
schemes and drop default ports
+ 11424 What is the `jetty.deploy.scanInterval` default? module, ini, code,
+ 11424 What is the `jetty.deploy.scanInterval` default? module, ini, code
and documentation do not agree.
+ 11432 Review number of acceptor threads
+ 11441 Quote escaping in HTML file

6
build/build-resources/pom.xml
View File

@ -8,7 +8,7 @@
-->
<groupId>org.eclipse.jetty</groupId>
<artifactId>build-resources</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Build :: Resources</name>
@ -17,8 +17,8 @@
<maven.deploy.skip>true</maven.deploy.skip>
<maven.javadoc.plugin.version>3.4.0</maven.javadoc.plugin.version>
<maven.javadoc.skip>true</maven.javadoc.skip>
<maven.remote-resources.plugin.version>3.1.0</maven.remote-resources.plugin.version>
<maven.surefire.plugin.version>3.2.3</maven.surefire.plugin.version>
<maven.remote-resources.plugin.version>3.2.0</maven.remote-resources.plugin.version>
<maven.surefire.plugin.version>3.2.5</maven.surefire.plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<skipTests>true</skipTests>
</properties>

2
build/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jetty.build</groupId>
<artifactId>build</artifactId>

24
build/scripts/dependency-update.sh Executable file
View File

@ -0,0 +1,24 @@
#!/usr/bin/env bash
echo "# This script is meant to be run from the root of the project"
echo "[jetty.project-12.0.x]$ build/scripts/dependency-update.sh"
PWD=$(pwd)
mvn -N -B -Pupdate-dependencies validate -Dmaven.build.cache.enabled=false
pushd jetty-core
mvn -N -B -Pupdate-dependencies-core validate -Dmaven.build.cache.enabled=false
popd
pushd jetty-ee10
mvn -N -B -Pupdate-dependencies-ee10 validate -Dmaven.build.cache.enabled=false
popd
pushd jetty-ee9
mvn -N -B -Pupdate-dependencies-ee9 validate -Dmaven.build.cache.enabled=false
popd
pushd jetty-ee8
mvn -N -B -Pupdate-dependencies-ee8 validate -Dmaven.build.cache.enabled=false
popd

2
documentation/jetty-asciidoctor-extensions/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.documentation</groupId>
<artifactId>documentation</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-asciidoctor-extensions</artifactId>
<packaging>jar</packaging>

2
documentation/jetty-documentation/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.documentation</groupId>
<artifactId>documentation</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-documentation</artifactId>
<packaging>pom</packaging>

2
documentation/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jetty.documentation</groupId>
<artifactId>documentation</artifactId>

3
javadoc/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>javadoc</artifactId>
<packaging>jar</packaging>
@ -34,7 +34,6 @@
</dependencyManagement>
<dependencies>
<!-- Necessary dependencies -->
<dependency>
<groupId>jakarta.mail</groupId>

2
jetty-core/jetty-alpn/jetty-alpn-client/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-alpn-client</artifactId>
<name>Core :: ALPN :: Client</name>

2
jetty-core/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-alpn-conscrypt-client</artifactId>
<name>Core :: ALPN :: Conscrypt Client</name>

5
jetty-core/jetty-alpn/jetty-alpn-conscrypt-client/src/test/java/org/eclipse/jetty/alpn/java/client/ConscryptHTTP2ClientTest.java
View File

@ -36,12 +36,11 @@ import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledOnOs;
import org.junit.jupiter.api.condition.DisabledOnOs;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.condition.OS.LINUX;
@EnabledOnOs({LINUX}) // TODO review if should be enabled on other OS
@DisabledOnOs(architectures = "aarch64", disabledReason = "Conscrypt does not provide aarch64 native libs as of version 2.5.2")
public class ConscryptHTTP2ClientTest
{
@Tag("external")

2
jetty-core/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-alpn-conscrypt-server</artifactId>
<name>Core :: ALPN :: Conscrypt Server</name>

2
jetty-core/jetty-alpn/jetty-alpn-conscrypt-server/src/test/java/org/eclipse/jetty/alpn/conscrypt/server/ConscryptHTTP2ServerTest.java
View File

@ -41,12 +41,14 @@ import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Test server that verifies that the Conscrypt ALPN mechanism works for both server and client side
*/
@DisabledOnOs(architectures = "aarch64", disabledReason = "Conscrypt does not provide aarch64 native libs as of version 2.5.2")
public class ConscryptHTTP2ServerTest
{
static

2
jetty-core/jetty-alpn/jetty-alpn-java-client/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-alpn-java-client</artifactId>
<name>Core :: ALPN :: Java Client</name>

2
jetty-core/jetty-alpn/jetty-alpn-java-server/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-alpn-java-server</artifactId>
<name>Core :: ALPN :: Java Server</name>

2
jetty-core/jetty-alpn/jetty-alpn-server/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-alpn-server</artifactId>
<name>Core :: ALPN :: Server</name>

2
jetty-core/jetty-alpn/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-core</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-alpn</artifactId>
<packaging>pom</packaging>

114
jetty-core/jetty-bom/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-core</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-bom</artifactId>
@ -18,282 +18,282 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-client</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-conscrypt-client</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-conscrypt-server</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-java-client</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-java-server</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-server</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-client</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-deploy</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http-spi</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http-tools</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jmx</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jndi</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-keystore</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-openid</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-osgi</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-plus</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-proxy</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-rewrite</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-session</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-slf4j-impl</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-start</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-unixdomain-server</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util-ajax</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-xml</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.demos</groupId>
<artifactId>jetty-demo-handler</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.fcgi</groupId>
<artifactId>jetty-fcgi-client</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.fcgi</groupId>
<artifactId>jetty-fcgi-proxy</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.fcgi</groupId>
<artifactId>jetty-fcgi-server</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>jetty-http2-client</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>jetty-http2-client-transport</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>jetty-http2-common</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>jetty-http2-hpack</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>jetty-http2-server</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http3</groupId>
<artifactId>jetty-http3-client</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http3</groupId>
<artifactId>jetty-http3-client-transport</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http3</groupId>
<artifactId>jetty-http3-common</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http3</groupId>
<artifactId>jetty-http3-qpack</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http3</groupId>
<artifactId>jetty-http3-server</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.quic</groupId>
<artifactId>jetty-quic-client</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.quic</groupId>
<artifactId>jetty-quic-common</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.quic</groupId>
<artifactId>jetty-quic-quiche-common</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.quic</groupId>
<artifactId>jetty-quic-quiche-foreign-incubator</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.quic</groupId>
<artifactId>jetty-quic-quiche-jna</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.quic</groupId>
<artifactId>jetty-quic-server</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>jetty-websocket-core-client</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>jetty-websocket-core-common</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>jetty-websocket-core-server</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>jetty-websocket-jetty-api</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>jetty-websocket-jetty-client</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>jetty-websocket-jetty-common</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>jetty-websocket-jetty-server</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>

2
jetty-core/jetty-client/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-core</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-client</artifactId>
<name>Core :: HTTP Client</name>

2
jetty-core/jetty-demos/jetty-demo-handler/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.jetty.demos</groupId>
<artifactId>jetty-demos</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-demo-handler</artifactId>
<name>Core :: Demo Handler</name>

2
jetty-core/jetty-demos/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-core</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jetty.demos</groupId>
<artifactId>jetty-demos</artifactId>

2
jetty-core/jetty-deploy/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-core</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-deploy</artifactId>
<name>Core :: Deployers</name>

2
jetty-core/jetty-fcgi/jetty-fcgi-client/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.fcgi</groupId>
<artifactId>jetty-fcgi</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-fcgi-client</artifactId>
<name>Core :: FastCGI :: Client</name>

2
jetty-core/jetty-fcgi/jetty-fcgi-proxy/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.fcgi</groupId>
<artifactId>jetty-fcgi</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-fcgi-proxy</artifactId>
<name>Core :: FastCGI :: Proxy</name>

2
jetty-core/jetty-fcgi/jetty-fcgi-server/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.fcgi</groupId>
<artifactId>jetty-fcgi</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-fcgi-server</artifactId>
<name>Core :: FastCGI :: Server</name>

2
jetty-core/jetty-fcgi/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-core</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jetty.fcgi</groupId>
<artifactId>jetty-fcgi</artifactId>

2
jetty-core/jetty-http-spi/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-core</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-http-spi</artifactId>
<name>Core :: HTTP SPI</name>

2
jetty-core/jetty-http-tools/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-core</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-http-tools</artifactId>
<name>Core :: HTTP Tools</name>

2
jetty-core/jetty-http/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-core</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-http</artifactId>
<name>Core :: HTTP</name>

2
jetty-core/jetty-http2/jetty-http2-client-transport/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>jetty-http2</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-http2-client-transport</artifactId>
<name>Core :: HTTP2 :: Client Transport</name>

2
jetty-core/jetty-http2/jetty-http2-client/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>jetty-http2</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-http2-client</artifactId>
<name>Core :: HTTP2 :: Client</name>

2
jetty-core/jetty-http2/jetty-http2-common/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>jetty-http2</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-http2-common</artifactId>
<name>Core :: HTTP2 :: Common</name>

2
jetty-core/jetty-http2/jetty-http2-hpack/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>jetty-http2</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-http2-hpack</artifactId>
<name>Core :: HTTP2 :: HPACK</name>

2
jetty-core/jetty-http2/jetty-http2-server/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>jetty-http2</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-http2-server</artifactId>
<name>Core :: HTTP2 :: Server</name>

2
jetty-core/jetty-http2/jetty-http2-tests/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>jetty-http2</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-http2-tests</artifactId>
<name>Core :: HTTP2 :: Tests</name>

2
jetty-core/jetty-http2/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-core</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>jetty-http2</artifactId>

2
jetty-core/jetty-http3/jetty-http3-client-transport/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.http3</groupId>
<artifactId>jetty-http3</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-http3-client-transport</artifactId>
<name>Core :: HTTP3 :: HTTP Client Transport</name>

2
jetty-core/jetty-http3/jetty-http3-client/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.http3</groupId>
<artifactId>jetty-http3</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-http3-client</artifactId>
<name>Core :: HTTP3 :: Client</name>

2
jetty-core/jetty-http3/jetty-http3-common/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.http3</groupId>
<artifactId>jetty-http3</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-http3-common</artifactId>
<name>Core :: HTTP3 :: Common</name>

2
jetty-core/jetty-http3/jetty-http3-qpack/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.http3</groupId>
<artifactId>jetty-http3</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-http3-qpack</artifactId>
<name>Core :: HTTP3 :: QPACK</name>

2
jetty-core/jetty-http3/jetty-http3-server/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.http3</groupId>
<artifactId>jetty-http3</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-http3-server</artifactId>
<name>Core :: HTTP3 :: Server</name>

2
jetty-core/jetty-http3/jetty-http3-tests/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.http3</groupId>
<artifactId>jetty-http3</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-http3-tests</artifactId>
<name>Core :: HTTP3 :: Tests</name>

2
jetty-core/jetty-http3/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-core</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jetty.http3</groupId>
<artifactId>jetty-http3</artifactId>

2
jetty-core/jetty-io/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-core</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-io</artifactId>
<name>Core :: IO</name>

2
jetty-core/jetty-jmx/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-core</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-jmx</artifactId>
<name>Core :: JMX</name>

2
jetty-core/jetty-jndi/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-core</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-jndi</artifactId>
<name>Core :: JNDI</name>

2
jetty-core/jetty-keystore/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-core</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-keystore</artifactId>
<packaging>jar</packaging>

2
jetty-core/jetty-openid/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-core</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-openid</artifactId>
<name>EE10 :: OpenID</name>

2
jetty-core/jetty-osgi/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-core</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-osgi</artifactId>
<name>Core :: OSGi</name>

2
jetty-core/jetty-plus/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-core</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-plus</artifactId>
<name>Core :: Plus</name>

2
jetty-core/jetty-proxy/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-core</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-proxy</artifactId>
<packaging>jar</packaging>

2
jetty-core/jetty-quic/jetty-quic-client/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.quic</groupId>
<artifactId>jetty-quic</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-quic-client</artifactId>
<name>Core :: QUIC :: Client</name>

2
jetty-core/jetty-quic/jetty-quic-common/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.quic</groupId>
<artifactId>jetty-quic</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-quic-common</artifactId>
<name>Core :: QUIC :: Common</name>

2
jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-common/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.quic</groupId>
<artifactId>jetty-quic-quiche</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-quic-quiche-common</artifactId>
<name>Core :: QUIC :: Quiche :: Common</name>

2
jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign-incubator/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.quic</groupId>
<artifactId>jetty-quic-quiche</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-quic-quiche-foreign-incubator</artifactId>
<name>Core :: QUIC :: Quiche :: Foreign (Java 17)</name>

2
jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.quic</groupId>
<artifactId>jetty-quic-quiche</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-quic-quiche-jna</artifactId>
<name>Core :: QUIC :: Quiche :: JNA Binding</name>

2
jetty-core/jetty-quic/jetty-quic-quiche/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.quic</groupId>
<artifactId>jetty-quic</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-quic-quiche</artifactId>
<packaging>pom</packaging>

2
jetty-core/jetty-quic/jetty-quic-server/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.quic</groupId>
<artifactId>jetty-quic</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-quic-server</artifactId>
<name>Core :: QUIC :: Server</name>

2
jetty-core/jetty-quic/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-core</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jetty.quic</groupId>
<artifactId>jetty-quic</artifactId>

2
jetty-core/jetty-rewrite/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-core</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-rewrite</artifactId>
<name>Core :: Rewrite</name>

2
jetty-core/jetty-security/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-core</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-security</artifactId>
<name>Core :: Security</name>

2
jetty-core/jetty-server/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-core</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-server</artifactId>
<name>Core :: Server</name>

24
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ErrorHandler.java
View File

@ -71,6 +71,7 @@ public class ErrorHandler implements Request.Handler
public static final HttpField ERROR_CACHE_CONTROL = new PreEncodedHttpField(HttpHeader.CACHE_CONTROL, "must-revalidate,no-cache,no-store");
boolean _showStacks = false;
boolean _showCauses = false;
boolean _showMessageInTitle = true;
String _defaultResponseMimeType = Type.TEXT_HTML.asString();
HttpField _cacheControl = new PreEncodedHttpField(HttpHeader.CACHE_CONTROL, "must-revalidate,no-cache,no-store");
@ -321,7 +322,7 @@ public class ErrorHandler implements Request.Handler
htmlRow(writer, "URI", uri);
htmlRow(writer, "STATUS", status);
htmlRow(writer, "MESSAGE", message);
while (cause != null)
while (_showCauses && cause != null)
{
htmlRow(writer, "CAUSED BY", cause);
cause = cause.getCause();
@ -354,7 +355,7 @@ public class ErrorHandler implements Request.Handler
writer.printf("URI: %s%n", request.getHttpURI());
writer.printf("STATUS: %s%n", code);
writer.printf("MESSAGE: %s%n", message);
while (cause != null)
while (_showCauses && cause != null)
{
writer.printf("CAUSED BY %s%n", cause);
if (showStacks)
@ -371,7 +372,7 @@ public class ErrorHandler implements Request.Handler
json.put("status", Integer.toString(code));
json.put("message", message);
int c = 0;
while (cause != null)
while (_showCauses && cause != null)
{
json.put("cause" + c++, cause.toString());
cause = cause.getCause();
@ -458,6 +459,23 @@ public class ErrorHandler implements Request.Handler
_showStacks = showStacks;
}
/**
* @return True if exception causes are shown in the error pages
*/
@ManagedAttribute("Whether the error page shows the exception causes")
public boolean isShowCauses()
{
return _showCauses;
}
/**
* @param showCauses True if exception causes are shown in the error pages
*/
public void setShowCauses(boolean showCauses)
{
_showCauses = showCauses;
}
@ManagedAttribute("Whether the error message is shown in the error page title")
public boolean isShowMessageInTitle()
{

76
jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/ErrorHandlerTest.java
View File

@ -481,6 +481,82 @@ public class ErrorHandlerTest
assertContent(response);
}
@Test
public void testContainsNoStacksByDefault() throws Exception
{
String rawResponse = connector.getResponse("""
GET /badmessage/444 HTTP/1.1
Host: Localhost
""");
HttpTester.Response response = HttpTester.parseResponse(rawResponse);
assertThat("Response status code", response.getStatus(), is(444));
assertThat("Response Content-Length", response.getField(HttpHeader.CONTENT_LENGTH).getIntValue(), greaterThan(0));
assertThat(response.getContent(), not(containsString("<h3>Caused by:</h3>")));
assertThat(response.getContent(), not(containsString("org.eclipse.jetty.server.ErrorHandlerTest$1.handle")));
}
@Test
public void testContainsStacksIfSpecified() throws Exception
{
ErrorHandler errorHandler = new ErrorHandler();
errorHandler.setShowStacks(true);
server.setErrorHandler(errorHandler);
String rawResponse = connector.getResponse("""
GET /badmessage/444 HTTP/1.1
Host: Localhost
""");
HttpTester.Response response = HttpTester.parseResponse(rawResponse);
assertThat("Response status code", response.getStatus(), is(444));
assertThat("Response Content-Length", response.getField(HttpHeader.CONTENT_LENGTH).getIntValue(), greaterThan(0));
assertThat(response.getContent(), containsString("<h3>Caused by:</h3>"));
assertThat(response.getContent(), containsString("org.eclipse.jetty.server.ErrorHandlerTest$1.handle"));
}
@Test
public void testContainsNoCausesByDefault() throws Exception
{
String rawResponse = connector.getResponse("""
GET /badmessage/444 HTTP/1.1
Host: Localhost
""");
HttpTester.Response response = HttpTester.parseResponse(rawResponse);
assertThat("Response status code", response.getStatus(), is(444));
assertThat("Response Content-Length", response.getField(HttpHeader.CONTENT_LENGTH).getIntValue(), greaterThan(0));
assertThat(response.getContent(), not(containsString("<th>CAUSED BY:</th>")));
assertThat(response.getContent(), not(containsString("<td>org.eclipse.jetty.http.BadMessageException: 444: null</td>")));
}
@Test
public void testContainsCausesIfSpecified() throws Exception
{
ErrorHandler errorHandler = new ErrorHandler();
errorHandler.setShowCauses(true);
server.setErrorHandler(errorHandler);
String rawResponse = connector.getResponse("""
GET /badmessage/444 HTTP/1.1
Host: Localhost
""");
HttpTester.Response response = HttpTester.parseResponse(rawResponse);
assertThat("Response status code", response.getStatus(), is(444));
assertThat("Response Content-Length", response.getField(HttpHeader.CONTENT_LENGTH).getIntValue(), greaterThan(0));
assertThat(response.getContent(), containsString("<th>CAUSED BY:</th>"));
assertThat(response.getContent(), containsString("<td>org.eclipse.jetty.http.BadMessageException: 444: null</td>"));
}
@Test
public void testNoBodyErrorHandler() throws Exception
{

20
jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/ServerHttpCookieTest.java
View File

@ -26,6 +26,8 @@ import org.eclipse.jetty.io.Content;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.Fields;
import org.eclipse.jetty.util.UrlEncoded;
import org.eclipse.jetty.util.component.LifeCycle;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
@ -58,7 +60,7 @@ public class ServerHttpCookieTest
_server.setHandler(new Handler.Abstract()
{
@Override
public boolean handle(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback)
{
Fields parameters = Request.extractQueryParameters(request);
Fields.Field setCookie = parameters.get("SetCookie");
@ -79,11 +81,17 @@ public class ServerHttpCookieTest
}
});
HttpConnectionFactory httpConnectionFactory = _connector.getConnectionFactory(HttpConnectionFactory.class);
httpConnectionFactory.setRecordHttpComplianceViolations(true);
_httpConfiguration = httpConnectionFactory.getHttpConfiguration();
_httpConfiguration.addComplianceViolationListener(new ComplianceViolation.LoggingListener());
_server.start();
}
@AfterEach
public void afterEach()
{
LifeCycle.stop(_server);
}
public static Stream<Arguments> requestCases()
{
return Stream.of(
@ -101,7 +109,7 @@ public class ServerHttpCookieTest
// multiple cookie tests
Arguments.of(RFC6265_STRICT, "Cookie: name=value; other=extra", 200, "Version=", List.of("[name=value]", "[other=extra]").toArray(new String[0])),
Arguments.of(RFC6265_STRICT, "Cookie: name=value, other=extra", 400, null, List.of("BadMessageException", "Comma cookie separator").toArray(new String[0])),
Arguments.of(RFC6265_STRICT, "Cookie: name=value, other=extra", 400, null, List.of("400", "Comma cookie separator").toArray(new String[0])),
Arguments.of(from("RFC6265_STRICT,COMMA_SEPARATOR,"), "Cookie: name=value, other=extra", 200, "Version=", List.of("[name=value]", "[other=extra]").toArray(new String[0])),
Arguments.of(RFC6265, "Cookie: name=value, other=extra", 200, "name=value", null),
Arguments.of(RFC6265_LEGACY, "Cookie: name=value, other=extra", 200, null, List.of("[name=value, other=extra]").toArray(new String[0])),
@ -110,13 +118,13 @@ public class ServerHttpCookieTest
Arguments.of(RFC2965_LEGACY, "Cookie: name=value, other=extra", 200, "Version=", List.of("[name=value]", "[other=extra]").toArray(new String[0])),
// white space
Arguments.of(RFC6265_STRICT, "Cookie: name =value", 400, null, List.of("BadMessageException", "Bad Cookie name").toArray(new String[0])),
Arguments.of(RFC6265_STRICT, "Cookie: name =value", 400, null, List.of("400", "Bad Cookie name").toArray(new String[0])),
Arguments.of(from("RFC6265,OPTIONAL_WHITE_SPACE"), "Cookie: name =value", 200, null, List.of("name=value").toArray(new String[0])),
// bad characters
Arguments.of(RFC6265_STRICT, "Cookie: name=va\\ue", 400, null, List.of("BadMessageException", "Bad Cookie value").toArray(new String[0])),
Arguments.of(RFC6265_STRICT, "Cookie: name=va\\ue", 400, null, List.of("400", "Bad Cookie value").toArray(new String[0])),
Arguments.of(RFC6265_STRICT, "Cookie: name=\"value\"", 200, "Version=", List.of("[name=value]").toArray(new String[0])),
Arguments.of(RFC6265_STRICT, "Cookie: name=\"value;other=extra\"", 400, null, List.of("BadMessageException", "Bad Cookie quoted value").toArray(new String[0])),
Arguments.of(RFC6265_STRICT, "Cookie: name=\"value;other=extra\"", 400, null, List.of("400", "Bad Cookie quoted value").toArray(new String[0])),
Arguments.of(RFC6265, "Cookie: name=\"value;other=extra\"", 200, "name=value", null),
Arguments.of(RFC6265_LEGACY, "Cookie: name=\"value;other=extra\"", 200, null, List.of("[name=value;other=extra]").toArray(new String[0])),
Arguments.of(RFC2965, "Cookie: name=\"value;other=extra\"", 200, null, List.of("[name=value;other=extra]").toArray(new String[0])),

2
jetty-core/jetty-session/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-core</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-session</artifactId>
<name>Core :: Sessions</name>

2
jetty-core/jetty-slf4j-impl/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-core</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-slf4j-impl</artifactId>
<name>Core :: SLF4J Implementation</name>

2
jetty-core/jetty-start/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-core</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-start</artifactId>
<name>Core :: Start</name>

2
jetty-core/jetty-tests/jetty-test-client-transports/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-tests</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-test-client-transports</artifactId>
<name>Core :: Tests :: Client Transports</name>

2
jetty-core/jetty-tests/jetty-test-jmx/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-tests</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-test-jmx</artifactId>
<name>Core :: Tests :: JMX</name>

2
jetty-core/jetty-tests/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-core</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-tests</artifactId>
<packaging>pom</packaging>

2
jetty-core/jetty-unixdomain-server/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-core</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-unixdomain-server</artifactId>
<name>Core :: Unix-Domain Sockets :: Server</name>

2
jetty-core/jetty-util-ajax/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-core</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-util-ajax</artifactId>
<name>Core :: Utilities :: JSON</name>

2
jetty-core/jetty-util/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-core</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-util</artifactId>
<name>Core :: Utilities</name>

2
jetty-core/jetty-websocket/jetty-websocket-core-client/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>jetty-websocket</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-websocket-core-client</artifactId>
<name>Core :: Websocket :: Client</name>

2
jetty-core/jetty-websocket/jetty-websocket-core-common/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>jetty-websocket</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-websocket-core-common</artifactId>
<name>Core :: Websocket :: Common</name>

2
jetty-core/jetty-websocket/jetty-websocket-core-server/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>jetty-websocket</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-websocket-core-server</artifactId>
<name>Core :: Websocket :: Server</name>

2
jetty-core/jetty-websocket/jetty-websocket-core-tests/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>jetty-websocket</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-websocket-core-tests</artifactId>
<name>Core :: Websocket :: Tests</name>

2
jetty-core/jetty-websocket/jetty-websocket-jetty-api/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>jetty-websocket</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-websocket-jetty-api</artifactId>
<name>Core :: Websocket :: Jetty API</name>

2
jetty-core/jetty-websocket/jetty-websocket-jetty-client/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>jetty-websocket</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-websocket-jetty-client</artifactId>
<name>Core :: Websocket :: Jetty Client</name>

2
jetty-core/jetty-websocket/jetty-websocket-jetty-common/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>jetty-websocket</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-websocket-jetty-common</artifactId>
<name>Core :: Websocket :: Jetty Common</name>

2
jetty-core/jetty-websocket/jetty-websocket-jetty-server/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>jetty-websocket</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-websocket-jetty-server</artifactId>
<name>Core :: Websocket :: Jetty Server</name>

2
jetty-core/jetty-websocket/jetty-websocket-jetty-tests/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>jetty-websocket</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-websocket-jetty-tests</artifactId>
<name>Core :: Websocket :: Jetty Tests</name>

2
jetty-core/jetty-websocket/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-core</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>jetty-websocket</artifactId>

2
jetty-core/jetty-xml/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-core</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-xml</artifactId>
<name>Core :: XML</name>

63
jetty-core/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-core</artifactId>
<packaging>pom</packaging>
@ -124,6 +124,67 @@
</plugins>
</build>
</profile>
<profile>
<!--
$ mvn -Pupdate-dependencies-core validate
-->
<id>update-dependencies-core</id>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<executions>
<execution>
<id>core-update</id>
<goals>
<goal>update-properties</goal>
</goals>
<phase>validate</phase>
<configuration>
<onlyProjectDependencies>true</onlyProjectDependencies>
<onlyUpgradable>true</onlyUpgradable>
<ruleSet>
<rules>
<rule>
<!-- ignore maven alpha/beta releases -->
<groupId>org.apache.maven</groupId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>.+-(alpha|beta).?[0-9]+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- ignore jetty core level version changes -->
<groupId>org.eclipse.jetty</groupId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>.+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<!-- ignore jetty nested level version changes -->
<groupId>org.eclipse.jetty.*</groupId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>.+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
</rules>
</ruleSet>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>

12
jetty-ee10/jetty-ee10-annotations/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-ee10-annotations</artifactId>
<name>EE10 :: Servlet Annotations</name>
@ -44,6 +44,16 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jakarta.interceptor</groupId>
<artifactId>jakarta.interceptor-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>

2
jetty-ee10/jetty-ee10-apache-jsp/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-ee10-apache-jsp</artifactId>
<name>EE10 :: Apache JSP</name>

54
jetty-ee10/jetty-ee10-bom/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-ee10-bom</artifactId>
@ -19,132 +19,132 @@
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-annotations</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-apache-jsp</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-cdi</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-fcgi-proxy</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-glassfish-jstl</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-jaspi</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-jndi</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-jspc-maven-plugin</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-maven-plugin</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-plus</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-proxy</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-quickstart</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-runner</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-servlet</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-servlets</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-webapp</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.osgi</groupId>
<artifactId>jetty-ee10-osgi-alpn</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.osgi</groupId>
<artifactId>jetty-ee10-osgi-boot</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.osgi</groupId>
<artifactId>jetty-ee10-osgi-boot-jsp</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.websocket</groupId>
<artifactId>jetty-ee10-websocket-jakarta-client</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.websocket</groupId>
<artifactId>jetty-ee10-websocket-jakarta-client-webapp</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.websocket</groupId>
<artifactId>jetty-ee10-websocket-jakarta-common</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.websocket</groupId>
<artifactId>jetty-ee10-websocket-jakarta-server</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.websocket</groupId>
<artifactId>jetty-ee10-websocket-jetty-client-webapp</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.websocket</groupId>
<artifactId>jetty-ee10-websocket-jetty-server</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.websocket</groupId>
<artifactId>jetty-ee10-websocket-servlet</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>

2
jetty-ee10/jetty-ee10-cdi/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-ee10-cdi</artifactId>
<packaging>jar</packaging>

2
jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-jar/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.ee10.demos</groupId>
<artifactId>jetty-ee10-demo-async-rest</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-ee10-demo-async-rest-jar</artifactId>
<packaging>jar</packaging>

2
jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-server/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.ee10.demos</groupId>
<artifactId>jetty-ee10-demo-async-rest</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-ee10-demo-async-rest-server</artifactId>
<packaging>jar</packaging>

2
jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-webapp/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.ee10.demos</groupId>
<artifactId>jetty-ee10-demo-async-rest</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-ee10-demo-async-rest-webapp</artifactId>
<packaging>war</packaging>

2
jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.ee10.demos</groupId>
<artifactId>jetty-ee10-demos</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-ee10-demo-async-rest</artifactId>
<packaging>pom</packaging>

2
jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.jetty.ee10.demos</groupId>
<artifactId>jetty-ee10-demos</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-ee10-demo-embedded</artifactId>
<name>EE10 :: Demo :: Embedded Jetty</name>

2
jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.jetty.ee10.demos</groupId>
<artifactId>jetty-ee10-demos</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-ee10-demo-jaas-webapp</artifactId>
<packaging>war</packaging>

2
jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.jetty.ee10.demos</groupId>
<artifactId>jetty-ee10-demos</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-ee10-demo-jetty-webapp</artifactId>
<packaging>war</packaging>

2
jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.jetty.ee10.demos</groupId>
<artifactId>jetty-ee10-demos</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-ee10-demo-jndi-webapp</artifactId>
<packaging>war</packaging>

2
jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jsp-webapp/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.ee10.demos</groupId>
<artifactId>jetty-ee10-demos</artifactId>
<version>12.0.8-SNAPSHOT</version>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-ee10-demo-jsp-webapp</artifactId>
<packaging>war</packaging>

Some files were not shown because too many files have changed in this diff Show More