aboutsummaryrefslogtreecommitdiff
path: root/id/server/auth
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2014-10-29 14:06:00 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2014-10-29 14:06:00 +0100
commit08e1d59be7c555a49f75988b050a43e0431ce9be (patch)
treefa00dbb1fe13779decdb13aefe8b46e848371b6e /id/server/auth
parent41b1942dc69f1284894270e724ef517fb689f075 (diff)
parentb9e2c8e57097ab446264a4e5f42765c5ed67dceb (diff)
downloadmoa-id-spss-08e1d59be7c555a49f75988b050a43e0431ce9be.tar.gz
moa-id-spss-08e1d59be7c555a49f75988b050a43e0431ce9be.tar.bz2
moa-id-spss-08e1d59be7c555a49f75988b050a43e0431ce9be.zip
Merge branch 'ISA-1.18-action' into moa-2.1-Snapshot
Conflicts: id/server/idserverlib/pom.xml
Diffstat (limited to 'id/server/auth')
-rw-r--r--id/server/auth/pom.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index b43a0e736..dd75ee6aa 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -108,6 +108,10 @@
<artifactId>iaik_pki_module</artifactId>
<groupId>iaik</groupId>
</exclusion>
+ <exclusion>
+ <artifactId>axis-wsdl4j</artifactId>
+ <groupId>axis</groupId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>