From 6f5319b465eb857e13ee562ccfd9a94f1e681501 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 12 Sep 2014 12:27:49 +0200
Subject: update dependency version   > org.apache.struts:struts2-core 2.3.16.3
   > org.apache.struts:struts2-json-plugin 2.3.16.3   > joda-time:joda-time
 2.4   > org.slf4j:jcl-over-slf4j 1.7.7   > org.slf4j:jul-to-slf4j 1.7.7   >
 org.slf4j:slf4j-api 1.7.7   > org.slf4j:slf4j-log4j12 1.7.7   >
 mysql:mysql-connector-java 5.1.32   > org.hibernate:hibernate-core
 4.3.6.Final   > org.hibernate:hibernate-entitymanager 4.3.6.Final   >
 org.hibernate:hibernate-c3p0 4.3.6.Final   >
 com.google.http-client:google-http-client-jackson2 1.19.0   >
 com.google.oauth-client:google-oauth-client-jetty 1.19.0   >
 org.apache.commons:commons-lang3 3.3.2   > commons-codec:commons-codec 1.9  
 > commons-logging:commons-logging 1.2   > xerces:xercesImpl 2.11.0   >
 postgresql:postgresql 9.3-1102-jdbc41   > junit:junit 3.8.2

---
 common/pom.xml                           | 15 ++++++++++-----
 id/ConfigWebTool/pom.xml                 |  4 ++--
 id/server/auth/pom.xml                   |  2 +-
 id/server/idserverlib/pom.xml            | 12 ++++++------
 id/server/moa-id-commons/pom.xml         | 10 +++++-----
 id/server/stork2-commons/pom.xml         |  3 +--
 id/server/stork2-saml-engine/pom.xml     |  8 ++++----
 pom.xml                                  | 21 ++++++++++-----------
 spss/handbook/clients/api/pom.xml        |  2 +-
 spss/handbook/clients/webservice/pom.xml |  2 +-
 spss/server/serverlib/pom.xml            |  2 +-
 11 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/common/pom.xml b/common/pom.xml
index b2f7f652c..70d0dc13c 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -67,12 +67,12 @@
         <dependency>
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
-            <version>2.3</version>
+            <version>2.4</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.6</version>
+            <version>1.7.7</version>
         </dependency>
 <!--         <dependency>
             <groupId>org.slf4j</groupId>
@@ -82,7 +82,12 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
-            <version>1.7.6</version>
+            <version>1.7.7</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.7</version>
         </dependency>
 <!--         <dependency>
             <groupId>org.slf4j</groupId>
@@ -92,12 +97,12 @@
         <dependency>
 					<groupId>org.slf4j</groupId>
 					<artifactId>slf4j-log4j12</artifactId>
-					<version>1.7.6</version>
+					<version>1.7.7</version>
 				</dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jul-to-slf4j</artifactId>
-            <version>1.7.6</version>
+            <version>1.7.7</version>
         </dependency>
     </dependencies>
 
diff --git a/id/ConfigWebTool/pom.xml b/id/ConfigWebTool/pom.xml
index 9b3ef3862..8c3622a4e 100644
--- a/id/ConfigWebTool/pom.xml
+++ b/id/ConfigWebTool/pom.xml
@@ -118,12 +118,12 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-core</artifactId>
-            <version>2.3.16.1</version>
+            <version>2.3.16.3</version>
         </dependency>
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-json-plugin</artifactId>
-            <version>2.3.16.1</version>
+            <version>2.3.16.3</version>
         </dependency>
 
         <dependency>
diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index 20c45b096..b43a0e736 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -98,7 +98,7 @@
 		<dependency>
     		<groupId>org.tuckey</groupId>
     		<artifactId>urlrewritefilter</artifactId>
-    		<version>4.0.3</version>
+    		<version>4.0.4</version>
 		</dependency>
 		<dependency>
 			<groupId>MOA.spss.server</groupId>
diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index c1ea05e4b..a8ffd10bc 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -142,11 +142,11 @@
         </dependency>
 
 
-        <dependency>
+<!--         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.6</version>
-        </dependency>
+            <version>1.7.7</version>
+        </dependency> -->
 <!--         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
@@ -267,20 +267,20 @@
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
-			<version>1.8</version>
+			<version>1.9</version>
 		</dependency>
 
 		<!-- Google OAuth Client -->
 		<dependency>
 			<groupId>com.google.http-client</groupId>
 			<artifactId>google-http-client-jackson2</artifactId>
-			<version>1.18.0-rc</version>
+			<version>1.19.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.google.oauth-client</groupId>
 			<artifactId>google-oauth-client-jetty</artifactId>
-			<version>1.18.0-rc</version>
+			<version>1.19.0</version>
 			<scope>test</scope>
 		</dependency>
 
diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index 0a3351edb..e6d708eca 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -46,23 +46,23 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-core</artifactId>
-            <version>4.3.4.Final</version>
+            <version>4.3.6.Final</version>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-c3p0</artifactId>
-            <version>4.3.4.Final</version>
+            <version>4.3.6.Final</version>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
-            <version>4.3.4.Final</version>
+            <version>4.3.6.Final</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.3.1</version>
+            <version>3.3.2</version>
         </dependency>
         <dependency>
 					<groupId>commons-httpclient</groupId>
