From 36b9661fab6805ce7f90b56ef1b18443c0e49b4b Mon Sep 17 00:00:00 2001
From: Jan Bartel <janb@webtide.com>
Date: Mon, 21 Sep 2020 14:41:40 +0200
Subject: [PATCH 1/2] Issue #5280 Remove unused SessionHandler methods. (#5303)

Signed-off-by: Jan Bartel <janb@webtide.com>
---
 .../jetty/server/session/SessionHandler.java    | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java
index cdbd7dd6e89..5c0efbf6695 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java
@@ -179,7 +179,6 @@ public class SessionHandler extends ScopedHandler
     protected String _sessionPath;
     protected int _maxCookieAge = -1;
     protected int _refreshCookieAge;
-    protected boolean _nodeIdInSessionId;
     protected boolean _checkingRemoteSessionIdEncoding;
     protected String _sessionComment;
     protected SessionCache _sessionCache;
@@ -961,22 +960,6 @@ public class SessionHandler extends ScopedHandler
         _sessionCache = cache;
     }
 
-    /**
-     * @return true if the cluster node id (worker id) is returned as part of the session id by {@link HttpSession#getId()}. Default is false.
-     */
-    public boolean isNodeIdInSessionId()
-    {
-        return _nodeIdInSessionId;
-    }
-
-    /**
-     * @param nodeIdInSessionId true if the cluster node id (worker id) will be returned as part of the session id by {@link HttpSession#getId()}. Default is false.
-     */
-    public void setNodeIdInSessionId(boolean nodeIdInSessionId)
-    {
-        _nodeIdInSessionId = nodeIdInSessionId;
-    }
-
     /**
      * Remove session from manager
      *

From 00d403170ddd4237da9a4df9ab5cd346bc594607 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <oliver.lamy@gmail.com>
Date: Tue, 22 Sep 2020 07:12:32 +1000
Subject: [PATCH 2/2] Jetty 10.0.x upgrade last schemas (#5298)

* jetty servlet api 4.0.4-SNAPSHOT

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* jetty servlet api 4.0.4

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* fix it

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
---
 .../postbuild.groovy                                            | 2 +-
 pom.xml                                                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jetty-maven-plugin/src/it/jetty-start-mojo-multi-module-single-war-it/postbuild.groovy b/jetty-maven-plugin/src/it/jetty-start-mojo-multi-module-single-war-it/postbuild.groovy
index 4e37335b279..97e23b4c98d 100644
--- a/jetty-maven-plugin/src/it/jetty-start-mojo-multi-module-single-war-it/postbuild.groovy
+++ b/jetty-maven-plugin/src/it/jetty-start-mojo-multi-module-single-war-it/postbuild.groovy
@@ -21,7 +21,7 @@ assert buildLog.text.contains( 'Started Server' )
 
 assert buildLog.text.contains( '(1a) >> javax.servlet.ServletContextListener loaded from jar:' )
 
-assert buildLog.text.contains( '/org/eclipse/jetty/toolchain/jetty-servlet-api/4.0.3/jetty-servlet-api-4.0.3.jar!/javax/servlet/ServletContextListener.class << (1b)' )
+assert buildLog.text.contains( '/org/eclipse/jetty/toolchain/jetty-servlet-api/4.0.4/jetty-servlet-api-4.0.4.jar!/javax/servlet/ServletContextListener.class << (1b)' )
 
 assert buildLog.text.contains( '(2a) >> mca.common.CommonService loaded from file:' )
 assert buildLog.text.contains( 'common/target/classes/mca/common/CommonService.class << (2b)' )
diff --git a/pom.xml b/pom.xml
index 5c9b3e5ffc0..d58eef2468e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
     <logback.version>1.3.0-alpha5</logback.version>
     <spring-version>5.1.1.RELEASE</spring-version>
     <jetty-test-policy.version>1.2</jetty-test-policy.version>
-    <servlet.api.version>4.0.3</servlet.api.version>
+    <servlet.api.version>4.0.4</servlet.api.version>
     <websocket.api.version>1.1.2</websocket.api.version>
     <jsp.version>9.0.29</jsp.version>
     <infinispan.version>9.4.8.Final</infinispan.version>