aboutsummaryrefslogtreecommitdiff
path: root/id
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2014-06-10 08:34:49 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2014-06-10 08:34:49 +0200
commite387479227276b41aa6a3973fc0a1fd554f6c298 (patch)
treea8ba6c5d3bbcec26c8e4c34a88b58b7a57fdd312 /id
parentd515dc2465a1daf5baa88c3059b9c2b0ea968df0 (diff)
parenta2d42868a53c8adc615aaa99fd29770f51573e9f (diff)
downloadmoa-id-spss-e387479227276b41aa6a3973fc0a1fd554f6c298.tar.gz
moa-id-spss-e387479227276b41aa6a3973fc0a1fd554f6c298.tar.bz2
moa-id-spss-e387479227276b41aa6a3973fc0a1fd554f6c298.zip
Merge branch 'moa-2.1-Snapshot' of gitlab.iaik.tugraz.at:afitzek/moa-idspss into moa-2.1-Snapshot
Diffstat (limited to 'id')
-rw-r--r--id/server/idserverlib/pom.xml5
-rw-r--r--id/server/moa-id-commons/pom.xml1
2 files changed, 5 insertions, 1 deletions
diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 1f392f7ec..51e6395fa 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -241,11 +241,14 @@
</dependency> -->
<!-- <dependency> <groupId>at.gv.egovernment.moa.id</groupId> <artifactId>mandate-validate</artifactId>
<version>1.1</version> </dependency> -->
- <dependency>
+ <!--
+ <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
</dependency>
+ -->
+
<dependency>
<groupId>eu.stork</groupId>
<artifactId>DocumentService</artifactId>
diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index 02915ef18..67a2231a6 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -72,6 +72,7 @@
<groupId>MOA</groupId>
<artifactId>moa-common</artifactId>
<type>jar</type>
+ <version>${moa-commons-version}</version>
</dependency>
<dependency>