From b78da3cdd0ac928be783e671eead86647a48bcf9 Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <daniel.gerhardt@mni.thm.de>
Date: Fri, 2 Aug 2013 10:25:49 +0200
Subject: [PATCH] Updated netty-socketio dependency to release version 1.0.0.
 Removed netty dependency. It is only needed by netty-socketio and should not
 be required in our POM explicitly. Updated jackson-databind dependency to
 version 2.2.2.

These changes hopefully fix the threading problems with redeployment on
Tomcat 7.
---
 pom.xml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 035afb27d..75ae34dfe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -253,15 +253,10 @@
 			<artifactId>spring-security-oauth-client</artifactId>
 			<version>1.0.0</version>
 		</dependency>
-		<dependency>
-			<groupId>io.netty</groupId>
-			<artifactId>netty</artifactId>
-			<version>3.5.7.Final</version>
-		</dependency>
 		<dependency>
 			<groupId>com.corundumstudio.socketio</groupId>
 			<artifactId>netty-socketio</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
+			<version>1.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.inject</groupId>
@@ -272,7 +267,7 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>2.1.0</version>
+			<version>2.2.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-- 
GitLab