From b04fbacb74bfcf4addaf16d72a819afd7161fd6f Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 31 Oct 2014 07:10:11 +0100
Subject: add .gitignore files

---
 id/oa/.gitignore | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 id/oa/.gitignore

(limited to 'id/oa')

diff --git a/id/oa/.gitignore b/id/oa/.gitignore
new file mode 100644
index 000000000..4dc009173
--- /dev/null
+++ b/id/oa/.gitignore
@@ -0,0 +1,2 @@
+/target
+/bin
-- 
cgit v1.2.3


From 13de12ab236a552e40a5b429d584d1e928d98fea Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 31 Oct 2014 12:49:46 +0100
Subject: exclude log4j-over-slf4j

---
 id/oa/pom.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'id/oa')

diff --git a/id/oa/pom.xml b/id/oa/pom.xml
index d5b3de522..93993c8a4 100644
--- a/id/oa/pom.xml
+++ b/id/oa/pom.xml
@@ -79,10 +79,22 @@
 			<dependency>
   			<groupId>org.opensaml</groupId>
   			<artifactId>opensaml</artifactId>
+  			<exclusions>
+  				<exclusion>
+						<groupId>org.slf4j</groupId>
+						<artifactId>log4j-over-slf4j</artifactId>
+					</exclusion>
+  			</exclusions>
   			</dependency>  		
 			<dependency>
 				<groupId>org.opensaml</groupId>
 				<artifactId>xmltooling</artifactId>
+  			<exclusions>
+  				<exclusion>
+						<groupId>org.slf4j</groupId>
+						<artifactId>log4j-over-slf4j</artifactId>
+					</exclusion>
+  			</exclusions>				
 				</dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-- 
cgit v1.2.3