From 74d8c83f76074d2d0df784cb4a305c586a702d25 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 9 Mar 2016 13:41:09 +0100
Subject: move moa-common to moa-id-common, because MOA-SPSS becomes a seperate
 project

---
 pom.xml | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index 9fb67e58a..a84bbc27b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,12 +29,15 @@
 			<moa-id-version-edu>3.2.0-OPB-Snapshot</moa-id-version-edu>			
 			
 			<moa-id-proxy-version>2.0.1-Snapshot</moa-id-proxy-version>
-			<moa-spss-version>2.0.5-RC1</moa-spss-version>
+			
 			<configtool-version>2.2.0-OPB-Snapshot</configtool-version>
 			<demo-oa-version>2.0.5</demo-oa-version>
 			
 			<moa-id-module-elga_mandate_client>1.0.0-Snapshot</moa-id-module-elga_mandate_client>
 		
+		
+			<moa-spss-version>2.0.5-RC1</moa-spss-version>
+		
 			<!-- Library Versions -->
 			<org.springframework.version>4.2.4.RELEASE</org.springframework.version>
 			<surefire.version>2.18.1</surefire.version>		
@@ -69,9 +72,11 @@
                 </property>
             </activation>
             <modules>
-                <module>common</module>
-                <module>spss</module>
+<!--                 <module>common</module> -->                
+<!--                 <module>spss</module> -->
+
                 <module>id</module>
+                
             </modules>
             <repositories>
                 <repository>
@@ -224,9 +229,10 @@
                     <descriptors>
                         <descriptor>id/assembly-auth-final.xml</descriptor>
                         <descriptor>id/assembly-auth-edu.xml</descriptor>
-                        <descriptor>id/assembly-proxy.xml</descriptor>                         
-                        <descriptor>spss/assembly.xml</descriptor>
-                        <descriptor>spss/assembly-lib.xml</descriptor>
+                        <descriptor>id/assembly-proxy.xml</descriptor>   
+                                              
+<!--                         <descriptor>spss/assembly.xml</descriptor>
+                        <descriptor>spss/assembly-lib.xml</descriptor> -->
                     </descriptors>
                 </configuration>
             </plugin>
@@ -438,12 +444,12 @@
   						<version>${moa-id-version}</version>
 						</dependency>
 
-            <dependency>
+<!--             <dependency>
                 <groupId>MOA</groupId>
                 <artifactId>moa-common</artifactId>
                 <version>${moa-commons-version}</version>
                 <scope>compile</scope>
-            </dependency>
+            </dependency> -->
             <dependency>
                 <groupId>MOA.id.server</groupId>
                 <artifactId>moa-id-lib</artifactId>
@@ -511,27 +517,27 @@
     		<version>${moa-id-module-elga_mandate_client}</version>
 			</dependency>
 
-			   
-			              
-            <dependency>
+			   			              
+             <dependency>
                 <groupId>MOA.spss.server</groupId>
                 <artifactId>moa-spss-lib</artifactId>
                 <version>${moa-spss-version}</version>
                 <scope>compile</scope>
             </dependency>
-            <dependency>
+            
+<!--             <dependency>
                 <groupId>MOA</groupId>
                 <artifactId>moa-common</artifactId>
                 <version>${moa-commons-version}</version>
                 <type>test-jar</type>
                 <scope>test</scope>
-            </dependency>
-            <dependency>
+            </dependency> -->
+<!--             <dependency>
                 <groupId>MOA.spss.server</groupId>
                 <artifactId>moa-spss-tools</artifactId>
                 <version>${moa-spss-version}</version>
                 <scope>test</scope>
-             </dependency>
+             </dependency> -->
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-- 
cgit v1.2.3