From 40fa3b460648997421f24aae509c747fd3e94a7f Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Tue, 11 Mar 2014 11:19:41 +0100
Subject: solve errors in combination with Tomcat 8 and log4j and slf4log

---
 id/ConfigWebTool/pom.xml         | 14 +++++++++++---
 id/server/moa-id-commons/pom.xml | 14 ++++++++++----
 2 files changed, 21 insertions(+), 7 deletions(-)

(limited to 'id')

diff --git a/id/ConfigWebTool/pom.xml b/id/ConfigWebTool/pom.xml
index 287b0b096..b5b753027 100644
--- a/id/ConfigWebTool/pom.xml
+++ b/id/ConfigWebTool/pom.xml
@@ -68,9 +68,17 @@
     					<groupId>com.sun</groupId>
     					<artifactId>*</artifactId>
     				</exclusion>
-    			</exclusions>
-				
-		</dependency>
+			    	<exclusion>
+			       	<groupId>org.slf4j</groupId>
+			       	<artifactId>*</artifactId>			        
+			    	</exclusion>
+    			</exclusions>				
+			</dependency>
+			<dependency>
+				<groupId>org.slf4j</groupId>
+				<artifactId>slf4j-simple</artifactId>
+				<version>1.7.5</version>
+			</dependency>
       
       <dependency>
   		<groupId>org.opensaml</groupId>
diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index a49f29bf3..7f1d9e45c 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -63,10 +63,16 @@
 			<version>0.5.6</version>
 		</dependency>
 		<dependency>
-	<groupId>org.jvnet.hyperjaxb3</groupId>
-	<artifactId>maven-hyperjaxb3-plugin</artifactId>
-	<version>0.5.6</version>
-</dependency>
+			<groupId>org.jvnet.hyperjaxb3</groupId>
+			<artifactId>maven-hyperjaxb3-plugin</artifactId>
+			<version>0.5.6</version>
+			<exclusions>
+			    <exclusion>
+			        <groupId>org.slf4j</groupId>
+			        <artifactId>slf4j-log4j12</artifactId>			        
+			    </exclusion>
+			</exclusions>
+		</dependency>
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
-- 
cgit v1.2.3