Merge remote-tracking branch 'upstream/master' into jakarta-update

# Conflicts:
#	src/main/java/org/jruby/rack/AbstractFilter.java
#	src/main/java/org/jruby/rack/AbstractServlet.java
#	src/main/java/org/jruby/rack/DefaultRackApplicationFactory.java
#	src/main/java/org/jruby/rack/DefaultRackConfig.java
#	src/main/java/org/jruby/rack/RackDispatcher.java
#	src/main/java/org/jruby/rack/RackTag.java
#	src/main/java/org/jruby/rack/logging/ServletContextLogger.java
#	src/main/java/org/jruby/rack/servlet/DefaultServletRackContext.java
#	src/main/java/org/jruby/rack/servlet/RequestCapture.java
#	src/main/java/org/jruby/rack/servlet/ResponseCapture.java
#	src/main/java/org/jruby/rack/servlet/RewindableInputStream.java
#	src/main/java/org/jruby/rack/servlet/ServletRackConfig.java
#	src/main/java/org/jruby/rack/servlet/ServletRackEnvironment.java
#	src/main/java/org/jruby/rack/servlet/ServletRackIncludedResponse.java
#	src/main/java/org/jruby/rack/servlet/ServletRackResponseEnvironment.java
#	src/spec/java/org/jruby/rack/fake/FakePageContext.java
#	src/spec/java/org/jruby/rack/mock/fail/FailingHttpServletResponse.java

Author: chadlwilson

src/main/java/org/jruby/rack/DefaultRackDispatcher.java

@@ -11,7 +11,7 @@
 
 import org.jruby.rack.servlet.ServletRackContext;
 
-import static org.jruby.rack.RackLogger.Level.*;
+import static org.jruby.rack.RackLogger.Level.ERROR;
 
 /**
  * Dispatcher suited for use in a servlet container

src/main/java/org/jruby/rack/RackApplicationFactoryDecorator.java

@@ -29,7 +29,7 @@
 
 import org.jruby.Ruby;
 
-import static org.jruby.rack.RackLogger.Level.*;
+import static org.jruby.rack.RackLogger.Level.DEBUG;
 
 /**
  * An abstract base class for decorating factories.

src/main/java/org/jruby/rack/RackException.java

@@ -6,6 +6,7 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
+
 import org.jruby.exceptions.RaiseException;
 
 /**

src/main/java/org/jruby/rack/SharedRackApplicationFactory.java

@@ -10,7 +10,7 @@
 import java.util.Collection;
 import java.util.Collections;
 
-import static org.jruby.rack.RackLogger.Level.*;
+import static org.jruby.rack.RackLogger.Level.INFO;
 
 /**
  * Shared application factory that only creates a single application instance.

src/main/java/org/jruby/rack/UnmappedRackFilter.java

@@ -15,7 +15,11 @@
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**

src/main/java/org/jruby/rack/ext/Input.java

@@ -23,16 +23,15 @@
 import org.jruby.RubyString;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.javasupport.JavaEmbedUtils;
+import org.jruby.rack.RackEnvironment;
+import org.jruby.rack.servlet.RewindableInputStream;
+import org.jruby.rack.util.ExceptionUtils;
 import org.jruby.runtime.Block;
 import org.jruby.runtime.Helpers;
 import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.util.ByteList;
-
-import org.jruby.rack.RackEnvironment;
-import org.jruby.rack.servlet.RewindableInputStream;
-import org.jruby.rack.util.ExceptionUtils;
 import org.jruby.util.StringSupport;
 
 /**

src/spec/java/org/jruby/rack/mock/fail/FailingServletOutputStream.java

@@ -23,12 +23,12 @@
  */
 package org.jruby.rack.mock.fail;
 
-import org.springframework.mock.web.DelegatingServletOutputStream;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 
+import org.springframework.mock.web.DelegatingServletOutputStream;
+
 /**
  * @author kares
  */