From 959f63845a58fa5b14b6442672ef74e6338c16b2 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Tue, 21 Jul 2015 15:31:13 +0200
Subject: update maven pom to 3.x

---
 id/ConfigWebTool/pom.xml         |  2 +-
 id/assembly-auth.xml             | 12 ++++--------
 id/moa-id-webgui/pom.xml         | 17 ++++++++++++++++-
 id/oa/pom.xml                    |  2 +-
 id/pom.xml                       |  1 +
 id/server/auth/pom.xml           |  2 +-
 id/server/idserverlib/pom.xml    |  2 +-
 id/server/moa-id-commons/pom.xml |  7 +------
 id/server/modules/pom.xml        |  2 +-
 id/server/pom.xml                |  2 +-
 10 files changed, 28 insertions(+), 21 deletions(-)

(limited to 'id')

diff --git a/id/ConfigWebTool/pom.xml b/id/ConfigWebTool/pom.xml
index aa4c9055c..35cb64d0c 100644
--- a/id/ConfigWebTool/pom.xml
+++ b/id/ConfigWebTool/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>MOA</groupId>
         <artifactId>id</artifactId>
-        <version>2.x</version>
+        <version>3.x</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/id/assembly-auth.xml b/id/assembly-auth.xml
index 701f3912b..5e0ca564a 100644
--- a/id/assembly-auth.xml
+++ b/id/assembly-auth.xml
@@ -131,20 +131,16 @@
 				<include>MOA.id.server:moa-id-commons</include>
 			</includes>
 			<binaries>
-				<includeDependencies>true</includeDependencies>
+				<includeDependencies>false</includeDependencies>
 				<outputDirectory>/migration/</outputDirectory>
 				<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
 				<unpack>false</unpack>
-<!-- 				<dependencySets>
+				<dependencySets>
 					<dependencySet>
-						<includes>
-							<include>iaik:commons-iaik</include>
-							<include>MOA:moa-common</include>
-						</includes>
-						<outputDirectory>/source/repositority</outputDirectory>
+						<outputDirectory>/migration/dependency-jars</outputDirectory>
 						<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
 					</dependencySet>
-				</dependencySets> -->
+				</dependencySets>
 			</binaries>
 		</moduleSet>
 		
diff --git a/id/moa-id-webgui/pom.xml b/id/moa-id-webgui/pom.xml
index 35436db4b..f23900155 100644
--- a/id/moa-id-webgui/pom.xml
+++ b/id/moa-id-webgui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>MOA</groupId>
         <artifactId>id</artifactId>
-        <version>2.x</version>
+        <version>3.x</version>
     </parent>
   
   <modelVersion>4.0.0</modelVersion>
@@ -53,8 +53,23 @@
     <dependency>
     	<groupId>MOA.id.server</groupId>
       <artifactId>moa-id-commons</artifactId>
+      <exclusions>
+      	<exclusion>
+      		<artifactId>hyperjaxb3-ejb-runtime</artifactId>
+      		<groupId>org.jvnet.hyperjaxb3</groupId>
+      	</exclusion>
+      	<exclusion>
+      		<artifactId>hibernate-c3p0</artifactId>
+      		<groupId>org.hibernate</groupId>
+      	</exclusion>
+      </exclusions>
     </dependency>
     
+    <dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+		</dependency>
+    
         <dependency>
             <groupId>org.opensaml</groupId>
             <artifactId>opensaml</artifactId>
diff --git a/id/oa/pom.xml b/id/oa/pom.xml
index 173019c1b..191eb2be6 100644
--- a/id/oa/pom.xml
+++ b/id/oa/pom.xml
@@ -4,7 +4,7 @@
     <parent>
   		<groupId>MOA</groupId>
     	<artifactId>id</artifactId>
-    	<version>2.x</version>
+    	<version>3.x</version>
   	</parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/id/pom.xml b/id/pom.xml
index 75972b549..575dcac0f 100644
--- a/id/pom.xml
+++ b/id/pom.xml
@@ -8,6 +8,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>id</artifactId>
+    <version>3.x</version>
     <packaging>pom</packaging>
     <name>MOA ID</name>
 
diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index cf394b7ad..0a9955af0 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>MOA.id</groupId>
 		<artifactId>moa-id</artifactId>
-		<version>2.x</version>
+		<version>3.x</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>
diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 9c0aea1ef..2d3963c11 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>MOA.id</groupId>
 		<artifactId>moa-id</artifactId>
-		<version>2.x</version>
+		<version>3.x</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index f4adb1368..05c4a4756 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>MOA.id</groupId>
         <artifactId>moa-id</artifactId>
-        <version>2.x</version>
+        <version>3.x</version>
     </parent>
     <artifactId>moa-id-commons</artifactId>
     <name>moa-id-commons</name>
@@ -54,13 +54,11 @@
 	    		<groupId>at.gv.egiz.components</groupId>
 	    		<artifactId>egiz-configuration-api</artifactId>
 	    		<version>0.2</version>
-	    		<classifier>sources</classifier>
     		</dependency>
     		<dependency>
     			<groupId>at.gv.egiz.components</groupId>
     			<artifactId>egiz-configuration-file</artifactId>
     			<version>0.2</version>
-    			<classifier>sources</classifier>
     		</dependency>        
     
         <dependency>
@@ -156,7 +154,6 @@
 		<dependency>
 			<groupId>commons-cli</groupId>
 			<artifactId>commons-cli</artifactId>
-			<version>1.2</version>
 		</dependency>
 		
 		<dependency>
@@ -171,12 +168,10 @@
 	  <dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>2.5.4</version>
 		</dependency>
 		<dependency>
 		 	<groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
-      <version>2.5.4</version>
 		</dependency>
 		
 		<dependency>
diff --git a/id/server/modules/pom.xml b/id/server/modules/pom.xml
index e9234a62f..1ca5b3835 100644
--- a/id/server/modules/pom.xml
+++ b/id/server/modules/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>MOA.id</groupId>
 		<artifactId>moa-id</artifactId>
-		<version>2.x</version>
+		<version>3.x</version>
 	</parent>
 
 	<groupId>MOA.id.server.modules</groupId>
diff --git a/id/server/pom.xml b/id/server/pom.xml
index 45d7822a1..a7e79ef78 100644
--- a/id/server/pom.xml
+++ b/id/server/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>MOA</groupId>
         <artifactId>id</artifactId>
-        <version>2.x</version>
+        <version>3.x</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-- 
cgit v1.2.3