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