commit 2b1b6398517366a92b16ee9e33417eb89e9330db
author Hector Oswaldo Caballero <hector.caballero@ericsson.com> Thu Dec 21 10:00:24 2017 -0500
committer Hector Oswaldo Caballero <hector.caballero@ericsson.com> Fri Dec 22 07:15:48 2017 -0500
tree 62eb953ff343d9923b9b3544d208efedd81d9604
parent c7c59cd7f0af0bb877fb755ab5c01c967bcb363e

Sync Jackson lib version with Gerrit

When trying to implement standalone build, it was found that plugin was
including the jackson-core artifact defined in Gerrit and not the one
defined in the plugin. Update jackson dependencies to match the version
defined in Gerrit.

Given jackson-core is already loaded by Gerrit, avoid loading it when
building in-tree. The dependency is kept, however, in order to allow
standalone build (in follow-up change) to work.

Change-Id: I6c06f9ce0a7338c614e5833ac0de9084db9acbb7

external_plugin_deps.bzl

diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index 3b481ff..0f361f1 100644
--- a/external_plugin_deps.bzl
+++ b/external_plugin_deps.bzl
@@ -1,29 +1,30 @@
 load("//tools/bzl:maven_jar.bzl", "maven_jar")
 
-JACKSON_REV = "2.1.1"
+JACKSON_REV = "2.6.6"
 
-def external_plugin_deps():
-  maven_jar(
-    name = "jackson_core",
-    artifact = "com.fasterxml.jackson.core:jackson-core:%s" % JACKSON_REV,
-    sha1 = "82ad1c5f92f6dcc6291f5c46ebacb975eaa844de",
-  )
+def external_plugin_deps(omit_jackson_core = True):
+  if not omit_jackson_core:
+    maven_jar(
+      name = "jackson_core",
+      artifact = "com.fasterxml.jackson.core:jackson-core:%s" % JACKSON_REV,
+      sha1 = "02eb801df67aacaf5b1deb4ac626e1964508e47b",
+    )
 
   maven_jar(
     name = "jackson_databind",
     artifact = "com.fasterxml.jackson.core:jackson-databind:%s" % JACKSON_REV,
-    sha1 = "38d2b3c0c89af5b937fd98c3e558bf6b58c14aa2",
+    sha1 = "5108dde6049374ba980b360e1ecff49847baba4a",
   )
 
   maven_jar(
     name = "jackson_annotations",
     artifact = "com.fasterxml.jackson.core:jackson-annotations:%s" % JACKSON_REV,
-    sha1 = "0b01cc83e745fc4425a3968fafbf8e5b8254a6dd",
+    sha1 = "7ef6440e71531604aa44a5eb62d4b466ffbf7e8f",
 
   )
 
   maven_jar(
     name = "jackson_dataformat_yaml",
     artifact = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:%s" % JACKSON_REV,
-    sha1 = "3922d45de7f3ccabe8f16aad4060a6394373c6cb",
+    sha1 = "d5c23915aa943541c38065a72ed50941f2fd278d",
   )