From c80eac0386b3741343b791729e18e2865c95ddfc Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Tue, 26 Jan 2021 11:13:09 -0600
Subject: [PATCH 1/2] Fixing checkstyle issue

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 .../eclipse/jetty/tests/distribution/JettyHomeTester.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/test-distribution/src/main/java/org/eclipse/jetty/tests/distribution/JettyHomeTester.java b/tests/test-distribution/src/main/java/org/eclipse/jetty/tests/distribution/JettyHomeTester.java
index 8cd90b094047..c65c10d864c3 100644
--- a/tests/test-distribution/src/main/java/org/eclipse/jetty/tests/distribution/JettyHomeTester.java
+++ b/tests/test-distribution/src/main/java/org/eclipse/jetty/tests/distribution/JettyHomeTester.java
@@ -156,9 +156,12 @@ public JettyHomeTester.Run start(List<String> args) throws Exception
 
         args = new ArrayList<>(args);
 
-        if (StringUtil.isNotBlank( config.mavenLocalRepository)) {
+        if (StringUtil.isNotBlank(config.mavenLocalRepository))
+        {
             args.add("maven.local.repo=" + config.mavenLocalRepository);
-        } else if (StringUtil.isNotBlank(System.getProperty("mavenRepoPath"))){
+        }
+        else if (StringUtil.isNotBlank(System.getProperty("mavenRepoPath")))
+        {
             // we get artifacts from local repo first
             args.add("maven.local.repo=" + System.getProperty("mavenRepoPath"));
         }

From 4c44d83b4566198702fa0c7756b1372f7d022624 Mon Sep 17 00:00:00 2001
From: Jan Bartel <janb@webtide.com>
Date: Wed, 27 Jan 2021 09:06:14 +0100
Subject: [PATCH 2/2] Issue #5901 Update to javax.servlet.api 4.0.6. (#5918)

This brings in a change to the javax.servlet.api module-info
to open the javax.servlet.resources package to all modules,
so that the dtds and xsds can be retrieved as resources, either
from the context Classloader.getResource, or
from the ServletContext.class.getResource.

Signed-off-by: Jan Bartel <janb@webtide.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f75372de16f4..5ea9987778a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <log4j2.version>2.13.0</log4j2.version>
     <logback.version>1.3.0-alpha5</logback.version>
     <jetty-test-policy.version>1.2</jetty-test-policy.version>
-    <servlet.api.version>4.0.5</servlet.api.version>
+    <servlet.api.version>4.0.6</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>