From db9fdd97ec65b050494a01891eab55b59c3f3ace Mon Sep 17 00:00:00 2001
From: Gerwin Gsenger <g.gsenger@datentechnik-innovation.at>
Date: Mon, 12 Jan 2015 10:13:16 +0100
Subject: switch to Jackson Version 2.5.0

---
 id/server/idserverlib/pom.xml    | 11 +++++++++++
 id/server/moa-id-commons/pom.xml |  5 -----
 2 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'id')

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 9465b56d1..f0c845928 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -424,6 +424,17 @@
 			</exclusions>
 		</dependency>
 
+		<!-- the core, which includes Streaming API, shared low-level abstractions (but NOT data-binding) -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+		</dependency>
+		<!-- databinding; ObjectMapper, JsonNode and related classes are here -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index 6d499f42a..27beeaaf3 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -123,11 +123,6 @@
             <artifactId>mysql-connector-java</artifactId>
             <version>${mysql-connector.java}</version>
         </dependency>
-		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-mapper-asl</artifactId>
-			<version>1.9.13</version>
-		</dependency>
     </dependencies>
 
     <build>
-- 
cgit v1.2.3