From 16a08cb4653c674d43a4d377048d949163a97a29 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 16 Oct 2017 23:53:23 +0200 Subject: [PATCH] Upgrade to Jackson 2.9.2 --- build.gradle | 2 +- .../web/socket/sockjs/frame/Jackson2SockJsMessageCodec.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 62e3fdf4ab..850dc66afd 100644 --- a/build.gradle +++ b/build.gradle @@ -45,7 +45,7 @@ configure(allprojects) { project -> ext.freemarkerVersion = "2.3.26-incubating" ext.groovyVersion = "2.4.12" ext.hsqldbVersion = "2.4.0" - ext.jackson2Version = "2.9.1" + ext.jackson2Version = "2.9.2" ext.jettyVersion = "9.4.7.v20170914" ext.junitJupiterVersion = "5.0.1" ext.junitPlatformVersion = "1.0.1" diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/frame/Jackson2SockJsMessageCodec.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/frame/Jackson2SockJsMessageCodec.java index 6686fc6f10..a4eefae99a 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/frame/Jackson2SockJsMessageCodec.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/frame/Jackson2SockJsMessageCodec.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -71,6 +71,7 @@ public class Jackson2SockJsMessageCodec extends AbstractSockJsMessageCodec { } @Override + @SuppressWarnings("deprecation") protected char[] applyJsonQuoting(String content) { return JsonStringEncoder.getInstance().quoteAsString(content); }