From 9cb68043945f53246928443cea723b58ee2b1c24 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Tue, 21 Jan 2014 14:38:35 +0100
Subject: updated samlengine

---
 id/server/idserverlib/pom.xml | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

(limited to 'id/server/idserverlib/pom.xml')

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index cd9e0a7df..8a9cdd51f 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -25,16 +25,23 @@
 	</repositories>
 
 	<dependencies>
-		<dependency>
-			<groupId>MOA.id</groupId>
-			<artifactId>stork-saml-engine</artifactId>
-			<version>1.5.2</version>
-		</dependency>
-		<dependency>
-			<groupId>MOA.id.server</groupId>
-			<artifactId>moa-id-commons</artifactId>
-			<version>${pom.version}</version>
-		</dependency>
+
+        <dependency>
+    		<groupId>MOA.id</groupId>
+    		<artifactId>stork-saml-engine</artifactId>
+    		<version>1.5.2</version>
+    </dependency>
+
+        <dependency>
+            <groupId>eu.stork</groupId>
+            <artifactId>SamlEngine</artifactId>
+            <version>1.1.0</version>
+        </dependency>
+    <dependency>
+    		<groupId>MOA.id.server</groupId>
+    		<artifactId>moa-id-commons</artifactId>
+    		<version>${pom.version}</version>
+    </dependency>
 		<dependency>
 			<groupId>MOA</groupId>
 			<artifactId>moa-common</artifactId>
-- 
cgit v1.2.3


From 91710631a3b7dc469edb83379c773b7bc27728ab Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 29 Jan 2014 16:21:24 +0100
Subject: add EUPL headers

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

(limited to 'id/server/idserverlib/pom.xml')

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index cd9e0a7df..059189b45 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -55,7 +55,7 @@
 			<artifactId>axis</artifactId>
 			<version>1.1</version>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>com.sun</groupId>
 			<artifactId>webservices-tools</artifactId>
@@ -66,12 +66,10 @@
 			<artifactId>webservices-rt</artifactId>
 			<version>2.0.1</version>
 		</dependency>
-<!--<dependency>
-			<groupId>javax.xml.bind</groupId>
-			<artifactId>jaxb-api</artifactId>
-		</dependency> -->
-		
-		
+		<!--<dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> 
+			</dependency> -->
+
+
 		<dependency>
 			<groupId>javax.mail</groupId>
 			<artifactId>mail</artifactId>
-- 
cgit v1.2.3


From 109aef31e7722cb8e18a920314ad342367bc8483 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 30 Jan 2014 11:56:54 +0100
Subject: -- set MOA-ID Version to 1.9.98-Snapshot -- update SZRGWClient --
 insert MOA-ID-lib version in PVP2 metadata

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

(limited to 'id/server/idserverlib/pom.xml')

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 059189b45..9b2711249 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>1.9.96-SNAPSHOT</version>
+		<version>1.9.98-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
@@ -53,7 +53,6 @@
 		<dependency>
 			<groupId>axis</groupId>
 			<artifactId>axis</artifactId>
-			<version>1.1</version>
 		</dependency>
 
 		<dependency>
-- 
cgit v1.2.3


From 8449c5ab138f0b7a1760cb5f2aa6db2eb9d0b22e Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Thu, 30 Jan 2014 19:04:02 +0100
Subject: added stork signature client api - untested

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

(limited to 'id/server/idserverlib/pom.xml')

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 8a9cdd51f..245348d09 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -37,6 +37,11 @@
             <artifactId>SamlEngine</artifactId>
             <version>1.1.0</version>
         </dependency>
+        <dependency>
+        	<groupId>eu.stork</groupId>
+        	<artifactId>oasis-dss-api</artifactId>
+        	<version>1.0.0-SNAPSHOT</version>
+        </dependency>
     <dependency>
     		<groupId>MOA.id.server</groupId>
     		<artifactId>moa-id-commons</artifactId>
-- 
cgit v1.2.3


From e1e410da00a399a8b059645a14a7848b39d3525c Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Thu, 30 Jan 2014 20:59:16 +0100
Subject: removed old saml-engine

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

(limited to 'id/server/idserverlib/pom.xml')

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 245348d09..1efa46c7d 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -25,13 +25,6 @@
 	</repositories>
 
 	<dependencies>
-
-        <dependency>
-    		<groupId>MOA.id</groupId>
-    		<artifactId>stork-saml-engine</artifactId>
-    		<version>1.5.2</version>
-    </dependency>
-
         <dependency>
             <groupId>eu.stork</groupId>
             <artifactId>SamlEngine</artifactId>
-- 
cgit v1.2.3


From 080e499cc22a0065ea7f47e04b6c0f336533e21e Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 3 Feb 2014 07:17:34 +0100
Subject: *update Assembly script *move demoOA to moa.id.demoOA *change name of
 moa-id configuration-tool

---
 id/server/idserverlib/pom.xml | 76 ++++++++++++++++++++++++-------------------
 1 file changed, 42 insertions(+), 34 deletions(-)

(limited to 'id/server/idserverlib/pom.xml')

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 9b2711249..b137fa7ca 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -60,15 +60,12 @@
 			<artifactId>webservices-tools</artifactId>
 			<version>2.0.1</version>
 		</dependency>
-		<dependency>
+ 		<dependency>
 			<groupId>com.sun</groupId>
 			<artifactId>webservices-rt</artifactId>
 			<version>2.0.1</version>
 		</dependency>
