update libs and version

2 files changed, 29 insertions, 25 deletions

diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index c4007fc80..fd8ddc7fb 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -215,7 +215,7 @@
 				<dependency>
 					<groupId>com.sun.xml.bind</groupId>
 					<artifactId>jaxb-xjc</artifactId>
-					<version>2.2.11</version>
+					<version>2.3.0</version>
 				</dependency>
 
 				<dependency>
@@ -227,7 +227,7 @@
 				<dependency>
 					<groupId>org.jvnet.jaxb2_commons</groupId>
 					<artifactId>jaxb2-basics-runtime</artifactId>
-					<version>0.11.0</version>
+					<version>1.11.1</version>
 				</dependency>
         
         <dependency>
@@ -257,7 +257,7 @@
 		<dependency>
     	<groupId>org.springframework.data</groupId>
     	<artifactId>spring-data-jpa</artifactId>
-    	<version>1.10.4.RELEASE</version>
+    	<version>${org.springframework.data.spring-data-jpa}</version>
 		</dependency>
 		
 		
@@ -301,7 +301,7 @@
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-dbcp2</artifactId>
-			<version>2.1.1</version>
+			<version>${org.apache.commons.commons.dbcp2}</version>
 		</dependency>
 
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 019050d99..c81a825f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,42 +22,41 @@
 		-->
 		
 			<!-- Project Version -->			
-			<moa-id-version>3.2.4-snapshot</moa-id-version>
+			<moa-id-version>3.3.0-snapshot</moa-id-version>
 			
-			<moa-id-version-final>3.2.4-snapshot</moa-id-version-final>			
-			<moa-id-version-edu>3.2.4-snapshot</moa-id-version-edu>			
+			<moa-id-version-final>3.3.0-snapshot</moa-id-version-final>			
+			<moa-id-version-edu>3.3.0-snapshot</moa-id-version-edu>			
 			
 			<moa-id-proxy-version>2.0.1</moa-id-proxy-version>
 			
-			<configtool-version>2.3.4-snapshot</configtool-version>
+			<configtool-version>2.4.0-snapshot</configtool-version>
 			<demo-oa-version>2.0.6</demo-oa-version>
 			
 			<moa-id-module-elga_mandate_client>1.3</moa-id-module-elga_mandate_client>
 							
-			<org.springframework.version>4.3.10.RELEASE</org.springframework.version>
-			<surefire.version>2.19.1</surefire.version>		
+			<org.springframework.version>4.3.11.RELEASE</org.springframework.version>
+			<org.springframework.data.spring-data-jpa>1.11.7.RELEASE</org.springframework.data.spring-data-jpa>
+			<surefire.version>2.20.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>
-			<xmlsec.version>2.0.8</xmlsec.version>
+			<xmlsec.version>2.1.0</xmlsec.version>
 			
-			<!-- Maybe problems with 5.2.3.Final -->
-			<hibernate.version>5.2.10.Final</hibernate.version>  <!-- update to v5 --> 
-			<!-- <hibernate.version>5.0.10.Final</hibernate.version>  update to v5 -->
-			
-			
-			<cxf.version>3.1.12</cxf.version>			
+			<hibernate.version>5.2.11.Final</hibernate.version>
+			<org.apache.commons.commons.dbcp2>2.1.1</org.apache.commons.commons.dbcp2> 
+						
+			<cxf.version>3.2.0</cxf.version>			
 			<struts.version>2.5.13</struts.version> <!-- 2.5.10.1 -->
 			
 			<egovutils.version>2.0.0</egovutils.version>
 			
-			<slf4j.version>1.7.24</slf4j.version>						
+			<slf4j.version>1.7.25</slf4j.version>						
 			
 			<httpclient.version>4.5.3</httpclient.version>
 			<httpcore.version>4.4.6</httpcore.version>
 			
 			<!-- Maybe problems with Hibernate 5.0.10 -->
-			<mysql-connector.java>6.0.5</mysql-connector.java>
+			<mysql-connector.java>6.0.6</mysql-connector.java>
 			<!-- <mysql-connector.java>5.1.40</mysql-connector.java> -->			
 						
 			<junit.version>4.12</junit.version>			
@@ -65,10 +64,10 @@
 			<org.apache.commons.lang3.version>3.6</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.9.4</jodatime.version>
+			<jodatime.version>2.9.9</jodatime.version>
 			
-			<jackson-version>2.8.7</jackson-version>
-	    <apache-cli-version>1.3.1</apache-cli-version>
+			<jackson-version>2.9.1</jackson-version>
+	    <apache-cli-version>1.4</apache-cli-version>
 	    <spring-orm-version>${org.springframework.version}</spring-orm-version>
 	   
     </properties>
@@ -281,6 +280,11 @@
     <dependencyManagement>
         <dependencies>
 
+					<dependency>
+						<groupId>org.apache.commons</groupId>
+						<artifactId>commons-dbcp2</artifactId>
+						<version>${org.apache.commons.commons.dbcp2}</version>
+					</dependency>
 			<dependency>
   				<groupId>org.opensaml</groupId>
   				<artifactId>opensaml</artifactId>
@@ -721,12 +725,12 @@
 			<dependency>
 				<groupId>org.easymock</groupId>
 				<artifactId>easymock</artifactId>
-				<version>3.4</version>
+				<version>3.5</version>
 			</dependency>
 			<dependency>
 				<groupId>org.unitils</groupId>
 				<artifactId>unitils-core</artifactId>
-				<version>3.4.3</version>
+				<version>3.4.6</version>
 			</dependency>
 			
 			</dependencies>
@@ -778,7 +782,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.4</version>
+            <version>${org.apache.commons.io.version}</version>
         </dependency>
 
     </dependencies>