From ae5214a3fdafeb1a859287f96f657783187e57d6 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Wed, 15 Jan 2014 15:19:15 +0100
Subject: fixed merge issue

---
 id/server/moa-id-commons/pom.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'id/server/moa-id-commons/pom.xml')

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>
-- 
cgit v1.2.3


From 09266016cbcb143d7b6e65d32b49b6b3d2cb53c0 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Mon, 27 Jan 2014 17:24:46 +0100
Subject: fixed issues after merge

---
 id/server/moa-id-commons/pom.xml | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

(limited to 'id/server/moa-id-commons/pom.xml')

diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index c3e850b11..d80e91e31 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -190,5 +190,40 @@
 				</executions>
 			</plugin>
 		</plugins>
-	</build>
+	<pluginManagement>
+		<plugins>
+			<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+			<plugin>
+				<groupId>org.eclipse.m2e</groupId>
+				<artifactId>lifecycle-mapping</artifactId>
+				<version>1.0.0</version>
+				<configuration>
+					<lifecycleMappingMetadata>
+						<pluginExecutions>
+							<pluginExecution>
+								<pluginExecutionFilter>
+									<groupId>
+										org.jvnet.hyperjaxb3
+									</groupId>
+									<artifactId>
+										maven-hyperjaxb3-plugin
+									</artifactId>
+									<versionRange>
+										[0.5.6,)
+									</versionRange>
+									<goals>
+										<goal>generate</goal>
+									</goals>
+								</pluginExecutionFilter>
+								<action>
+									<ignore></ignore>
+								</action>
+							</pluginExecution>
+						</pluginExecutions>
+					</lifecycleMappingMetadata>
+				</configuration>
+			</plugin>
+		</plugins>
+	</pluginManagement>
+  	</build>
 </project>
\ No newline at end of file
-- 
cgit v1.2.3