From f5970e6aa4f621e870db8a9337fb00598cd85703 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Tue, 22 Mar 2016 08:49:49 +0100
Subject: update third party libs

---
 id/ConfigWebTool/pom.xml | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

(limited to 'id/ConfigWebTool/pom.xml')

diff --git a/id/ConfigWebTool/pom.xml b/id/ConfigWebTool/pom.xml
index ecb956bb8..c672d32a6 100644
--- a/id/ConfigWebTool/pom.xml
+++ b/id/ConfigWebTool/pom.xml
@@ -57,17 +57,19 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-						<artifactId>log4j-core</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>MOA.id.server</groupId>
             <artifactId>moa-id-commons</artifactId>
+            <exclusions>
+            	<exclusion>
+            		<artifactId>hibernate-c3p0</artifactId>
+            		<groupId>org.hibernate</groupId>
+            	</exclusion>
+            </exclusions>
         </dependency>
         
         <dependency>
@@ -180,8 +182,7 @@
         <dependency>
         		<groupId>org.opensaml</groupId>
         		<artifactId>openws</artifactId>
-        		<!-- <version>${openws-version}</version> -->
-        		<version>1.5.4</version>
+        		<version>1.5.6</version>
         		<exclusions>
         			<exclusion>
         				<artifactId>log4j-over-slf4j</artifactId>
@@ -198,16 +199,23 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-core</artifactId>
+            <exclusions>
+            	<exclusion>
+            		<artifactId>javassist</artifactId>
+            		<groupId>javassist</groupId>
+            	</exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-json-plugin</artifactId>
         </dependency>
 
-        <dependency>
+<!--         <dependency>
            <groupId>org.apache.logging.log4j</groupId>
 							<artifactId>log4j-core</artifactId>
-        </dependency>
+        </dependency> -->
+        
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
-- 
cgit v1.2.3