-		<!--<dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> 
-			</dependency> -->
-
-
+		
 		<dependency>
 			<groupId>javax.mail</groupId>
 			<artifactId>mail</artifactId>
@@ -78,22 +75,45 @@
 			<artifactId>servlet-api</artifactId>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>xerces</groupId>
-			<artifactId>xercesImpl</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>xalan-bin-dist</groupId>
-			<artifactId>xml-apis</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>xalan-bin-dist</groupId>
-			<artifactId>xalan</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>xalan-bin-dist</groupId>
-			<artifactId>serializer</artifactId>
-		</dependency>
+		
+        <dependency>
+            <groupId>xalan-bin-dist</groupId>
+            <artifactId>xalan</artifactId>
+            <!-- should be provided by the container or jre -->
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <!-- should be provided by the container or jre -->
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>xalan-bin-dist</groupId>
+            <artifactId>xml-apis</artifactId>
+            <!-- should be provided by the container or jre -->
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>xalan-bin-dist</groupId>
+            <artifactId>serializer</artifactId>
+            <!-- should be provided by the container or jre -->
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>iaik.prod</groupId>
+            <artifactId>iaik_jce_full</artifactId>
+            <!-- should be in the ext directory of the jre -->
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>iaik.prod</groupId>
+            <artifactId>iaik_ecc</artifactId>
+            <!-- should be in the ext directory of the jre -->
+            <scope>provided</scope>
+        </dependency>
+		
+		
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
@@ -127,15 +147,6 @@
 			<groupId>iaik.prod</groupId>
 			<artifactId>iaik_moa</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>iaik.prod</groupId>
-			<artifactId>iaik_ecc</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>iaik.prod</groupId>
-			<artifactId>iaik_jce_full</artifactId>
-			<scope>provided</scope>
-		</dependency>
 		<dependency>
 			<groupId>iaik.prod</groupId>
 			<artifactId>iaik_ixsil</artifactId>
@@ -161,10 +172,7 @@
 			<groupId>regexp</groupId>
 			<artifactId>regexp</artifactId>
 		</dependency>
-		<!-- <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> 
-			</dependency> -->
-		<!-- <dependency> <groupId>at.gv.egovernment.moa.id</groupId> <artifactId>mandate-validate</artifactId> 
-			<version>1.1</version> </dependency> -->
+
 		<dependency>
 			<groupId>commons-lang</groupId>
 			<artifactId>commons-lang</artifactId>
-- 
cgit v1.2.3


From ef35deb727190363d17d693d10f27171787cc92c Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 3 Feb 2014 15:38:24 +0100
Subject: Solve some merge problems

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

(limited to 'id/server/idserverlib/pom.xml')

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index e5670f9a7..81213f721 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -25,16 +25,17 @@
 	</repositories>
 
 	<dependencies>
-        <dependency>
-            <groupId>eu.stork</groupId>
-            <artifactId>SamlEngine</artifactId>
-            <version>1.1.0</version>
-        </dependency>
-        <dependency>
-        	<groupId>eu.stork</groupId>
-        	<artifactId>oasis-dss-api</artifactId>
-        	<version>1.0.0-SNAPSHOT</version>
-        </dependency>
+  	<dependency>
+    	<groupId>eu.stork</groupId>
+      <artifactId>SamlEngine</artifactId>
+     <version>1.1.0</version>
+     </dependency>
+     <dependency>
+     	<groupId>eu.stork</groupId>
+      <artifactId>oasis-dss-api</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+    </dependency>
+    
     <dependency>
     		<groupId>MOA.id.server</groupId>
     		<artifactId>moa-id-commons</artifactId>
@@ -60,7 +61,7 @@
 			<artifactId>axis</artifactId>
 		</dependency>
 
-		<dependency>
+<!-- 		<dependency>
 			<groupId>com.sun</groupId>
 			<artifactId>webservices-tools</artifactId>
 			<version>2.0.1</version>
@@ -69,7 +70,7 @@
 			<groupId>com.sun</groupId>
 			<artifactId>webservices-rt</artifactId>
 			<version>2.0.1</version>
-		</dependency>
+		</dependency> -->
 		
 		<dependency>
 			<groupId>javax.mail</groupId>
@@ -162,7 +163,7 @@
 		</dependency>
 		<!-- <dependency> <groupId>iaik</groupId> <artifactId>moa</artifactId> 
 			<version>1.28</version> </dependency> -->
-		<dependency>
+<!-- 		<dependency>
 			<groupId>edu.internet2.middleware</groupId>
 			<artifactId>shibboleth-common</artifactId>
 			<version>1.4.0</version>
@@ -172,6 +173,18 @@
 					<groupId>ch.qos.logback</groupId>
 				</exclusion>
 			</exclusions>
+		</dependency> -->
+		
+		<dependency>
+  		<groupId>org.opensaml</groupId>
+  		<artifactId>opensaml</artifactId>
+  		<version>2.6.0</version>
+  	</dependency>  	
+		
+		<dependency>
+			<groupId>org.opensaml</groupId>
+			<artifactId>xmltooling</artifactId>
+			<version>1.4.0</version>
 		</dependency>
 		<dependency>
 			<groupId>regexp</groupId>
@@ -228,8 +241,8 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<source>1.5</source>
-					<target>1.5</target>
+					<source>1.6</source>
+					<target>1.6</target>
 				</configuration>
 			</plugin>
 			<plugin>
-- 
cgit v1.2.3