aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Reimair <florian.reimair@iaik.tugraz.at>2014-01-15 15:19:15 +0100
committerFlorian Reimair <florian.reimair@iaik.tugraz.at>2014-01-27 16:36:30 +0100
commitae5214a3fdafeb1a859287f96f657783187e57d6 (patch)
treea7f363407eeda42d1b2d5a55ed576a4dee78303b
parent5624eaf5d2f0305f92eb376cf5e4362da0f07e3a (diff)
downloadmoa-id-spss-ae5214a3fdafeb1a859287f96f657783187e57d6.tar.gz
moa-id-spss-ae5214a3fdafeb1a859287f96f657783187e57d6.tar.bz2
moa-id-spss-ae5214a3fdafeb1a859287f96f657783187e57d6.zip
fixed merge issue
-rw-r--r--id/server/moa-id-commons/pom.xml6
1 files changed, 5 insertions, 1 deletions
diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index 94726fa16..c3e850b11 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -62,7 +62,11 @@
<artifactId>hyperjaxb3-ejb-runtime</artifactId>
<version>0.5.6</version>
</dependency>
-
+ <dependency>
+ <groupId>org.jvnet.hyperjaxb3</groupId>
+ <artifactId>maven-hyperjaxb3-plugin</artifactId>
+ <version>0.5.6</version>
+</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>