aboutsummaryrefslogtreecommitdiff
path: root/id/server/stork2-commons/pom.xml
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2014-09-15 13:42:36 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2014-09-15 13:42:36 +0200
commit8074865580b5fa28817b37c9ad2e8c992ebef977 (patch)
tree475cd1ed9bc517dffbf023e7d9c7d16ce2bde8c5 /id/server/stork2-commons/pom.xml
parent234f17d14f9f48655c27d54114df0aa2593cf6d8 (diff)
parent714a8cb32dd5585829dfc1926e56971425a2a692 (diff)
downloadmoa-id-spss-8074865580b5fa28817b37c9ad2e8c992ebef977.tar.gz
moa-id-spss-8074865580b5fa28817b37c9ad2e8c992ebef977.tar.bz2
moa-id-spss-8074865580b5fa28817b37c9ad2e8c992ebef977.zip
Merge branch 'moa-2.1-Snapshot'
Conflicts: id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OATargetConfiguration.java pom.xml
Diffstat (limited to 'id/server/stork2-commons/pom.xml')
-rw-r--r--id/server/stork2-commons/pom.xml3
1 files changed, 1 insertions, 2 deletions
diff --git a/id/server/stork2-commons/pom.xml b/id/server/stork2-commons/pom.xml
index c6d15b51b..d0fd5a1ad 100644
--- a/id/server/stork2-commons/pom.xml
+++ b/id/server/stork2-commons/pom.xml
@@ -13,7 +13,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<stork.version>1.4.0</stork.version>
- <opensaml.version>2.6.0</opensaml.version>
+ <opensaml.version>2.6.2</opensaml.version>
</properties>
<version>${stork.version}</version>
<description>
@@ -57,7 +57,6 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml</artifactId>
- <version>${opensaml.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>