From f917ac900fe2d386462d7371ee6c867bcdfe9d5a Mon Sep 17 00:00:00 2001
From: Mark Robert Miller <markrmiller@apache.org>
Date: Fri, 17 Jul 2015 19:07:26 +0000
Subject: [PATCH] SOLR-7805: Update Kite Morphlines to 1.1.0

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1691626 13f79535-47bb-0310-9956-ffa450edef68
---
 lucene/ivy-versions.properties                             | 2 +-
 solr/CHANGES.txt                                           | 1 +
 .../test/org/apache/solr/hadoop/MorphlineMapperTest.java   | 7 +++++++
 solr/licenses/kite-morphlines-avro-0.12.1.jar.sha1         | 1 -
 solr/licenses/kite-morphlines-avro-1.1.0.jar.sha1          | 1 +
 solr/licenses/kite-morphlines-core-0.12.1-tests.jar.sha1   | 1 -
 solr/licenses/kite-morphlines-core-0.12.1.jar.sha1         | 1 -
 solr/licenses/kite-morphlines-core-1.1.0-tests.jar.sha1    | 1 +
 solr/licenses/kite-morphlines-core-1.1.0.jar.sha1          | 1 +
 .../kite-morphlines-hadoop-sequencefile-0.12.1.jar.sha1    | 1 -
 .../kite-morphlines-hadoop-sequencefile-1.1.0.jar.sha1     | 1 +
 solr/licenses/kite-morphlines-json-0.12.1.jar.sha1         | 1 -
 solr/licenses/kite-morphlines-json-1.1.0.jar.sha1          | 1 +
 solr/licenses/kite-morphlines-saxon-0.12.1.jar.sha1        | 1 -
 solr/licenses/kite-morphlines-saxon-1.1.0.jar.sha1         | 1 +
 solr/licenses/kite-morphlines-tika-core-0.12.1.jar.sha1    | 1 -
 solr/licenses/kite-morphlines-tika-core-1.1.0.jar.sha1     | 1 +
 .../kite-morphlines-tika-decompress-0.12.1.jar.sha1        | 1 -
 .../kite-morphlines-tika-decompress-1.1.0.jar.sha1         | 1 +
 solr/licenses/kite-morphlines-twitter-0.12.1.jar.sha1      | 1 -
 solr/licenses/kite-morphlines-twitter-1.1.0.jar.sha1       | 1 +
 21 files changed, 18 insertions(+), 10 deletions(-)
 delete mode 100644 solr/licenses/kite-morphlines-avro-0.12.1.jar.sha1
 create mode 100644 solr/licenses/kite-morphlines-avro-1.1.0.jar.sha1
 delete mode 100644 solr/licenses/kite-morphlines-core-0.12.1-tests.jar.sha1
 delete mode 100644 solr/licenses/kite-morphlines-core-0.12.1.jar.sha1
 create mode 100644 solr/licenses/kite-morphlines-core-1.1.0-tests.jar.sha1
 create mode 100644 solr/licenses/kite-morphlines-core-1.1.0.jar.sha1
 delete mode 100644 solr/licenses/kite-morphlines-hadoop-sequencefile-0.12.1.jar.sha1
 create mode 100644 solr/licenses/kite-morphlines-hadoop-sequencefile-1.1.0.jar.sha1
 delete mode 100644 solr/licenses/kite-morphlines-json-0.12.1.jar.sha1
 create mode 100644 solr/licenses/kite-morphlines-json-1.1.0.jar.sha1
 delete mode 100644 solr/licenses/kite-morphlines-saxon-0.12.1.jar.sha1
 create mode 100644 solr/licenses/kite-morphlines-saxon-1.1.0.jar.sha1
 delete mode 100644 solr/licenses/kite-morphlines-tika-core-0.12.1.jar.sha1
 create mode 100644 solr/licenses/kite-morphlines-tika-core-1.1.0.jar.sha1
 delete mode 100644 solr/licenses/kite-morphlines-tika-decompress-0.12.1.jar.sha1
 create mode 100644 solr/licenses/kite-morphlines-tika-decompress-1.1.0.jar.sha1
 delete mode 100644 solr/licenses/kite-morphlines-twitter-0.12.1.jar.sha1
 create mode 100644 solr/licenses/kite-morphlines-twitter-1.1.0.jar.sha1

diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index 60aba7e9924..08639abed16 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -259,7 +259,7 @@ org.iq80.leveldb.version = 0.7
 /org.iq80.leveldb/leveldb = ${org.iq80.leveldb.version}
 /org.iq80.leveldb/leveldb-api = ${org.iq80.leveldb.version}
 
