fixed merge

jetty-server/src/main/java/org/eclipse/jetty/server/handler/InetAccessHandler.java

@@ -115,7 +115,7 @@ public class InetAccessHandler extends HandlerWrapper
     public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
     {
         // Get the real remote IP (not the one set by the forwarded headers (which may be forged))
-        HttpChannel<?> channel = baseRequest.getHttpChannel();
+        HttpChannel channel = baseRequest.getHttpChannel();
         if (channel!=null)
         {
             EndPoint endp=channel.getEndPoint();

jetty-util/src/main/java/org/eclipse/jetty/util/IncludeExclude.java

@@ -19,6 +19,7 @@
 package org.eclipse.jetty.util;
 
 import java.util.Set;
+import java.util.function.Predicate;
 
 
 /** Utility class to maintain a set of inclusions and exclusions.

jetty-util/src/main/java/org/eclipse/jetty/util/IncludeExcludeSet.java

@@ -19,7 +19,9 @@
 package org.eclipse.jetty.util;
 
 import java.util.HashSet;
+import java.util.Objects;
 import java.util.Set;
+import java.util.function.Predicate;
 
 
 /** Utility class to maintain a set of inclusions and exclusions.

jetty-util/src/main/java/org/eclipse/jetty/util/InetAddressSet.java

@@ -24,6 +24,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Predicate;
 
 /**
  * A set of InetAddress patterns.