From 57c8ec9d6e1a658907eca8f5386b07e4e483ccf1 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Tue, 20 May 2014 16:22:18 +0200 Subject: **Temporary BUGFIX*** exclude iaik_pki_module_1.0 which is used by libtsl.1.0 because it produce conflicts with iaik_moa_1.5 (both defines iaik.pki.PKIConfiguration interface, but with different interface specification!!!!) --- id/server/auth/pom.xml | 10 ++++++++-- id/server/idserverlib/pom.xml | 14 ++++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) (limited to 'id/server') diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml index cbc147c0a..577270221 100644 --- a/id/server/auth/pom.xml +++ b/id/server/auth/pom.xml @@ -29,7 +29,7 @@ - + org.apache.maven.plugins maven-war-plugin @@ -94,6 +94,12 @@ MOA.spss.server moa-spss-lib + + + iaik_pki_module + iaik + + MOA.id.server diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml index 687c8843e..8280e631d 100644 --- a/id/server/idserverlib/pom.xml +++ b/id/server/idserverlib/pom.xml @@ -62,6 +62,16 @@ MOA.spss.server moa-spss-lib + + + iaik_pki_module + iaik + + + javax.servlet + servlet-api + + axis @@ -278,7 +288,7 @@ - + org.apache.maven.plugins -- cgit v1.2.3