You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2017/08/20 18:49:50 UTC
[2/2] lucene-solr:branch_7_0: SOLR-11261: Fix missing dependency &
add new thread filter
SOLR-11261: Fix missing dependency & add new thread filter
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/75141efa
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/75141efa
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/75141efa
Branch: refs/heads/branch_7_0
Commit: 75141efada4520c36b4b87a4e05b4ef1eff886a0
Parents: 04c6395
Author: Uwe Schindler <us...@apache.org>
Authored: Sun Aug 20 16:57:24 2017 +0200
Committer: Uwe Schindler <us...@apache.org>
Committed: Sun Aug 20 20:48:16 2017 +0200
----------------------------------------------------------------------
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(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/75141efa/lucene/ivy-versions.properties
----------------------------------------------------------------------
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index 010251c..794cfca 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
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/75141efa/solr/core/ivy.xml
----------------------------------------------------------------------
diff --git a/solr/core/ivy.xml b/solr/core/ivy.xml
index 5f4f84f..77d3bed 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"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/75141efa/solr/licenses/jetty-sslengine-6.1.26.jar.sha1
----------------------------------------------------------------------
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 0000000..28e4a92
--- /dev/null
+++ b/solr/licenses/jetty-sslengine-6.1.26.jar.sha1
@@ -0,0 +1 @@
+60367999cee49a3b09fa86bdcb52310b6c896014
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/75141efa/solr/test-framework/src/java/org/apache/solr/util/BadHdfsThreadsFilter.java
----------------------------------------------------------------------
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 e235182..a6e2254 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;
}