From 2b986b919ec2057b3770af31f3307c46306e60cb Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 31 Mar 2014 15:01:45 +0200
Subject: exclude Spring Framework from HyperJAXB plugin

---
 id/server/moa-id-commons/pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'id/server')

diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index e494033a0..c8593ee5f 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -75,6 +75,10 @@
 			    		<groupId>org.hibernate.javax.persistence</groupId>
 							<artifactId>hibernate-jpa-2.0-api</artifactId>
 			    </exclusion>
+			    <exclusion>
+			    	<groupId>org.springframework</groupId>
+			    	<artifactId>spring</artifactId>
+			    </exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
-- 
cgit v1.2.3


From 8e595eec1e3418e3c71037fc2c3752a243fc49d6 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 31 Mar 2014 15:36:27 +0200
Subject: update slf4j to version 1.7.6

---
 id/server/idserverlib/pom.xml        | 10 +++++-----
 id/server/stork2-saml-engine/pom.xml | 14 +++++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'id/server')

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 4c9a5e768..fd0c3737a 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -138,27 +138,27 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.5</version>
+            <version>1.7.6</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>1.7.5</version>
+            <version>1.7.6</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
-            <version>1.7.5</version>
+            <version>1.7.6</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>log4j-over-slf4j</artifactId>
-            <version>1.7.5</version>
+            <version>1.7.6</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jul-to-slf4j</artifactId>
-            <version>1.7.5</version>
+            <version>1.7.6</version>
         </dependency>
 		
 		<dependency>
diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml
index 9b294f6d6..ec328e039 100644
--- a/id/server/stork2-saml-engine/pom.xml
+++ b/id/server/stork2-saml-engine/pom.xml
@@ -54,7 +54,7 @@
 		<dependency>
 			<groupId>org.opensaml</groupId>
 			<artifactId>opensaml</artifactId>
-			<version>${opensaml.version}</version>
+<!-- 			<version>${opensaml.version}</version> -->
 			<exclusions>
 				<exclusion>
 					<groupId>org.slf4j</groupId>
@@ -82,33 +82,33 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<version>1.7.5</version>
+			<version>1.7.6</version>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-simple</artifactId>
-			<version>1.7.5</version>
+			<version>1.7.6</version>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jcl-over-slf4j</artifactId>
-			<version>1.7.5</version>
+			<version>1.7.6</version>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>log4j-over-slf4j</artifactId>
-			<version>1.7.5</version>
+			<version>1.7.6</version>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jul-to-slf4j</artifactId>
-			<version>1.7.5</version>
+			<version>1.7.6</version>
 		</dependency>
 
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
-			<version>2.2</version>
+			<version>2.4</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
-- 
cgit v1.2.3


From ab536c2da230c4e96ffd589ef1828da193197e84 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 31 Mar 2014 15:58:49 +0200
Subject: update WebServiceTools to version 2.3

---
 id/server/idserverlib/pom.xml | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

(limited to 'id/server')

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index fd0c3737a..46f79c8ff 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -68,25 +68,17 @@
 			<artifactId>axis</artifactId>
 		</dependency>
 		
-<!--  		<dependency>
-			<groupId>com.sun</groupId>
+		<dependency>
+			<groupId>org.glassfish.metro</groupId>
 			<artifactId>webservices-tools</artifactId>
-			<version>2.0.1</version>
-		</dependency>		
+			<version>2.3</version>
+		</dependency>
 		<dependency>
-			<groupId>com.sun</groupId>
+			<groupId>org.glassfish.metro</groupId>
 			<artifactId>webservices-rt</artifactId>
-			<version>2.0.1</version>
-		</dependency>		 -->
-				
-
-		<dependency>
-			<groupId>com.sun.xml.ws</groupId>
-			<artifactId>jaxws-tools</artifactId>
-			<version>2.1.7</version>
+			<version>2.3</version>
 		</dependency>
-            
-				
+		
 		<dependency>
 			<groupId>javax.mail</groupId>
 			<artifactId>mail</artifactId>
-- 
cgit v1.2.3


From c1842312eab80c1d6a013dfa294459a2d354c7b8 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 31 Mar 2014 16:20:01 +0200
Subject: remove unused regexp.jar

---
 id/server/idserverlib/pom.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'id/server')

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 46f79c8ff..b37c11faa 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -216,11 +216,12 @@
 		<groupId>org.opensaml</groupId>
 		<artifactId>xmltooling</artifactId>
 	</dependency>
