mirror of https://github.com/apache/lucene.git
SOLR-9076: Update to Hadoop 2.7.2
This commit is contained in:
Gregory Chanan
parent
07be2c42ba
commit
f273cb1b3a
|
|
@ -72,7 +72,10 @@ com.sun.jersey.version = 1.9
|
|||
/dom4j/dom4j = 1.6.1
|
||||
/hsqldb/hsqldb = 1.8.0.10
|
||||
/io.airlift/slice = 0.10
|
||||
/io.netty/netty = 3.7.0.Final
|
||||
|
||||
io.netty.netty-all.version = 4.0.36.Final
|
||||
/io.netty/netty-all = ${io.netty.netty-all.version}
|
||||
|
||||
/javax.activation/activation = 1.1.1
|
||||
/javax.inject/javax.inject= 1
|
||||
/javax.servlet/javax.servlet-api = 3.1.0
|
||||
|
|
@ -136,7 +139,7 @@ org.apache.directory.server.version = 2.0.0-M15
|
|||
/org.apache.directory.server/apacheds-protocol-shared = ${org.apache.directory.server.version}
|
||||
/org.apache.directory.server/apacheds-xdbm-partition = ${org.apache.directory.server.version}
|
||||
|
||||
org.apache.hadoop.version = 2.6.0
|
||||
org.apache.hadoop.version = 2.7.2
|
||||
/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}
|
||||
|
|
@ -159,6 +162,8 @@ org.apache.hadoop.version = 2.6.0
|
|||
/org.apache.hadoop/hadoop-yarn-server-tests = ${org.apache.hadoop.version}
|
||||
/org.apache.hadoop/hadoop-yarn-server-web-proxy = ${org.apache.hadoop.version}
|
||||
|
||||
/org.apache.htrace/htrace-core = 3.2.0-incubating
|
||||
|
||||
# The httpcore version is often different from the httpclient and httpmime versions,
|
||||
# so the httpcore version value should not share the same symbolic name with them.
|
||||
/org.apache.httpcomponents/httpclient = 4.4.1
|
||||
|
|
@ -252,9 +257,6 @@ org.gagravarr.vorbis.java.version = 0.8
|
|||
/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.iq80.leveldb.version = 0.7
|
||||
/org.iq80.leveldb/leveldb = ${org.iq80.leveldb.version}
|
||||
/org.iq80.leveldb/leveldb-api = ${org.iq80.leveldb.version}
|
||||
|
|
|
|||
|
|
@ -96,6 +96,9 @@ Other Changes
|
|||
* SOLR-8981: Upgraded Extraction module to Apache Tika 1.13.
|
||||
(Tim Allison, Lewis John McGibbney via Uwe Schindler)
|
||||
|
||||
* SOLR-9076: Update to Hadoop 2.7.2
|
||||
(Mark Miller, Gregory Chanan)
|
||||
|
||||
================== 6.1.0 ==================
|
||||
|
||||
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@
|
|||
<dependency org="aopalliance" name="aopalliance" rev="${/aopalliance/aopalliance}" conf="test" />
|
||||
<dependency org="com.sun.xml.bind" name="jaxb-impl" rev="${/com.sun.xml.bind/jaxb-impl}" conf="test" />
|
||||
<dependency org="org.objenesis" name="objenesis" rev="${/org.objenesis/objenesis}" conf="test" />
|
||||
<dependency org="io.netty" name="netty" rev="${/io.netty/netty}" conf="test" />
|
||||
<dependency org="io.netty" name="netty-all" rev="${/io.netty/netty-all}" conf="test" />
|
||||
<dependency org="org.apache.mrunit" name="mrunit" rev="${/org.apache.mrunit/mrunit}" conf="test">
|
||||
<artifact name="mrunit" maven:classifier="hadoop2" />
|
||||
<exclude org="log4j" module="log4j" />
|
||||
|
|
@ -116,7 +116,8 @@
|
|||
<dependency org="org.mortbay.jetty" name="jetty" rev="${/org.mortbay.jetty/jetty}" conf="test.DfsMiniCluster" />
|
||||
<dependency org="org.mortbay.jetty" name="jetty-util" rev="${/org.mortbay.jetty/jetty-util}" conf="test.DfsMiniCluster" />
|
||||
<dependency org="com.sun.jersey" name="jersey-core" rev="${/com.sun.jersey/jersey-core}" conf="test.DfsMiniCluster" />
|
||||
|
||||
<dependency org="org.apache.htrace" name="htrace-core" rev="${/org.apache.htrace/htrace-core}" conf="test.DfsMiniCluster"/>
|
||||
|
||||
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}" />
|
||||
|
||||
</dependencies>
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@
|
|||
|
||||
<dependency org="com.google.protobuf" name="protobuf-java" rev="${/com.google.protobuf/protobuf-java}" conf="compile.hadoop"/>
|
||||
<dependency org="com.github.ben-manes.caffeine" name="caffeine" rev="${/com.github.ben-manes.caffeine/caffeine}" conf="compile.hadoop"/>
|
||||
<dependency org="org.htrace" name="htrace-core" rev="${/org.htrace/htrace-core}" conf="compile.hadoop"/>
|
||||
<dependency org="org.apache.htrace" name="htrace-core" rev="${/org.apache.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">
|
||||
|
|
@ -91,7 +91,11 @@
|
|||
<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="io.netty" name="netty-all" rev="${/io.netty/netty-all}" conf="test.DfsMiniCluster"/>
|
||||
<dependency org="org.apache.htrace" name="htrace-core" rev="${/org.apache.htrace/htrace-core}" conf="test.DfsMiniCluster"/>
|
||||
<dependency org="org.codehaus.jackson" name="jackson-core-asl" rev="${/org.codehaus.jackson/jackson-core-asl}" conf="test.DfsMiniCluster" />
|
||||
<dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="${/org.codehaus.jackson/jackson-mapper-asl}" conf="test.DfsMiniCluster" />
|
||||
|
||||
<!-- Hadoop MiniKdc Dependencies-->
|
||||
<dependency org="org.apache.hadoop" name="hadoop-minikdc" rev="${/org.apache.hadoop/hadoop-minikdc}" conf="test.MiniKdc"/>
|
||||
<dependency org="org.apache.directory.server" name="apacheds-core" rev="${/org.apache.directory.server/apacheds-core}" conf="test.MiniKdc"/>
|
||||
|
|
|
|||
|
|
@ -308,12 +308,6 @@ public class HdfsUpdateLog extends UpdateLog {
|
|||
HdfsTransactionLog ntlog = new HdfsTransactionLog(fs, new Path(tlogDir, newLogName),
|
||||
globalStrings, tlogDfsReplication);
|
||||
tlog = ntlog;
|
||||
|
||||
if (tlog != ntlog) {
|
||||
ntlog.deleteOnClose = false;
|
||||
ntlog.decref();
|
||||
ntlog.forceClose();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
8cd40a4cde2b77e6edc1ab3bb55706d626ae8b2d
|
||||
|
|
@ -0,0 +1 @@
|
|||
80693ef2884927ee3c5464a7539fcfa4af382e14
|
||||
|
|
@ -1 +0,0 @@
|
|||
b0b8dec23a84ac8a0d00fbd69a87d320724ae34a
|
||||
|
|
@ -0,0 +1 @@
|
|||
bf613cfec06a1f3d3a91d7f82f9e4af75bc01f72
|
||||
|
|
@ -1 +0,0 @@
|
|||
23c6df24f0d08412d04ed4d7bc11753ba7bf45d6
|
||||
|
|
@ -1 +0,0 @@
|
|||
a3f6d9827e9813a0fb286ebc0d3ae8cffed17105
|
||||
|
|
@ -0,0 +1 @@
|
|||
482b3051dc384c1e15182a6ad1402649ef24be02
|
||||
|
|
@ -0,0 +1 @@
|
|||
422eb48913fa6f81835b3192c97a576505b6c192
|
||||
|
|
@ -1 +0,0 @@
|
|||
c23e40b4cfaca80c93849a9bccb7d6793a9239aa
|
||||
|
|
@ -1 +0,0 @@
|
|||
9e25d4ea9daab5d0b7fbbe1749790aef3280ff35
|
||||
|
|
@ -0,0 +1 @@
|
|||
dfb6840b97211044e87a0345f7edad51b942fd2a
|
||||
|
|
@ -0,0 +1 @@
|
|||
3c304b3d9227fbf8af8bc1cab013271538c3cf0a
|
||||
|
|
@ -1 +0,0 @@
|
|||
43aba8c4a4c152889363efcff5691b7bf0cd6db7
|
||||
|
|
@ -0,0 +1 @@
|
|||
6e4a1d1754c68b5ce3821cea96da77d0fc2067b5
|
||||
|
|
@ -1 +0,0 @@
|
|||
00b901fc26d9d73558132120fc8d9e7d753ee7a7
|
||||
|
|
@ -0,0 +1 @@
|
|||
8021f146b10053f29c2085d0972b115395da1a33
|
||||
|
|
@ -1 +0,0 @@
|
|||
c0c6bb2c79833e0a0e75473c340a1fb9544a9ac9
|
||||
|
|
@ -0,0 +1 @@
|
|||
accf0f40de77a6d8cece5e3bd6bbc2a579102a4f
|
||||
|
|
@ -1 +0,0 @@
|
|||
ae39982d46c4bb6750fa1dc50d14177adee72100
|
||||
|
|
@ -0,0 +1 @@
|
|||
57ccdecef8a4d9075e5f37dc254776e410cc6230
|
||||
|
|
@ -1 +0,0 @@
|
|||
e7de458eb3a7553326318ff08f936f4ca12b92e8
|
||||
|
|
@ -1 +0,0 @@
|
|||
250e960011ff5a87964fbf7b2cd86438cbb74c16
|
||||
|
|
@ -0,0 +1 @@
|
|||
c686047090283e21bd1d4659e6eabb73d726a4fe
|
||||
|
|
@ -0,0 +1 @@
|
|||
cb2ca1e41075d55ad6dacf2f54cc0f0f97d623b6
|
||||
|
|
@ -1 +0,0 @@
|
|||
32ecb6cb40ade3abea1ef4cad5eb16704b5467b0
|
||||
|
|
@ -0,0 +1 @@
|
|||
edaf659eaf16effa6c7f759c603ab3e2c0f976f3
|
||||
|
|
@ -1 +0,0 @@
|
|||
1a573fd3156d17ff706a0836e9f7471238a89501
|
||||
|
|
@ -0,0 +1 @@
|
|||
59d112c8683f563f7aaf05fde7bc4022b90b44a7
|
||||
|
|
@ -1 +0,0 @@
|
|||
c3bcbcd82cd61b55dc5d523f26a259f8d27fc237
|
||||
|
|
@ -0,0 +1 @@
|
|||
373d35254d9e292a36c35f48f8a797359b86e1f7
|
||||
|
|
@ -1 +0,0 @@
|
|||
bbd9752aaa12a1db3fd6ce1e851307dd12c8fe96
|
||||
|
|
@ -0,0 +1 @@
|
|||
6a626356170511385bac2ef4bd60eeea880dec46
|
||||
|
|
@ -1 +0,0 @@
|
|||
9dd33fb5183f8faac731868eff69ac2b7678b75b
|
||||
|
|
@ -0,0 +1 @@
|
|||
ab16767c5c34cfee6ac2780c7fea56207762d2c7
|
||||
|
|
@ -1 +0,0 @@
|
|||
1a1bc2114c4c2004c6a1841f897778ae77d2a065
|
||||
|
|
@ -0,0 +1 @@
|
|||
5ecdbd3bcc77826e4f4491ce12df722252f04f68
|
||||
|
|
@ -1 +0,0 @@
|
|||
887639fe75421ab6f67a78b6f9b04b0c9b251490
|
||||
|
|
@ -0,0 +1 @@
|
|||
514ebf83b773352e9e662a7b5011c8d947162c5f
|
||||
|
|
@ -1 +0,0 @@
|
|||
e02948e79d7408d79c4d1d60cb410b16146376d5
|
||||
|
|
@ -0,0 +1 @@
|
|||
521e0fb188ef3c6b239eb6dcca69e39cc788690b
|
||||
|
|
@ -1 +0,0 @@
|
|||
08d9240e288d501bf2c5dbd3870d6d87b3c79769
|
||||
|
|
@ -0,0 +1 @@
|
|||
6444a32767712596c11767943ba10070a82b34da
|
||||
|
|
@ -1 +0,0 @@
|
|||
c2539026721df0ad4757c31bc29ec2f1c00ac2ba
|
||||
|
|
@ -0,0 +1 @@
|
|||
60de24530087690d0e15444f2c2538bcd384c5cf
|
||||
|
|
@ -1 +0,0 @@
|
|||
49042e6b5c54cfde7756b869669761a2b1ad6bf4
|
||||
|
|
@ -0,0 +1 @@
|
|||
430c3b53dcf1901f37a92d703bb4ce343298561b
|
||||
|
|
@ -1 +0,0 @@
|
|||
d7461828faf28411f37f8570d896292db277d838
|
||||
|
|
@ -0,0 +1 @@
|
|||
8797cf3230f01e8724ef27a0ed565dabb6998c64
|
||||
|
|
@ -1 +0,0 @@
|
|||
07a8c35599c68c0bf383df74469aa3e03d9aca87
|
||||
|
|
@ -0,0 +1 @@
|
|||
ad89ee6584a9ea41152fae012e18e7fa818eab73
|
||||
Loading…
Reference in New Issue