Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x

jetty · Jun 15, 2022 · 309b6a9 · 309b6a9
2 parents 30d3c70 + d63569d
commit 309b6a9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/RegexPathSpec.java b/jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/RegexPathSpec.java
@@ -18,12 +18,12 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.eclipse.jetty.util.log.Log;
-import org.eclipse.jetty.util.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class RegexPathSpec extends AbstractPathSpec
 {
-    private static final Logger LOG = Log.getLogger(UriTemplatePathSpec.class);
+    private static final Logger LOG = LoggerFactory.getLogger(UriTemplatePathSpec.class);
 
     private static final Map<Character, String> FORBIDDEN_ESCAPED = new HashMap<>();
 

diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/MultiPartInputStreamParser.java b/jetty-server/src/main/java/org/eclipse/jetty/server/MultiPartInputStreamParser.java
@@ -48,8 +48,8 @@
 import org.eclipse.jetty.util.QuotedStringTokenizer;
 import org.eclipse.jetty.util.ReadLineInputStream;
 import org.eclipse.jetty.util.ReadLineInputStream.Termination;
-import org.eclipse.jetty.util.log.Log;
-import org.eclipse.jetty.util.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * MultiPartInputStream
@@ -65,7 +65,7 @@
 @Deprecated
 public class MultiPartInputStreamParser
 {
-    private static final Logger LOG = Log.getLogger(MultiPartInputStreamParser.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MultiPartInputStreamParser.class);
     public static final MultipartConfigElement __DEFAULT_MULTIPART_CONFIG = new MultipartConfigElement(System.getProperty("java.io.tmpdir"));
     public static final MultiMap<Part> EMPTY_MAP = new MultiMap(Collections.emptyMap());
     protected InputStream _in;

diff --git a/...ket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/proxy/WebSocketProxy.java b/...ket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/proxy/WebSocketProxy.java
@@ -21,8 +21,6 @@
 
 import org.eclipse.jetty.util.BufferUtil;
 import org.eclipse.jetty.util.StringUtil;
-import org.eclipse.jetty.util.log.Log;
-import org.eclipse.jetty.util.log.Logger;
 import org.eclipse.jetty.websocket.api.Session;
 import org.eclipse.jetty.websocket.api.StatusCode;
 import org.eclipse.jetty.websocket.api.WebSocketConnectionListener;
@@ -31,10 +29,12 @@
 import org.eclipse.jetty.websocket.api.exceptions.WebSocketException;
 import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
 import org.eclipse.jetty.websocket.client.WebSocketClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class WebSocketProxy
 {
-    private static final Logger LOG = Log.getLogger(WebSocketProxy.class);
+    private static final Logger LOG = LoggerFactory.getLogger(WebSocketProxy.class);
 
     private final WebSocketClient client;
     private final URI serverUri;