You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2020/09/19 02:49:26 UTC
[lucene-solr] branch branch_8x updated: SOLR-14876: Upgrade to
zookeeper 3.6.2
This is an automated email from the ASF dual-hosted git repository.
erick pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/branch_8x by this push:
new 27733fb SOLR-14876: Upgrade to zookeeper 3.6.2
27733fb is described below
commit 27733fbb0b034af78156f7327c563fa079cb5e23
Author: Erick Erickson <Er...@gmail.com>
AuthorDate: Fri Sep 18 22:45:08 2020 -0400
SOLR-14876: Upgrade to zookeeper 3.6.2
---
lucene/ivy-versions.properties | 2 +-
.../java/org/apache/lucene/search/join/ToParentBlockJoinSortField.java | 2 --
solr/CHANGES.txt | 2 ++
solr/licenses/zookeeper-3.6.1.jar.sha1 | 1 -
solr/licenses/zookeeper-3.6.2.jar.sha1 | 1 +
solr/licenses/zookeeper-jute-3.6.1.jar.sha1 | 1 -
solr/licenses/zookeeper-jute-3.6.2.jar.sha1 | 1 +
7 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index 126b932..183c762 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -221,7 +221,7 @@ org.apache.velocity.tools.version = 3.0
/org.apache.xmlbeans/xmlbeans = 3.1.0
-org.apache.zookeeper.version = 3.6.1
+org.apache.zookeeper.version = 3.6.2
/org.apache.zookeeper/zookeeper = ${org.apache.zookeeper.version}
/org.apache.zookeeper/zookeeper-jute = ${org.apache.zookeeper.version}
diff --git a/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinSortField.java b/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinSortField.java
index 64f45c5..2227405 100644
--- a/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinSortField.java
+++ b/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinSortField.java
@@ -35,8 +35,6 @@ import org.apache.lucene.search.comparators.LongComparator;
import org.apache.lucene.util.BitSet;
import org.apache.lucene.util.NumericUtils;
-import static org.apache.lucene.search.join.BlockJoinSelector.toIter;
-
/**
* A special sort field that allows sorting parent docs based on nested / child level fields.
* Based on the sort order it either takes the document with the lowest or highest field value into account.
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 480c1ac..9c682ce 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -136,6 +136,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.sha1
deleted file mode 100644
index a08353a..0000000
--- a/solr/licenses/zookeeper-3.6.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-19757b416e2d73709cc14d799e8c9c32f48843e6
diff --git a/solr/licenses/zookeeper-3.6.2.jar.sha1 b/solr/licenses/zookeeper-3.6.2.jar.sha1
new file mode 100644
index 0000000..c2ebcda
--- /dev/null
+++ b/solr/licenses/zookeeper-3.6.2.jar.sha1
@@ -0,0 +1 @@
+bd0630f2de482ce8a14bc1de8dc12ef6197f4624
diff --git a/solr/licenses/zookeeper-jute-3.6.1.jar.sha1 b/solr/licenses/zookeeper-jute-3.6.1.jar.sha1
deleted file mode 100644
index d269b47..0000000
--- a/solr/licenses/zookeeper-jute-3.6.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6421c6284d07abe78762fd30447c4fb15440b6c2
diff --git a/solr/licenses/zookeeper-jute-3.6.2.jar.sha1 b/solr/licenses/zookeeper-jute-3.6.2.jar.sha1
new file mode 100644
index 0000000..05a9ea4
--- /dev/null
+++ b/solr/licenses/zookeeper-jute-3.6.2.jar.sha1
@@ -0,0 +1 @@
+1cb72bc20e0796c2bb10034e514f76364e902898