@@ -118,7 +118,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.29</version>
+            <version>5.1.32</version>
         </dependency>
     </dependencies>
 
diff --git a/id/server/stork2-commons/pom.xml b/id/server/stork2-commons/pom.xml
index c6d15b51b..d0fd5a1ad 100644
--- a/id/server/stork2-commons/pom.xml
+++ b/id/server/stork2-commons/pom.xml
@@ -13,7 +13,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<stork.version>1.4.0</stork.version>
-		<opensaml.version>2.6.0</opensaml.version>
+		<opensaml.version>2.6.2</opensaml.version>
 	</properties>
 	<version>${stork.version}</version>
   <description>
@@ -57,7 +57,6 @@
 		<dependency>
 			<groupId>org.opensaml</groupId>
 			<artifactId>opensaml</artifactId>
-			<version>${opensaml.version}</version>
 			<exclusions>
 				<exclusion>
 				    <groupId>org.slf4j</groupId>
diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml
index ed5dfa973..89ddab22a 100644
--- a/id/server/stork2-saml-engine/pom.xml
+++ b/id/server/stork2-saml-engine/pom.xml
@@ -17,7 +17,7 @@
 		<samlspec.version>0.5.2</samlspec.version>
 		<samlspecacept.version>0.5.1</samlspecacept.version>
 		<commons.version>1.4.0</commons.version>
-		<opensaml.version>2.6.1</opensaml.version>
+		<opensaml.version>2.6.2</opensaml.version>
 		<timestamp>${maven.build.timestamp}</timestamp>
 		<repositoryPath>${basedir}/../../../repository</repositoryPath>
 	</properties>
@@ -88,7 +88,7 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<version>1.7.6</version>
+			<version>1.7.7</version>
 		</dependency>
 <!-- 		<dependency>
 			<groupId>org.slf4j</groupId>
@@ -98,7 +98,7 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jcl-over-slf4j</artifactId>
-			<version>1.7.6</version>
+			<version>1.7.7</version>
 		</dependency>
 <!-- 		<dependency>
 			<groupId>org.slf4j</groupId>
@@ -108,7 +108,7 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jul-to-slf4j</artifactId>
-			<version>1.7.6</version>
+			<version>1.7.7</version>
 		</dependency>
 
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 02a25375d..4010333eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,10 +12,10 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         
         <moa-commons-version>2.0.0</moa-commons-version>
-				<moa-id-version>2.1.1-Snapshot</moa-id-version>
+				<moa-id-version>2.1.1</moa-id-version>
 				<moa-id-proxy-version>2.0.0</moa-id-proxy-version>
         <moa-spss-version>2.0.2</moa-spss-version>
-				<configtool-version>1.1.1-Snapshot</configtool-version>
+				<configtool-version>1.1.2</configtool-version>
 				<demo-oa-version>2.0.2</demo-oa-version>
     </properties>
 
@@ -196,12 +196,11 @@
                 <version>1.2.17</version>
                 <scope>compile</scope>
             </dependency>
-            <dependency>
-                <groupId>postgresql</groupId>
-                <artifactId>postgresql</artifactId>
-                <version>7.2</version>
-                <scope>runtime</scope>
-            </dependency>
+						<dependency>
+							<groupId>org.postgresql</groupId>
+							<artifactId>postgresql</artifactId>
+							<version>9.3-1102-jdbc41</version>
+						</dependency>
 
             <dependency>
                 <groupId>javax.mail</groupId>
@@ -277,13 +276,13 @@
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>3.8.1</version>
+                <version>3.8.2</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>commons-logging</groupId>
                 <artifactId>commons-logging</artifactId>
-                <version>1.1.3</version>
+                <version>1.2</version>
                 <scope>compile</scope>
             </dependency>
             
@@ -446,7 +445,7 @@
             <dependency>
                 <groupId>xerces</groupId>
                 <artifactId>xercesImpl</artifactId>
-                <version>2.9.0</version>
+                <version>2.11.0</version>
                 <scope>compile</scope>	
             </dependency>
             <!-- The xmlParserAPIs.jar of the official xalan distribution
diff --git a/spss/handbook/clients/api/pom.xml b/spss/handbook/clients/api/pom.xml
index 13d988a57..581c29e56 100644
--- a/spss/handbook/clients/api/pom.xml
+++ b/spss/handbook/clients/api/pom.xml
@@ -58,7 +58,7 @@
 			<artifactId>log4j</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>postgresql</groupId>
+			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
 		</dependency>
 		<dependency>
diff --git a/spss/handbook/clients/webservice/pom.xml b/spss/handbook/clients/webservice/pom.xml
index 0a48df11c..50850b592 100644
--- a/spss/handbook/clients/webservice/pom.xml
+++ b/spss/handbook/clients/webservice/pom.xml
@@ -58,7 +58,7 @@
 			<artifactId>log4j</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>postgresql</groupId>
+			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
 		</dependency>
 		<dependency>		
diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml
index cc96d411a..3cf8d0bd7 100644
--- a/spss/server/serverlib/pom.xml
+++ b/spss/server/serverlib/pom.xml
@@ -58,7 +58,7 @@
 			<artifactId>log4j</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>postgresql</groupId>
+			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
 		</dependency>
 		<dependency>
-- 
cgit v1.2.3