commit b1f13c85d5a7170801ce957d2919094bd4e4d9e4
author David Pursehouse <dpursehouse@collab.net> Sun Jun 17 08:30:32 2018 +0900
committer David Pursehouse <dpursehouse@collab.net> Sun Jun 17 16:27:55 2018 +0900
tree 457c1a553203821a7212550c525f6c69abc4acc7
parent 5e9fede3ef003b2f46cc2187ce77aa35aaae5a9b

Align jackson version with core Gerrit

Upgrade jackson dependencies to 2.8.9 to align with the versions used
in core Gerrit stable-2.15, and add dependency on org.yaml.snakeyaml
which is a new dependency in jackson-dataformat-yaml version 2.8.9.

Change-Id: Ifb23b3947107c762655b69ce5ac5c5123ccae0e4

external_plugin_deps.bzl

diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index d40c1b6..75a8801 100644
--- a/external_plugin_deps.bzl
+++ b/external_plugin_deps.bzl
@@ -1,29 +1,34 @@
 load("//tools/bzl:maven_jar.bzl", "maven_jar")
 
-JACKSON_REV = "2.1.1"
+JACKSON_REV = "2.8.9"
 
 def external_plugin_deps():
         maven_jar(
           name = "jackson-core",
-          artifact = "com.fasterxml.jackson.core:jackson-core:%s" % JACKSON_REV,
+          artifact = "com.fasterxml.jackson.core:jackson-core:" + JACKSON_REV,
           sha1 = "82ad1c5f92f6dcc6291f5c46ebacb975eaa844de",
         )
 
         maven_jar(
           name = "jackson-databind",
-          artifact = "com.fasterxml.jackson.core:jackson-databind:%s" % JACKSON_REV,
-          sha1 = "38d2b3c0c89af5b937fd98c3e558bf6b58c14aa2",
+          artifact = "com.fasterxml.jackson.core:jackson-databind:" + JACKSON_REV,
+          sha1 = "4dfca3975be3c1a98eacb829e70f02e9a71bc159",
         )
 
         maven_jar(
           name = "jackson-annotations",
-          artifact = "com.fasterxml.jackson.core:jackson-annotations:%s" % JACKSON_REV,
-          sha1 = "0b01cc83e745fc4425a3968fafbf8e5b8254a6dd",
-
+          artifact = "com.fasterxml.jackson.core:jackson-annotations:" + JACKSON_REV,
+          sha1 = "e0e758381a6579cb2029dace23a7209b90ac7232",
         )
 
         maven_jar(
           name = "jackson-dataformat-yaml",
-          artifact = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:%s" % JACKSON_REV,
-          sha1 = "3922d45de7f3ccabe8f16aad4060a6394373c6cb",
+          artifact = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:" + JACKSON_REV,
+          sha1 = "607f3253c20267e385c85f60c859760a73a29e37",
+        )
+
+        maven_jar(
+          name = "snakeyaml",
+          artifact = "org.yaml:snakeyaml:1.17",
+          sha1 = "7a27ea250c5130b2922b86dea63cbb1cc10a660c",
         )

owners-common/common.bzl

diff --git a/owners-common/common.bzl b/owners-common/common.bzl
index 290e0e1..b752bd6 100644
--- a/owners-common/common.bzl
+++ b/owners-common/common.bzl
@@ -2,5 +2,6 @@
     '@jackson-core//jar',
     '@jackson-databind//jar',
     '@jackson-annotations//jar',
-    '@jackson-dataformat-yaml//jar'
+    '@jackson-dataformat-yaml//jar',
+    '@snakeyaml//jar'
   ]

owners-common/common.defs

diff --git a/owners-common/common.defs b/owners-common/common.defs
index 26452a1..860a830 100644
--- a/owners-common/common.defs
+++ b/owners-common/common.defs
@@ -4,4 +4,5 @@
     ':jackson-databind',
     ':jackson-annotations',
     ':jackson-dataformat-yaml',
+    ':snakeyaml',
 ]]