commit 079439c67cb30a69100421783ab6a0051bb69401
author Marcin Czech <maczech@gmail.com> Mon Jun 08 18:59:35 2020 +0200
committer Luca Milanesio <luca.milanesio@gmail.com> Wed Jul 15 23:15:35 2020 +0000
tree 5b79e3345919999324430aeb21975b7625dcfcd8
parent 53b46061cc4700485a5376eaa4b16326bf8c68e2

Add zookeeper-refdb jar compiled with zookeeper 3.5.x

Zookeeper server from version 3.5.x is able to server traffic over SSL.
Building zookeeper-refdb plugin with zookeeper client 3.5.x causes
incompatibility with previous zookeeper server versions. Creating
additional zookeeper-refdb jar compiled with zookeeper 3.5.x allows to
start using SSL connections. At the same time old zookeeper-refdb jar
can be used with both zookeeper server 3.5.x and zookeeper server 3.4.x.

Feature: Issue 12583

Change-Id: Ifa58b550184941c1381d5400e8f4dcda4597aaf5

BUILD

diff --git a/BUILD b/BUILD
index 9238349..89632a4 100644
--- a/BUILD
+++ b/BUILD
@@ -7,6 +7,28 @@
 )
 
 gerrit_plugin(
+    name = "zookeeper-refdb-zk-3.5",
+    srcs = glob(["src/main/java/**/*.java"]),
+    manifest_entries = [
+        "Gerrit-PluginName: zookeeper-refdb",
+        "Gerrit-Module: com.googlesource.gerrit.plugins.validation.dfsrefdb.zookeeper.ZkValidationModule",
+        "Implementation-Title: zookeeper ref-db plugin",
+        "Implementation-URL: https://review.gerrithub.io/admin/repos/GerritForge/plugins_zookeeper",
+    ],
+    resources = glob(["src/main/resources/**/*"]),
+    dir_name = "zookeeper-refdb",
+    deps = [
+        "@curator-client//jar",
+        "@curator-framework//jar",
+        "@curator-recipes//jar",
+        "@global-refdb//jar",
+        "@zookeeper_3.5//jar",
+        "@zookeeper-jute_3.5//jar",
+        "@netty-all_3.5//jar",
+    ],
+)
+
+gerrit_plugin(
     name = "zookeeper-refdb",
     srcs = glob(["src/main/java/**/*.java"]),
     manifest_entries = [
@@ -21,9 +43,7 @@
         "@curator-framework//jar",
         "@curator-recipes//jar",
         "@global-refdb//jar",
-        "@zookeeper//jar",
-        "@zookeeper-jute//jar",
-        "@netty-all//jar",
+        "@zookeeper_3.4//jar",
     ],
 )
 
@@ -45,7 +65,7 @@
     testonly = 1,
     visibility = ["//visibility:public"],
     exports = PLUGIN_DEPS + PLUGIN_TEST_DEPS + [
-        ":zookeeper-refdb__plugin",
+        ":zookeeper-refdb-zk-3.5__plugin",
         "@curator-framework//jar",
         "@curator-recipes//jar",
         "@curator-test//jar",

external_plugin_deps.bzl

diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index 3e18e21..b68d6cc 100644
--- a/external_plugin_deps.bzl
+++ b/external_plugin_deps.bzl
@@ -28,24 +28,30 @@
     )
 
     maven_jar(
-        name = "zookeeper",
+        name = "zookeeper_3.5",
         artifact = "org.apache.zookeeper:zookeeper:3.5.7",
         sha1 = "12bdf55ba8be7fc891996319d37f35eaad7e63ea",
     )
 
     maven_jar(
-        name = "zookeeper-jute",
+        name = "zookeeper-jute_3.5",
         artifact = "org.apache.zookeeper:zookeeper-jute:3.5.7",
         sha1 = "1270f80b08904499a6839a2ee1800da687ad96b4",
     )
 
     maven_jar(
-        name = "netty-all",
+        name = "netty-all_3.5",
         artifact = "io.netty:netty-all:4.1.45.Final",
         sha1 = "e830eae36d22f2bba3118a3bc08e17f15263a01d",
     )
 
     maven_jar(
+        name = "zookeeper_3.4",
+        artifact = "org.apache.zookeeper:zookeeper:3.4.14",
+        sha1 = "c114c1e1c8172a7cd3f6ae39209a635f7a06c1a1",
+    )
+
+    maven_jar(
         name = "global-refdb",
         artifact = "com.gerritforge:global-refdb:3.1.2",
         sha1 = "6ddee3de0f3fe9254453118ae1eca481ec03e957",