diff options
author | Bojan Suzic <bojan.suzic@iaik.tugraz.at> | 2014-11-03 13:05:12 +0100 |
---|---|---|
committer | Bojan Suzic <bojan.suzic@iaik.tugraz.at> | 2014-11-03 13:05:12 +0100 |
commit | c2819264cface1a6f11cfe692429a0e93804794f (patch) | |
tree | 710858de5e3d9883d36213b041e5baff25d1da29 /id/oa | |
parent | 22a66cdf1b5f7916422034f3338e680202ddc31b (diff) | |
parent | 2886006ba2ca141377e66a330df5fc52797c2755 (diff) | |
download | moa-id-spss-c2819264cface1a6f11cfe692429a0e93804794f.tar.gz moa-id-spss-c2819264cface1a6f11cfe692429a0e93804794f.tar.bz2 moa-id-spss-c2819264cface1a6f11cfe692429a0e93804794f.zip |
merging
Diffstat (limited to 'id/oa')
-rw-r--r-- | id/oa/.gitignore | 2 | ||||
-rw-r--r-- | id/oa/pom.xml | 12 |
2 files changed, 14 insertions, 0 deletions
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 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> |