From 54a26c8e353069abacefe5232f8270bec6b3cc60 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 21 Mar 2016 15:49:24 +0100
Subject: update libs

---
 pom.xml | 46 ++++++++++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 20 deletions(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index 4117c52b4..f9657240e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,8 @@
 		
 			<!-- Project Version -->			
 			<moa-id-version>3.2.0-OPB-Snapshot</moa-id-version>
-			<moa-id-version-final>3.2.0-RC1</moa-id-version-final>
+			
+			<moa-id-version-final>3.1.0-RC2</moa-id-version-final>			
 			<moa-id-version-edu>3.2.0-OPB-Snapshot</moa-id-version-edu>			
 			
 			<moa-id-proxy-version>2.0.1-Snapshot</moa-id-proxy-version>
@@ -32,31 +33,35 @@
 			<demo-oa-version>2.0.5</demo-oa-version>
 			
 			<moa-id-module-elga_mandate_client>1.0.0-Snapshot</moa-id-module-elga_mandate_client>
-		
-		
-			<moa-spss-version>2.0.5-RC1</moa-spss-version>
-		
+				
+					
 			<!-- Library Versions -->
-			<org.springframework.version>4.2.4.RELEASE</org.springframework.version>
-			<surefire.version>2.18.1</surefire.version>		
-			<opensaml.version>2.6.5</opensaml.version>
-			<xmltooling.version>1.4.5</xmltooling.version>
-			<cxf.version>3.1.4</cxf.version>
+			<moa-spss-version>2.0.5</moa-spss-version>
+			
+			<org.springframework.version>4.2.5.RELEASE</org.springframework.version>
+			<surefire.version>2.19.1</surefire.version>		
+			
+			<opensaml.version>2.6.6</opensaml.version> <!-- update to v3 (v2 is end-of-life in june 2016)-->
+			<xmltooling.version>1.4.6</xmltooling.version>
+			
+			<hibernate.version>5.1.0.Final</hibernate.version>  <!-- update to v5 -->
+			<cxf.version>3.1.5</cxf.version>			
 			<struts.version>2.3.24.1</struts.version>
+			
 			<egovutils.version>2.0.0</egovutils.version>
-			<slf4j.version>1.7.19</slf4j.version>
-			<hibernate.version>4.3.11.Final</hibernate.version>
+			
+			<slf4j.version>1.7.19</slf4j.version>						
 			<mysql-connector.java>5.1.38</mysql-connector.java>			
-			<junit.version>4.11</junit.version>
+			<junit.version>4.11</junit.version>			
 			<org.apache.commons.io.version>2.4</org.apache.commons.io.version>
 			<org.apache.commons.lang3.version>3.4</org.apache.commons.lang3.version>
 			<org.apache.commons.collections4.version>4.1</org.apache.commons.collections4.version>
 			<org.apache.commons.collections3.version>3.2.2</org.apache.commons.collections3.version>
 			<jodatime.version>2.7</jodatime.version>
 			
-			<jackson-version>2.7.0</jackson-version>
+			<jackson-version>2.7.3</jackson-version>
 	    <apache-cli-version>1.3.1</apache-cli-version>
-	    <spring-orm-version>3.1.1.RELEASE</spring-orm-version>
+	    <spring-orm-version>${org.springframework.version}</spring-orm-version>
 	   
     </properties>
 
@@ -337,7 +342,7 @@
 				</dependency>
 			
 			
-            <dependency>
+<!--             <dependency>
                 <groupId>axis</groupId>
                 <artifactId>axis</artifactId>
                 <version>1.0_IAIK_1.2</version>                
@@ -360,7 +365,8 @@
                <artifactId>axis-wsdl4j</artifactId>
                <version>1.5.1</version>
                <scope>compile</scope>
-            </dependency>
+            </dependency> -->
+            
             <dependency>
                 <groupId>jaxen</groupId>
                 <artifactId>jaxen</artifactId>
@@ -411,7 +417,7 @@
             <dependency>
 							 <groupId>org.apache.httpcomponents</groupId>
 							 <artifactId>httpclient</artifactId>
-							 <version>4.5.1</version>
+							 <version>4.5.2</version>
 						</dependency>            
             <dependency>
                 <groupId>dav4j</groupId>
@@ -432,11 +438,11 @@
             </dependency> -->
 
 
-						<dependency>
+<!-- 						<dependency>
 							<groupId>org.bouncycastle</groupId>
 							<artifactId>bcprov-jdk16</artifactId>
 							<version>1.46</version>
-						</dependency>
+						</dependency> -->
 
       			<dependency>
 							<groupId>MOA.id.server</groupId>
-- 
cgit v1.2.3