aboutsummaryrefslogtreecommitdiff
path: root/spss/server/serverws/pom.xml
diff options
context:
space:
mode:
authorAlexander Marsalek <amarsalek@iaik.tugraz.at>2014-07-07 17:24:33 +0200
committerAlexander Marsalek <amarsalek@iaik.tugraz.at>2014-07-07 17:24:33 +0200
commit26a2ba4a0c171fb9cdf9ea2c769576b1062480eb (patch)
tree81eba1f7a442e7a121c2d1b783b1926a42e2a553 /spss/server/serverws/pom.xml
parent8b8ea32ebd30b542a9b4ea1c797078377443f251 (diff)
parentb6b155c4d55a31a13d189f50831fb7fa8c504b90 (diff)
downloadmoa-id-spss-26a2ba4a0c171fb9cdf9ea2c769576b1062480eb.tar.gz
moa-id-spss-26a2ba4a0c171fb9cdf9ea2c769576b1062480eb.tar.bz2
moa-id-spss-26a2ba4a0c171fb9cdf9ea2c769576b1062480eb.zip
Merge branch 'moa-2.1-Snapshot' into authnrequest_signrequest_split
Diffstat (limited to 'spss/server/serverws/pom.xml')
-rw-r--r--spss/server/serverws/pom.xml8
1 files changed, 7 insertions, 1 deletions
diff --git a/spss/server/serverws/pom.xml b/spss/server/serverws/pom.xml
index 56168a586..9159242ef 100644
--- a/spss/server/serverws/pom.xml
+++ b/spss/server/serverws/pom.xml
@@ -91,7 +91,7 @@
<dependency>
<groupId>MOA.spss.server</groupId>
<artifactId>moa-spss-lib</artifactId>
- <!--version>${pom.version}</version-->
+ <!--version>${pom.version}</version-->
</dependency>
<dependency>
<groupId>MOA</groupId>
@@ -104,6 +104,12 @@
<dependency>
<groupId>iaik</groupId>
<artifactId>iaik_tsl</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>iaik_pki_module</artifactId>
+ <groupId>iaik</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>log4j</groupId>