diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 459642e0b1c..3c2c86c502a 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.1 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]")); } } } diff --git a/distribution/licenses/jackson-core-2.6.2.jar.sha1 b/distribution/licenses/jackson-core-2.6.2.jar.sha1 deleted file mode 100644 index 87d28eb9363..00000000000 --- a/distribution/licenses/jackson-core-2.6.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -123f29333b2c6b3516b14252b6e93226bfcd6e37 diff --git a/distribution/licenses/jackson-core-2.7.1.jar.sha1 b/distribution/licenses/jackson-core-2.7.1.jar.sha1 new file mode 100644 index 00000000000..73831ed2d51 --- /dev/null +++ b/distribution/licenses/jackson-core-2.7.1.jar.sha1 @@ -0,0 +1 @@ +4127b62db028f981e81caa248953c0899d720f98 \ No newline at end of file diff --git a/distribution/licenses/jackson-dataformat-cbor-2.6.2.jar.sha1 b/distribution/licenses/jackson-dataformat-cbor-2.6.2.jar.sha1 deleted file mode 100644 index 66757dbc917..00000000000 --- a/distribution/licenses/jackson-dataformat-cbor-2.6.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1e13c575f914c83761bb8e2aca7dfd9e4c647579 diff --git a/distribution/licenses/jackson-dataformat-cbor-2.7.1.jar.sha1 b/distribution/licenses/jackson-dataformat-cbor-2.7.1.jar.sha1 new file mode 100644 index 00000000000..19bb5e64610 --- /dev/null +++ b/distribution/licenses/jackson-dataformat-cbor-2.7.1.jar.sha1 @@ -0,0 +1 @@ +4282418817ad2be26ce18739461499eae679390f \ No newline at end of file diff --git a/distribution/licenses/jackson-dataformat-smile-2.6.2.jar.sha1 b/distribution/licenses/jackson-dataformat-smile-2.6.2.jar.sha1 deleted file mode 100644 index 2ae62f6111e..00000000000 --- a/distribution/licenses/jackson-dataformat-smile-2.6.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -395d18c1a1dd730b8026ee59c4067e5d2b45ba6e diff --git a/distribution/licenses/jackson-dataformat-smile-2.7.1.jar.sha1 b/distribution/licenses/jackson-dataformat-smile-2.7.1.jar.sha1 new file mode 100644 index 00000000000..45c78df1ba3 --- /dev/null +++ b/distribution/licenses/jackson-dataformat-smile-2.7.1.jar.sha1 @@ -0,0 +1 @@ +9ccde45d574388371d2c4032d4b853e2d596777e \ No newline at end of file diff --git a/distribution/licenses/jackson-dataformat-yaml-2.6.2.jar.sha1 b/distribution/licenses/jackson-dataformat-yaml-2.6.2.jar.sha1 deleted file mode 100644 index 385f04d4db3..00000000000 --- a/distribution/licenses/jackson-dataformat-yaml-2.6.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4ae23088dd3fae47c66843f2e4251d7255ee140e diff --git a/distribution/licenses/jackson-dataformat-yaml-2.7.1.jar.sha1 b/distribution/licenses/jackson-dataformat-yaml-2.7.1.jar.sha1 new file mode 100644 index 00000000000..01b442577b1 --- /dev/null +++ b/distribution/licenses/jackson-dataformat-yaml-2.7.1.jar.sha1 @@ -0,0 +1 @@ +6c5235a523b7d720b2b0e1b850ea14083e342b07 \ No newline at end of file