From cb35455745d7af7660781dc131845dc232f6bf94 Mon Sep 17 00:00:00 2001 From: James Bertouch Date: Wed, 24 Feb 2016 18:06:38 -0500 Subject: [PATCH] Upgrade to Jackson 2.7.0 Closes #16294 --- buildSrc/version.properties | 2 +- .../common/settings/loader/JsonSettingsLoaderTests.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 3ca58b7bee1..8df2f0244f3 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -4,7 +4,7 @@ lucene = 5.5.0 # optional dependencies spatial4j = 0.5 jts = 1.13 -jackson = 2.6.2 +jackson = 2.7.0 log4j = 1.2.17 slf4j = 1.6.2 jna = 4.1.0 diff --git a/core/src/test/java/org/elasticsearch/common/settings/loader/JsonSettingsLoaderTests.java b/core/src/test/java/org/elasticsearch/common/settings/loader/JsonSettingsLoaderTests.java index 18591d9a592..d7f10891f28 100644 --- a/core/src/test/java/org/elasticsearch/common/settings/loader/JsonSettingsLoaderTests.java +++ b/core/src/test/java/org/elasticsearch/common/settings/loader/JsonSettingsLoaderTests.java @@ -58,7 +58,7 @@ public class JsonSettingsLoaderTests extends ESTestCase { fail("expected exception"); } catch (SettingsException e) { assertEquals(e.getCause().getClass(), ElasticsearchParseException.class); - assertTrue(e.toString().contains("duplicate settings key [foo] found at line number [1], column number [13], previous value [bar], current value [baz]")); + assertTrue(e.toString().contains("duplicate settings key [foo] found at line number [1], column number [20], previous value [bar], current value [baz]")); } } }