-org.kitesdk.kite-morphlines.version = 0.12.1
+org.kitesdk.kite-morphlines.version = 1.1.0
 /org.kitesdk/kite-morphlines-avro = ${org.kitesdk.kite-morphlines.version}
 /org.kitesdk/kite-morphlines-core = ${org.kitesdk.kite-morphlines.version}
 /org.kitesdk/kite-morphlines-hadoop-sequencefile = ${org.kitesdk.kite-morphlines.version}
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index a1cc6499359..1735f7bc365 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -337,6 +337,7 @@ Other Changes
   treat missing values as 0 if that is desired.
   Example:  facet:{ mean:"avg(def(myfield,0))" }
 
+* SOLR-7805: Update Kite Morphlines to 1.1.0 (Mark Miller)
 
 ==================  5.2.1 ==================
 
diff --git a/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineMapperTest.java b/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineMapperTest.java
index 3aa08a5d6bb..9704a086c94 100644
--- a/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineMapperTest.java
+++ b/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineMapperTest.java
@@ -27,9 +27,16 @@ import org.apache.hadoop.mrunit.types.Pair;
 import org.apache.lucene.util.Constants;
 import org.apache.solr.common.SolrInputDocument;
 import org.apache.solr.hadoop.morphline.MorphlineMapper;
