You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2015/07/17 21:39:51 UTC
svn commit: r1691631 - in /lucene/dev/branches/branch_5x: ./ lucene/ solr/
solr/contrib/ solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/
solr/licenses/
Author: markrmiller
Date: Fri Jul 17 19:39:51 2015
New Revision: 1691631
URL: http://svn.apache.org/r1691631
Log:
SOLR-7805: Update Kite Morphlines to 1.1.0
Added:
lucene/dev/branches/branch_5x/solr/licenses/kite-morphlines-avro-1.1.0.jar.sha1
- copied unchanged from r1691626, lucene/dev/trunk/solr/licenses/kite-morphlines-avro-1.1.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/kite-morphlines-core-1.1.0-tests.jar.sha1
- copied unchanged from r1691626, lucene/dev/trunk/solr/licenses/kite-morphlines-core-1.1.0-tests.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/kite-morphlines-core-1.1.0.jar.sha1
- copied unchanged from r1691626, lucene/dev/trunk/solr/licenses/kite-morphlines-core-1.1.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/kite-morphlines-hadoop-sequencefile-1.1.0.jar.sha1
- copied unchanged from r1691626, lucene/dev/trunk/solr/licenses/kite-morphlines-hadoop-sequencefile-1.1.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/kite-morphlines-json-1.1.0.jar.sha1
- copied unchanged from r1691626, lucene/dev/trunk/solr/licenses/kite-morphlines-json-1.1.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/kite-morphlines-saxon-1.1.0.jar.sha1
- copied unchanged from r1691626, lucene/dev/trunk/solr/licenses/kite-morphlines-saxon-1.1.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/kite-morphlines-tika-core-1.1.0.jar.sha1
- copied unchanged from r1691626, lucene/dev/trunk/solr/licenses/kite-morphlines-tika-core-1.1.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/kite-morphlines-tika-decompress-1.1.0.jar.sha1
- copied unchanged from r1691626, lucene/dev/trunk/solr/licenses/kite-morphlines-tika-decompress-1.1.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/kite-morphlines-twitter-1.1.0.jar.sha1
- copied unchanged from r1691626, lucene/dev/trunk/solr/licenses/kite-morphlines-twitter-1.1.0.jar.sha1
Removed:
lucene/dev/branches/branch_5x/solr/licenses/kite-morphlines-avro-0.12.1.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/kite-morphlines-core-0.12.1-tests.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/kite-morphlines-core-0.12.1.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/kite-morphlines-hadoop-sequencefile-0.12.1.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/kite-morphlines-json-0.12.1.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/kite-morphlines-saxon-0.12.1.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/kite-morphlines-tika-core-0.12.1.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/kite-morphlines-tika-decompress-0.12.1.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/kite-morphlines-twitter-0.12.1.jar.sha1
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/lucene/ (props changed)
lucene/dev/branches/branch_5x/lucene/ivy-versions.properties (contents, props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/solr/contrib/ (props changed)
lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineMapperTest.java
lucene/dev/branches/branch_5x/solr/licenses/ (props changed)
Modified: lucene/dev/branches/branch_5x/lucene/ivy-versions.properties
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/ivy-versions.properties?rev=1691631&r1=1691630&r2=1691631&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/ivy-versions.properties (original)
+++ lucene/dev/branches/branch_5x/lucene/ivy-versions.properties Fri Jul 17 19:39:51 2015
@@ -253,7 +253,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}
Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1691631&r1=1691630&r2=1691631&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Fri Jul 17 19:39:51 2015
@@ -279,6 +279,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 ==================
Modified: lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineMapperTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineMapperTest.java?rev=1691631&r1=1691630&r2=1691631&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineMapperTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineMapperTest.java Fri Jul 17 19:39:51 2015
@@ -27,9 +27,16 @@ import org.apache.hadoop.mrunit.types.Pa
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