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/03/23 15:16:34 UTC
svn commit: r1668652 - in /lucene/dev/trunk: lucene/ solr/ solr/core/
solr/licenses/ solr/test-framework/src/java/org/apache/solr/util/
Author: markrmiller
Date: Mon Mar 23 14:16:33 2015
New Revision: 1668652
URL: http://svn.apache.org/r1668652
Log:
SOLR-6414: Update to Hadoop 2.6.0.
Added:
lucene/dev/trunk/solr/licenses/hadoop-annotations-2.6.0.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/hadoop-auth-2.6.0.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/hadoop-common-2.6.0-tests.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/hadoop-common-2.6.0.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/hadoop-hdfs-2.6.0-tests.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/hadoop-hdfs-2.6.0.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-app-2.6.0.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-common-2.6.0.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-core-2.6.0.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-hs-2.6.0.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-jobclient-2.6.0-tests.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-jobclient-2.6.0.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-shuffle-2.6.0.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/hadoop-minikdc-2.6.0.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/hadoop-yarn-api-2.6.0.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/hadoop-yarn-client-2.6.0.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/hadoop-yarn-common-2.6.0.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/hadoop-yarn-server-common-2.6.0.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/hadoop-yarn-server-nodemanager-2.6.0.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/hadoop-yarn-server-resourcemanager-2.6.0.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/hadoop-yarn-server-tests-2.6.0-tests.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/hadoop-yarn-server-web-proxy-2.6.0.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/htrace-core-3.0.4.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/htrace-core-LICENSE-ASL.txt (with props)
lucene/dev/trunk/solr/licenses/htrace-core-NOTICE.txt (with props)
lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/BadHdfsThreadsFilter.java (with props)
lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/BadZookeeperThreadsFilter.java (with props)
Removed:
lucene/dev/trunk/solr/licenses/hadoop-annotations-2.3.0.jar.sha1
lucene/dev/trunk/solr/licenses/hadoop-auth-2.3.0.jar.sha1
lucene/dev/trunk/solr/licenses/hadoop-common-2.3.0-tests.jar.sha1
lucene/dev/trunk/solr/licenses/hadoop-common-2.3.0.jar.sha1
lucene/dev/trunk/solr/licenses/hadoop-hdfs-2.3.0-tests.jar.sha1
lucene/dev/trunk/solr/licenses/hadoop-hdfs-2.3.0.jar.sha1
lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-app-2.3.0.jar.sha1
lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-common-2.3.0.jar.sha1
lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-core-2.3.0.jar.sha1
lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-hs-2.3.0.jar.sha1
lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-jobclient-2.3.0-tests.jar.sha1
lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-jobclient-2.3.0.jar.sha1
lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-shuffle-2.3.0.jar.sha1
lucene/dev/trunk/solr/licenses/hadoop-minikdc-2.3.0.jar.sha1
lucene/dev/trunk/solr/licenses/hadoop-yarn-api-2.3.0.jar.sha1
lucene/dev/trunk/solr/licenses/hadoop-yarn-client-2.3.0.jar.sha1
lucene/dev/trunk/solr/licenses/hadoop-yarn-common-2.3.0.jar.sha1
lucene/dev/trunk/solr/licenses/hadoop-yarn-server-common-2.3.0.jar.sha1
lucene/dev/trunk/solr/licenses/hadoop-yarn-server-nodemanager-2.3.0.jar.sha1
lucene/dev/trunk/solr/licenses/hadoop-yarn-server-resourcemanager-2.3.0.jar.sha1
lucene/dev/trunk/solr/licenses/hadoop-yarn-server-tests-2.3.0-tests.jar.sha1
lucene/dev/trunk/solr/licenses/hadoop-yarn-server-web-proxy-2.3.0.jar.sha1
Modified:
lucene/dev/trunk/lucene/ivy-versions.properties
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/ivy.xml
Modified: lucene/dev/trunk/lucene/ivy-versions.properties
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/ivy-versions.properties?rev=1668652&r1=1668651&r2=1668652&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/ivy-versions.properties (original)
+++ lucene/dev/trunk/lucene/ivy-versions.properties Mon Mar 23 14:16:33 2015
@@ -91,7 +91,7 @@ com.sun.jersey.version = 1.9
/org.apache.derby/derby = 10.9.1.0
/org.apache.directory.server/apacheds-all = 2.0.0-M15
-org.apache.hadoop.version = 2.3.0
+org.apache.hadoop.version = 2.6.0
/org.apache.hadoop/hadoop-annotations = ${org.apache.hadoop.version}
/org.apache.hadoop/hadoop-auth = ${org.apache.hadoop.version}
/org.apache.hadoop/hadoop-common = ${org.apache.hadoop.version}
@@ -201,6 +201,9 @@ org.gagravarr.vorbis.java.version = 0.6
/org.gagravarr/vorbis-java-core = ${org.gagravarr.vorbis.java.version}
/org.gagravarr/vorbis-java-tika = ${org.gagravarr.vorbis.java.version}
+org.htrace.version = 3.0.4
+/org.htrace/htrace-core = ${org.htrace.version}
+
org.kitesdk.kite-morphlines.version = 0.12.1
/org.kitesdk/kite-morphlines-avro = ${org.kitesdk.kite-morphlines.version}
/org.kitesdk/kite-morphlines-core = ${org.kitesdk.kite-morphlines.version}
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1668652&r1=1668651&r2=1668652&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Mon Mar 23 14:16:33 2015
@@ -368,6 +368,8 @@ Other Changes
* SOLR-7162: Remove unused SolrSortField interface. (yonik, Connor Warrington via shalin)
+* SOLR-6414: Update to Hadoop 2.6.0. (Mark Miller)
+
================== 5.0.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
Modified: lucene/dev/trunk/solr/core/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/ivy.xml?rev=1668652&r1=1668651&r2=1668652&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/ivy.xml (original)
+++ lucene/dev/trunk/solr/core/ivy.xml Mon Mar 23 14:16:33 2015
@@ -80,6 +80,7 @@
<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"/>
+ <dependency org="org.htrace" name="htrace-core" rev="${/org.htrace/htrace-core}" conf="test.DfsMiniCluster"/>
<!-- Hadoop MiniKdc Dependencies-->
<dependency org="org.apache.hadoop" name="hadoop-minikdc" rev="${/org.apache.hadoop/hadoop-minikdc}" conf="test.MiniKdc"/>
Added: lucene/dev/trunk/solr/licenses/hadoop-annotations-2.6.0.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/hadoop-annotations-2.6.0.jar.sha1?rev=1668652&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/hadoop-annotations-2.6.0.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/hadoop-annotations-2.6.0.jar.sha1 Mon Mar 23 14:16:33 2015
@@ -0,0 +1 @@
+8cd40a4cde2b77e6edc1ab3bb55706d626ae8b2d
Added: lucene/dev/trunk/solr/licenses/hadoop-auth-2.6.0.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/hadoop-auth-2.6.0.jar.sha1?rev=1668652&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/hadoop-auth-2.6.0.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/hadoop-auth-2.6.0.jar.sha1 Mon Mar 23 14:16:33 2015
@@ -0,0 +1 @@
+b0b8dec23a84ac8a0d00fbd69a87d320724ae34a
Added: lucene/dev/trunk/solr/licenses/hadoop-common-2.6.0-tests.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/hadoop-common-2.6.0-tests.jar.sha1?rev=1668652&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/hadoop-common-2.6.0-tests.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/hadoop-common-2.6.0-tests.jar.sha1 Mon Mar 23 14:16:33 2015
@@ -0,0 +1 @@
+23c6df24f0d08412d04ed4d7bc11753ba7bf45d6
Added: lucene/dev/trunk/solr/licenses/hadoop-common-2.6.0.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/hadoop-common-2.6.0.jar.sha1?rev=1668652&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/hadoop-common-2.6.0.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/hadoop-common-2.6.0.jar.sha1 Mon Mar 23 14:16:33 2015
@@ -0,0 +1 @@
+a3f6d9827e9813a0fb286ebc0d3ae8cffed17105
Added: lucene/dev/trunk/solr/licenses/hadoop-hdfs-2.6.0-tests.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/hadoop-hdfs-2.6.0-tests.jar.sha1?rev=1668652&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/hadoop-hdfs-2.6.0-tests.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/hadoop-hdfs-2.6.0-tests.jar.sha1 Mon Mar 23 14:16:33 2015
@@ -0,0 +1 @@
+c23e40b4cfaca80c93849a9bccb7d6793a9239aa
Added: lucene/dev/trunk/solr/licenses/hadoop-hdfs-2.6.0.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/hadoop-hdfs-2.6.0.jar.sha1?rev=1668652&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/hadoop-hdfs-2.6.0.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/hadoop-hdfs-2.6.0.jar.sha1 Mon Mar 23 14:16:33 2015
@@ -0,0 +1 @@
+9e25d4ea9daab5d0b7fbbe1749790aef3280ff35
Added: lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-app-2.6.0.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-app-2.6.0.jar.sha1?rev=1668652&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-app-2.6.0.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-app-2.6.0.jar.sha1 Mon Mar 23 14:16:33 2015
@@ -0,0 +1 @@
+43aba8c4a4c152889363efcff5691b7bf0cd6db7
Added: lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-common-2.6.0.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-common-2.6.0.jar.sha1?rev=1668652&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-common-2.6.0.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-common-2.6.0.jar.sha1 Mon Mar 23 14:16:33 2015
@@ -0,0 +1 @@
+00b901fc26d9d73558132120fc8d9e7d753ee7a7
Added: lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-core-2.6.0.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-core-2.6.0.jar.sha1?rev=1668652&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-core-2.6.0.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-core-2.6.0.jar.sha1 Mon Mar 23 14:16:33 2015
@@ -0,0 +1 @@
+c0c6bb2c79833e0a0e75473c340a1fb9544a9ac9
Added: lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-hs-2.6.0.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-hs-2.6.0.jar.sha1?rev=1668652&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-hs-2.6.0.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-hs-2.6.0.jar.sha1 Mon Mar 23 14:16:33 2015
@@ -0,0 +1 @@
+ae39982d46c4bb6750fa1dc50d14177adee72100
Added: lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-jobclient-2.6.0-tests.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-jobclient-2.6.0-tests.jar.sha1?rev=1668652&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-jobclient-2.6.0-tests.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-jobclient-2.6.0-tests.jar.sha1 Mon Mar 23 14:16:33 2015
@@ -0,0 +1 @@
+e7de458eb3a7553326318ff08f936f4ca12b92e8
Added: lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-jobclient-2.6.0.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-jobclient-2.6.0.jar.sha1?rev=1668652&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-jobclient-2.6.0.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-jobclient-2.6.0.jar.sha1 Mon Mar 23 14:16:33 2015
@@ -0,0 +1 @@
+250e960011ff5a87964fbf7b2cd86438cbb74c16
Added: lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-shuffle-2.6.0.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-shuffle-2.6.0.jar.sha1?rev=1668652&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-shuffle-2.6.0.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-shuffle-2.6.0.jar.sha1 Mon Mar 23 14:16:33 2015
@@ -0,0 +1 @@
+32ecb6cb40ade3abea1ef4cad5eb16704b5467b0
Added: lucene/dev/trunk/solr/licenses/hadoop-minikdc-2.6.0.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/hadoop-minikdc-2.6.0.jar.sha1?rev=1668652&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/hadoop-minikdc-2.6.0.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/hadoop-minikdc-2.6.0.jar.sha1 Mon Mar 23 14:16:33 2015
@@ -0,0 +1 @@
+1a573fd3156d17ff706a0836e9f7471238a89501
Added: lucene/dev/trunk/solr/licenses/hadoop-yarn-api-2.6.0.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/hadoop-yarn-api-2.6.0.jar.sha1?rev=1668652&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/hadoop-yarn-api-2.6.0.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/hadoop-yarn-api-2.6.0.jar.sha1 Mon Mar 23 14:16:33 2015
@@ -0,0 +1 @@
+c3bcbcd82cd61b55dc5d523f26a259f8d27fc237
Added: lucene/dev/trunk/solr/licenses/hadoop-yarn-client-2.6.0.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/hadoop-yarn-client-2.6.0.jar.sha1?rev=1668652&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/hadoop-yarn-client-2.6.0.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/hadoop-yarn-client-2.6.0.jar.sha1 Mon Mar 23 14:16:33 2015
@@ -0,0 +1 @@
+bbd9752aaa12a1db3fd6ce1e851307dd12c8fe96
Added: lucene/dev/trunk/solr/licenses/hadoop-yarn-common-2.6.0.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/hadoop-yarn-common-2.6.0.jar.sha1?rev=1668652&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/hadoop-yarn-common-2.6.0.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/hadoop-yarn-common-2.6.0.jar.sha1 Mon Mar 23 14:16:33 2015
@@ -0,0 +1 @@
+9dd33fb5183f8faac731868eff69ac2b7678b75b
Added: lucene/dev/trunk/solr/licenses/hadoop-yarn-server-common-2.6.0.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/hadoop-yarn-server-common-2.6.0.jar.sha1?rev=1668652&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/hadoop-yarn-server-common-2.6.0.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/hadoop-yarn-server-common-2.6.0.jar.sha1 Mon Mar 23 14:16:33 2015
@@ -0,0 +1 @@
+887639fe75421ab6f67a78b6f9b04b0c9b251490
Added: lucene/dev/trunk/solr/licenses/hadoop-yarn-server-nodemanager-2.6.0.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/hadoop-yarn-server-nodemanager-2.6.0.jar.sha1?rev=1668652&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/hadoop-yarn-server-nodemanager-2.6.0.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/hadoop-yarn-server-nodemanager-2.6.0.jar.sha1 Mon Mar 23 14:16:33 2015
@@ -0,0 +1 @@
+e02948e79d7408d79c4d1d60cb410b16146376d5
Added: lucene/dev/trunk/solr/licenses/hadoop-yarn-server-resourcemanager-2.6.0.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/hadoop-yarn-server-resourcemanager-2.6.0.jar.sha1?rev=1668652&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/hadoop-yarn-server-resourcemanager-2.6.0.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/hadoop-yarn-server-resourcemanager-2.6.0.jar.sha1 Mon Mar 23 14:16:33 2015
@@ -0,0 +1 @@
+08d9240e288d501bf2c5dbd3870d6d87b3c79769
Added: lucene/dev/trunk/solr/licenses/hadoop-yarn-server-tests-2.6.0-tests.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/hadoop-yarn-server-tests-2.6.0-tests.jar.sha1?rev=1668652&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/hadoop-yarn-server-tests-2.6.0-tests.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/hadoop-yarn-server-tests-2.6.0-tests.jar.sha1 Mon Mar 23 14:16:33 2015
@@ -0,0 +1 @@
+c2539026721df0ad4757c31bc29ec2f1c00ac2ba
Added: lucene/dev/trunk/solr/licenses/hadoop-yarn-server-web-proxy-2.6.0.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/hadoop-yarn-server-web-proxy-2.6.0.jar.sha1?rev=1668652&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/hadoop-yarn-server-web-proxy-2.6.0.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/hadoop-yarn-server-web-proxy-2.6.0.jar.sha1 Mon Mar 23 14:16:33 2015
@@ -0,0 +1 @@
+49042e6b5c54cfde7756b869669761a2b1ad6bf4
Added: lucene/dev/trunk/solr/licenses/htrace-core-3.0.4.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/htrace-core-3.0.4.jar.sha1?rev=1668652&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/htrace-core-3.0.4.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/htrace-core-3.0.4.jar.sha1 Mon Mar 23 14:16:33 2015
@@ -0,0 +1 @@
+d7461828faf28411f37f8570d896292db277d838
Added: lucene/dev/trunk/solr/licenses/htrace-core-LICENSE-ASL.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/htrace-core-LICENSE-ASL.txt?rev=1668652&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/htrace-core-LICENSE-ASL.txt (added)
+++ lucene/dev/trunk/solr/licenses/htrace-core-LICENSE-ASL.txt Mon Mar 23 14:16:33 2015
@@ -0,0 +1,182 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+This project contains annotations derived from JCIP-ANNOTATIONS
+Copyright (c) 2005 Brian Goetz and Tim Peierls.
+See http://www.jcip.net and the Creative Commons Attribution License
+(http://creativecommons.org/licenses/by/2.5)
+
Added: lucene/dev/trunk/solr/licenses/htrace-core-NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/htrace-core-NOTICE.txt?rev=1668652&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/htrace-core-NOTICE.txt (added)
+++ lucene/dev/trunk/solr/licenses/htrace-core-NOTICE.txt Mon Mar 23 14:16:33 2015
@@ -0,0 +1,18 @@
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).
+
+In addition, this product includes software developed by:
+
+JUnit (http://www.junit.org/) included under the Common Public License v1.0. See
+the full text here: http://junit.sourceforge.net/cpl-v10.html
+
+levigo, a go wrapper for leveldb, is copyright Jeffrey M Hodges and
+is MIT licensed: https://github.com/jmhodges/levigo/blob/master/LICENSE
+
+Units, unit multipliers and functions for go, has license
+(TBD https://github.com/alecthomas/units/issues/1).
+It is by alecthomas: https://github.com/alecthomas/units
+
+Kingpin, a go command line and flag parser is licensed MIT
+(https://github.com/alecthomas/kingpin/blob/master/COPYING)
+by alecthomas
Added: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/BadHdfsThreadsFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/BadHdfsThreadsFilter.java?rev=1668652&view=auto
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/BadHdfsThreadsFilter.java (added)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/BadHdfsThreadsFilter.java Mon Mar 23 14:16:33 2015
@@ -0,0 +1,36 @@
+package org.apache.solr.util;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import com.carrotsearch.randomizedtesting.ThreadFilter;
+
+public class BadHdfsThreadsFilter implements ThreadFilter {
+
+ @Override
+ public boolean reject(Thread t) {
+ String name = t.getName();
+ if (name.startsWith("IPC Parameter Sending Thread ")) { // SOLR-5007
+ return true;
+ } else if (name.startsWith("org.apache.hadoop.hdfs.PeerCache")) { // SOLR-7288
+ return true;
+ } else if (name.startsWith("LeaseRenewer")) { // SOLR-7287
+ return true;
+ }
+ return false;
+ }
+}
Added: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/BadZookeeperThreadsFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/BadZookeeperThreadsFilter.java?rev=1668652&view=auto
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/BadZookeeperThreadsFilter.java (added)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/BadZookeeperThreadsFilter.java Mon Mar 23 14:16:33 2015
@@ -0,0 +1,35 @@
+package org.apache.solr.util;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import com.carrotsearch.randomizedtesting.ThreadFilter;
+
+public class BadZookeeperThreadsFilter implements ThreadFilter {
+
+ @Override
+ public boolean reject(Thread t) {
+ String name = t.getName();
+
+ StackTraceElement [] stack = t.getStackTrace();
+ if (name.startsWith("Thread-") && stack.length > 1 && stack[stack.length - 2].getClassName().equals("org.apache.zookeeper.Login$1")) {
+ return true; // see ZOOKEEPER-2100
+ }
+
+ return false;
+ }
+}