bookkeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From si...@apache.org
Subject [bookkeeper] branch master updated: ISSUE #237: Upgrade to ZooKeeper 3.5.3-BETA
Date Mon, 17 Jul 2017 21:08:51 GMT
This is an automated email from the ASF dual-hosted git repository.

sijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git


The following commit(s) were added to refs/heads/master by this push:
     new dc1fba1  ISSUE #237: Upgrade to ZooKeeper 3.5.3-BETA
dc1fba1 is described below

commit dc1fba1685fe04931ae2966d2ccc5b418af257ca
Author: Enrico Olivelli <eolivelli@apache.org>
AuthorDate: Mon Jul 17 14:08:42 2017 -0700

    ISSUE #237: Upgrade to ZooKeeper 3.5.3-BETA
    
    Descriptions of the changes in this PR:
    
    Update ZooKeeper dependency from 3.5.1-alpha to 3.5.3-beta.
    This will enable ZooKeeper over SSL
    
    ---
    Be sure to do all of the following to help us incorporate your contribution
    quickly and easily:
    
    - [x ] Make sure the PR title is formatted like:
        `<Issue # or BOOKKEEPER-#>: Description of pull request`
        `e.g. Issue 123: Description ...`
        `e.g. BOOKKEEPER-1234: Description ...`
    - [ x] Make sure tests pass via `mvn clean apache-rat:check install findbugs:check`.
    - [ x] Replace `<Issue # or BOOKKEEPER-#>` in the title with the actual Issue/JIRA
number.
    
    ---
    
    Author: Enrico Olivelli <eolivelli@apache.org>
    
    Reviewers: Jia Zhai <None>, Sijie Guo <sijie@apache.org>
    
    This closes #238 from eolivelli/zookeeper-3.5.3, closes #237
---
 .../src/test/java/org/apache/bookkeeper/test/ZooKeeperUtil.java     | 6 ++++++
 pom.xml                                                             | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ZooKeeperUtil.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ZooKeeperUtil.java
index a327479..5fc95cb 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ZooKeeperUtil.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ZooKeeperUtil.java
@@ -47,6 +47,12 @@ import org.slf4j.LoggerFactory;
 import static org.junit.Assert.*;
 
 public class ZooKeeperUtil {
+
+    static {
+        // org.apache.zookeeper.test.ClientBase uses FourLetterWordMain, from 3.5.3 four
letter words
+        // are disabled by default due to security reasons
+        System.setProperty("zookeeper.4lw.commands.whitelist", "*");
+    }
     static final Logger LOG = LoggerFactory.getLogger(ZooKeeperUtil.class);
 
     // ZooKeeper related variables
diff --git a/pom.xml b/pom.xml
index cfb23db..400faa8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
     <netty.version>4.1.10.Final</netty.version>
     <protobuf.version>2.6.1</protobuf.version>
     <slf4j.version>1.7.25</slf4j.version>
-    <zookeeper.version>3.5.1-alpha</zookeeper.version>
+    <zookeeper.version>3.5.3-beta</zookeeper.version>
   </properties>
   <url>http://bookkeeper.apache.org</url>
   <build>

-- 
To stop receiving notification emails like this one, please contact
['"commits@bookkeeper.apache.org" <commits@bookkeeper.apache.org>'].

Mime
View raw message