3 files changed, 48 insertions, 11 deletions
diff --git a/id/ConfigWebTool/pom.xml b/id/ConfigWebTool/pom.xml
index ae8b62645..15228a30e 100644
--- a/id/ConfigWebTool/pom.xml
+++ b/id/ConfigWebTool/pom.xml
@@ -51,13 +51,40 @@
     		<groupId>MOA.id.server</groupId>
     		<artifactId>moa-id-lib</artifactId>
     		<!-- <version>1.9.98-SNAPSHOT</version> -->
+    		<exclusions>
+    			<exclusion>
+    				<groupId>*</groupId>
+    				<artifactId>*</artifactId>
+    			</exclusion>
+    		</exclusions>
     	</dependency>
       
-      <dependency>
+       <dependency>
 				<groupId>at.gv.util</groupId>
 				<artifactId>egovutils</artifactId>
 				<version>1.0.4</version>
-			</dependency>
+				<exclusions>
+    				<exclusion>
+    					<groupId>com.sun</groupId>
+    					<artifactId>*</artifactId>
+    				</exclusion>
+    			</exclusions>
+				
+		</dependency>
+      
+      <dependency>
+  		<groupId>org.opensaml</groupId>
+  		<artifactId>opensaml</artifactId>
+  	</dependency>  		
+	<dependency>
+		<groupId>org.opensaml</groupId>
+		<artifactId>xmltooling</artifactId>
+	</dependency>
+      
+      <dependency>
+		<groupId>javax.mail</groupId>
+		<artifactId>mail</artifactId>
+	  </dependency>
       
       <dependency>
 				<groupId>org.apache.struts</groupId>
diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 81213f721..68acb8841 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -175,17 +175,15 @@
 			</exclusions>
 		</dependency> -->
 		
-		<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>  		
+	<dependency>
+		<groupId>org.opensaml</groupId>
+		<artifactId>xmltooling</artifactId>
+	</dependency>
+	
 		<dependency>
 			<groupId>regexp</groupId>
 			<artifactId>regexp</artifactId>
diff --git a/pom.xml b/pom.xml
index 33ca79239..d87ab8a4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,6 +94,18 @@
     <dependencyManagement>
         <dependencies>
 
+			<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>axis</groupId>
                 <artifactId>axis</artifactId>