Merge branch 'pr/16801'

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.1
 log4j             = 1.2.17
 slf4j             = 1.6.2
 jna               = 4.1.0

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]"));
         }
     }
 }

distribution/licenses/jackson-core-2.6.2.jar.sha1

@@ -1 +0,0 @@
-123f29333b2c6b3516b14252b6e93226bfcd6e37

distribution/licenses/jackson-core-2.7.1.jar.sha1

@@ -0,0 +1 @@
+4127b62db028f981e81caa248953c0899d720f98

distribution/licenses/jackson-dataformat-cbor-2.6.2.jar.sha1

@@ -1 +0,0 @@
-1e13c575f914c83761bb8e2aca7dfd9e4c647579

distribution/licenses/jackson-dataformat-cbor-2.7.1.jar.sha1

@@ -0,0 +1 @@
+4282418817ad2be26ce18739461499eae679390f

distribution/licenses/jackson-dataformat-smile-2.6.2.jar.sha1

@@ -1 +0,0 @@
-395d18c1a1dd730b8026ee59c4067e5d2b45ba6e

distribution/licenses/jackson-dataformat-smile-2.7.1.jar.sha1

@@ -0,0 +1 @@
+9ccde45d574388371d2c4032d4b853e2d596777e

distribution/licenses/jackson-dataformat-yaml-2.6.2.jar.sha1

@@ -1 +0,0 @@
-4ae23088dd3fae47c66843f2e4251d7255ee140e

distribution/licenses/jackson-dataformat-yaml-2.7.1.jar.sha1

@@ -0,0 +1 @@
+6c5235a523b7d720b2b0e1b850ea14083e342b07