From 878009189f68ab5f7640c4bb6c908e277254e3cf Mon Sep 17 00:00:00 2001
From: Marco Miller <marco.miller@ericsson.com>
Date: Fri, 13 Apr 2018 12:45:57 -0400
Subject: [PATCH] lib/jest for Elasticsearch: refactor dependencies

Move the commons-lang3 runtime dependency from jest to jest-common,
since the latter library is the one explicitly requiring it, as per [1]
and [2] below.

Remove the otherwise unnecessary explicit runtime dependencies, as well.
For httpcore-niossl, remove it also from httpcomponents thus WORKSPACE,
as the hereby removed reference to it was the very last one in Gerrit.

[1] https://mvnrepository.com/artifact/io.searchbox/jest-common/2.4.0
[2] https://mvnrepository.com/artifact/io.searchbox/jest/2.4.0

Bug: Issue 6094
Change-Id: Ia0d5e64acb438a91af80b79c20d120e8500a1cb9
---
 WORKSPACE                | 7 -------
 lib/httpcomponents/BUILD | 6 ------
 lib/jest/BUILD           | 6 +++---
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index 7641e8019b..439b10e29f 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1002,13 +1002,6 @@ maven_jar(
     sha1 = "a8c5e3c3bfea5ce23fb647c335897e415eb442e3",
 )
 
-maven_jar(
-    name = "httpcore_niossl",
-    artifact = "org.apache.httpcomponents:httpcore-niossl:4.0-alpha6",
-    attach_source = False,
-    sha1 = "9c662e7247ca8ceb1de5de629f685c9ef3e4ab58",
-)
-
 load("//tools/bzl:js.bzl", "npm_binary", "bower_archive")
 
 npm_binary(
diff --git a/lib/httpcomponents/BUILD b/lib/httpcomponents/BUILD
index 2b2cc6f804..6e8fcd81a8 100644
--- a/lib/httpcomponents/BUILD
+++ b/lib/httpcomponents/BUILD
@@ -45,9 +45,3 @@ java_library(
     data = ["//lib:LICENSE-Apache2.0"],
     exports = ["@httpcore_nio//jar"],
 )
-
-java_library(
-    name = "httpcore-niossl",
-    data = ["//lib:LICENSE-Apache2.0"],
-    exports = ["@httpcore_niossl//jar"],
-)
diff --git a/lib/jest/BUILD b/lib/jest/BUILD
index 3fdb5f72e6..169f27157d 100644
--- a/lib/jest/BUILD
+++ b/lib/jest/BUILD
@@ -5,6 +5,9 @@ java_library(
     data = ["//lib:LICENSE-Apache2.0"],
     visibility = ["//visibility:public"],
     exports = ["@jest_common//jar"],
+    runtime_deps = [
+        "//lib/commons:lang3",
+    ],
 )
 
 java_library(
@@ -13,11 +16,8 @@ java_library(
     visibility = ["//visibility:public"],
     exports = ["@jest//jar"],
     runtime_deps = [
-        ":jest-common",
-        "//lib/commons:lang3",
         "//lib/httpcomponents:httpasyncclient",
         "//lib/httpcomponents:httpclient",
         "//lib/httpcomponents:httpcore-nio",
-        "//lib/httpcomponents:httpcore-niossl",
     ],
 )