From 597bb85901e077fabe687179a463756b521f4700 Mon Sep 17 00:00:00 2001
From: Todd Fredrich <tfredrich@gmail.com>
Date: Fri, 29 Apr 2016 16:12:52 -0600
Subject: [PATCH] Upgraded Jackson Databind to 2.7.4 and Netty to 4.0.36.final

---
 README.md    |  4 +++-
 core/pom.xml | 14 +++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 1149671a..871f1a3f 100644
--- a/README.md
+++ b/README.md
@@ -76,7 +76,9 @@ Change History/Release Notes:
 ---------------------------------------------------------------------------------------------------
 Release 0.11.4-SNAPSHOT (in master)
 -----------------------------------
-* Issue #126 - Introduced RestExpress.noCompression() to turns off resopnse GZip and deflate encoding support (the Netty HttpContentCompressor is not put in the pipeline) for speed optimization of small payloads.
+* Issue #126 - Introduced RestExpress.noCompression() to turns off response GZip and deflate encoding support (the Netty HttpContentCompressor is not put in the pipeline) for speed optimization (e.g. for small payloads).
+* Upgraded Jackson Databind to 2.7.4
+* Upgraded Netty to 4.0.36.final
 
 Release 0.11.3 - 10 Feb 2016
 ----------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 9cee613f..91ca1837 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -28,7 +28,7 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>2.7.1-1</version>
+			<version>2.7.4</version>
 		</dependency>
 		<dependency>
 			<groupId>com.thoughtworks.xstream</groupId>
@@ -38,13 +38,18 @@
 		<dependency>
 			<groupId>io.netty</groupId>
 			<artifactId>netty-all</artifactId>
-			<version>4.0.34.Final</version>
+			<version>4.0.36.Final</version>
 		</dependency>
 		<dependency>
 	        <groupId>org.owasp.encoder</groupId>
 	        <artifactId>encoder</artifactId>
 	        <version>1.2</version>
 		</dependency>
+        <dependency>
+            <groupId>com.jcraft</groupId>
+            <artifactId>jzlib</artifactId>
+            <version>1.1.3</version>
+        </dependency>
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
@@ -60,11 +65,6 @@
 			<scope>test</scope>
 			<optional>true</optional>
 		</dependency>
-        <dependency>
-            <groupId>com.jcraft</groupId>
-            <artifactId>jzlib</artifactId>
-            <version>1.1.3</version>
-        </dependency>
 	</dependencies>
 
 	<properties>