From d28e5b6e0d0793558f3328c5a420c17bdd606104 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 16 Apr 2015 13:48:50 +0200
Subject: update library versions

---
 common/pom.xml                       | 12 ++---
 id/ConfigWebTool/pom.xml             |  3 --
 id/oa/pom.xml                        |  2 -
 id/server/idserverlib/pom.xml        | 12 ++++-
 id/server/moa-id-commons/pom.xml     |  9 ++--
 id/server/stork2-commons/pom.xml     |  3 +-
 id/server/stork2-saml-engine/pom.xml |  5 --
 pom.xml                              | 89 +++++++++++++++++++++++++++++++-----
 8 files changed, 96 insertions(+), 39 deletions(-)

diff --git a/common/pom.xml b/common/pom.xml
index 72cf702bc..8f18a1b92 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -67,28 +67,24 @@
         <dependency>
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
-            <version>2.7</version>
+            <version>${jodatime.version}</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.10</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
-            <version>1.7.10</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jul-to-slf4j</artifactId>
-            <version>1.7.10</version>
         </dependency>
         <dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-			<version>1.7.10</version>
-		</dependency>
+						<groupId>org.slf4j</groupId>
+						<artifactId>slf4j-log4j12</artifactId>
+				</dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
diff --git a/id/ConfigWebTool/pom.xml b/id/ConfigWebTool/pom.xml
index 827254d00..423d442d0 100644
--- a/id/ConfigWebTool/pom.xml
+++ b/id/ConfigWebTool/pom.xml
@@ -83,7 +83,6 @@
         <dependency>
             <groupId>at.gv.util</groupId>
             <artifactId>egovutils</artifactId>
-            <version>2.0.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.cxf</groupId>
@@ -159,12 +158,10 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-core</artifactId>
-            <version>2.3.20</version>
         </dependency>
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-json-plugin</artifactId>
-            <version>2.3.20</version>
         </dependency>
 
         <dependency>
diff --git a/id/oa/pom.xml b/id/oa/pom.xml
index c97db6db2..173019c1b 100644
--- a/id/oa/pom.xml
+++ b/id/oa/pom.xml
@@ -110,12 +110,10 @@
   		<dependency>
   			<groupId>org.slf4j</groupId>
   			<artifactId>slf4j-api</artifactId>
-  			<version>1.7.6</version>
   		</dependency>
   		<dependency>
   			<groupId>org.slf4j</groupId>
   			<artifactId>slf4j-log4j12</artifactId>
-  			<version>1.7.6</version>
   		</dependency>
   		
   		<dependency>
diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index dbfc19b68..9465b56d1 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -113,8 +113,6 @@
 		   <dependency>
             <groupId>at.gv.util</groupId>
             <artifactId>egovutils</artifactId>
-            <!-- <version>1.0.7</version> -->
-            <version>2.0.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.sun</groupId>
@@ -142,6 +140,16 @@
                 </exclusion>
             </exclusions>
         </dependency>
+				
+		  <dependency>
+        	<groupId>org.apache.cxf</groupId>
+        	<artifactId>cxf-rt-frontend-jaxws</artifactId>
+    	</dependency>
+    	<dependency>
+        	<groupId>org.apache.cxf</groupId>
+        	<artifactId>cxf-rt-transports-http</artifactId>
+    	</dependency>
+		
 		
 		<dependency>
 			<groupId>javax.xml.bind</groupId>
diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index c504a7f0c..27beeaaf3 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -46,23 +46,22 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-core</artifactId>
-            <version>4.3.8.Final</version>
+            <version>${hibernate.version}</version>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-c3p0</artifactId>
-            <version>4.3.8.Final</version>
+            <version>${hibernate.version}</version>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
-            <version>4.3.8.Final</version>
+            <version>${hibernate.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.3.2</version>
         </dependency>
 				<dependency>
 					<groupId>commons-httpclient</groupId>
@@ -122,7 +121,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.34</version>
+            <version>${mysql-connector.java}</version>
         </dependency>
     </dependencies>
 
diff --git a/id/server/stork2-commons/pom.xml b/id/server/stork2-commons/pom.xml
index 81f2cf4e5..1a8dfd786 100644
--- a/id/server/stork2-commons/pom.xml
+++ b/id/server/stork2-commons/pom.xml
@@ -34,7 +34,7 @@
 		<dependency>
 			<groupId>joda-time</groupId>
 			<artifactId>joda-time</artifactId>
-			<version>2.3</version>
+			<version>${jodatime.version}</version>
 		</dependency>
 
 		<!-- Log4J -->
@@ -113,7 +113,6 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.11</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml
index e5d3dc1f4..36df747e4 100644
--- a/id/server/stork2-saml-engine/pom.xml
+++ b/id/server/stork2-saml-engine/pom.xml
@@ -96,7 +96,6 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<version>1.7.10</version>
 		</dependency>
 <!-- 		<dependency>
 			<groupId>org.slf4j</groupId>
@@ -106,7 +105,6 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jcl-over-slf4j</artifactId>
-			<version>1.7.10</version>
 		</dependency>
 <!-- 		<dependency>
 			<groupId>org.slf4j</groupId>
@@ -116,13 +114,11 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jul-to-slf4j</artifactId>
-			<version>1.7.10</version>
 		</dependency>
 
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
-			<version>2.4</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
@@ -133,7 +129,6 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.11</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/pom.xml b/pom.xml
index 8897201b0..a87900e72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,16 +21,31 @@
 		<moa-commons-version>2.0.1</moa-commons-version>
 		-->
 		
-		<moa-commons-version>2.0.3-SNAPSHOT</moa-commons-version>
-		<moa-id-version>2.2.1-SNAPSHOT</moa-id-version>
-		<moa-id-proxy-version>2.0.1-SNAPSHOT</moa-id-proxy-version>
-		<moa-spss-version>2.0.5-SNAPSHOT</moa-spss-version>
-		<configtool-version>1.1.6-SNAPSHOT</configtool-version>
-		<demo-oa-version>2.0.4-SNAPSHOT</demo-oa-version>
+			<!-- 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-spss-version>2.0.5</moa-spss-version>
+			<configtool-version>1.1.6</configtool-version>
+			<demo-oa-version>2.0.4</demo-oa-version>
 		
-		<org.springframework.version>4.1.5.RELEASE</org.springframework.version>
-		<surefire.version>2.18.1</surefire.version>
-
+			<!-- Library Versions -->
+			<org.springframework.version>4.1.6.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.0.4</cxf.version>
+			<struts.version>2.3.20</struts.version>
+			<egovutils.version>2.0.0</egovutils.version>
+			<slf4j.version>1.7.12</slf4j.version>
+			<hibernate.version>4.3.8.Final</hibernate.version>
+			<mysql-connector.java>5.1.35</mysql-connector.java>			
+			<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.0</org.apache.commons.collections4.version>
+			<jodatime.version>2.7</jodatime.version>
+			
     </properties>
 
     <profiles>
@@ -232,15 +247,65 @@
 			<dependency>
   				<groupId>org.opensaml</groupId>
   				<artifactId>opensaml</artifactId>
-  				<version>2.6.5</version>
+  				<version>${opensaml.version}</version>
   			</dependency>  		
 			<dependency>
 				<groupId>org.opensaml</groupId>
 				<artifactId>xmltooling</artifactId>
-				<version>1.4.5</version>
+				<version>${xmltooling.version}</version>
 			</dependency>
 
+    	<dependency>
+        	<groupId>org.apache.cxf</groupId>
+        	<artifactId>cxf-rt-frontend-jaxws</artifactId>
+        	<version>${cxf.version}</version>
+    	</dependency>
+    	<dependency>
+        	<groupId>org.apache.cxf</groupId>
+        	<artifactId>cxf-rt-transports-http</artifactId>
+        	<version>${cxf.version}</version>
+    	</dependency>
+
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-core</artifactId>
+            <version>${struts.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-json-plugin</artifactId>
+            <version>${struts.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>at.gv.util</groupId>
+            <artifactId>egovutils</artifactId>
+            <version>${egovutils.version}</version>
+        </dependency>
 
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jul-to-slf4j</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
+        <dependency>
+						<groupId>org.slf4j</groupId>
+						<artifactId>slf4j-log4j12</artifactId>
+						<version>${slf4j.version}</version>
+				</dependency>
+			
+			
             <dependency>
                 <groupId>axis</groupId>
                 <artifactId>axis</artifactId>
@@ -307,7 +372,7 @@
             <dependency>
 							 <groupId>org.apache.httpcomponents</groupId>
 							 <artifactId>httpclient</artifactId>
-							 <version>4.4</version>
+							 <version>4.4.1</version>
 						</dependency>            
             <dependency>
                 <groupId>dav4j</groupId>
-- 
cgit v1.2.3