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/24 14:23:43 UTC
svn commit: r1668886 - in /lucene/dev/branches/branch_5x: ./ lucene/ solr/
solr/core/ solr/licenses/
Author: markrmiller
Date: Tue Mar 24 13:23:42 2015
New Revision: 1668886
URL: http://svn.apache.org/r1668886
Log:
SOLR-6414: Update to Hadoop 2.6.0.
Added:
lucene/dev/branches/branch_5x/solr/licenses/hadoop-annotations-2.6.0.jar.sha1
- copied unchanged from r1668769, lucene/dev/trunk/solr/licenses/hadoop-annotations-2.6.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-auth-2.6.0.jar.sha1
- copied unchanged from r1668769, lucene/dev/trunk/solr/licenses/hadoop-auth-2.6.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-common-2.6.0-tests.jar.sha1
- copied unchanged from r1668769, lucene/dev/trunk/solr/licenses/hadoop-common-2.6.0-tests.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-common-2.6.0.jar.sha1
- copied unchanged from r1668769, lucene/dev/trunk/solr/licenses/hadoop-common-2.6.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-hdfs-2.6.0-tests.jar.sha1
- copied unchanged from r1668769, lucene/dev/trunk/solr/licenses/hadoop-hdfs-2.6.0-tests.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-hdfs-2.6.0.jar.sha1
- copied unchanged from r1668769, lucene/dev/trunk/solr/licenses/hadoop-hdfs-2.6.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-mapreduce-client-app-2.6.0.jar.sha1
- copied unchanged from r1668769, lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-app-2.6.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-mapreduce-client-common-2.6.0.jar.sha1
- copied unchanged from r1668769, lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-common-2.6.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-mapreduce-client-core-2.6.0.jar.sha1
- copied unchanged from r1668769, lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-core-2.6.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-mapreduce-client-hs-2.6.0.jar.sha1
- copied unchanged from r1668769, lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-hs-2.6.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-mapreduce-client-jobclient-2.6.0-tests.jar.sha1
- copied unchanged from r1668769, lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-jobclient-2.6.0-tests.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-mapreduce-client-jobclient-2.6.0.jar.sha1
- copied unchanged from r1668769, lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-jobclient-2.6.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-mapreduce-client-shuffle-2.6.0.jar.sha1
- copied unchanged from r1668769, lucene/dev/trunk/solr/licenses/hadoop-mapreduce-client-shuffle-2.6.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-minikdc-2.6.0.jar.sha1
- copied unchanged from r1668769, lucene/dev/trunk/solr/licenses/hadoop-minikdc-2.6.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-yarn-api-2.6.0.jar.sha1
- copied unchanged from r1668769, lucene/dev/trunk/solr/licenses/hadoop-yarn-api-2.6.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-yarn-client-2.6.0.jar.sha1
- copied unchanged from r1668769, lucene/dev/trunk/solr/licenses/hadoop-yarn-client-2.6.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-yarn-common-2.6.0.jar.sha1
- copied unchanged from r1668769, lucene/dev/trunk/solr/licenses/hadoop-yarn-common-2.6.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-yarn-server-common-2.6.0.jar.sha1
- copied unchanged from r1668769, lucene/dev/trunk/solr/licenses/hadoop-yarn-server-common-2.6.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-yarn-server-nodemanager-2.6.0.jar.sha1
- copied unchanged from r1668769, lucene/dev/trunk/solr/licenses/hadoop-yarn-server-nodemanager-2.6.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-yarn-server-resourcemanager-2.6.0.jar.sha1
- copied unchanged from r1668769, lucene/dev/trunk/solr/licenses/hadoop-yarn-server-resourcemanager-2.6.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-yarn-server-tests-2.6.0-tests.jar.sha1
- copied unchanged from r1668769, lucene/dev/trunk/solr/licenses/hadoop-yarn-server-tests-2.6.0-tests.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-yarn-server-web-proxy-2.6.0.jar.sha1
- copied unchanged from r1668769, lucene/dev/trunk/solr/licenses/hadoop-yarn-server-web-proxy-2.6.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/htrace-core-3.0.4.jar.sha1
- copied unchanged from r1668769, lucene/dev/trunk/solr/licenses/htrace-core-3.0.4.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/htrace-core-LICENSE-ASL.txt
- copied unchanged from r1668769, lucene/dev/trunk/solr/licenses/htrace-core-LICENSE-ASL.txt
lucene/dev/branches/branch_5x/solr/licenses/htrace-core-NOTICE.txt
- copied unchanged from r1668769, lucene/dev/trunk/solr/licenses/htrace-core-NOTICE.txt
Removed:
lucene/dev/branches/branch_5x/solr/licenses/hadoop-annotations-2.3.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-auth-2.3.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-common-2.3.0-tests.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-common-2.3.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-hdfs-2.3.0-tests.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-hdfs-2.3.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-mapreduce-client-app-2.3.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-mapreduce-client-common-2.3.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-mapreduce-client-core-2.3.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-mapreduce-client-hs-2.3.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-mapreduce-client-jobclient-2.3.0-tests.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-mapreduce-client-jobclient-2.3.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-mapreduce-client-shuffle-2.3.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-minikdc-2.3.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-yarn-api-2.3.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-yarn-client-2.3.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-yarn-common-2.3.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-yarn-server-common-2.3.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-yarn-server-nodemanager-2.3.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-yarn-server-resourcemanager-2.3.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-yarn-server-tests-2.3.0-tests.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/hadoop-yarn-server-web-proxy-2.3.0.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/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/ivy.xml
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=1668886&r1=1668885&r2=1668886&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/ivy-versions.properties (original)
+++ lucene/dev/branches/branch_5x/lucene/ivy-versions.properties Tue Mar 24 13:23:42 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/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1668886&r1=1668885&r2=1668886&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Tue Mar 24 13:23:42 2015
@@ -310,6 +310,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/branches/branch_5x/solr/core/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/ivy.xml?rev=1668886&r1=1668885&r2=1668886&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/solr/core/ivy.xml Tue Mar 24 13:23:42 2015
@@ -68,7 +68,8 @@
<dependency org="com.google.protobuf" name="protobuf-java" rev="${/com.google.protobuf/protobuf-java}" conf="compile.hadoop"/>
<dependency org="com.googlecode.concurrentlinkedhashmap" name="concurrentlinkedhashmap-lru" rev="${/com.googlecode.concurrentlinkedhashmap/concurrentlinkedhashmap-lru}" conf="compile.hadoop"/>
-
+ <dependency org="org.htrace" name="htrace-core" rev="${/org.htrace/htrace-core}" conf="compile.hadoop"/>
+
<!-- Hadoop DfsMiniCluster Dependencies-->
<dependency org="org.apache.hadoop" name="hadoop-common" rev="${/org.apache.hadoop/hadoop-common}" conf="test.DfsMiniCluster">
<artifact name="hadoop-common" type="test" ext="jar" maven:classifier="tests" />