From fb287cd9b4697b78350666b661bb059e7c66aa67 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 21 May 2014 12:05:36 +0200
Subject: build process update

---
 common/pom.xml                               | 4 ++--
 id/ConfigWebTool/pom.xml                     | 4 ++--
 id/oa/pom.xml                                | 4 ++--
 id/pom.xml                                   | 4 ++--
 id/server/moa-id-commons/pom.xml             | 4 ++--
 id/server/pom.xml                            | 4 ++--
 id/server/proxy/pom.xml                      | 4 ++--
 id/server/stork2-commons/pom.xml             | 4 ++--
 id/server/stork2-saml-engine/pom.xml         | 4 ++--
 pom.xml                                      | 4 ++--
 spss/handbook/clients/api/pom.xml            | 4 ++--
 spss/handbook/clients/pom.xml                | 4 ++--
 spss/handbook/clients/referencedData/pom.xml | 4 ++--
 spss/handbook/clients/webservice/pom.xml     | 4 ++--
 spss/handbook/pom.xml                        | 4 ++--
 spss/pom.xml                                 | 4 ++--
 spss/server/pom.xml                          | 4 ++--
 spss/server/serverlib/pom.xml                | 4 ++--
 spss/server/serverws/.project                | 7 ++-----
 spss/server/serverws/pom.xml                 | 6 +++---
 spss/server/tools/pom.xml                    | 6 +++---
 21 files changed, 44 insertions(+), 47 deletions(-)

diff --git a/common/pom.xml b/common/pom.xml
index cde0c6ed8..b2f7f652c 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -103,7 +103,7 @@
 
     <build>
         <plugins>
-                		<plugin>
+<!--                 		<plugin>
             		<groupId>org.codehaus.mojo</groupId>
             		<artifactId>properties-maven-plugin</artifactId>
             		<version>1.0-alpha-2</version>
@@ -120,7 +120,7 @@
           		          </configuration>
               		  </execution>
             		</executions>
-        		</plugin>
+        		</plugin> -->
         
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/id/ConfigWebTool/pom.xml b/id/ConfigWebTool/pom.xml
index e777a52ac..01359e38a 100644
--- a/id/ConfigWebTool/pom.xml
+++ b/id/ConfigWebTool/pom.xml
@@ -143,7 +143,7 @@
 		<build>
 			<plugins>
 			
-			       	<plugin>
+<!-- 			       	<plugin>
             		<groupId>org.codehaus.mojo</groupId>
             		<artifactId>properties-maven-plugin</artifactId>
             		<version>1.0-alpha-2</version>
@@ -160,7 +160,7 @@
           		          </configuration>
               		  </execution>
             		</executions>
-        		</plugin>
+        		</plugin> -->
         		
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/id/oa/pom.xml b/id/oa/pom.xml
index 7965d2157..d5b3de522 100644
--- a/id/oa/pom.xml
+++ b/id/oa/pom.xml
@@ -34,7 +34,7 @@
     <build>
         <finalName>oa</finalName>
         <plugins>
-        		  <plugin>
+<!--         		  <plugin>
             		<groupId>org.codehaus.mojo</groupId>
             		<artifactId>properties-maven-plugin</artifactId>
             		<version>1.0-alpha-2</version>
@@ -51,7 +51,7 @@
           		          </configuration>
               		  </execution>
             		</executions>
-        		</plugin>
+        		</plugin> -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
diff --git a/id/pom.xml b/id/pom.xml
index 78ee829ba..0753a7805 100644
--- a/id/pom.xml
+++ b/id/pom.xml
@@ -25,7 +25,7 @@
 
     <build>
         <plugins>
-			       	<plugin>
+<!-- 			       	<plugin>
             		<groupId>org.codehaus.mojo</groupId>
             		<artifactId>properties-maven-plugin</artifactId>
             		<version>1.0-alpha-2</version>
@@ -42,7 +42,7 @@
           		          </configuration>
               		  </execution>
             		</executions>
-        		</plugin>
+        		</plugin> -->
             <plugin>
                 <artifactId>maven-enforcer-plugin</artifactId>
                 <version>1.1.1</version>
diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index 608ad0ed9..02915ef18 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -243,7 +243,7 @@
                 </executions>
             </plugin> -->
    
-           	 <plugin>
+<!--            	 <plugin>
             		<groupId>org.codehaus.mojo</groupId>
             		<artifactId>properties-maven-plugin</artifactId>
             		<version>1.0-alpha-2</version>
@@ -260,7 +260,7 @@
           		          </configuration>
               		  </execution>
             		</executions>
-        		</plugin>
+        		</plugin> -->
                   
                 <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
                 <plugin>
diff --git a/id/server/pom.xml b/id/server/pom.xml
index cd2f82e84..f574a0cf2 100644
--- a/id/server/pom.xml
+++ b/id/server/pom.xml
@@ -28,7 +28,7 @@
 
     <build>
         <plugins>
-        		<plugin>
+<!--         		<plugin>
             		<groupId>org.codehaus.mojo</groupId>
             		<artifactId>properties-maven-plugin</artifactId>
             		<version>1.0-alpha-2</version>
@@ -45,7 +45,7 @@
           		          </configuration>
               		  </execution>
             		</executions>
-        		</plugin>
+        		</plugin> -->
         	</plugins>
        </build>
 
diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml
index c7024e0ea..2b74266f2 100644
--- a/id/server/proxy/pom.xml
+++ b/id/server/proxy/pom.xml
@@ -26,7 +26,7 @@
 	
 	<build>
 		<plugins>
-				        <plugin>
+<!-- 				        <plugin>
             		<groupId>org.codehaus.mojo</groupId>
             		<artifactId>properties-maven-plugin</artifactId>
             		<version>1.0-alpha-2</version>
@@ -43,7 +43,7 @@
           		          </configuration>
               		  </execution>
             		</executions>
-        		</plugin>
+        		</plugin> -->
 		
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
diff --git a/id/server/stork2-commons/pom.xml b/id/server/stork2-commons/pom.xml
index e74f702a8..c6d15b51b 100644
--- a/id/server/stork2-commons/pom.xml
+++ b/id/server/stork2-commons/pom.xml
@@ -147,7 +147,7 @@
 		<plugins>
 		
 		           	 
-		          <plugin>
+<!-- 		          <plugin>
             		<groupId>org.codehaus.mojo</groupId>
             		<artifactId>properties-maven-plugin</artifactId>
             		<version>1.0-alpha-2</version>
@@ -164,7 +164,7 @@
           		          </configuration>
               		  </execution>
             		</executions>
-        		</plugin>
+        		</plugin> -->
 		
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml
index 5a6621f12..ed5dfa973 100644
--- a/id/server/stork2-saml-engine/pom.xml
+++ b/id/server/stork2-saml-engine/pom.xml
@@ -156,7 +156,7 @@
 		</pluginManagement>
 		<plugins>
 		
-		           	 <plugin>
+<!-- 		           	 <plugin>
             		<groupId>org.codehaus.mojo</groupId>
             		<artifactId>properties-maven-plugin</artifactId>
             		<version>1.0-alpha-2</version>
@@ -173,7 +173,7 @@
           		          </configuration>
               		  </execution>
             		</executions>
-        		</plugin>
+        		</plugin> -->
 		
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
diff --git a/pom.xml b/pom.xml
index 63b547e51..35b094538 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
 
     <build>
         <plugins>
-        		<plugin>
+<!--         		<plugin>
             		<groupId>org.codehaus.mojo</groupId>
             		<artifactId>properties-maven-plugin</artifactId>
             		<version>1.0-alpha-2</version>
@@ -76,7 +76,7 @@
           		          </configuration>
               		  </execution>
             		</executions>
-        		</plugin>
+        		</plugin> -->
         		<plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
diff --git a/spss/handbook/clients/api/pom.xml b/spss/handbook/clients/api/pom.xml
index 52a96c56b..13d988a57 100644
--- a/spss/handbook/clients/api/pom.xml
+++ b/spss/handbook/clients/api/pom.xml
@@ -135,7 +135,7 @@
 	</dependencies>
     <build>
         <plugins>
