From 40744d99ff2d237cb43653bb4efa740009cb8b1d Mon Sep 17 00:00:00 2001 From: Marco Miller Date: Fri, 13 Apr 2018 14:56:58 -0400 Subject: [PATCH] lib/elasticsearch: remove unnecessary dependencies Remove the hereby no longer used ones also from libs thus WORKSPACE. Bug: Issue 6094 Change-Id: Icb0ee8dd89ae30c1256ae60481eb782798f252ef --- WORKSPACE | 24 ------------------------ lib/elasticsearch/BUILD | 11 ----------- lib/jackson/BUILD | 6 ------ lib/lucene/BUILD | 13 ------------- 4 files changed, 54 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 439b10e29f..7a3284bdfb 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -458,12 +458,6 @@ maven_jar( sha1 = "f0bc3114a6b43f8e64a33c471d5b9e8ddc51564d", ) -maven_jar( - name = "lucene_codecs", - artifact = "org.apache.lucene:lucene-codecs:" + LUCENE_VERS, - sha1 = "e01fe463d9490bb1b4a6a168e771f7b7255a50b1", -) - maven_jar( name = "backward_codecs", artifact = "org.apache.lucene:lucene-backward-codecs:" + LUCENE_VERS, @@ -500,12 +494,6 @@ maven_jar( sha1 = "7409db9863d8fbc265c27793c6cc7511304182c2", ) -maven_jar( - name = "lucene_sandbox", - artifact = "org.apache.lucene:lucene-sandbox:" + LUCENE_VERS, - sha1 = "30a91f120706ba66732d5a974b56c6971b3c8a16", -) - maven_jar( name = "lucene_spatial", artifact = "org.apache.lucene:lucene-spatial:" + LUCENE_VERS, @@ -964,12 +952,6 @@ maven_jar( sha1 = "84ccf145ac2215e6bfa63baa3101c0af41017cfc", ) -maven_jar( - name = "jna", - artifact = "net.java.dev.jna:jna:4.1.0", - sha1 = "1c12d070e602efd8021891cdd7fd18bc129372d4", -) - JACKSON_VERSION = "2.6.6" maven_jar( @@ -978,12 +960,6 @@ maven_jar( sha1 = "02eb801df67aacaf5b1deb4ac626e1964508e47b", ) -maven_jar( - name = "jackson_dataformat_smile", - artifact = "com.fasterxml.jackson.dataformat:jackson-dataformat-smile:" + JACKSON_VERSION, - sha1 = "ccbfc948748ed2754a58c1af9e0a02b5cc1aed69", -) - maven_jar( name = "jackson_dataformat_cbor", artifact = "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:" + JACKSON_VERSION, diff --git a/lib/elasticsearch/BUILD b/lib/elasticsearch/BUILD index 418cb698a6..32a8cd0916 100644 --- a/lib/elasticsearch/BUILD +++ b/lib/elasticsearch/BUILD @@ -7,20 +7,15 @@ java_library( runtime_deps = [ ":compress-lzf", ":hppc", - ":jna", ":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", "//lib/lucene:lucene-memory", "//lib/lucene:lucene-queries", - "//lib/lucene:lucene-sandbox", "//lib/lucene:lucene-spatial", "//lib/lucene:lucene-suggest", ], @@ -60,9 +55,3 @@ java_library( visibility = ["//lib/elasticsearch:__pkg__"], exports = ["@t_digest//jar"], ) - -java_library( - name = "jna", - data = ["//lib:LICENSE-Apache2.0"], - exports = ["@jna//jar"], -) diff --git a/lib/jackson/BUILD b/lib/jackson/BUILD index 4847371502..5938c7b1b9 100644 --- a/lib/jackson/BUILD +++ b/lib/jackson/BUILD @@ -8,12 +8,6 @@ java_library( exports = ["@jackson_core//jar"], ) -java_library( - name = "jackson-dataformat-smile", - data = ["//lib:LICENSE-Apache2.0"], - exports = ["@jackson_dataformat_smile//jar"], -) - java_library( name = "jackson-dataformat-cbor", data = ["//lib:LICENSE-Apache2.0"], diff --git a/lib/lucene/BUILD b/lib/lucene/BUILD index bbf43a65b0..6590af4a46 100644 --- a/lib/lucene/BUILD +++ b/lib/lucene/BUILD @@ -22,13 +22,6 @@ java_library( runtime_deps = [":lucene-core-and-backward-codecs"], ) -java_library( - name = "lucene-codecs", - data = ["//lib:LICENSE-Apache2.0"], - visibility = ["//visibility:public"], - exports = ["@lucene_codecs//jar"], -) - java_library( name = "lucene-core", data = ["//lib:LICENSE-Apache2.0"], @@ -70,12 +63,6 @@ java_library( exports = ["@lucene_memory//jar"], ) -java_library( - name = "lucene-sandbox", - data = ["//lib:LICENSE-Apache2.0"], - exports = ["@lucene_sandbox//jar"], -) - java_library( name = "lucene-spatial", data = ["//lib:LICENSE-Apache2.0"],