Removing 9.4.x references from documentation where appropriate. Resolves

 #3987

jetty-documentation/src/main/asciidoc/distribution-guide/connectors/configuring-connectors.adoc

@@ -214,7 +214,7 @@ At this point the server has been configured with connectors for both HTTP and H
 ....
 [mybase] java -jar $JETTY_HOME/start.jar
 2017-08-31 10:19:58.855:INFO::main: Logging initialized @372ms to org.eclipse.jetty.util.log.StdErrLog
-2017-08-31 10:19:59.076:INFO:oejs.Server:main: jetty-9.4.6.v20170531
+2017-08-31 10:19:59.076:INFO:oejs.Server:main: jetty-{VERSION}
 2017-08-31 10:19:59.125:INFO:oejs.AbstractConnector:main: Started ServerConnector@421e98e0{HTTP/1.1,[http/1.1]}{0.0.0.0:8080}
 2017-08-31 10:19:59.150:INFO:oejus.SslContextFactory:main: x509=X509@5315b42e(jetty,h=[jetty.eclipse.org],w=[]) for SslContextFactory@2ef9b8bc(file:///Users/staff/installs/repository/jetty-distribution-{VERSION}/mybase/etc/keystore,file:///Users/staff/installs/repository/jetty-distribution-{VERSION}/mybase/etc/keystore)
 2017-08-31 10:19:59.151:INFO:oejus.SslContextFactory:main: x509=X509@5d624da6(mykey,h=[],w=[]) for SslContextFactory@2ef9b8bc(file:///Users/staff/installs/repository/jetty-distribution-{VERSION}/mybase/etc/keystore,file:///Users/staff/installs/repository/jetty-distribution-{VERSION}/mybase/etc/keystore)
@@ -280,7 +280,7 @@ Now when the server is started, HTTP connections will enter on port 5231:
 ....
 [mybase] java -jar ../start.jar
 2017-08-31 10:31:32.955:INFO::main: Logging initialized @366ms to org.eclipse.jetty.util.log.StdErrLog
-2017-08-31 10:31:33.109:INFO:oejs.Server:main: jetty-9.4.6.v20170531
+2017-08-31 10:31:33.109:INFO:oejs.Server:main: jetty-{VERSION}
 2017-08-31 10:31:33.146:INFO:oejs.AbstractConnector:main: Started ServerConnector@2ef9b8bc{HTTP/1.1,[http/1.1]}{0.0.0.0:5231}
 ...
 2017-08-31 10:31:33.263:INFO:oejs.Server:main: Started @675ms

jetty-documentation/src/main/asciidoc/distribution-guide/logging/configuring-logging-modules.adoc

@@ -479,7 +479,7 @@ As an example, here is the output from Logback before using the `console-capture
 ....
 [my-base]$ java -jar ../start.jar
 419  [main] INFO  org.eclipse.jetty.util.log - Logging initialized @508ms to org.eclipse.jetty.util.log.Slf4jLog
-540  [main] INFO  org.eclipse.jetty.server.Server - jetty-9.4.0-SNAPSHOT
+540  [main] INFO  org.eclipse.jetty.server.Server - jetty-{VERSION}
 575  [main] INFO  o.e.jetty.server.AbstractConnector - Started ServerConnector@3c0ecd4b{HTTP/1.1,[http/1.1]}{0.0.0.0:8080}
 575  [main] INFO  org.eclipse.jetty.server.Server - Started @668ms
 ....

jetty-documentation/src/main/asciidoc/distribution-guide/logging/default-logging-with-stderrlog.adoc

@@ -128,7 +128,7 @@ There are a number of properties that can be defined in the configuration that w
 [source, screen, subs="{sub-order}"]
 ....
 2016-10-21 15:31:01.248:INFO::main: Logging initialized @332ms to org.eclipse.jetty.util.log.StdErrLog
-2016-10-21 15:31:01.370:INFO:oejs.Server:main: jetty-9.4.0-SNAPSHOT
+2016-10-21 15:31:01.370:INFO:oejs.Server:main: jetty-{VERSION}
 2016-10-21 15:31:01.400:INFO:oejs.AbstractConnector:main: Started ServerConnector@2c330fbc{HTTP/1.1,[http/1.1]}{0.0.0.0:8080}
 2016-10-21 15:31:01.400:INFO:oejs.Server:main: Started @485ms
 ....
@@ -138,7 +138,7 @@ There are a number of properties that can be defined in the configuration that w
 [source, screen, subs="{sub-order}"]
 ....
 2016-10-21 15:31:35.020:INFO::main: Logging initialized @340ms to org.eclipse.jetty.util.log.StdErrLog
-2016-10-21 15:31:35.144:INFO:org.eclipse.jetty.server.Server:main: jetty-9.4.0-SNAPSHOT
+2016-10-21 15:31:35.144:INFO:org.eclipse.jetty.server.Server:main: jetty-{VERSION}
 2016-10-21 15:31:35.174:INFO:org.eclipse.jetty.server.AbstractConnector:main: Started ServerConnector@edf4efb{HTTP/1.1,[http/1.1]}{0.0.0.0:8080}
 2016-10-21 15:31:35.175:INFO:org.eclipse.jetty.server.Server:main: Started @495ms
 ....

jetty-documentation/src/main/asciidoc/distribution-guide/security/secure-passwords.adoc

@@ -73,7 +73,7 @@ ____
 
 [source, screen, subs="{sub-order}"]
 ....
-$ java -cp ../lib/jetty-util-9.4.7.v20170914.jar org.eclipse.jetty.util.security.Password username username:realm:password
+$ java -cp ../lib/jetty-util-{VERSION}.jar org.eclipse.jetty.util.security.Password username username:realm:password
 2017-12-13 11:34:33.263:INFO::main: Logging initialized @97ms to org.eclipse.jetty.util.log.StdErrLog
 username:realm:password
 OBF:1w281yf41v1x1z7e1xmi1v1p1tvv1v901c3j1x8k1ugo1ri71uh21x8a1c3j1v9m1tv71v2p1xms1z7o1v2h1yf21w1a

jetty-documentation/src/main/asciidoc/distribution-guide/sessions/session-configuration-infinispan.adoc

@@ -206,9 +206,9 @@ java -jar ../start.jar --add-to-start=infinispan-embedded-query
 There are no configuration properties associated with this module.
 
 
-==== Converting session format for jetty-9.4.13
+==== Converting Session Format for Jetty-9.4.13
 
-From jetty-9.4.13 onwards, we have changed the format of the serialized session when using a remote cache (ie using hotrod).
+From Jetty-9.4.13 onwards, we have changed the format of the serialized session when using a remote cache (ie using hotrod).
 Prior to release 9.4.13 we used the default Infinispan serialization, however this was not able to store sufficient information to allow jetty to properly deserialize session attributes in all circumstances.
 See issue https://github.com/eclipse/jetty.project/issues/2919 for more background.
 
@@ -222,7 +222,7 @@ How to use the converter:
 
 [source, screen, subs="{sub-order}"]
 ----
-java -cp jetty-servlet-api-4.0.2.jar:jetty-util-9.4.13.jar:jetty-server-9.4.13.jar:infinispan-remote-9.1.0.Final.jar:jetty-infinispan-9.4.13.jar:[other classpath]  org.eclipse.jetty.session.infinispan.InfinispanSessionLegacyConverter
+java -cp jetty-servlet-api-4.0.2.jar:jetty-util-{VERSION}.jar:jetty-server-{VERSION}.jar:infinispan-remote-9.1.0.Final.jar:jetty-infinispan-{VERSION}.jar:[other classpath]  org.eclipse.jetty.session.infinispan.InfinispanSessionLegacyConverter
 
 Usage:  InfinispanSessionLegacyConverter [-Dhost=127.0.0.1] [-Dverbose=true|false] <cache-name> [check]
 ----
@@ -242,7 +242,7 @@ The following command will attempt to convert all sessions in the cached named `
 
 [source, screen, subs="{sub-order}"]
 ----
-java -cp jetty-servlet-api-4.0.2.jar:jetty-util-9.4.13.jar:jetty-server-9.4.13.jar:infinispan-remote-9.1.0.Final.jar:jetty-infinispan-9.4.13.jar:/my/custom/classes  org.eclipse.jetty.session.infinispan.InfinispanSessionLegacyConverter -Dhost=myhost my-remote-cache
+java -cp jetty-servlet-api-4.0.2.jar:jetty-util-{VERSION}.jar:jetty-server-{VERSION}.jar:infinispan-remote-9.1.0.Final.jar:jetty-infinispan-{VERSION}.jar:/my/custom/classes  org.eclipse.jetty.session.infinispan.InfinispanSessionLegacyConverter -Dhost=myhost my-remote-cache
 ----
 
 If the converter fails to convert a session, an error message and stacktrace will be printed and the conversion will abort. The failed session should be untouched, however _it is prudent to take a backup of your cache before attempting the conversion_.

jetty-documentation/src/main/asciidoc/distribution-guide/sessions/session-hierarchy.adoc

@@ -19,21 +19,6 @@
 [[jetty-sessions-architecture]]
 === Session Architecture
 
-// TODO: Remove in Jetty 9.5/10 - This paragraph is dated and only really useful for upgrading into 9.4 from prior versions.
-==== Changes in Session Architecture
-The architecture of Session Management Jetty changed significantly in Jetty 9.4.
-These changes have resulted in Sessions not only being easier to configure but making them much more pluggable for various technologies.
-
-In previous versions of Jetty, users were required to configure a separate `SessionIdManager` for each kind of session clustering technology being implemented (JDBC, MongoDB..etc.).
-In Jetty 9.4, there is now a single `SessionIdManager` implementation which works across all types of session clustering technologies.
-Likewise, prior to Jetty 9.4 there were several different instances of the `SessionManager` class.
-Instead of a single `SessionManager` though, it has been done away with entirely, with most of it's functionality moved to the `SesssionHandler` class.
-Additionally, Jetty 9.4 introduced the concepts of a `SessionCache` and an associated `SessionDataStore` (both explained below).
-
-Finally, Session scavenging has been re-worked.
-Where previously each `SessionManager` instance would periodically scan the in-memory (or clustered) sessions for expired sessions, there is now a single generic scavenger thread which instructs the `SessionHandler` to clean up expired sessions.
-Session expiration has been changed to use a much more efficient timer-based mechanism that avoids constant iteration over all current sessions in memory by the scavenger.
-
 ==== Session Architecture Hierarchy
 
 Each Jetty instance has a singular `SessionIdManager` to handle all session requests, regardless of clustering technology.

jetty-documentation/src/main/asciidoc/distribution-guide/startup/startup-jpms.adoc

@@ -69,11 +69,11 @@ This will give an output looking something like this (broken in sections for cla
 [source, screen, subs="{sub-order}"]
 ....
 /opt/openjdk-11+28/bin/java
---module-path /opt/jetty/lib/jetty-servlet-api-4.0.2.jar:/opt/jetty/lib/jetty-http-9.4.13-SNAPSHOT.jar:...
+--module-path /opt/jetty/lib/jetty-servlet-api-4.0.2.jar:/opt/jetty/lib/jetty-http-{VERSION}.jar:...
 --module org.eclipse.jetty.xml/org.eclipse.jetty.xml.XmlConfiguration /opt/jetty/etc/jetty-threadpool.xml /opt/jetty/etc/jetty.xml ...
 ....
 
-The `--module-path` option specifies the list of Jetty jars. 
+The `--module-path` option specifies the list of Jetty jars.
 This list depends on the Jetty modules that have been enabled via the link:#startup-modules[`--add-to-start`] command.
 
 The `--module` option tells the JVM to run main class `XmlConfiguration` from the `org.eclipse.jetty.xml` module, with the given XML files as program arguments.

jetty-documentation/src/main/asciidoc/embedded-guide/server/frameworks/osgi.adoc

@@ -1104,22 +1104,22 @@ You should see output similar to this on the console, using the `felix:lb` comma
     6|Active     |    1|javax.mail bundle from Glassfish (1.4.1.v201005082020)
     7|Active     |    1|Java Server Pages Standard Tag Library API Bundle (1.2.0.v201105211821)
     8|Active     |    1|JavaServer Pages (TM) TagLib Implementation (1.2.2)
-    9|Active     |    1|Jetty :: Servlet Annotations (9.4.14)
-   10|Active     |    1|Jetty :: Deployers (9.4.14)
-   11|Active     |    1|Jetty :: Http Utility (9.4.14)
-   12|Active     |    1|Jetty :: IO Utility (9.4.14)
-   13|Active     |    1|Jetty :: JNDI Naming (9.4.14)
-   14|Active     |    1|Jetty :: OSGi :: Boot (9.4.14)
-   15|Resolved   |    1|Jetty-OSGi-Jasper Integration (9.4.14)
+    9|Active     |    1|Jetty :: Servlet Annotations ({VERSION})
+   10|Active     |    1|Jetty :: Deployers ({VERSION})
+   11|Active     |    1|Jetty :: Http Utility ({VERSION})
+   12|Active     |    1|Jetty :: IO Utility ({VERSION})
+   13|Active     |    1|Jetty :: JNDI Naming ({VERSION})
+   14|Active     |    1|Jetty :: OSGi :: Boot ({VERSION})
+   15|Resolved   |    1|Jetty-OSGi-Jasper Integration ({VERSION})
    16|Active     |    1|Jetty Servlet API and Schemas for OSGi (3.1.0)
-   17|Active     |    1|Jetty :: Plus (9.4.14)
-   18|Active     |    1|Jetty :: Security (9.4.14)
-   19|Active     |    1|Jetty :: Server Core (9.4.14)
-   20|Active     |    1|Jetty :: Servlet Handling (9.4.14)
-   21|Active     |    1|Jetty :: Utility Servlets and Filters (9.4.14)
-   22|Active     |    1|Jetty :: Utilities (9.4.14)
-   23|Active     |    1|Jetty :: Webapp Application Support (9.4.14)
-   24|Active     |    1|Jetty :: XML utilities (9.4.14)
+   17|Active     |    1|Jetty :: Plus ({VERSION})
+   18|Active     |    1|Jetty :: Security ({VERSION})
+   19|Active     |    1|Jetty :: Server Core ({VERSION})
+   20|Active     |    1|Jetty :: Servlet Handling ({VERSION})
+   21|Active     |    1|Jetty :: Utility Servlets and Filters ({VERSION})
+   22|Active     |    1|Jetty :: Utilities ({VERSION})
+   23|Active     |    1|Jetty :: Webapp Application Support ({VERSION})
+   24|Active     |    1|Jetty :: XML utilities ({VERSION})
    25|Active     |    1|Apache Aries SPI Fly Dynamic Weaving Bundle (1.2)
    27|Active     |    1|Apache Felix Bundle Repository (2.0.2)
    28|Active     |    1|Apache Felix Configuration Admin Service (1.8.0)
@@ -1128,7 +1128,7 @@ You should see output similar to this on the console, using the `felix:lb` comma
    31|Active     |    1|Apache Felix Gogo Runtime (0.12.1)
    32|Active     |    1|Apache Felix Gogo Shell (0.10.0)
    33|Active     |    1|Apache Felix Log Service (1.0.1)
-   34|Active     |    1|Jetty :: Apache JSP (9.4.14)
+   34|Active     |    1|Jetty :: Apache JSP ({VERSION})
    35|Active     |    1|Eclipse Compiler for Java(TM) (3.8.2.v20130121-145325)
    36|Active     |    1|Mortbay EL API and Implementation (8.5.33.1)
    37|Active     |    1|Mortbay Jasper (8.5.33.1)

jetty-documentation/src/main/asciidoc/embedded-guide/server/maven/jetty-maven-helloworld.adoc

@@ -29,7 +29,7 @@ ____
 [NOTE]
 Use of Maven and the jetty-maven-plugin is *not* required.
 Using Maven for Jetty implementations is a popular choice, but users encouraged to manage their projects in whatever way suits their needs.
-Other popular tools include Ant and Gradle. 
+Other popular tools include Ant and Gradle.
 ____
 
 First we'll have a look at a very simple HelloWorld java application that embeds Jetty, then a simple webapp which makes use of the link:#jetty-maven-plugin[jetty-maven-plugin] to speed up the development cycle.
@@ -117,7 +117,7 @@ Use an editor to create the file `pom.xml` in the `JettyMavenHelloWorld` directo
       <!-- Adapt this to a version found on
            https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-maven-plugin/
         -->
-      <jettyVersion>9.4.22.v20191022</jettyVersion>
+      <jettyVersion>{VERSION}</jettyVersion>
   </properties>
 
   <dependencies>