-	
-		<dependency>
+
+<!-- 	<dependency>
 			<groupId>regexp</groupId>
 			<artifactId>regexp</artifactId>
-		</dependency>
+		</dependency> -->
+		
 		<!-- <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> 
 			</dependency> -->
 		<!-- <dependency> <groupId>at.gv.egovernment.moa.id</groupId> <artifactId>mandate-validate</artifactId> 
-- 
cgit v1.2.3


From 52bcaffeccf3e163e4073004ca4dfd86474cfac5 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 31 Mar 2014 16:27:42 +0200
Subject: update Google OAuth libraries  -jsontoken to 1.1  -OAuth to 1.18.0-rc

---
 id/server/idserverlib/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'id/server')

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index b37c11faa..052d6d63e 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -237,7 +237,7 @@
 		<dependency>
 			<groupId>com.googlecode.jsontoken</groupId>
 			<artifactId>jsontoken</artifactId>
-			<version>1.0</version>
+			<version>1.1</version>
 		</dependency>
 
 		<dependency>
@@ -250,13 +250,13 @@
 		<dependency>
 			<groupId>com.google.http-client</groupId>
 			<artifactId>google-http-client-jackson2</artifactId>
-			<version>1.17.0-rc</version>
+			<version>1.18.0-rc</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.google.oauth-client</groupId>
 			<artifactId>google-oauth-client-jetty</artifactId>
-			<version>1.17.0-rc</version>
+			<version>1.18.0-rc</version>
 			<scope>test</scope>
 		</dependency>
 
-- 
cgit v1.2.3


From 779030ed2d7091183b3faf13fec57fa270d46c3a Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Tue, 1 Apr 2014 14:02:19 +0200
Subject: change version to 2.0.1

---
 id/server/auth/pom.xml               | 2 +-
 id/server/idserverlib/pom.xml        | 2 +-
 id/server/moa-id-commons/pom.xml     | 2 +-
 id/server/pom.xml                    | 2 +-
 id/server/proxy/pom.xml              | 2 +-
 id/server/stork2-commons/pom.xml     | 5 +++++
 id/server/stork2-saml-engine/pom.xml | 2 +-
 7 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'id/server')

diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index 1f8417ea2..618429a8e 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>MOA.id</groupId>
 		<artifactId>moa-id</artifactId>
-		<version>2.0.0</version>
+		<version>2.0.1</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>
diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 052d6d63e..ae4c57fc8 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>MOA.id</groupId>
 		<artifactId>moa-id</artifactId>
-		<version>2.0.0</version>
+		<version>2.0.1</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index c8593ee5f..5da911f89 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>MOA.id</groupId>
     <artifactId>moa-id</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.1</version>
   </parent>
   <artifactId>moa-id-commons</artifactId>
   <name>moa-id-commons</name>
diff --git a/id/server/pom.xml b/id/server/pom.xml
index ccb958508..d748c01eb 100644
--- a/id/server/pom.xml
+++ b/id/server/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>MOA</groupId>
         <artifactId>id</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml
index 3d4d8c74d..e47b31144 100644
--- a/id/server/proxy/pom.xml
+++ b/id/server/proxy/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>MOA.id</groupId>
 		<artifactId>moa-id</artifactId>
-		<version>2.0.0</version>
+		<version>2.0.1</version>
 	</parent>
 	
 	<properties>
diff --git a/id/server/stork2-commons/pom.xml b/id/server/stork2-commons/pom.xml
index 04b35f5f5..b13035307 100644
--- a/id/server/stork2-commons/pom.xml
+++ b/id/server/stork2-commons/pom.xml
@@ -1,5 +1,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<parent>
+    <groupId>MOA.id</groupId>
+    <artifactId>moa-id</artifactId>
+    <version>2.0.1</version>
+  </parent>	
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>eu.stork</groupId>
 	<artifactId>Commons</artifactId>
diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml
index ec328e039..e4af3d90e 100644
--- a/id/server/stork2-saml-engine/pom.xml
+++ b/id/server/stork2-saml-engine/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>MOA.id</groupId>
 		<artifactId>moa-id</artifactId>
-		<version>2.0.0</version>
+		<version>2.0.1</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>
-- 
cgit v1.2.3