diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/annotations/using-annotations.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/annotations/using-annotations.adoc index 93eb15c82ef..765bb61a22a 100644 --- a/jetty-documentation/src/main/asciidoc/distribution-guide/annotations/using-annotations.adoc +++ b/jetty-documentation/src/main/asciidoc/distribution-guide/annotations/using-annotations.adoc @@ -121,9 +121,8 @@ As is the case with annotation scanning, the link:#using-extra-classpath-method[ ____ [NOTE] -As of Jetty-9.4.4, unless the `web.xml` is version 3.0 or greater, only `ServletContainerInitializers` that are on the container classpath will be discovered. -Users wishing to use `ServletContainerInitializers` from within the webapp with older versions of `web.xml` must either upgrade their `web.xml` version, or call `WebAppContext.setConfigurationDiscovered(true)` either programmatically or in xml. -Upgrading the `web.xml` version is preferable. +As of Jetty 10, Annotations will be discovered even for old versions of `web.xml` (2.5). +Users wishing to not use `ServletContainerInitializers` from within the webapp with older versions of `web.xml` must call `WebAppContext.setConfigurationDiscovered(false)` either programmatically or in xml. ____ ===== Controlling the order of ServletContainerInitializer invocation diff --git a/jetty-documentation/src/main/asciidoc/quickstart-guide/upgrading/upgrading-9.4-to.10.0.adoc b/jetty-documentation/src/main/asciidoc/quickstart-guide/upgrading/upgrading-9.4-to.10.0.adoc index 0b3653c10c9..fb0da833c5b 100644 --- a/jetty-documentation/src/main/asciidoc/quickstart-guide/upgrading/upgrading-9.4-to.10.0.adoc +++ b/jetty-documentation/src/main/asciidoc/quickstart-guide/upgrading/upgrading-9.4-to.10.0.adoc @@ -23,9 +23,14 @@ It is not comprehensive, but covers many of the major changes included in the re ==== Required Java Version -Jetty 10 requires, at a minimum, Java 9 to function. +Jetty 10 requires, at a minimum, Java 11 to function. Items such as the Java Platform Module System (JPMS), which Jetty 10 supports, are not available in earlier versions of Java. +==== ServletContainerInitializers + +As of Jetty 10, Annotations will be discovered even for old versions of `web.xml` (2.5). +Users wishing to not use `ServletContainerInitializers` from within the webapp with older versions of `web.xml` must call `WebAppContext.setConfigurationDiscovered(false)` either programmatically or in xml. + ==== Removed Classes //TODO - Insert major removed/refactored classes from Jetty-9.x.x to Jetty-10.0.x