Previous commit introduced a couple incorrect dependency versions, na…

…mely using 2.12 as the target Scala version, instead of intended 2.11. Additionally adds a few other missing dependencies, and upgrades Kafka libraries to use version 2.4.1 (#54) Co-authored-by: Daniel Fritsch <[email protected]>
teslamotors · Dec 16, 2021 · 9afa847 · 9afa847
1 parent 155dfd5
commit 9afa847
Show file tree

Hide file tree

Showing 22 changed files with 348 additions and 158 deletions.
diff --git a/3rdparty/jvm/com/101tec/BUILD b/3rdparty/jvm/com/101tec/BUILD
diff --git a/3rdparty/jvm/com/fasterxml/jackson/datatype/BUILD b/3rdparty/jvm/com/fasterxml/jackson/datatype/BUILD
@@ -0,0 +1,13 @@
+java_library(
+    name = "jackson_datatype_jdk8",
+    visibility = [
+        "//3rdparty/jvm:__subpackages__",
+    ],
+    exports = [
+        "//external:jar/com/fasterxml/jackson/datatype/jackson_datatype_jdk8",
+    ],
+    runtime_deps = [
+        "//3rdparty/jvm/com/fasterxml/jackson/core:jackson_core",
+        "//3rdparty/jvm/com/fasterxml/jackson/core:jackson_databind",
+    ],
+)
diff --git a/3rdparty/jvm/com/fasterxml/jackson/module/BUILD b/3rdparty/jvm/com/fasterxml/jackson/module/BUILD
@@ -11,3 +11,35 @@ java_library(
         "//3rdparty/jvm/com/fasterxml/jackson/core:jackson_databind",
     ],
 )
