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/12/09 16:51:00 UTC
lucene-solr:master: SOLR-12727: Upgrade ZooKeeper dependency to 3.4.13
Repository: lucene-solr
Updated Branches:
refs/heads/master df84a3c98 -> f690302e0
SOLR-12727: Upgrade ZooKeeper dependency to 3.4.13
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/f690302e
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/f690302e
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/f690302e
Branch: refs/heads/master
Commit: f690302e052f2fcad3117ef287296c7b740c1636
Parents: df84a3c
Author: Erick Erickson <Er...@gmail.com>
Authored: Sun Dec 9 08:50:51 2018 -0800
Committer: Erick Erickson <Er...@gmail.com>
Committed: Sun Dec 9 08:50:51 2018 -0800
----------------------------------------------------------------------
lucene/ivy-versions.properties | 2 +-
lucene/tools/junit4/solr-tests.policy | 4 ++--
solr/CHANGES.txt | 1 +
.../src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java | 2 +-
solr/licenses/zookeeper-3.4.11.jar.sha1 | 1 -
solr/licenses/zookeeper-3.4.13.jar.sha1 | 1 +
.../src/java/org/apache/solr/cloud/ZkTestServer.java | 4 ++--
7 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f690302e/lucene/ivy-versions.properties
----------------------------------------------------------------------
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index 2cfb65c..5a38cbb 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -206,7 +206,7 @@ org.apache.tika.version = 1.19.1
/org.apache.velocity/velocity = 1.7
/org.apache.velocity/velocity-tools = 2.0
/org.apache.xmlbeans/xmlbeans = 3.0.1
-/org.apache.zookeeper/zookeeper = 3.4.11
+/org.apache.zookeeper/zookeeper = 3.4.13
# 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/f690302e/lucene/tools/junit4/solr-tests.policy
----------------------------------------------------------------------
diff --git a/lucene/tools/junit4/solr-tests.policy b/lucene/tools/junit4/solr-tests.policy
index 3333e95..d58b82c 100644
--- a/lucene/tools/junit4/solr-tests.policy
+++ b/lucene/tools/junit4/solr-tests.policy
@@ -85,8 +85,8 @@ grant {
permission javax.security.auth.PrivateCredentialPermission "sun.security.jgss.krb5.Krb5Util$KeysFromKeyTab * \"*\"", "read";
permission javax.security.auth.kerberos.ServicePermission "krbtgt/EXAMPLE.COM@EXAMPLE.COM", "initiate";
- permission javax.security.auth.kerberos.ServicePermission "zookeeper/127.0.0.1@EXAMPLE.COM", "initiate";
- permission javax.security.auth.kerberos.ServicePermission "zookeeper/127.0.0.1@EXAMPLE.COM", "accept";
+ permission javax.security.auth.kerberos.ServicePermission "zookeeper/localhost@EXAMPLE.COM", "initiate";
+ permission javax.security.auth.kerberos.ServicePermission "zookeeper/localhost@EXAMPLE.COM", "accept";
permission javax.security.auth.kerberos.ServicePermission "HTTP/127.0.0.1@EXAMPLE.COM", "initiate";
permission javax.security.auth.kerberos.ServicePermission "HTTP/127.0.0.1@EXAMPLE.COM", "accept";
permission javax.security.auth.kerberos.DelegationPermission "\"HTTP/127.0.0.1@EXAMPLE.COM\" \"krbtgt/EXAMPLE.COM@EXAMPLE.COM\"";
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f690302e/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 7936e57..dc6fc47 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -178,6 +178,7 @@ Other Changes
* SOLR-13036: Fix retry logic in JettySolrRunner (Gus Heck)
+* SOLR-12727: Upgrade ZooKeeper dependency to 3.4.13 (Kevin Risden, Erick Erickson)
================== 7.6.0 ==================
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f690302e/solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java b/solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java
index 38e2ab6..9d1f0a3 100644
--- a/solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java
@@ -196,7 +196,7 @@ public class SaslZkACLProviderTest extends SolrTestCaseJ4 {
System.setProperty("zookeeper.kerberos.removeHostFromPrincipal", "true");
File keytabFile = new File(kdcDir, "keytabs");
String zkClientPrincipal = "solr";
- String zkServerPrincipal = "zookeeper/127.0.0.1";
+ String zkServerPrincipal = "zookeeper/localhost";
kerberosTestServices = KerberosTestServices.builder()
.withKdc(new File(kdcDir))
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f690302e/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
deleted file mode 100644
index 075b3f4..0000000
--- a/solr/licenses/zookeeper-3.4.11.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dc767a0b76db57b9ed442ff80418f3c078f670b7
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f690302e/solr/licenses/zookeeper-3.4.13.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/zookeeper-3.4.13.jar.sha1 b/solr/licenses/zookeeper-3.4.13.jar.sha1
new file mode 100644
index 0000000..a9df3b1
--- /dev/null
+++ b/solr/licenses/zookeeper-3.4.13.jar.sha1
@@ -0,0 +1 @@
+31e9937541cef95c4585b547eb2dbd34d3a76f1c
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f690302e/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java
----------------------------------------------------------------------
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java b/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java
index 85f6afb..1150c48 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java
@@ -454,7 +454,7 @@ public class ZkTestServer {
}
public String getZkHost() {
- return "127.0.0.1:" + zkServer.getLocalPort();
+ return "localhost:" + zkServer.getLocalPort();
}
public String getZkAddress() {
@@ -469,7 +469,7 @@ public class ZkTestServer {
public String getZkAddress(String chroot) {
if (!chroot.startsWith("/"))
chroot = "/" + chroot;
- return "127.0.0.1:" + zkServer.getLocalPort() + chroot;
+ return "localhost:" + zkServer.getLocalPort() + chroot;
}
/**