aboutsummaryrefslogtreecommitdiff
path: root/id/oa/pom.xml
diff options
context:
space:
mode:
authorAlexander Marsalek <amarsalek@iaik.tugraz.at>2014-10-31 16:26:19 +0100
committerAlexander Marsalek <amarsalek@iaik.tugraz.at>2014-10-31 16:26:19 +0100
commitbce35f534b42d77cdaf1ab8e861237d1cf2f1191 (patch)
tree4daf3b9a89647ff08ddd6414b7ccddd59db5e5d5 /id/oa/pom.xml
parent9c6fece57add83ce29e6ba1acc55a11d2ed89fc0 (diff)
parent2886006ba2ca141377e66a330df5fc52797c2755 (diff)
downloadmoa-id-spss-bce35f534b42d77cdaf1ab8e861237d1cf2f1191.tar.gz
moa-id-spss-bce35f534b42d77cdaf1ab8e861237d1cf2f1191.tar.bz2
moa-id-spss-bce35f534b42d77cdaf1ab8e861237d1cf2f1191.zip
Merge branch 'merge' into moa-2.1-Snapshot
Diffstat (limited to 'id/oa/pom.xml')
-rw-r--r--id/oa/pom.xml12
1 files changed, 12 insertions, 0 deletions
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>