update to Jetty 9.4.x, other minor version updates

Signed-off-by: Ceki Gulcu <ceki@qos.ch>
qos-ch · Jul 31, 2021 · 751ec92 · 751ec92
1 parent aaa8a89
commit 751ec92
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 19 deletions.
diff --git a/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java b/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java
@@ -112,7 +112,7 @@
  * @author Ceki G&uuml;lc&uuml;
  * @author S&eacute;bastien Pennec
  */
-public class RequestLogImpl extends ContextBase implements RequestLog, AppenderAttachable<IAccessEvent>, FilterAttachable<IAccessEvent> {
+public class RequestLogImpl extends ContextBase implements org.eclipse.jetty.util.component.LifeCycle,  RequestLog, AppenderAttachable<IAccessEvent>, FilterAttachable<IAccessEvent> {
 
     public final static String DEFAULT_CONFIG_FILE = "etc" + File.separatorChar + "logback-access.xml";
 

diff --git a/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyFixtureBase.java b/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyFixtureBase.java
@@ -13,22 +13,23 @@
  */
 package ch.qos.logback.access.jetty;
 
+import java.io.IOException;
+import java.io.OutputStream;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.handler.AbstractHandler;
 import org.eclipse.jetty.server.handler.HandlerList;
 import org.eclipse.jetty.server.handler.RequestLogHandler;
-import org.eclipse.jetty.server.nio.SelectChannelConnector;
 import org.eclipse.jetty.util.ByteArrayISO8859Writer;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.OutputStream;
-
 public class JettyFixtureBase {
     final protected RequestLogImpl requestLogImpl;
     protected Handler handler = new BasicHandler();
@@ -52,7 +53,7 @@ public String getUrl() {
 
     public void start() throws Exception {
         server = new Server();
-        Connector connector = new SelectChannelConnector();
+        ServerConnector connector = new ServerConnector (server);
         connector.setPort(port);
         server.setConnectors(new Connector[] { connector });
 

diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/ParamModelHandler.java b/logback-core/src/main/java/ch/qos/logback/core/joran/ParamModelHandler.java
@@ -6,7 +6,6 @@
 import ch.qos.logback.core.joran.util.beans.BeanDescriptionCache;
 import ch.qos.logback.core.model.Model;
 import ch.qos.logback.core.model.ParamModel;
-import ch.qos.logback.core.model.processor.EventEvaluatorModelHandler;
 import ch.qos.logback.core.model.processor.ModelHandlerBase;
 import ch.qos.logback.core.model.processor.ModelHandlerException;
 

diff --git a/logback-core/src/main/java/ch/qos/logback/core/util/OptionHelper.java b/logback-core/src/main/java/ch/qos/logback/core/util/OptionHelper.java
@@ -16,8 +16,6 @@
 import java.lang.reflect.Constructor;
 import java.util.Properties;
 
-import org.eclipse.jdt.annotation.Nullable;
-
 import ch.qos.logback.core.Context;
 import ch.qos.logback.core.CoreConstants;
 import ch.qos.logback.core.spi.ContextAware;
@@ -259,7 +257,7 @@ public static boolean toBoolean(String value, boolean dEfault) {
         return dEfault;
     }
 
-    public static boolean isNullOrEmpty(@Nullable String str) {
+    public static boolean isNullOrEmpty(String str) {
         return ((str == null) || CoreConstants.EMPTY_STRING.equals(str.trim()));
     }
 

diff --git a/pom.xml b/pom.xml
@@ -55,7 +55,7 @@
     <junit.version>4.12</junit.version>
     <hamcrest.version>1.3</hamcrest.version>
     <javax.mail.version>1.6.2</javax.mail.version>
-    <janino.version>3.0.6</janino.version>
+    <janino.version>3.1.6</janino.version>
     <!-- slf4j.version property is used below, in
          logback-classic/pom.xml, /logback-examples/src/main/resources/setClasspath.cmd, download.htnl
     -->    
@@ -64,8 +64,8 @@
     <consolePlugin.version>1.1.0</consolePlugin.version>
     <!--<tomcat.version>7.0.59</tomcat.version>-->
     <tomcat.version>8.5.9</tomcat.version>
-    <jetty.version>8.2.0.v20160908</jetty.version>
-    <!--<jetty.version>9.2.9.v20150224</jetty.version>-->
+    <!--<jetty.version>8.2.0.v20160908</jetty.version>-->
+    <jetty.version>9.4.9.v20180320</jetty.version>
     <compiler-plugin.version>3.8.0</compiler-plugin.version> <!-- 3.6.1, 3.7.0 -->
     <jansi.version>1.17</jansi.version>
 
@@ -223,7 +223,7 @@
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>javax.servlet-api</artifactId>
-        <version>3.1.0</version>
+        <version>4.0.1</version>
       </dependency>
 
       <dependency>
@@ -449,7 +449,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jxr-plugin</artifactId>
-        <version>2.5</version>
+        <version>${maven-jxr-plugin.version}</version>
         <configuration>
           <aggregate>true</aggregate>
           <javadocDir>target/site/apidocs/</javadocDir>