-        		<plugin>
+<!--         		<plugin>
             		<groupId>org.codehaus.mojo</groupId>
             		<artifactId>properties-maven-plugin</artifactId>
             		<version>1.0-alpha-2</version>
@@ -152,7 +152,7 @@
           		          </configuration>
               		  </execution>
             		</executions>
-        		</plugin>
+        		</plugin> -->
         	</plugins>
        </build>
 </project>
diff --git a/spss/handbook/clients/pom.xml b/spss/handbook/clients/pom.xml
index 70ae70a4b..c104c6c3b 100644
--- a/spss/handbook/clients/pom.xml
+++ b/spss/handbook/clients/pom.xml
@@ -24,7 +24,7 @@
   </properties>
       <build>
         <plugins>
-        		<plugin>
+<!--         		<plugin>
             		<groupId>org.codehaus.mojo</groupId>
             		<artifactId>properties-maven-plugin</artifactId>
             		<version>1.0-alpha-2</version>
@@ -41,7 +41,7 @@
           		          </configuration>
               		  </execution>
             		</executions>
-        		</plugin>
+        		</plugin> -->
         	</plugins>
        </build>
 </project>
diff --git a/spss/handbook/clients/referencedData/pom.xml b/spss/handbook/clients/referencedData/pom.xml
index 65f8635de..3a220fd4d 100644
--- a/spss/handbook/clients/referencedData/pom.xml
+++ b/spss/handbook/clients/referencedData/pom.xml
@@ -34,7 +34,7 @@
         </configuration>
       </plugin>
 
-        		<plugin>
+<!--         		<plugin>
             		<groupId>org.codehaus.mojo</groupId>
             		<artifactId>properties-maven-plugin</artifactId>
             		<version>1.0-alpha-2</version>
@@ -51,7 +51,7 @@
           		          </configuration>
               		  </execution>
             		</executions>
-        		</plugin>
+        		</plugin> -->
         	</plugins>
        </build>
 </project>
diff --git a/spss/handbook/clients/webservice/pom.xml b/spss/handbook/clients/webservice/pom.xml
index 95f2c5173..0a48df11c 100644
--- a/spss/handbook/clients/webservice/pom.xml
+++ b/spss/handbook/clients/webservice/pom.xml
@@ -134,7 +134,7 @@
 	</dependencies>
     <build>
         <plugins>
-        		<plugin>
+<!--         		<plugin>
             		<groupId>org.codehaus.mojo</groupId>
             		<artifactId>properties-maven-plugin</artifactId>
             		<version>1.0-alpha-2</version>
@@ -151,7 +151,7 @@
           		          </configuration>
               		  </execution>
             		</executions>
-        		</plugin>
+        		</plugin> -->
         	</plugins>
        </build>
 </project>
diff --git a/spss/handbook/pom.xml b/spss/handbook/pom.xml
index e9323a55f..d4cf8e867 100644
--- a/spss/handbook/pom.xml
+++ b/spss/handbook/pom.xml
@@ -22,7 +22,7 @@
   </properties>
       <build>
         <plugins>
-        		<plugin>
+<!--         		<plugin>
             		<groupId>org.codehaus.mojo</groupId>
             		<artifactId>properties-maven-plugin</artifactId>
             		<version>1.0-alpha-2</version>
@@ -39,7 +39,7 @@
           		          </configuration>
               		  </execution>
             		</executions>
-        		</plugin>
+        		</plugin> -->
         	</plugins>
        </build>
 </project>
diff --git a/spss/pom.xml b/spss/pom.xml
index 5954b9b0a..2f1d57446 100644
--- a/spss/pom.xml
+++ b/spss/pom.xml
@@ -23,7 +23,7 @@
 
     <build>
         <plugins>
-        		<plugin>
+<!--         		<plugin>
             		<groupId>org.codehaus.mojo</groupId>
             		<artifactId>properties-maven-plugin</artifactId>
             		<version>1.0-alpha-2</version>
