diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-11-03 11:13:38 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-11-03 11:13:38 +0100 |
| commit | a3e59e5011e16271dab6cc8299a1d1241b4a7fb2 (patch) | |
| tree | aae2f450b7296a286c09a8c51d423aec4bedd0dd /id/oa | |
| parent | 83dc74e60a4d9031285ac27aa0661fe0c26485e0 (diff) | |
| parent | 1fbff5f5a86733bc6a75c8ae901153baa0963441 (diff) | |
| download | moa-id-spss-MOA-SPSS-2.0.3.tar.gz moa-id-spss-MOA-SPSS-2.0.3.tar.bz2 moa-id-spss-MOA-SPSS-2.0.3.zip | |
Merge branch 'moa-2.1-Snapshot'MOA-SPSS-2.0.3MOA-ID-2.1.2
Conflicts:
.gitignore
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> |