From 2b986b919ec2057b3770af31f3307c46306e60cb Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 31 Mar 2014 15:01:45 +0200
Subject: exclude Spring Framework from HyperJAXB plugin

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

(limited to 'id/server/moa-id-commons')

diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index e494033a0..c8593ee5f 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -75,6 +75,10 @@
 			    		<groupId>org.hibernate.javax.persistence</groupId>
 							<artifactId>hibernate-jpa-2.0-api</artifactId>
 			    </exclusion>
+			    <exclusion>
+			    	<groupId>org.springframework</groupId>
+			    	<artifactId>spring</artifactId>
+			    </exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
-- 
cgit v1.2.3


From 779030ed2d7091183b3faf13fec57fa270d46c3a Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Tue, 1 Apr 2014 14:02:19 +0200
Subject: change version to 2.0.1

---
 id/server/moa-id-commons/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'id/server/moa-id-commons')

diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index c8593ee5f..5da911f89 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>MOA.id</groupId>
     <artifactId>moa-id</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.1</version>
   </parent>
   <artifactId>moa-id-commons</artifactId>
   <name>moa-id-commons</name>
-- 
cgit v1.2.3