Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-12727: Upgrade ZooKeeper dependency to 3.4.13

This commit is contained in:
Erick Erickson 2018-12-09 08:50:51 -08:00
parent df84a3c981
commit f690302e05
7 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lucene/ivy-versions.properties
View File

@ -206,7 +206,7 @@ org.apache.tika.version = 1.19.1
/org.apache.velocity/velocity = 1.7 /org.apache.velocity/velocity = 1.7
/org.apache.velocity/velocity-tools = 2.0 /org.apache.velocity/velocity-tools = 2.0
/org.apache.xmlbeans/xmlbeans = 3.0.1 /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, # 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 # which is the same as asciidoctor-pdf 1.5.0-alpha.16

4
lucene/tools/junit4/solr-tests.policy
View File

@ -85,8 +85,8 @@ grant {
permission javax.security.auth.PrivateCredentialPermission "sun.security.jgss.krb5.Krb5Util$KeysFromKeyTab * \"*\"", "read"; 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 "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/localhost@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", "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", "initiate";
permission javax.security.auth.kerberos.ServicePermission "HTTP/127.0.0.1@EXAMPLE.COM", "accept"; 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\""; permission javax.security.auth.kerberos.DelegationPermission "\"HTTP/127.0.0.1@EXAMPLE.COM\" \"krbtgt/EXAMPLE.COM@EXAMPLE.COM\"";

1
solr/CHANGES.txt
View File

@ -178,6 +178,7 @@ Other Changes
* SOLR-13036: Fix retry logic in JettySolrRunner (Gus Heck) * 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 ================== ================== 7.6.0 ==================

2
solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java
View File

@ -196,7 +196,7 @@ public class SaslZkACLProviderTest extends SolrTestCaseJ4 {
System.setProperty("zookeeper.kerberos.removeHostFromPrincipal", "true"); System.setProperty("zookeeper.kerberos.removeHostFromPrincipal", "true");
File keytabFile = new File(kdcDir, "keytabs"); File keytabFile = new File(kdcDir, "keytabs");
String zkClientPrincipal = "solr"; String zkClientPrincipal = "solr";
String zkServerPrincipal = "zookeeper/127.0.0.1"; String zkServerPrincipal = "zookeeper/localhost";
kerberosTestServices = KerberosTestServices.builder() kerberosTestServices = KerberosTestServices.builder()
.withKdc(new File(kdcDir)) .withKdc(new File(kdcDir))

1
solr/licenses/zookeeper-3.4.11.jar.sha1
View File

@ -1 +0,0 @@
dc767a0b76db57b9ed442ff80418f3c078f670b7

1
solr/licenses/zookeeper-3.4.13.jar.sha1 Normal file
View File

@ -0,0 +1 @@
31e9937541cef95c4585b547eb2dbd34d3a76f1c

4
solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java
View File

@ -454,7 +454,7 @@ public class ZkTestServer {
} }
public String getZkHost() { public String getZkHost() {
return "127.0.0.1:" + zkServer.getLocalPort(); return "localhost:" + zkServer.getLocalPort();
} }
public String getZkAddress() { public String getZkAddress() {
@ -469,7 +469,7 @@ public class ZkTestServer {
public String getZkAddress(String chroot) { public String getZkAddress(String chroot) {
if (!chroot.startsWith("/")) if (!chroot.startsWith("/"))
chroot = "/" + chroot; chroot = "/" + chroot;
return "127.0.0.1:" + zkServer.getLocalPort() + chroot; return "localhost:" + zkServer.getLocalPort() + chroot;
} }
/** /**