+
+java_library(
+    name = "jackson_module_paranamer",
+    visibility = [
+        "//3rdparty/jvm:__subpackages__",
+    ],
+    exports = [
+        "//external:jar/com/fasterxml/jackson/module/jackson_module_paranamer",
+    ],
+    runtime_deps = [
+        "//3rdparty/jvm/com/fasterxml/jackson/core:jackson_databind",
+        "//3rdparty/jvm/com/thoughtworks/paranamer",
+    ],
+)
+
+scala_import(
+    name = "jackson_module_scala",
+    jars = [
+        "//external:jar/com/fasterxml/jackson/module/jackson_module_scala_2_11",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+    runtime_deps = [
+        ":jackson_module_paranamer",
+        "//3rdparty/jvm/com/fasterxml/jackson/core:jackson_annotations",
+        "//3rdparty/jvm/com/fasterxml/jackson/core:jackson_core",
+        "//3rdparty/jvm/com/fasterxml/jackson/core:jackson_databind",
+        "//3rdparty/jvm/org/scala_lang:scala_library",
+        "//3rdparty/jvm/org/scala_lang:scala_reflect",
+    ],
+)
diff --git a/3rdparty/jvm/com/thoughtworks/paranamer/BUILD b/3rdparty/jvm/com/thoughtworks/paranamer/BUILD
@@ -0,0 +1,9 @@
+java_library(
+    name = "paranamer",
+    visibility = [
+        "//3rdparty/jvm:__subpackages__",
+    ],
+    exports = [
+        "//external:jar/com/thoughtworks/paranamer/paranamer",
+    ],
+)
diff --git a/3rdparty/jvm/com/typesafe/scala_logging/BUILD b/3rdparty/jvm/com/typesafe/scala_logging/BUILD
@@ -1,11 +1,11 @@
-java_library(
-    name = "scala_logging_2_12",
+scala_import(
+    name = "scala_logging",
+    jars = [
+        "//external:jar/com/typesafe/scala_logging/scala_logging_2_11",
+    ],
     visibility = [
         "//3rdparty/jvm:__subpackages__",
     ],
-    exports = [
-        "//external:jar/com/typesafe/scala_logging/scala_logging_2_12",
-    ],
     runtime_deps = [
         "//3rdparty/jvm/org/scala_lang:scala_library",
         "//3rdparty/jvm/org/scala_lang:scala_reflect",

diff --git a/3rdparty/jvm/io/netty/BUILD b/3rdparty/jvm/io/netty/BUILD
@@ -0,0 +1,9 @@
+java_library(
+    name = "netty",
+    visibility = [
+        "//3rdparty/jvm:__subpackages__",
+    ],
+    exports = [
+        "//external:jar/io/netty/netty",
+    ],
+)
diff --git a/3rdparty/jvm/jline/BUILD b/3rdparty/jvm/jline/BUILD
@@ -0,0 +1,9 @@
+java_library(
+    name = "jline",
+    visibility = [
+        "//3rdparty/jvm:__subpackages__",
+    ],
+    exports = [
+        "//external:jar/jline/jline",
+    ],
+)
diff --git a/3rdparty/jvm/org/apache/kafka/BUILD b/3rdparty/jvm/org/apache/kafka/BUILD
@@ -1,21 +1,26 @@
-java_library(
-    name = "kafka_2_12",
+scala_import(
+    name = "kafka",
+    jars = [
+        "//external:jar/org/apache/kafka/kafka_2_11",
+    ],
     visibility = [
         "//visibility:public",
     ],
-    exports = [
-        "//external:jar/org/apache/kafka/kafka_2_12",
-    ],
     runtime_deps = [
         ":kafka_clients",
-        "//3rdparty/jvm/com/101tec:zkclient",
         "//3rdparty/jvm/com/fasterxml/jackson/core:jackson_databind",
-        "//3rdparty/jvm/com/typesafe/scala_logging:scala_logging_2_12",
+        "//3rdparty/jvm/com/fasterxml/jackson/dataformat:jackson_dataformat_csv",
+        "//3rdparty/jvm/com/fasterxml/jackson/datatype:jackson_datatype_jdk8",
+        "//3rdparty/jvm/com/fasterxml/jackson/module:jackson_module_scala",
+        "//3rdparty/jvm/com/typesafe/scala_logging",
         "//3rdparty/jvm/com/yammer/metrics:metrics_core",
+        "//3rdparty/jvm/commons_cli",
         "//3rdparty/jvm/net/sf/jopt_simple",
         "//3rdparty/jvm/org/apache/zookeeper",
         "//3rdparty/jvm/org/scala_lang:scala_library",
         "//3rdparty/jvm/org/scala_lang:scala_reflect",
+        "//3rdparty/jvm/org/scala_lang/modules:scala_collection_compat_2_11",
+        "//3rdparty/jvm/org/scala_lang/modules:scala_java8_compat",
         "//3rdparty/jvm/org/slf4j:slf4j_api",
     ],
 )

diff --git a/3rdparty/jvm/org/apache/zookeeper/BUILD b/3rdparty/jvm/org/apache/zookeeper/BUILD
@@ -1,12 +1,15 @@
 java_library(
     name = "zookeeper",
     visibility = [
-        "//3rdparty/jvm:__subpackages__",
+        "//visibility:public",
     ],
     exports = [
         "//external:jar/org/apache/zookeeper/zookeeper",
     ],
     runtime_deps = [
+        "//3rdparty/jvm/io/netty",
+        "//3rdparty/jvm/jline",
+        "//3rdparty/jvm/log4j",
         "//3rdparty/jvm/org/apache/yetus:audience_annotations",
         "//3rdparty/jvm/org/slf4j:slf4j_api",
     ],

diff --git a/3rdparty/jvm/org/scala_lang/BUILD b/3rdparty/jvm/org/scala_lang/BUILD
@@ -1,22 +1,19 @@
-java_library(
+scala_library(
     name = "scala_library",
     visibility = [
         "//visibility:public",
     ],
     exports = [
-        "//external:jar/org/scala_lang/scala_library",
+        "@io_bazel_rules_scala_scala_library",
     ],
 )
 
-java_library(
+scala_library(
     name = "scala_reflect",
     visibility = [
-        "//3rdparty/jvm:__subpackages__",
+        "//visibility:public",
     ],
     exports = [
-        "//external:jar/org/scala_lang/scala_reflect",
-    ],
-    runtime_deps = [
-        ":scala_library",
+        "@io_bazel_rules_scala_scala_reflect",
     ],
 )
diff --git a/3rdparty/jvm/org/scala_lang/modules/BUILD b/3rdparty/jvm/org/scala_lang/modules/BUILD
@@ -0,0 +1,25 @@
+java_library(
+    name = "scala_collection_compat_2_11",
+    visibility = [
+        "//3rdparty/jvm:__subpackages__",
+    ],
+    exports = [
+        "//external:jar/org/scala_lang/modules/scala_collection_compat_2_11",
+    ],
+    runtime_deps = [
+        "//3rdparty/jvm/org/scala_lang:scala_library",
+    ],
+)
+
+scala_import(
+    name = "scala_java8_compat",
+    jars = [
+        "//external:jar/org/scala_lang/modules/scala_java8_compat_2_11",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+    runtime_deps = [
+        "//3rdparty/jvm/org/scala_lang:scala_library",
+    ],
+)