+import org.apache.solr.util.BadHdfsThreadsFilter;
+import org.apache.solr.util.BadMrClusterThreadsFilter;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
+
+@ThreadLeakFilters(defaultFilters = true, filters = {
+    BadHdfsThreadsFilter.class // hdfs currently leaks thread(s)
+})
 public class MorphlineMapperTest extends MRUnitBase {
   
   @BeforeClass
diff --git a/solr/licenses/kite-morphlines-avro-0.12.1.jar.sha1 b/solr/licenses/kite-morphlines-avro-0.12.1.jar.sha1
deleted file mode 100644
index 37503329dec..00000000000
--- a/solr/licenses/kite-morphlines-avro-0.12.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-04c5681a25261b7ea4590e57297ceb6ec7938e5e
diff --git a/solr/licenses/kite-morphlines-avro-1.1.0.jar.sha1 b/solr/licenses/kite-morphlines-avro-1.1.0.jar.sha1
new file mode 100644
index 00000000000..fb596dddd0e
--- /dev/null
+++ b/solr/licenses/kite-morphlines-avro-1.1.0.jar.sha1
@@ -0,0 +1 @@
+e097a18ce6ccf3fc208fc6194dbe64ee38bbcb4c
diff --git a/solr/licenses/kite-morphlines-core-0.12.1-tests.jar.sha1 b/solr/licenses/kite-morphlines-core-0.12.1-tests.jar.sha1
deleted file mode 100644
index 635df911952..00000000000
--- a/solr/licenses/kite-morphlines-core-0.12.1-tests.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-fa5b7f0f072b2a92006782bfb7b3381c929b0c5b
diff --git a/solr/licenses/kite-morphlines-core-0.12.1.jar.sha1 b/solr/licenses/kite-morphlines-core-0.12.1.jar.sha1
deleted file mode 100644
index f85ce2c9a75..00000000000
--- a/solr/licenses/kite-morphlines-core-0.12.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-43306d1bce0db1591d3e030924583356374624f5
diff --git a/solr/licenses/kite-morphlines-core-1.1.0-tests.jar.sha1 b/solr/licenses/kite-morphlines-core-1.1.0-tests.jar.sha1
new file mode 100644
index 00000000000..3c7baae875b
--- /dev/null
+++ b/solr/licenses/kite-morphlines-core-1.1.0-tests.jar.sha1
@@ -0,0 +1 @@
+4110e16503a3bde44406ca9969055320b169c041
diff --git a/solr/licenses/kite-morphlines-core-1.1.0.jar.sha1 b/solr/licenses/kite-morphlines-core-1.1.0.jar.sha1
new file mode 100644
index 00000000000..b98e853ed11
--- /dev/null
+++ b/solr/licenses/kite-morphlines-core-1.1.0.jar.sha1
@@ -0,0 +1 @@
+0a73f6cbbb0cde8dfd2c1924c7b66224f1b0ab64
diff --git a/solr/licenses/kite-morphlines-hadoop-sequencefile-0.12.1.jar.sha1 b/solr/licenses/kite-morphlines-hadoop-sequencefile-0.12.1.jar.sha1
deleted file mode 100644
index 2e7053469ca..00000000000
--- a/solr/licenses/kite-morphlines-hadoop-sequencefile-0.12.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f34c36e60171f8bf8c8782e900f4a8f94cb9c1e1
diff --git a/solr/licenses/kite-morphlines-hadoop-sequencefile-1.1.0.jar.sha1 b/solr/licenses/kite-morphlines-hadoop-sequencefile-1.1.0.jar.sha1
new file mode 100644
index 00000000000..d228894c0ad
--- /dev/null
+++ b/solr/licenses/kite-morphlines-hadoop-sequencefile-1.1.0.jar.sha1
@@ -0,0 +1 @@
+6f6d7c45138d571f2bf23be8c80c552f8d8a4851
diff --git a/solr/licenses/kite-morphlines-json-0.12.1.jar.sha1 b/solr/licenses/kite-morphlines-json-0.12.1.jar.sha1
deleted file mode 100644
index a773eed72d3..00000000000
--- a/solr/licenses/kite-morphlines-json-0.12.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2fdd97002f14fa4dc38e7917622b86d17804fbaf
diff --git a/solr/licenses/kite-morphlines-json-1.1.0.jar.sha1 b/solr/licenses/kite-morphlines-json-1.1.0.jar.sha1
new file mode 100644
index 00000000000..82db075ae89
--- /dev/null
+++ b/solr/licenses/kite-morphlines-json-1.1.0.jar.sha1
@@ -0,0 +1 @@
+33009c21ad90f18a8ddceca9680c83dc2006555d
diff --git a/solr/licenses/kite-morphlines-saxon-0.12.1.jar.sha1 b/solr/licenses/kite-morphlines-saxon-0.12.1.jar.sha1
deleted file mode 100644
index a2f24bea588..00000000000
--- a/solr/licenses/kite-morphlines-saxon-0.12.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-da4aa57277fad71063ee2081d5fc5d7fa40f4d06
diff --git a/solr/licenses/kite-morphlines-saxon-1.1.0.jar.sha1 b/solr/licenses/kite-morphlines-saxon-1.1.0.jar.sha1
new file mode 100644
index 00000000000..ec131b2dc81
--- /dev/null
+++ b/solr/licenses/kite-morphlines-saxon-1.1.0.jar.sha1
@@ -0,0 +1 @@
+7cdb3f9d756906b60778f4eef7fcb57ddd3ef0fa
diff --git a/solr/licenses/kite-morphlines-tika-core-0.12.1.jar.sha1 b/solr/licenses/kite-morphlines-tika-core-0.12.1.jar.sha1
deleted file mode 100644
index 201b71a5990..00000000000
--- a/solr/licenses/kite-morphlines-tika-core-0.12.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7f3a86b95a04e459c2a102c9acc83f56e9677461
diff --git a/solr/licenses/kite-morphlines-tika-core-1.1.0.jar.sha1 b/solr/licenses/kite-morphlines-tika-core-1.1.0.jar.sha1
new file mode 100644
index 00000000000..ace76dde665
--- /dev/null
+++ b/solr/licenses/kite-morphlines-tika-core-1.1.0.jar.sha1
@@ -0,0 +1 @@
+c9fb579f66f669529e4aa359270cc84ae720d4f8
diff --git a/solr/licenses/kite-morphlines-tika-decompress-0.12.1.jar.sha1 b/solr/licenses/kite-morphlines-tika-decompress-0.12.1.jar.sha1
deleted file mode 100644
index 29de7112a98..00000000000
--- a/solr/licenses/kite-morphlines-tika-decompress-0.12.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-37b466494d4ab4ad55cdac5344cb8bd8352956ad
diff --git a/solr/licenses/kite-morphlines-tika-decompress-1.1.0.jar.sha1 b/solr/licenses/kite-morphlines-tika-decompress-1.1.0.jar.sha1
new file mode 100644
index 00000000000..10872c115fe
--- /dev/null
+++ b/solr/licenses/kite-morphlines-tika-decompress-1.1.0.jar.sha1
@@ -0,0 +1 @@
+3ae30cdeeef3978520e64289a49426aad815ef4b
diff --git a/solr/licenses/kite-morphlines-twitter-0.12.1.jar.sha1 b/solr/licenses/kite-morphlines-twitter-0.12.1.jar.sha1
deleted file mode 100644
index 054ea502d16..00000000000
--- a/solr/licenses/kite-morphlines-twitter-0.12.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3fea7c8a904e049875f8ef7600718e6893e0f5d1
diff --git a/solr/licenses/kite-morphlines-twitter-1.1.0.jar.sha1 b/solr/licenses/kite-morphlines-twitter-1.1.0.jar.sha1
new file mode 100644
index 00000000000..421739d4df6
--- /dev/null
+++ b/solr/licenses/kite-morphlines-twitter-1.1.0.jar.sha1
@@ -0,0 +1 @@
+1a26addfbb112f3426c4fce2e3f7c1f338a04f25