summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Pursehouse <dpursehouse@collab.net>2018-10-08 10:57:40 +0900
committerDavid Pursehouse <dpursehouse@collab.net>2018-10-08 10:57:40 +0900
commit5fe24a948ce5263aaaa914c9b9c22e2450917b52 (patch)
treec40eb4ac132dd401e5ee6bd053f0b73d2df4a12c
parent6c0282015df1c7b05c3e35b490c09caf799f3620 (diff)
parent527e01513e0a16642874f32ab3da7db8e7c4c238 (diff)
Merge branch 'stable-2.14' into stable-2.15
* stable-2.14: Update JGit to 4.7.5.201810051826-r ElasticContainer: Use Elasticsearch 6.4.2 for V6_4 tests Upgrade elasticsearch-rest-client to 6.4.2 Upgrade jackson-core to 2.9.7 Change-Id: Ia3e641679225e4897825e003e0ddb3ba764c0b50
-rw-r--r--WORKSPACE4
-rw-r--r--lib/jackson/BUILD1
2 files changed, 3 insertions, 2 deletions
diff --git a/WORKSPACE b/WORKSPACE
index ddd1a4feb1..ef43a78210 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -884,12 +884,12 @@ maven_jar(
sha1 = "a2baf2d4fdf03f31fbd39351a32bee25fcdfa1cf",
)
-JACKSON_VERSION = "2.6.6"
+JACKSON_VERSION = "2.9.7"
maven_jar(
name = "jackson-core",
artifact = "com.fasterxml.jackson.core:jackson-core:" + JACKSON_VERSION,
- sha1 = "02eb801df67aacaf5b1deb4ac626e1964508e47b",
+ sha1 = "4b7f0e0dc527fab032e9800ed231080fdc3ac015",
)
maven_jar(
diff --git a/lib/jackson/BUILD b/lib/jackson/BUILD
index 5c1519356e..9bf8f04d2f 100644
--- a/lib/jackson/BUILD
+++ b/lib/jackson/BUILD
@@ -5,5 +5,6 @@ VERSION = "2.6.6"
java_library(
name = "jackson-core",
data = ["//lib:LICENSE-Apache2.0"],
+ visibility = ["//gerrit-elasticsearch:__pkg__"],
exports = ["@jackson-core//jar"],
)