Provide Joda time only for Elasticsearch
Change-Id: Iccfdb1e20ed0f5847c369e7b253cd3421fbdf527
diff --git a/WORKSPACE b/WORKSPACE
index ac4d04b..8c92ad1 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -192,18 +192,6 @@
sha1 = "de80fe047052445869b96f6def6baca7182c95af",
)
-maven_jar(
- name = "joda_time",
- artifact = "joda-time:joda-time:2.9.9",
- sha1 = "f7b520c458572890807d143670c9b24f4de90897",
-)
-
-maven_jar(
- name = "joda_convert",
- artifact = "org.joda:joda-convert:1.8.1",
- sha1 = "675642ac208e0b741bc9118dcbcae44c271b992a",
-)
-
load("//lib:guava.bzl", "GUAVA_VERSION", "GUAVA_BIN_SHA1")
maven_jar(
@@ -942,6 +930,18 @@
)
maven_jar(
+ name = "joda_time",
+ artifact = "joda-time:joda-time:2.9.9",
+ sha1 = "f7b520c458572890807d143670c9b24f4de90897",
+)
+
+maven_jar(
+ name = "joda_convert",
+ artifact = "org.joda:joda-convert:1.8.1",
+ sha1 = "675642ac208e0b741bc9118dcbcae44c271b992a",
+)
+
+maven_jar(
name = "compress_lzf",
artifact = "com.ning:compress-lzf:1.0.2",
sha1 = "62896e6fca184c79cc01a14d143f3ae2b4f4b4ae",
diff --git a/gerrit-elasticsearch/BUILD b/gerrit-elasticsearch/BUILD
index fb86aaf..d278bcf 100644
--- a/gerrit-elasticsearch/BUILD
+++ b/gerrit-elasticsearch/BUILD
@@ -17,10 +17,10 @@
"//lib/elasticsearch",
"//lib/elasticsearch:jest",
"//lib/elasticsearch:jest-common",
+ "//lib/elasticsearch:joda-time",
"//lib/guice",
"//lib/guice:guice-assistedinject",
"//lib/jgit/org.eclipse.jgit:jgit",
- "//lib/joda:joda-time",
"//lib/log:api",
"//lib/lucene:lucene-analyzers-common",
"//lib/lucene:lucene-core",
diff --git a/lib/elasticsearch/BUILD b/lib/elasticsearch/BUILD
index c40925e..18c62af 100644
--- a/lib/elasticsearch/BUILD
+++ b/lib/elasticsearch/BUILD
@@ -8,13 +8,13 @@
":compress-lzf",
":hppc",
":jna",
+ ":joda-time",
":jsr166e",
":netty",
":t-digest",
"//lib/jackson:jackson-core",
"//lib/jackson:jackson-dataformat-cbor",
"//lib/jackson:jackson-dataformat-smile",
- "//lib/joda:joda-time",
"//lib/lucene:lucene-codecs",
"//lib/lucene:lucene-highlighter",
"//lib/lucene:lucene-join",
@@ -48,6 +48,19 @@
)
java_library(
+ name = "joda-time",
+ data = ["//lib:LICENSE-Apache2.0"],
+ exports = ["@joda_time//jar"],
+ runtime_deps = ["joda-convert"],
+)
+
+java_library(
+ name = "joda-convert",
+ data = ["//lib:LICENSE-Apache2.0"],
+ exports = ["@joda_convert//jar"],
+)
+
+java_library(
name = "compress-lzf",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//lib/elasticsearch:__pkg__"],
diff --git a/lib/joda/BUILD b/lib/joda/BUILD
deleted file mode 100644
index e1a1924..0000000
--- a/lib/joda/BUILD
+++ /dev/null
@@ -1,13 +0,0 @@
-java_library(
- name = "joda-time",
- data = ["//lib:LICENSE-Apache2.0"],
- visibility = ["//visibility:public"],
- exports = ["@joda_time//jar"],
- runtime_deps = ["joda-convert"],
-)
-
-java_library(
- name = "joda-convert",
- data = ["//lib:LICENSE-Apache2.0"],
- exports = ["@joda_convert//jar"],
-)
