From 01a5bc2eaa55131cb58e9b3ed84ec4fb5a818f57 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Sat, 7 Oct 2017 16:30:00 +0200 Subject: [PATCH] Update jackson dependency to 2.9.1 --- build.gradle | 2 +- src/main/kotlin/net/pterodactylus/sone/web/ajax/GetTimesAjaxPage.kt | 2 +- src/test/kotlin/net/pterodactylus/sone/web/ajax/JsonReturnObjectTest.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 51398e8..4ab4170 100644 --- a/build.gradle +++ b/build.gradle @@ -45,7 +45,7 @@ dependencies { compile group: 'net.pterodactylus', name: 'utils', version: '0.12.4' compile group: 'com.google.inject', name: 'guice', version: '3.0' compile group: 'com.google.guava', name: 'guava', version: '14.0.1' - compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.1.2' + compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.1' compile group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2' compile group: 'org.jsoup', name: 'jsoup', version: '1.10.2' diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetTimesAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetTimesAjaxPage.kt index 6930e45..fb2592e 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetTimesAjaxPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetTimesAjaxPage.kt @@ -43,7 +43,7 @@ class GetTimesAjaxPage(webInterface: WebInterface, "tooltip" to synchronized(dateTimeFormatter) { dateTimeFormatter.format(time) }) - }.forEach { this@jsonObject.put(it.first, it.second) } + }.forEach { this@jsonObject.set(it.first, it.second) } } } diff --git a/src/test/kotlin/net/pterodactylus/sone/web/ajax/JsonReturnObjectTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/ajax/JsonReturnObjectTest.kt index 55d1ba1..7849139 100644 --- a/src/test/kotlin/net/pterodactylus/sone/web/ajax/JsonReturnObjectTest.kt +++ b/src/test/kotlin/net/pterodactylus/sone/web/ajax/JsonReturnObjectTest.kt @@ -84,7 +84,7 @@ class JsonReturnObjectTest { put("text", "text") put("int", 123) put("boolean", true) - put("object", objectNode) + set("object", objectNode) })) } -- 2.7.4