aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBojan Suzic <bojan.suzic@iaik.tugraz.at>2015-05-11 18:56:58 +0200
committerBojan Suzic <bojan.suzic@iaik.tugraz.at>2015-05-11 18:56:58 +0200
commit231da432bd3d174aeee5610116856194c79f75aa (patch)
treeee0722e62ab620b41a61ccdc0b5225b24f202d55
parent3060411f3e02094e5d3dbd44f1037cfd3ce4c5aa (diff)
downloadmoa-id-spss-231da432bd3d174aeee5610116856194c79f75aa.tar.gz
moa-id-spss-231da432bd3d174aeee5610116856194c79f75aa.tar.bz2
moa-id-spss-231da432bd3d174aeee5610116856194c79f75aa.zip
fixing dependency colision due to different library versions used in moa and samlengine
-rw-r--r--id/ConfigWebTool/pom.xml6
-rw-r--r--pom.xml5
2 files changed, 8 insertions, 3 deletions
diff --git a/id/ConfigWebTool/pom.xml b/id/ConfigWebTool/pom.xml
index 423d442d0..aa4c9055c 100644
--- a/id/ConfigWebTool/pom.xml
+++ b/id/ConfigWebTool/pom.xml
@@ -144,7 +144,11 @@
</exclusion>
</exclusions>
</dependency>
-
+ <dependency>
+ <groupId>org.opensaml</groupId>
+ <artifactId>openws</artifactId>
+ <version>${openws-version}</version>
+ </dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk16</artifactId>
diff --git a/pom.xml b/pom.xml
index 2ecc43a21..0bb052ce3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,12 +28,13 @@
<moa-spss-version>2.0.5-SNAPSHOT</moa-spss-version>
<configtool-version>1.1.7-SNAPSHOT</configtool-version>
<demo-oa-version>2.0.5-SNAPSHOT</demo-oa-version>
-
+
<!-- Library Versions -->
<org.springframework.version>4.1.6.RELEASE</org.springframework.version>
<surefire.version>2.18.1</surefire.version>
<opensaml.version>2.6.5</opensaml.version>
- <xmltooling.version>1.4.5</xmltooling.version>
+ <openws-version>1.5.3</openws-version>
+ <xmltooling.version>1.4.5</xmltooling.version>
<cxf.version>3.0.4</cxf.version>
<struts.version>2.3.20</struts.version>
<egovutils.version>2.0.0</egovutils.version>