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 +++
 id/server/moa-id-commons/pom.xml | 10 +++++++++-
 id/server/pom.xml                |  9 +++------
 pom.xml                          | 16 +++++++++-------
 4 files changed, 24 insertions(+), 14 deletions(-)

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>
diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index 9260f8b22..c04ea13fa 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -147,6 +147,7 @@
 		<dependency>
 			<groupId>commons-cli</groupId>
 			<artifactId>commons-cli</artifactId>
+			<version>1.2</version>
 		</dependency>
 		
 		<dependency>
@@ -158,10 +159,17 @@
 			<artifactId>spring-orm</artifactId>
 		</dependency>
 		
-	    <dependency>
+	  <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>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
diff --git a/id/server/pom.xml b/id/server/pom.xml
index b88bf7b49..45d7822a1 100644
--- a/id/server/pom.xml
+++ b/id/server/pom.xml
@@ -100,11 +100,7 @@
 				<version>${org.springframework.version}</version>
 				<scope>test</scope>
 			</dependency>
-		</dependencies>
-	</dependencyManagement>
-
-	<dependencyManagement>
-		<dependencies>
+			
 			<dependency>
 				<groupId>junit</groupId>
 				<artifactId>junit</artifactId>
@@ -121,9 +117,10 @@
 				<artifactId>unitils-core</artifactId>
 				<version>3.4.2</version>
 			</dependency>
+			
 		</dependencies>
 	</dependencyManagement>
-
+	
     <build>
         <plugins>
 <!--         		<plugin>
diff --git a/pom.xml b/pom.xml
index 2c5ae79c9..40d4376bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,11 +22,11 @@
 		-->
 		
 			<!-- Project Version -->
-			<moa-commons-version>2.0.3</moa-commons-version>
-			<moa-id-version>2.2.1</moa-id-version>
-			<moa-id-proxy-version>2.0.1-SNAPSHOT</moa-id-proxy-version>
+			<moa-commons-version>3.0.0-Snapshot</moa-commons-version>
+			<moa-id-version>3.0.0-Snapshot</moa-id-version>
+			<moa-id-proxy-version>2.0.1-Snapshot</moa-id-proxy-version>
 			<moa-spss-version>2.0.5</moa-spss-version>
-			<configtool-version>1.1.6</configtool-version>
+			<configtool-version>1.2.0-Snapshot</configtool-version>
 			<demo-oa-version>2.0.4</demo-oa-version>
 		
 			<!-- Library Versions -->
@@ -46,7 +46,9 @@
 			<org.apache.commons.collections4.version>4.0</org.apache.commons.collections4.version>
 			<jodatime.version>2.7</jodatime.version>
 			
+			<jackson-version>2.5.4</jackson-version>
 	    <apache-cli-version>1.2</apache-cli-version>
+	    <spring-orm-version>3.1.1.RELEASE</spring-orm-version>
 	   
     </properties>
 
@@ -668,7 +670,6 @@
 				<version>${org.springframework.version}</version>
 			</dependency>
 			
-        </dependencies>
             <!-- the core, which includes Streaming API, shared low-level abstractions (but NOT data-binding) -->
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
@@ -702,8 +703,9 @@
 				<groupId>org.unitils</groupId>
 				<artifactId>unitils-core</artifactId>
 				<version>3.4.2</version>
-			</dependency>
-        </dependencies>
+			</dependency>
+			
+			</dependencies>
     </dependencyManagement>
 
     <dependencies>
-- 
cgit v1.2.3