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 2018/01/29 03:36:19 UTC

lucene-solr:branch_7x: SOLR-11658: Upgrade ZooKeeper dependency to 3.4.11

Repository: lucene-solr
Updated Branches:
  refs/heads/branch_7x e3fc06319 -> 11c015ae9


SOLR-11658: Upgrade ZooKeeper dependency to 3.4.11

(cherry picked from commit d15ab2f)


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/11c015ae
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/11c015ae
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/11c015ae

Branch: refs/heads/branch_7x
Commit: 11c015ae9c8f66b6786a0a4043bc1678b02d5b0b
Parents: e3fc063
Author: Erick <er...@apache.org>
Authored: Sun Jan 28 19:34:49 2018 -0800
Committer: Erick <er...@apache.org>
Committed: Sun Jan 28 19:36:00 2018 -0800

----------------------------------------------------------------------
 lucene/ivy-versions.properties          | 2 +-
 solr/CHANGES.txt                        | 4 +++-
 solr/licenses/zookeeper-3.4.10.jar.sha1 | 1 -
 solr/licenses/zookeeper-3.4.11.jar.sha1 | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/11c015ae/lucene/ivy-versions.properties
----------------------------------------------------------------------
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index bd2e052..6270c22 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -194,7 +194,7 @@ org.apache.uima.version = 2.3.1
 /org.apache.velocity/velocity = 1.7
 /org.apache.velocity/velocity-tools = 2.0
 /org.apache.xmlbeans/xmlbeans = 2.6.0
-/org.apache.zookeeper/zookeeper = 3.4.10
+/org.apache.zookeeper/zookeeper = 3.4.11
 
 # v1.6.0-alpha.5 of asciidoctor-ant includes asciidoctorj-pdf 1.5.0-alpha.16,
 # which is the same as asciidoctor-pdf 1.5.0-alpha.16

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/11c015ae/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 55145b7..93aec7f 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -26,7 +26,7 @@ Apache Tika 1.16
 Carrot2 3.15.0
 Velocity 1.7 and Velocity Tools 2.0
 Apache UIMA 2.3.1
-Apache ZooKeeper 3.4.10
+Apache ZooKeeper 3.4.11
 Jetty 9.4.8.v20171121
 
 Upgrade Notes
@@ -172,6 +172,8 @@ Other Changes
 
 * SOLR-11051: Use disk free metric in default cluster preferences (noble)
 
+* SOLR-11658: Upgrade ZooKeeper dependency to 3.4.11 (Steve Rowe, Erick Erickson)
+
 ==================  7.2.1 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/11c015ae/solr/licenses/zookeeper-3.4.10.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/zookeeper-3.4.10.jar.sha1 b/solr/licenses/zookeeper-3.4.10.jar.sha1
deleted file mode 100644
index 9b94ebd..0000000
--- a/solr/licenses/zookeeper-3.4.10.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-08eebdbb7a9df83e02eaa42d0e5da0b57bf2e4da

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/11c015ae/solr/licenses/zookeeper-3.4.11.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/zookeeper-3.4.11.jar.sha1 b/solr/licenses/zookeeper-3.4.11.jar.sha1
new file mode 100644
index 0000000..075b3f4
--- /dev/null
+++ b/solr/licenses/zookeeper-3.4.11.jar.sha1
@@ -0,0 +1 @@
+dc767a0b76db57b9ed442ff80418f3c078f670b7