From 949a89c15be1566a57fe7794448892f79e591ded Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Nov 2020 16:34:46 +1000
Subject: [PATCH 1/5] Bump geronimo-interceptor_1.2_spec from 1.1 to 1.2
 (#5632)

Bumps geronimo-interceptor_1.2_spec from 1.1 to 1.2.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 tests/test-webapps/test-owb-cdi-webapp/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test-webapps/test-owb-cdi-webapp/pom.xml b/tests/test-webapps/test-owb-cdi-webapp/pom.xml
index 4dc1222d883..0372524fd69 100644
--- a/tests/test-webapps/test-owb-cdi-webapp/pom.xml
+++ b/tests/test-webapps/test-owb-cdi-webapp/pom.xml
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-interceptor_1.2_spec</artifactId>
-      <version>1.1</version>
+      <version>1.2</version>
     </dependency>
     <dependency>
       <groupId>org.apache.openwebbeans</groupId>

From f691ed81b960a806df03e8d5074c44d1137832e4 Mon Sep 17 00:00:00 2001
From: olivier lamy <oliver.lamy@gmail.com>
Date: Tue, 10 Nov 2020 20:31:49 +1000
Subject: [PATCH 2/5] derby 10.15 not supporting java8

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 86aaad2d372..8cdb82e9df8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
     <settingsPath>src/it/settings.xml</settingsPath>
     <surefire.rerunFailingTestsCount>0</surefire.rerunFailingTestsCount>
     <testcontainers.version>1.15.0</testcontainers.version>
-    <derby.version>10.15.2.0</derby.version>
+    <derby.version>10.14.2.0</derby.version>
   </properties>
 
   <licenses>

From 2af2821a0e8ddb4690dbf5dbc02f265848232a9d Mon Sep 17 00:00:00 2001
From: olivier lamy <oliver.lamy@gmail.com>
Date: Tue, 10 Nov 2020 20:34:23 +1000
Subject: [PATCH 3/5] Revert "Bump maven-bundle-plugin from 3.5.1 to 5.1.1"
 until we figure out the problem

This reverts commit 1475e4e22596a8a79a26a4bc0b5782bbfb6571f5.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8cdb82e9df8..2de5de2d312 100644
--- a/pom.xml
+++ b/pom.xml
@@ -701,7 +701,7 @@
         <plugin>
           <groupId>org.apache.felix</groupId>
           <artifactId>maven-bundle-plugin</artifactId>
-          <version>5.1.1</version>
+          <version>3.5.1</version>
           <extensions>true</extensions>
           <configuration>
             <supportedProjectTypes>

From 0a345420ff2ac0430b9c0da139cf4d0844b8f9dd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Nov 2020 11:53:24 +0000
Subject: [PATCH 4/5] Bump checkstyle from 8.36.2 to 8.37

Bumps [checkstyle](https://github.com/checkstyle/checkstyle) from 8.36.2 to 8.37.
- [Release notes](https://github.com/checkstyle/checkstyle/releases)
- [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-8.36.2...checkstyle-8.37)

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2de5de2d312..340b94ff05b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
     <jetty.url>https://eclipse.org/jetty</jetty.url>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <build-support.version>1.5</build-support.version>
-    <checkstyle.version>8.36.2</checkstyle.version>
+    <checkstyle.version>8.37</checkstyle.version>
     <slf4j.version>1.7.30</slf4j.version>
     <log4j2.version>2.11.2</log4j2.version>
     <disruptor.version>3.4.2</disruptor.version>

From 21c27f6370dce8e1dec37ae82d6cd18d391e689b Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Tue, 10 Nov 2020 06:33:04 -0600
Subject: [PATCH 5/5] Fixing checkstyle violations

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 .../main/java/org/eclipse/jetty/servlet/ServletHolder.java    | 2 +-
 .../src/main/java/org/eclipse/jetty/test/InfoServlet.java     | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
index f84d21c4a46..7a74be39d00 100644
--- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
+++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
@@ -1262,7 +1262,7 @@ public class ServletHolder extends Holder<Servlet> implements UserIdentity.Scope
         public void service(ServletRequest req, ServletResponse res) throws ServletException, IOException
         {
             if (LOG.isDebugEnabled())
-               LOG.debug("Unavailable {}", req, _unavailableException);
+                LOG.debug("Unavailable {}", req, _unavailableException);
             if (_unavailableStart == null)
             {
                 ((HttpServletResponse)res).sendError(HttpServletResponse.SC_NOT_FOUND);
diff --git a/tests/test-webapps/test-cdi-common-webapp/src/main/java/org/eclipse/jetty/test/InfoServlet.java b/tests/test-webapps/test-cdi-common-webapp/src/main/java/org/eclipse/jetty/test/InfoServlet.java
index c158735bb81..0e8b84f0bcc 100644
--- a/tests/test-webapps/test-cdi-common-webapp/src/main/java/org/eclipse/jetty/test/InfoServlet.java
+++ b/tests/test-webapps/test-cdi-common-webapp/src/main/java/org/eclipse/jetty/test/InfoServlet.java
@@ -51,7 +51,9 @@ public class InfoServlet extends HttpServlet
         {
             out.printf("%16s => %s%n", bean.getName(), bean);
             for (InjectionPoint ij : bean.getInjectionPoints())
-            out.printf("%16s -> %s%n", "", ij);
+            {
+                out.printf("%16s -> %s%n", "", ij);
+            }
         }
     }
 }