diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-09-19 13:24:22 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-09-19 13:24:22 +0200 |
| commit | 83dc74e60a4d9031285ac27aa0661fe0c26485e0 (patch) | |
| tree | 10121ca0a4e2d799383a921fbaf72693bb1f7f5f /id/server/idserverlib/pom.xml | |
| parent | 00677e1478fa2a33ec22b06b5c5180b965e2c9f2 (diff) | |
| parent | 4c6e440ba41767653a2082fd92e8eeae6c3a6c1a (diff) | |
| download | moa-id-spss-83dc74e60a4d9031285ac27aa0661fe0c26485e0.tar.gz moa-id-spss-83dc74e60a4d9031285ac27aa0661fe0c26485e0.tar.bz2 moa-id-spss-83dc74e60a4d9031285ac27aa0661fe0c26485e0.zip | |
Merge branch 'moa-2.1-Snapshot'MOA-SPSS-2.0.2MOA-ID-2.1.1
Diffstat (limited to 'id/server/idserverlib/pom.xml')
| -rw-r--r-- | id/server/idserverlib/pom.xml | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml index a8ffd10bc..00d128ca5 100644 --- a/id/server/idserverlib/pom.xml +++ b/id/server/idserverlib/pom.xml @@ -226,11 +226,23 @@ <dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml</artifactId>
- </dependency>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>xmltooling</artifactId>
- </dependency>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<!-- <dependency>
<groupId>regexp</groupId>
|