From cf051abcb9f8385e5de65de6c08468e31707f2d2 Mon Sep 17 00:00:00 2001
From: Uwe Schindler <uschindler@apache.org>
Date: Sun, 20 Aug 2017 16:57:24 +0200
Subject: [PATCH] SOLR-11261: Fix missing dependency & add new thread filter

---
 lucene/ivy-versions.properties                                  | 1 +
 solr/core/ivy.xml                                               | 1 +
 solr/licenses/jetty-sslengine-6.1.26.jar.sha1                   | 1 +
 .../src/java/org/apache/solr/util/BadHdfsThreadsFilter.java     | 2 ++
 4 files changed, 5 insertions(+)
 create mode 100644 solr/licenses/jetty-sslengine-6.1.26.jar.sha1

diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index 0a674a2cd79..ac0ea6c56ea 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -252,6 +252,7 @@ org.gagravarr.vorbis.java.version = 0.8
 
 org.mortbay.jetty.version = 6.1.26
 /org.mortbay.jetty/jetty = ${org.mortbay.jetty.version}
+/org.mortbay.jetty/jetty-sslengine = ${org.mortbay.jetty.version}
 /org.mortbay.jetty/jetty-util = ${org.mortbay.jetty.version}
 
 /org.noggit/noggit = 0.8
diff --git a/solr/core/ivy.xml b/solr/core/ivy.xml
index 5f4f84f77d8..77d3bed3d34 100644
--- a/solr/core/ivy.xml
+++ b/solr/core/ivy.xml
@@ -87,6 +87,7 @@
     <dependency org="org.mortbay.jetty" name="jetty" rev="${/org.mortbay.jetty/jetty}" conf="test.DfsMiniCluster"/>
     <dependency org="org.codehaus.janino" name="commons-compiler" rev="${/org.codehaus.janino/commons-compiler}" conf="compile"/>
     <dependency org="org.mortbay.jetty" name="jetty-util" rev="${/org.mortbay.jetty/jetty-util}" conf="test.DfsMiniCluster"/>
+    <dependency org="org.mortbay.jetty" name="jetty-sslengine" rev="${/org.mortbay.jetty/jetty-sslengine}" conf="test.DfsMiniCluster"/>
     <dependency org="com.sun.jersey" name="jersey-core" rev="${/com.sun.jersey/jersey-core}" conf="test.DfsMiniCluster"/>
     <dependency org="com.sun.jersey" name="jersey-server" rev="${/com.sun.jersey/jersey-server}" conf="test.DfsMiniCluster"/>
     <dependency org="commons-collections" name="commons-collections" rev="${/commons-collections/commons-collections}" conf="test.DfsMiniCluster"/>
diff --git a/solr/licenses/jetty-sslengine-6.1.26.jar.sha1 b/solr/licenses/jetty-sslengine-6.1.26.jar.sha1
new file mode 100644
index 00000000000..28e4a92ae80
--- /dev/null
+++ b/solr/licenses/jetty-sslengine-6.1.26.jar.sha1
@@ -0,0 +1 @@
+60367999cee49a3b09fa86bdcb52310b6c896014
diff --git a/solr/test-framework/src/java/org/apache/solr/util/BadHdfsThreadsFilter.java b/solr/test-framework/src/java/org/apache/solr/util/BadHdfsThreadsFilter.java
index e235182366d..a6e2254b3d3 100644
--- a/solr/test-framework/src/java/org/apache/solr/util/BadHdfsThreadsFilter.java
+++ b/solr/test-framework/src/java/org/apache/solr/util/BadHdfsThreadsFilter.java
@@ -29,6 +29,8 @@ public class BadHdfsThreadsFilter implements ThreadFilter {
       return true;
     } else if (name.startsWith("LeaseRenewer")) { // SOLR-7287
       return true;
+    } else if (name.startsWith("org.apache.hadoop.fs.FileSystem$Statistics")) { // SOLR-11261
+      return true;
     }
     return false;
   }