Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  lib/elasticsearch: remove unnecessary dependencies
  lib/jest for Elasticsearch: refactor dependencies
  Elasticsearch BUILD: remove unneeded dependencies

Change-Id: Id9f5eba410579f220c836e2b998ed8aac0111cd4

WORKSPACE

@@ -459,12 +459,6 @@ maven_jar(
     sha1 = "08ce9d34c8124c80e176e8332ee947480bbb9576",
 )
 
-maven_jar(
-    name = "lucene_codecs",
-    artifact = "org.apache.lucene:lucene-codecs:" + LUCENE_VERS,
-    sha1 = "afdad570668469b1734fbd32b8f98561561bed48",
-)
-
 maven_jar(
     name = "backward_codecs",
     artifact = "org.apache.lucene:lucene-backward-codecs:" + LUCENE_VERS,
@@ -501,12 +495,6 @@ maven_jar(
     sha1 = "4dbdc2e1a24837722294762a9edb479f79092ab9",
 )
 
-maven_jar(
-    name = "lucene_sandbox",
-    artifact = "org.apache.lucene:lucene-sandbox:" + LUCENE_VERS,
-    sha1 = "49498bbb2adc333e98bdca4bf6170ae770cbad11",
-)
-
 maven_jar(
     name = "lucene_spatial",
     artifact = "org.apache.lucene:lucene-spatial:" + LUCENE_VERS,
@@ -971,12 +959,6 @@ maven_jar(
     sha1 = "84ccf145ac2215e6bfa63baa3101c0af41017cfc",
 )
 
-maven_jar(
-    name = "jna",
-    artifact = "net.java.dev.jna:jna:4.1.0",
-    sha1 = "1c12d070e602efd8021891cdd7fd18bc129372d4",
-)
-
 JACKSON_VERSION = "2.8.9"
 
 maven_jar(
@@ -985,12 +967,6 @@ maven_jar(
     sha1 = "569b1752705da98f49aabe2911cc956ff7d8ed9d",
 )
 
-maven_jar(
-    name = "jackson_dataformat_smile",
-    artifact = "com.fasterxml.jackson.dataformat:jackson-dataformat-smile:" + JACKSON_VERSION,
-    sha1 = "d36cbae6b06ac12fca16fda403759e479316141b",
-)
-
 maven_jar(
     name = "jackson_dataformat_cbor",
     artifact = "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:" + JACKSON_VERSION,
@@ -1009,13 +985,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(

gerrit-elasticsearch/BUILD

@@ -11,18 +11,14 @@ java_library(
         "//lib:gson",
         "//lib:guava",
         "//lib:gwtorm",
-        "//lib:protobuf",
         "//lib/commons:codec",
-        "//lib/commons:lang",
         "//lib/elasticsearch",
         "//lib/guice",
         "//lib/guice:guice-assistedinject",
         "//lib/jest",
         "//lib/jest:jest-common",
         "//lib/jgit/org.eclipse.jgit:jgit",
-        "//lib/joda:joda-time",
         "//lib/log:api",
-        "//lib/lucene:lucene-analyzers-common",
         "//lib/lucene:lucene-core",
     ],
 )
@@ -35,17 +31,13 @@ java_library(
     srcs = glob(["src/test/java/**/ElasticTestUtils.java"]),
     deps = [
         ":elasticsearch",
-        "//gerrit-extension-api:api",
         "//gerrit-index:index",
         "//gerrit-reviewdb:server",
         "//gerrit-server:server",
         "//lib:gson",
-        "//lib:guava",
-        "//lib:junit",
         "//lib:truth",
         "//lib/elasticsearch",
         "//lib/jgit/org.eclipse.jgit:jgit",
-        "//lib/jgit/org.eclipse.jgit.junit:junit",
     ],
 )
 
@@ -60,7 +52,6 @@ junit_tests(
         ":elasticsearch",
         ":elasticsearch_test_utils",
         "//gerrit-server:query_tests_code",
-        "//gerrit-server:server",
         "//gerrit-server:testutil",
         "//lib/guice",
         "//lib/jgit/org.eclipse.jgit:jgit",

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"],
-)

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"],
-)

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"],

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",
     ],
 )

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"],