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 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'id/server/idserverlib/pom.xml')

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>
-- 
cgit v1.2.3


From 4d16df7e7a3a893332248d20d032d23605eb091e Mon Sep 17 00:00:00 2001
From: Christian Wagner <c.wagner@datentechnik-innovation.com>
Date: Mon, 12 Jan 2015 16:32:43 +0100
Subject: add Jackson 2.5.0 annotations

---
 id/server/idserverlib/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'id/server/idserverlib/pom.xml')

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index f0c845928..b224717c2 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -435,6 +435,12 @@
 			<artifactId>jackson-databind</artifactId>
 		</dependency>
 
+
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-annotations</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
-- 
cgit v1.2.3


From d24179f90949ff6768f89eea0073f65990d0765a Mon Sep 17 00:00:00 2001
From: Martin Bonato <mbonato@datentechnik-innovation.com>
Date: Wed, 21 Jan 2015 16:55:53 +0100
Subject: Add unit initial unit tests.

---
 id/server/idserverlib/pom.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'id/server/idserverlib/pom.xml')

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index b224717c2..dd24f5d56 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -240,6 +240,16 @@
             <version>1.7.6</version>
         </dependency> -->
 
+		<dependency>
+			<groupId>org.easymock</groupId>
+			<artifactId>easymock</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.unitils</groupId>
+			<artifactId>unitils-core</artifactId>
+			<scope>test</scope>
+		</dependency>
  		<dependency>
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging</artifactId>
-- 
cgit v1.2.3


From cc7e339de3a905892be3afbd624509f3dd45b19e Mon Sep 17 00:00:00 2001
From: Gerwin Gsenger <g.gsenger@datentechnik-innovation.at>
Date: Thu, 22 Jan 2015 13:51:54 +0100
Subject: move dependencies to more appropriate pom files, testNG warning NOT
 fixed

---
 id/server/idserverlib/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'id/server/idserverlib/pom.xml')

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index dd24f5d56..eefa3761b 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -250,6 +250,12 @@
 			<artifactId>unitils-core</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>MOA</groupId>
+			<artifactId>moa-common</artifactId>
+			<type>test-jar</type>
+			<scope>test</scope>
+		</dependency>
  		<dependency>
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging</artifactId>
-- 
cgit v1.2.3


From 0ac1586549bf1bb391c48a4151a5f32a0863a5f4 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 19 Jun 2015 12:14:39 +0200
Subject: update pom

---
 id/server/idserverlib/pom.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'id/server/idserverlib/pom.xml')

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index eefa3761b..0bda107be 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -444,17 +444,20 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-core</artifactId>
+			<version>2.5.4</version>
 		</dependency>
 		<!-- databinding; ObjectMapper, JsonNode and related classes are here -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
+			<version>2.5.4</version>
 		</dependency>
 
 
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-annotations</artifactId>
+			<version>2.5.4</version>
 		</dependency>
 
 		<dependency>
-- 
cgit v1.2.3