@@ -40,7 +40,7 @@
           		          </configuration>
               		  </execution>
             		</executions>
-        		</plugin>
+        		</plugin> -->
         	</plugins>
        </build>
 
diff --git a/spss/server/pom.xml b/spss/server/pom.xml
index 08e740cd3..eb37775c1 100644
--- a/spss/server/pom.xml
+++ b/spss/server/pom.xml
@@ -24,7 +24,7 @@
 
     <build>
         <plugins>
-        		<plugin>
+<!--         		<plugin>
             		<groupId>org.codehaus.mojo</groupId>
             		<artifactId>properties-maven-plugin</artifactId>
             		<version>1.0-alpha-2</version>
@@ -41,7 +41,7 @@
           		          </configuration>
               		  </execution>
             		</executions>
-        		</plugin>
+        		</plugin> -->
         	</plugins>
        </build>
 
diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml
index fb95746da..61465bd83 100644
--- a/spss/server/serverlib/pom.xml
+++ b/spss/server/serverlib/pom.xml
@@ -177,7 +177,7 @@
 	</dependencies>
     <build>
         <plugins>
-        		<plugin>
+<!--         		<plugin>
             		<groupId>org.codehaus.mojo</groupId>
             		<artifactId>properties-maven-plugin</artifactId>
             		<version>1.0-alpha-2</version>
@@ -194,7 +194,7 @@
           		          </configuration>
               		  </execution>
             		</executions>
-        		</plugin>
+        		</plugin> -->
 
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
diff --git a/spss/server/serverws/.project b/spss/server/serverws/.project
index 7b8e89662..4faa086c3 100644
--- a/spss/server/serverws/.project
+++ b/spss/server/serverws/.project
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 	<name>moa-spss-ws</name>
-	<comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
+	<comment></comment>
 	<projects>
-		<project>moa-spss-lib</project>
-		<project>moa-common</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
@@ -29,10 +27,9 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
 	</natures>
 </projectDescription>
diff --git a/spss/server/serverws/pom.xml b/spss/server/serverws/pom.xml
index ac06946a4..56168a586 100644
--- a/spss/server/serverws/pom.xml
+++ b/spss/server/serverws/pom.xml
@@ -10,7 +10,7 @@
     <groupId>MOA.spss.server</groupId>
     <artifactId>moa-spss-ws</artifactId>
     <packaging>war</packaging>
-    <version>2.0.1</version>
+    <version>${moa-spss-version}</version>
     <name>MOA SP/SS WebService</name>
 
     <properties>
@@ -67,7 +67,7 @@
                 </configuration>
             </plugin>
 
-        		<plugin>
+<!--         		<plugin>
             		<groupId>org.codehaus.mojo</groupId>
             		<artifactId>properties-maven-plugin</artifactId>
             		<version>1.0-alpha-2</version>
@@ -84,7 +84,7 @@
           		          </configuration>
               		  </execution>
             		</executions>
-        		</plugin>
+        		</plugin> -->
         	</plugins>
        </build>
     <dependencies>
diff --git a/spss/server/tools/pom.xml b/spss/server/tools/pom.xml
index 880eac2c1..f139e962d 100644
--- a/spss/server/tools/pom.xml
+++ b/spss/server/tools/pom.xml
@@ -9,7 +9,7 @@
   <groupId>MOA.spss.server</groupId>
   <artifactId>moa-spss-tools</artifactId>
   <packaging>jar</packaging>
-  <version>2.0.1</version>
+  <version>${moa-spss-version}</version>
   <name>MOA SP/SS Tools</name>
 
   <properties>
@@ -81,7 +81,7 @@
               </configuration>
           </plugin>
 
-        		<plugin>
+<!--         		<plugin>
             		<groupId>org.codehaus.mojo</groupId>
             		<artifactId>properties-maven-plugin</artifactId>
             		<version>1.0-alpha-2</version>
@@ -98,7 +98,7 @@
           		          </configuration>
               		  </execution>
             		</executions>
-        		</plugin>
+        		</plugin> -->
         	</plugins>
        </build>
 </project>
-- 
cgit v1.2.3