From 1dd788edd544d7b03450addbf77539ae564a8379 Mon Sep 17 00:00:00 2001 From: kamaci Date: Wed, 21 Aug 2019 20:44:05 +0300 Subject: [PATCH 1/4] Zookeeper version is updated. --- docs/tutorials/cluster.md | 6 +++--- docs/tutorials/index.md | 6 +++--- pom.xml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/tutorials/cluster.md b/docs/tutorials/cluster.md index a6c97797cfc3..476c316cfa80 100644 --- a/docs/tutorials/cluster.md +++ b/docs/tutorials/cluster.md @@ -434,9 +434,9 @@ bin/start-cluster-master-no-zk-server If you plan to run ZK on Master servers, first update `conf/zoo.cfg` to reflect how you plan to run ZK. Then log on to your Master servers and install Zookeeper: ```bash -curl http://www.gtlib.gatech.edu/pub/apache/zookeeper/zookeeper-3.4.11/zookeeper-3.4.11.tar.gz -o zookeeper-3.4.11.tar.gz -tar -xzf zookeeper-3.4.11.tar.gz -mv zookeeper-3.4.11 zk +curl http://www.gtlib.gatech.edu/pub/apache/zookeeper/zookeeper-3.4.14/zookeeper-3.4.14.tar.gz -o zookeeper-3.4.14.tar.gz +tar -xzf zookeeper-3.4.14.tar.gz +mv zookeeper-3.4.14 zk ``` If you are running ZK on the Master server, you can start the Master server processes together with ZK using: diff --git a/docs/tutorials/index.md b/docs/tutorials/index.md index d8e1de99abfd..9440dd8dc271 100644 --- a/docs/tutorials/index.md +++ b/docs/tutorials/index.md @@ -80,9 +80,9 @@ need to download and run Zookeeper. In the package root, run the following commands: ```bash -curl https://archive.apache.org/dist/zookeeper/zookeeper-3.4.11/zookeeper-3.4.11.tar.gz -o zookeeper-3.4.11.tar.gz -tar -xzf zookeeper-3.4.11.tar.gz -mv zookeeper-3.4.11 zk +curl https://archive.apache.org/dist/zookeeper/zookeeper-3.4.14/zookeeper-3.4.14.tar.gz -o zookeeper-3.4.14.tar.gz +tar -xzf zookeeper-3.4.14.tar.gz +mv zookeeper-3.4.14 zk ``` The startup scripts for the tutorial will expect the contents of the Zookeeper tarball to be located at `zk` under the diff --git a/pom.xml b/pom.xml index d9c9c72d77bc..bcb00676b1f0 100644 --- a/pom.xml +++ b/pom.xml @@ -100,7 +100,7 @@ 1.11.199 2.5.5 - 3.4.11 + 3.4.14 2.5.7 1.22.0 From 333907dc5cc7b1df8db419e13d4e144a061c500d Mon Sep 17 00:00:00 2001 From: kamaci Date: Thu, 22 Aug 2019 12:03:54 +0300 Subject: [PATCH 2/4] Zookeeper version is updated at licenses.yaml --- licenses.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/licenses.yaml b/licenses.yaml index 93d2df15e674..3b0d4599318c 100644 --- a/licenses.yaml +++ b/licenses.yaml @@ -1450,7 +1450,7 @@ name: Apache Zookeeper license_category: binary module: java-core license_name: Apache License version 2.0 -version: 3.4.11 +version: 3.4.14 libraries: - org.apache.zookeeper: zookeeper notices: From f8f22e2af6b53cbb52e4c3b3df24ab4d96786b64 Mon Sep 17 00:00:00 2001 From: kamaci Date: Fri, 23 Aug 2019 14:59:34 +0300 Subject: [PATCH 3/4] licenses.yaml is updated and dependencies are fixed to make the project successfully build. --- .../materialized-view-maintenance/pom.xml | 10 ++++++++++ extensions-contrib/materialized-view-selection/pom.xml | 10 ++++++++++ licenses.yaml | 2 +- pom.xml | 4 ++++ 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/extensions-contrib/materialized-view-maintenance/pom.xml b/extensions-contrib/materialized-view-maintenance/pom.xml index 0442e857cfaf..fffffb0820fb 100644 --- a/extensions-contrib/materialized-view-maintenance/pom.xml +++ b/extensions-contrib/materialized-view-maintenance/pom.xml @@ -65,6 +65,16 @@ easymock test + + junit + junit + test + + + org.hamcrest + hamcrest-all + test + \ No newline at end of file diff --git a/extensions-contrib/materialized-view-selection/pom.xml b/extensions-contrib/materialized-view-selection/pom.xml index d5525838f0e4..95577f44ed87 100644 --- a/extensions-contrib/materialized-view-selection/pom.xml +++ b/extensions-contrib/materialized-view-selection/pom.xml @@ -69,5 +69,15 @@ curator-test test + + junit + junit + test + + + org.hamcrest + hamcrest-all + test + \ No newline at end of file diff --git a/licenses.yaml b/licenses.yaml index 3b0d4599318c..90efe75657b2 100644 --- a/licenses.yaml +++ b/licenses.yaml @@ -2831,7 +2831,7 @@ libraries: notices: - zookeeper: | Apache ZooKeeper - Copyright 2009-2012 The Apache Software Foundation + Copyright 2009-2019 The Apache Software Foundation --- diff --git a/pom.xml b/pom.xml index bcb00676b1f0..d7785e23cb9e 100644 --- a/pom.xml +++ b/pom.xml @@ -279,6 +279,10 @@ io.netty netty + + com.github.spotbugs + spotbugs-annotations + From 78c42493e00aa91e7daa6c2dcdd82ea886c97a06 Mon Sep 17 00:00:00 2001 From: kamaci Date: Sat, 24 Aug 2019 14:43:49 +0300 Subject: [PATCH 4/4] Zookeeper versions are fixed at licenses.yaml --- licenses.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/licenses.yaml b/licenses.yaml index 90efe75657b2..dd2c91807085 100644 --- a/licenses.yaml +++ b/licenses.yaml @@ -1456,7 +1456,7 @@ libraries: notices: - zookeeper: | Apache ZooKeeper - Copyright 2009-2017 The Apache Software Foundation + Copyright 2009-2019 The Apache Software Foundation --- @@ -2831,7 +2831,7 @@ libraries: notices: - zookeeper: | Apache ZooKeeper - Copyright 2009-2019 The Apache Software Foundation + Copyright 2009-2012 The Apache Software Foundation ---