Apache Solr open-source search software
SOLR-14876: Upgrade to zookeeper 3.6.2
Erick Ericksonab3f1f0d1d0f
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex ebcc7359a63..869944c94b8 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -258,6 +258,8 @@ Other Changes* SOLR-10471: Update default Zookeeper session timeout to 30s in bin/solr and bin/solr.cmd(Michael Braun, Markus Jelsma via Munendra S N)+* SOLR-14876: Upgrade to zookeeper 3.6.2 (odidev via Erick Erickson)+================== 8.6.2 ==================Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.diff --git a/solr/licenses/zookeeper-3.6.1.jar.sha1 b/solr/licenses/zookeeper-3.6.1.jar.sha1deleted file mode 100644index a08353a60c4..00000000000--- a/solr/licenses/zookeeper-3.6.1.jar.sha1+++ /dev/null@@ -1 +0,0 @@-19757b416e2d73709cc14d799e8c9c32f48843e6diff --git a/solr/licenses/zookeeper-3.6.2.jar.sha1 b/solr/licenses/zookeeper-3.6.2.jar.sha1new file mode 100644index 00000000000..c2ebcdab8e8--- /dev/null+++ b/solr/licenses/zookeeper-3.6.2.jar.sha1@@ -0,0 +1 @@+bd0630f2de482ce8a14bc1de8dc12ef6197f4624diff --git a/solr/licenses/zookeeper-jute-3.6.1.jar.sha1 b/solr/licenses/zookeeper-jute-3.6.1.jar.sha1deleted file mode 100644index d269b474d88..00000000000--- a/solr/licenses/zookeeper-jute-3.6.1.jar.sha1+++ /dev/null@@ -1 +0,0 @@-6421c6284d07abe78762fd30447c4fb15440b6c2diff --git a/solr/licenses/zookeeper-jute-3.6.2.jar.sha1 b/solr/licenses/zookeeper-jute-3.6.2.jar.sha1new file mode 100644index 00000000000..05a9ea45c69--- /dev/null+++ b/solr/licenses/zookeeper-jute-3.6.2.jar.sha1@@ -0,0 +1 @@+1cb72bc20e0796c2bb10034e514f76364e902898diff --git a/versions.lock b/versions.lockindex e9603063dff..5c40e1724a5 100644--- a/versions.lock+++ b/versions.lock@@ -48,10 +48,10 @@ io.jaegertracing:jaeger-thrift:1.1.0 (1 constraints: 0405f335)io.netty:netty-buffer:4.1.50.Final (6 constraints: 0555463a)io.netty:netty-codec:4.1.50.Final (2 constraints: f0132581)io.netty:netty-common:4.1.50.Final (8 constraints: 6d6ed7af)-io.netty:netty-handler:4.1.50.Final (2 constraints: 2c174741)+io.netty:netty-handler:4.1.50.Final (2 constraints: 25171741)io.netty:netty-resolver:4.1.50.Final (3 constraints: 9b2100cd)io.netty:netty-transport:4.1.50.Final (5 constraints: 5a47c31d)-io.netty:netty-transport-native-epoll:4.1.50.Final (2 constraints: 2c174741)+io.netty:netty-transport-native-epoll:4.1.50.Final (2 constraints: 25171741)io.netty:netty-transport-native-unix-common:4.1.50.Final (2 constraints: fc194204)io.opentracing:opentracing-api:0.33.0 (5 constraints: 4d3cfe52)io.opentracing:opentracing-mock:0.33.0 (1 constraints: 3805343b)@@ -119,8 +119,8 @@ org.apache.tika:tika-java7:1.24 (1 constraints: db04f730)org.apache.tika:tika-parsers:1.24 (1 constraints: db04f730)org.apache.tika:tika-xmp:1.24 (1 constraints: db04f730)org.apache.xmlbeans:xmlbeans:3.1.0 (1 constraints: 0605fd35)-org.apache.zookeeper:zookeeper:3.6.1 (1 constraints: 0c050d36)-org.apache.zookeeper:zookeeper-jute:3.6.1 (1 constraints: 8a0d3828)+org.apache.zookeeper:zookeeper:3.6.2 (1 constraints: 0d050e36)+org.apache.zookeeper:zookeeper-jute:3.6.2 (1 constraints: 8b0d3928)org.aspectj:aspectjrt:1.8.0 (1 constraints: 0b050836)org.bitbucket.b_c:jose4j:0.6.5 (1 constraints: 0d050236)org.bouncycastle:bcmail-jdk15on:1.64 (1 constraints: df04ff30)diff --git a/versions.props b/versions.propsindex fa27d0ec354..c86546e9d5e 100644--- a/versions.props+++ b/versions.props@@ -70,7 +70,7 @@ org.apache.pdfbox:jempbox=1.8.16org.apache.poi:*=4.1.1org.apache.tika:*=1.24org.apache.xmlbeans:xmlbeans=3.1.0-org.apache.zookeeper:*=3.6.1+org.apache.zookeeper:*=3.6.2org.asciidoctor:asciidoctorj=1.6.2org.aspectj:aspectjrt=1.8.0org.bitbucket.b_c:jose4j=0.6.5