etcd

dependencies.gradle

@@ -39,6 +39,7 @@ depVersions = [
     dockerJava: "3.2.5",
     dropwizard: "3.2.5",
     errorprone: "2.4.0",
+    etcd: "0.5.4",
     freebuilder: "2.7.0",
     googleHTTPClient: "1.34.0",
     gradleTooling: "4.0.1",
@@ -112,6 +113,9 @@ depLibs = [
     },
     dockerJava: "com.github.docker-java:docker-java:${depVersions.dockerJava}",
     errorprone: "com.google.errorprone:error_prone_annotations:${depVersions.errorprone}",
+    etcd: dependencies.create("io.etcd:jetcd-core:${depVersions.etcd}") {
+        exclude group: 'io.grpc'
+    },
     freebuilder: "org.inferred:freebuilder:${depVersions.freebuilder}",
     googleHTTPClient: dependencies.create("com.google.http-client:google-http-client:${depVersions.googleHTTPClient}") {
         exclude group: 'com.google.code.findbugs', module: 'jsr305'

metadata-drivers/etcd/build.gradle

@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+plugins {
+    id 'java'
+}
+
+dependencies {
+    implementation project(":bookkeeper-server")
+    implementation project(":bookkeeper-common")
+    implementation project(":bookkeeper-stats")
+    implementation depLibs.etcd
+    implementation depLibs.commonsConfiguration
+    implementation depLibs.grpc
+    implementation depLibs.zookeeper
+
+    compileOnly depLibs.lombok
+
+    testImplementation depLibs.arquillianCubeDocker
+    testImplementation depLibs.arquillianJunitStandalone
+    testImplementation depLibs.testcontainers
+    testImplementation project(path: ':bookkeeper-common', configuration: 'testArtifacts')
+    testImplementation project(path: ':bookkeeper-server', configuration: 'testArtifacts')
+    testImplementation depLibs.dockerJava
+    testCompileOnly depLibs.lombok
+
+    annotationProcessor depLibs.lombok
+    testAnnotationProcessor depLibs.lombok
+
+}

metadata-drivers/etcd/src/main/java/org/apache/bookkeeper/metadata/etcd/EtcdMetadataDriverBase.java

@@ -17,7 +17,7 @@
  */
 package org.apache.bookkeeper.metadata.etcd;
 
-import com.beust.jcommander.internal.Lists;
+import com.google.common.collect.Lists;
 import io.etcd.jetcd.Client;
 import java.io.IOException;
 import java.util.List;

settings.gradle

@@ -59,6 +59,7 @@ include(':bookkeeper-benchmark',
         'cpu-affinity:src:main:affinity',
         'dev:release',
         'microbenchmarks',
+        'metadata-drivers:etcd',
         'shaded:distributedlog-core-shaded',
         'stats:utils',
         'stream:api',

stream/clients/java/all/pom.xml

@@ -35,7 +35,7 @@
       <groupId>org.apache.bookkeeper</groupId>
       <artifactId>stream-storage-java-client-base</artifactId>
       <version>${project.parent.version}</version>
-      <type>test-jar</type>
+      <type>*test-jar</type>
       <scope>test</scope>
     </dependency>
   </dependencies>